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

perf: modify user login ACL msg

pull/13568/head
wangruidong 2024-07-01 19:28:58 +08:00 committed by w940853815
parent 237b4a82c9
commit c718fe1a9d
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/authentication/errors/failed.py
View File

@ -142,11 +142,11 @@ class ACLError(AuthFailedNeedLogMixin, AuthFailedError):
} }
class LoginACLIPAndTimePeriodNotAllowed(ACLError): class LoginACLNotAllowed(ACLError):
def __init__(self, username, request, **kwargs): def __init__(self, username, request, **kwargs):
self.username = username self.username = username
self.request = request self.request = request
super().__init__(_("Current IP and Time period is not allowed"), **kwargs) super().__init__(_("Current login is prohibited by ACL rules"), **kwargs)
class MFACodeRequiredError(AuthFailedError): class MFACodeRequiredError(AuthFailedError):

2
apps/authentication/mixins.py
View File

@ -353,7 +353,7 @@ class AuthACLMixin:
return return
if acl.is_action(LoginACL.ActionChoices.reject): if acl.is_action(LoginACL.ActionChoices.reject):
raise errors.LoginACLIPAndTimePeriodNotAllowed(user.username, request=self.request) raise errors.LoginACLNotAllowed(user.username, request=self.request)
if acl.is_action(acl.ActionChoices.review): if acl.is_action(acl.ActionChoices.review):
self.request.session['auth_confirm_required'] = '1' self.request.session['auth_confirm_required'] = '1'

2
apps/i18n/core/en/LC_MESSAGES/django.po
View File

@ -2997,7 +2997,7 @@ msgid "Login confirm ticket was {}"
msgstr "" msgstr ""
#: authentication/errors/failed.py:149 #: authentication/errors/failed.py:149
msgid "Current IP and Time period is not allowed" msgid "Current login is prohibited by ACL rules"
msgstr "" msgstr ""
#: authentication/errors/failed.py:154 #: authentication/errors/failed.py:154

4
apps/i18n/core/ja/LC_MESSAGES/django.po
View File

@ -3073,8 +3073,8 @@ msgid "Login confirm ticket was {}"
msgstr "ログイン確認チケットは {} でした" msgstr "ログイン確認チケットは {} でした"
#: authentication/errors/failed.py:149 #: authentication/errors/failed.py:149
msgid "Current IP and Time period is not allowed" msgid "Current login is prohibited by ACL rules"
msgstr "現在の IP と期間はログインを許可されていません" msgstr "現在のログインはACLルールによって禁止されています"
#: authentication/errors/failed.py:154 #: authentication/errors/failed.py:154
msgid "Please enter MFA code" msgid "Please enter MFA code"

4
apps/i18n/core/zh/LC_MESSAGES/django.po
View File

@ -3026,8 +3026,8 @@ msgid "Login confirm ticket was {}"
msgstr "登录复核: {}" msgstr "登录复核: {}"
#: authentication/errors/failed.py:149 #: authentication/errors/failed.py:149
msgid "Current IP and Time period is not allowed" msgid "Current login is prohibited by ACL rules"
msgstr "当前 IP 和时间段不被允许登录" msgstr "当前登录ACL规则禁止登录"
#: authentication/errors/failed.py:154 #: authentication/errors/failed.py:154
msgid "Please enter MFA code" msgid "Please enter MFA code"