external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-20 18:27:23 +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
#	setup/mail-users.sh
This commit is contained in:
downtownallday
2020-09-29 22:20:15 -04:00
parent e2dea39e5b ada2167d08
commit 5deb88ab60
5 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
management/daemon.py
View File

@@ -9,7 +9,7 @@ import auth, utils, mfa
from mailconfig import get_mail_users, get_mail_users_ex, get_admins, add_mail_user, set_mail_password, set_mail_display_name, remove_mail_user
from mailconfig import get_mail_user_privileges, add_remove_mail_user_privilege
from mailconfig import get_mail_aliases, get_mail_aliases_ex, get_mail_domains, add_mail_alias, remove_mail_alias
from mfa import get_mfa_state, enable_mfa, disable_mfa
from mfa import get_public_mfa_state, enable_mfa, disable_mfa
import mfa_totp
env = utils.load_environment()
@@ -413,7 +413,7 @@ def ssl_provision_certs():
@authorized_personnel_only
def mfa_get_status():
return json_response({
"enabled_mfa": get_mfa_state(request.user_email, env),
"enabled_mfa": get_public_mfa_state(request.user_email, env),
"new_mfa": {
"totp": mfa_totp.provision(request.user_email, env)
}