external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-05 00:27:25 +00:00
Code Issues Releases Wiki Activity

Rename a function

Browse Source
This commit is contained in:
downtownallday 2020-09-29 08:55:04 -04:00
parent 18d9cd99ea
commit 75fb6d2a5d
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
management/mfa.py
View File

@ -30,11 +30,12 @@ def strip_order_prefix(rec, attributes):
newvals = [] newvals = []
for val in rec[attr]: for val in rec[attr]:
i = val.find('}') i = val.find('}')
if i>=0: newvals.append(val[i+1:]) newvals.append(val[i+1:])
rec[attr] = newvals rec[attr] = newvals
def get_mfa_user(email, env, conn=None): def get_mfa_user(email, env, conn=None):
'''get the ldap record for the user '''get the ldap record for the user along with all MFA-related
attributes
''' '''
user = find_mail_user(env, email, ['objectClass','totpSecret','totpMruToken','totpLabel'], conn) user = find_mail_user(env, email, ['objectClass','totpSecret','totpMruToken','totpLabel'], conn)
@ -103,7 +104,7 @@ def validate_auth_mfa(email, request, env):
for mfa_mode in mfa_state: for mfa_mode in mfa_state:
if mfa_mode["type"] == "totp": if mfa_mode["type"] == "totp":
user = get_mfa_user(email, env) user = get_mfa_user(email, env)
result, hint = mfa_totp.validate(user, mfa_mode, request, True, env) result, hint = mfa_totp.validate_auth(user, mfa_mode, request, True, env)
if not result: if not result:
hints.add(hint) hints.add(hint)
else: else:

4
management/mfa_totp.py
View File

@ -93,7 +93,7 @@ def disable(user, id, env):
open_database(env).modify_record(user, mods) open_database(env).modify_record(user, mods)
else: else:
# Disable totp at index specified # Disable totp at the index specified
idx = totp_index_from_id(user, id) idx = totp_index_from_id(user, id)
if idx<0 or idx>=len(user['totpSecret']): if idx<0 or idx>=len(user['totpSecret']):
raise ValueError('MFA/totp mru index is out of range') raise ValueError('MFA/totp mru index is out of range')
@ -141,7 +141,7 @@ def provision(email, env):
} }
def validate(user, state, request, save_mru, env): def validate_auth(user, state, request, save_mru, env):
# Check that a token is present in the X-Auth-Token header. # Check that a token is present in the X-Auth-Token header.
# If not, give a hint that one can be supplied. # If not, give a hint that one can be supplied.
token = request.headers.get('x-auth-token') token = request.headers.get('x-auth-token')