external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-04 15:54:48 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'fspoettel/admin-panel-2fa' into totp

Browse Source 
# Conflicts:
#	management/daemon.py
#	management/mfa.py
This commit is contained in:
downtownallday
2020-10-29 16:56:36 -04:00
parent a78e6eb3fa 601c23d91b
commit a7370beae0
11 changed files with 206 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/suites/_mgmt-functions.sh
View File

@@ -222,8 +222,8 @@ mgmt_mfa_status() {
local user="$1"
local pw="$2"
record "[Get MFA status]"
if ! mgmt_rest_as_user "GET" "/admin/mfa/status" "$user" "$pw"; then
REST_ERROR="Failed: GET /admin/mfa/status: $REST_ERROR"
if ! mgmt_rest_as_user "POST" "/admin/mfa/status" "$user" "$pw"; then
REST_ERROR="Failed: POST /admin/mfa/status: $REST_ERROR"
return 1
fi
# json is in REST_OUTPUT...