From 29da9b4b8e0b8792e5ee0967cc48e7f718da42b5 Mon Sep 17 00:00:00 2001 From: stephb9959 Date: Mon, 31 Jan 2022 14:14:33 -0800 Subject: [PATCH] Fixing Google Authenticator --- src/RESTAPI/RESTAPI_subuser_handler.cpp | 3 +-- src/RESTAPI/RESTAPI_user_handler.cpp | 3 +-- test_scripts/curl/cli | 9 +++++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/RESTAPI/RESTAPI_subuser_handler.cpp b/src/RESTAPI/RESTAPI_subuser_handler.cpp index 21b61da..c3020c6 100644 --- a/src/RESTAPI/RESTAPI_subuser_handler.cpp +++ b/src/RESTAPI/RESTAPI_subuser_handler.cpp @@ -202,8 +202,7 @@ namespace OpenWifi { if(RawObject->has("userTypeProprietaryInfo")) { if(NewUser.userTypeProprietaryInfo.mfa.enabled) { - if (!NewUser.userTypeProprietaryInfo.mfa.method.empty() && - !MFAMETHODS::Validate(NewUser.userTypeProprietaryInfo.mfa.method)) { + if (!MFAMETHODS::Validate(NewUser.userTypeProprietaryInfo.mfa.method)) { return BadRequest(RESTAPI::Errors::BadMFAMethod); } diff --git a/src/RESTAPI/RESTAPI_user_handler.cpp b/src/RESTAPI/RESTAPI_user_handler.cpp index b53bcbb..ef7d955 100644 --- a/src/RESTAPI/RESTAPI_user_handler.cpp +++ b/src/RESTAPI/RESTAPI_user_handler.cpp @@ -211,8 +211,7 @@ namespace OpenWifi { if(RawObject->has("userTypeProprietaryInfo")) { if(NewUser.userTypeProprietaryInfo.mfa.enabled) { - if (!NewUser.userTypeProprietaryInfo.mfa.method.empty() && - !MFAMETHODS::Validate(NewUser.userTypeProprietaryInfo.mfa.method)) { + if (!MFAMETHODS::Validate(NewUser.userTypeProprietaryInfo.mfa.method)) { return BadRequest(RESTAPI::Errors::BadMFAMethod); } diff --git a/test_scripts/curl/cli b/test_scripts/curl/cli index 06d5b1b..7950b0d 100755 --- a/test_scripts/curl/cli +++ b/test_scripts/curl/cli @@ -329,6 +329,14 @@ getpreferences() { jq < ${result_file} } +getauthqrcode() { + curl ${FLAGS} -X GET "https://${OWSEC}/api/v1/totp" \ + -H "Content-Type: application/json" \ + -H "Accept: image/svg+xml" \ + -H "Authorization: Bearer ${token}" \ + -o qrcode.svg +} + testlogout() { echo "Logged in..." oldtoken=${token} @@ -448,6 +456,7 @@ case "$1" in "systeminfo") login; systeminfo ; logout;; "setpreferences") login; setpreferences "$2" "$3" ; logout;; "getpreferences") login; getpreferences ; logout;; + "getauthqrcode") login; getauthqrcode; logout;; "help") login; help ; logout ;; *) help ;; esac