From d1110c4c026d8cd60ac881ced5285b25f39355a7 Mon Sep 17 00:00:00 2001 From: downtownallday Date: Sat, 31 Oct 2020 11:31:44 -0400 Subject: [PATCH] merge from upstream --- api/mailinabox.yml | 2 +- management/mfa.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api/mailinabox.yml b/api/mailinabox.yml index 2c27b0b9..a9a2c124 100644 --- a/api/mailinabox.yml +++ b/api/mailinabox.yml @@ -1734,7 +1734,7 @@ paths: tags: - MFA summary: Disable multi-factor authentication for you or another user - description: Disables multi-factor authentication for the currently logged-in admin user or another user if a 'user' parameter is subimtted. Either disables all multi-factor authentication methods or the method corresponding to the optional property `mfa_id`. + description: Disables multi-factor authentication for the currently logged-in admin user or another user if a 'user' parameter is submitted. Either disables all multi-factor authentication methods or the method corresponding to the optional property `mfa_id`. operationId: mfaTotpDisable requestBody: required: false diff --git a/management/mfa.py b/management/mfa.py index ed9783b9..9c3a6636 100644 --- a/management/mfa.py +++ b/management/mfa.py @@ -107,10 +107,11 @@ def disable_mfa(email, mfa_id, env): if mfa_id is None: # Disable all MFA for a user. return mfa_totp.disable(user, None, env) - elif mfa_id.startswith("totp:"): # Disable a particular MFA mode for a user. return mfa_totp.disable(user, mfa_id, env) + else: + return False def validate_auth_mfa(email, request, env): # Validates that a login request satisfies any MFA modes