github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3926 from jumpserver/fix_otp_error 

Fix otp error
pull/3929/head
老广 2020-04-20 17:00:54 +08:00 committed by GitHub
parent c16a986c4b 91c994924f
commit 2df7bd8510
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/authentication/errors.py
View File

@ -93,6 +93,9 @@ class AuthFailedError(Exception):
'msg': self.msg, 'msg': self.msg,
} }
def __str__(self):
return str(self.msg)
class CredentialError(AuthFailedNeedLogMixin, AuthFailedNeedBlockMixin, AuthFailedError): class CredentialError(AuthFailedNeedLogMixin, AuthFailedNeedBlockMixin, AuthFailedError):
def __init__(self, error, username, ip, request): def __init__(self, error, username, ip, request):

2
apps/authentication/views/login.py
View File

@ -133,7 +133,7 @@ class UserLoginGuardView(mixins.AuthMixin, RedirectView):
user = self.check_user_auth_if_need() user = self.check_user_auth_if_need()
self.check_user_mfa_if_need(user) self.check_user_mfa_if_need(user)
self.check_user_login_confirm_if_need(user) self.check_user_login_confirm_if_need(user)
except errors.CredentialError: except (errors.CredentialError, errors.SessionEmptyError):
return self.format_redirect_url(self.login_url) return self.format_redirect_url(self.login_url)
except errors.MFARequiredError: except errors.MFARequiredError:
return self.format_redirect_url(self.login_otp_url) return self.format_redirect_url(self.login_otp_url)

6
apps/authentication/views/mfa.py
View File

@ -6,6 +6,9 @@ from django.views.generic.edit import FormView
from .. import forms, errors, mixins from .. import forms, errors, mixins
from .utils import redirect_to_guard_view from .utils import redirect_to_guard_view
from common.utils import get_logger
logger = get_logger(__name__)
__all__ = ['UserLoginOtpView'] __all__ = ['UserLoginOtpView']
@ -22,4 +25,7 @@ class UserLoginOtpView(mixins.AuthMixin, FormView):
except errors.MFAFailedError as e: except errors.MFAFailedError as e:
form.add_error('otp_code', e.msg) form.add_error('otp_code', e.msg)
return super().form_invalid(form) return super().form_invalid(form)
except Exception as e:
logger.error(e)
return redirect_to_guard_view()