From 3d9c0a212efbb17a70e0729681b140f22aaf4c84 Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Tue, 30 Jul 2019 19:10:06 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=AC=A1=E6=95=B0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/authentication/forms.py | 33 +++- .../templates/authentication/login.html | 10 +- .../templates/authentication/new_login.html | 4 +- apps/authentication/views/login.py | 1 + apps/locale/zh/LC_MESSAGES/django.mo | Bin 78311 -> 78676 bytes apps/locale/zh/LC_MESSAGES/django.po | 150 ++++++++++-------- apps/users/utils.py | 9 +- 7 files changed, 129 insertions(+), 78 deletions(-) diff --git a/apps/authentication/forms.py b/apps/authentication/forms.py index 61b073e21..5316e0d79 100644 --- a/apps/authentication/forms.py +++ b/apps/authentication/forms.py @@ -5,6 +5,8 @@ from django import forms from django.contrib.auth.forms import AuthenticationForm from django.utils.translation import gettext_lazy as _ from captcha.fields import CaptchaField +from django.conf import settings +from users.utils import get_login_failed_count class UserLoginForm(AuthenticationForm): @@ -16,10 +18,18 @@ class UserLoginForm(AuthenticationForm): error_messages = { 'invalid_login': _( - "Please enter a correct username and password. Note that both " - "fields may be case-sensitive." + "The username or password you entered is incorrect, " + "please enter it again." ), 'inactive': _("This account is inactive."), + 'limit_login': _( + "You can also try {times_try} times " + "(The account will be temporarily locked for {block_time} minutes)" + ), + 'block_login': _( + "The account has been locked " + "(please contact admin to unlock it or try again after {} minutes)" + ) } def confirm_login_allowed(self, user): @@ -28,6 +38,25 @@ class UserLoginForm(AuthenticationForm): self.error_messages['inactive'], code='inactive',) + def get_limit_login_error_message(self, username, ip): + times_up = settings.SECURITY_LOGIN_LIMIT_COUNT + times_failed = get_login_failed_count(username, ip) + times_try = int(times_up) - int(times_failed) + block_time = settings.SECURITY_LOGIN_LIMIT_TIME + if times_try <= 0: + error_message = self.error_messages['block_login'] + error_message = error_message.format(block_time) + else: + error_message = self.error_messages['limit_login'] + error_message = error_message.format( + times_try=times_try, block_time=block_time, + ) + return error_message + + def add_limit_login_error(self, username, ip): + error = self.get_limit_login_error_message(username, ip) + self.add_error('password', error) + class UserLoginCaptchaForm(UserLoginForm): captcha = CaptchaField() diff --git a/apps/authentication/templates/authentication/login.html b/apps/authentication/templates/authentication/login.html index e565e209c..b31a716b8 100644 --- a/apps/authentication/templates/authentication/login.html +++ b/apps/authentication/templates/authentication/login.html @@ -58,6 +58,7 @@ {% else %}

{{ form.non_field_errors.as_text }}

{% endif %} +

{{ form.errors.password.as_text }}

{% endif %}
@@ -78,10 +79,11 @@ {% endif %}
-
- - {% trans 'Forgot password' %}? - +
+ + {% trans 'Forgot password' %}? + +
{% if AUTH_OPENID %} diff --git a/apps/authentication/templates/authentication/new_login.html b/apps/authentication/templates/authentication/new_login.html index c644e6fad..4a62dd6d0 100644 --- a/apps/authentication/templates/authentication/new_login.html +++ b/apps/authentication/templates/authentication/new_login.html @@ -72,9 +72,10 @@
{% csrf_token %} -
+
{% if block_login %}

{% trans 'Log in frequently and try again later' %}

+

{{ form.errors.password.as_text }}

{% elif password_expired %}

{% trans 'The user password has expired' %}

{% elif form.errors %} @@ -83,6 +84,7 @@ {% else %}

{{ form.non_field_errors.as_text }}

{% endif %} +

{{ form.errors.password.as_text }}

{% endif %}
diff --git a/apps/authentication/views/login.py b/apps/authentication/views/login.py index 53112fcac..0939370f1 100644 --- a/apps/authentication/views/login.py +++ b/apps/authentication/views/login.py @@ -100,6 +100,7 @@ class UserLoginView(FormView): # limit user login failed count ip = get_request_ip(self.request) increase_login_failed_count(username, ip) + form.add_limit_login_error(username, ip) # show captcha cache.set(self.key_prefix_captcha.format(ip), 1, 3600) self.send_auth_signal(success=False, username=username, reason=reason) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 47239902980980e61e50183934a00b8144ea263b..098558e3f1dd022335dd3739c200d3209cf8e940 100644 GIT binary patch delta 23526 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 delta 23163 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 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 2e9883d6a..a7dd721b8 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Jumpserver 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-29 18:24+0800\n" +"POT-Creation-Date: 2019-07-30 18:48+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -429,29 +429,29 @@ msgstr "详情" #: assets/templates/assets/system_user_list.html:33 #: assets/templates/assets/system_user_list.html:85 audits/models.py:33 #: perms/templates/perms/asset_permission_detail.html:30 -#: perms/templates/perms/asset_permission_list.html:177 +#: perms/templates/perms/asset_permission_list.html:178 #: perms/templates/perms/remote_app_permission_detail.html:30 #: perms/templates/perms/remote_app_permission_list.html:59 #: terminal/templates/terminal/terminal_detail.html:16 -#: terminal/templates/terminal/terminal_list.html:72 +#: terminal/templates/terminal/terminal_list.html:73 #: users/templates/users/user_detail.html:25 #: users/templates/users/user_group_detail.html:28 #: users/templates/users/user_group_list.html:20 -#: users/templates/users/user_group_list.html:70 +#: users/templates/users/user_group_list.html:71 #: users/templates/users/user_list.html:20 -#: users/templates/users/user_list.html:102 -#: users/templates/users/user_list.html:105 +#: users/templates/users/user_list.html:103 +#: users/templates/users/user_list.html:106 #: users/templates/users/user_profile.html:181 #: users/templates/users/user_profile.html:191 #: users/templates/users/user_profile.html:201 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:29 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:55 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:56 #: xpack/plugins/cloud/templates/cloud/account_detail.html:23 -#: xpack/plugins/cloud/templates/cloud/account_list.html:39 +#: xpack/plugins/cloud/templates/cloud/account_list.html:40 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:29 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:56 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:57 #: xpack/plugins/orgs/templates/orgs/org_detail.html:25 -#: xpack/plugins/orgs/templates/orgs/org_list.html:87 +#: xpack/plugins/orgs/templates/orgs/org_list.html:88 msgid "Update" msgstr "更新" @@ -473,25 +473,25 @@ msgstr "更新" #: assets/templates/assets/system_user_list.html:86 audits/models.py:34 #: ops/templates/ops/task_list.html:64 #: perms/templates/perms/asset_permission_detail.html:34 -#: perms/templates/perms/asset_permission_list.html:178 +#: perms/templates/perms/asset_permission_list.html:179 #: perms/templates/perms/remote_app_permission_detail.html:34 #: perms/templates/perms/remote_app_permission_list.html:60 #: settings/templates/settings/terminal_setting.html:93 #: settings/templates/settings/terminal_setting.html:115 -#: terminal/templates/terminal/terminal_list.html:74 +#: terminal/templates/terminal/terminal_list.html:75 #: users/templates/users/user_detail.html:30 #: users/templates/users/user_group_detail.html:32 -#: users/templates/users/user_group_list.html:72 -#: users/templates/users/user_list.html:110 -#: users/templates/users/user_list.html:114 +#: users/templates/users/user_group_list.html:73 +#: users/templates/users/user_list.html:111 +#: users/templates/users/user_list.html:115 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:33 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:57 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:58 #: xpack/plugins/cloud/templates/cloud/account_detail.html:27 -#: xpack/plugins/cloud/templates/cloud/account_list.html:41 +#: xpack/plugins/cloud/templates/cloud/account_list.html:42 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:33 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:57 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:58 #: xpack/plugins/orgs/templates/orgs/org_detail.html:29 -#: xpack/plugins/orgs/templates/orgs/org_list.html:89 +#: xpack/plugins/orgs/templates/orgs/org_list.html:90 msgid "Delete" msgstr "删除" @@ -719,9 +719,9 @@ msgstr "SSH网关，支持代理SSH,RDP和VNC" #: assets/templates/assets/domain_gateway_list.html:71 #: assets/templates/assets/system_user_detail.html:62 #: assets/templates/assets/system_user_list.html:52 audits/models.py:94 -#: audits/templates/audits/login_log_list.html:51 authentication/forms.py:11 -#: authentication/templates/authentication/login.html:64 -#: authentication/templates/authentication/new_login.html:90 +#: audits/templates/audits/login_log_list.html:51 authentication/forms.py:13 +#: authentication/templates/authentication/login.html:65 +#: authentication/templates/authentication/new_login.html:91 #: ops/models/adhoc.py:164 perms/templates/perms/asset_permission_list.html:70 #: perms/templates/perms/asset_permission_user.html:55 #: perms/templates/perms/remote_app_permission_user.html:54 @@ -748,9 +748,9 @@ msgstr "密码或密钥密码" #: assets/serializers/asset_user.py:62 #: assets/templates/assets/_asset_user_auth_update_modal.html:21 #: assets/templates/assets/_asset_user_auth_view_modal.html:27 -#: authentication/forms.py:13 -#: authentication/templates/authentication/login.html:67 -#: authentication/templates/authentication/new_login.html:93 +#: authentication/forms.py:15 +#: authentication/templates/authentication/login.html:68 +#: authentication/templates/authentication/new_login.html:94 #: settings/forms.py:110 users/forms.py:16 users/forms.py:28 #: users/templates/users/reset_password.html:53 #: users/templates/users/user_password_authentication.html:18 @@ -1595,8 +1595,8 @@ msgstr "选择节点" #: users/templates/users/user_detail.html:441 #: users/templates/users/user_detail.html:486 #: users/templates/users/user_group_create_update.html:32 -#: users/templates/users/user_group_list.html:119 -#: users/templates/users/user_list.html:255 +#: users/templates/users/user_group_list.html:120 +#: users/templates/users/user_list.html:256 #: xpack/plugins/cloud/templates/cloud/account_create_update.html:34 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:54 #: xpack/plugins/interface/templates/interface/interface.html:103 @@ -1649,10 +1649,10 @@ msgstr "创建管理用户" #: assets/templates/assets/asset_list.html:304 #: assets/templates/assets/system_user_list.html:192 #: assets/templates/assets/system_user_list.html:223 -#: users/templates/users/user_group_list.html:163 -#: users/templates/users/user_group_list.html:194 -#: users/templates/users/user_list.html:164 -#: users/templates/users/user_list.html:196 +#: users/templates/users/user_group_list.html:164 +#: users/templates/users/user_group_list.html:195 +#: users/templates/users/user_list.html:165 +#: users/templates/users/user_list.html:197 #: xpack/plugins/vault/templates/vault/vault.html:224 msgid "Please select file" msgstr "选择文件" @@ -1792,8 +1792,8 @@ msgstr "显示所有子节点资产" #: users/templates/users/user_detail.html:386 #: users/templates/users/user_detail.html:412 #: users/templates/users/user_detail.html:480 -#: users/templates/users/user_group_list.html:113 -#: users/templates/users/user_list.html:249 +#: users/templates/users/user_group_list.html:114 +#: users/templates/users/user_list.html:250 #: xpack/plugins/interface/templates/interface/interface.html:97 msgid "Are you sure?" msgstr "你确认吗?" @@ -1809,8 +1809,8 @@ msgstr "删除选择资产" #: users/templates/users/user_detail.html:416 #: users/templates/users/user_detail.html:484 #: users/templates/users/user_group_create_update.html:31 -#: users/templates/users/user_group_list.html:117 -#: users/templates/users/user_list.html:253 +#: users/templates/users/user_group_list.html:118 +#: users/templates/users/user_list.html:254 #: xpack/plugins/interface/templates/interface/interface.html:101 #: xpack/plugins/orgs/templates/orgs/org_create_update.html:32 msgid "Cancel" @@ -2392,17 +2392,29 @@ msgstr "" msgid "Invalid token or cache refreshed." msgstr "" -#: authentication/forms.py:19 +#: authentication/forms.py:21 msgid "" -"Please enter a correct username and password. Note that both fields may be " -"case-sensitive." -msgstr "请输入正确的用户名和密码. 注意它们是区分大小写." +"The username or password you entered is incorrect, please enter it again." +msgstr "您输入的用户名或密码不正确，请重新输入。" -#: authentication/forms.py:22 +#: authentication/forms.py:24 msgid "This account is inactive." msgstr "此账户无效" -#: authentication/forms.py:37 users/forms.py:22 +#: authentication/forms.py:26 +#, python-brace-format +msgid "" +"You can also try {times_try} times (The account will be temporarily locked " +"for {block_time} minutes)" +msgstr "您还可以尝试 {times_try} 次（账号将被临时锁定 {block_time} 分钟）" + +#: authentication/forms.py:30 +msgid "" +"The account has been locked (please contact admin to unlock it or try again " +"after {} minutes)" +msgstr "账号已被锁定（请联系管理员解锁 或 {}分钟后重试）" + +#: authentication/forms.py:66 users/forms.py:22 msgid "MFA code" msgstr "MFA 验证码" @@ -2466,8 +2478,8 @@ msgid "Changes the world, starting with a little bit." msgstr "改变世界，从一点点开始。" #: authentication/templates/authentication/login.html:46 -#: authentication/templates/authentication/login.html:72 -#: authentication/templates/authentication/new_login.html:99 +#: authentication/templates/authentication/login.html:73 +#: authentication/templates/authentication/new_login.html:100 #: templates/_header_bar.html:101 msgid "Login" msgstr "登录" @@ -2482,18 +2494,18 @@ msgstr "用户密码已过期" msgid "Captcha invalid" msgstr "验证码错误" -#: authentication/templates/authentication/login.html:83 -#: authentication/templates/authentication/new_login.html:103 +#: authentication/templates/authentication/login.html:84 +#: authentication/templates/authentication/new_login.html:104 #: users/templates/users/forgot_password.html:10 #: users/templates/users/forgot_password.html:25 msgid "Forgot password" msgstr "忘记密码" -#: authentication/templates/authentication/login.html:89 +#: authentication/templates/authentication/login.html:91 msgid "More login options" msgstr "更多登录方式" -#: authentication/templates/authentication/login.html:93 +#: authentication/templates/authentication/login.html:95 msgid "Keycloak" msgstr "" @@ -2542,16 +2554,16 @@ msgstr "欢迎回来，请输入用户名和密码登录" msgid "Please enable cookies and try again." msgstr "设置你的浏览器支持cookie" -#: authentication/views/login.py:172 users/views/user.py:386 +#: authentication/views/login.py:173 users/views/user.py:386 #: users/views/user.py:411 msgid "MFA code invalid, or ntp sync server time" msgstr "MFA验证码不正确，或者服务器端时间不对" -#: authentication/views/login.py:203 +#: authentication/views/login.py:204 msgid "Logout success" msgstr "退出登录成功" -#: authentication/views/login.py:204 +#: authentication/views/login.py:205 msgid "Logout success, return login page" msgstr "退出登录成功，返回到登录页面" @@ -2955,9 +2967,9 @@ msgstr "版本" #: ops/templates/ops/task_list.html:63 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:137 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:53 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:54 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:141 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:54 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:55 msgid "Run" msgstr "执行" @@ -3167,7 +3179,7 @@ msgstr "刷新授权缓存" msgid "Validity" msgstr "有效" -#: perms/templates/perms/asset_permission_list.html:244 +#: perms/templates/perms/asset_permission_list.html:245 msgid "Refresh success" msgstr "刷新成功" @@ -4347,11 +4359,11 @@ msgstr "地址" msgid "Alive" msgstr "在线" -#: terminal/templates/terminal/terminal_list.html:77 +#: terminal/templates/terminal/terminal_list.html:78 msgid "Accept" msgstr "接受" -#: terminal/templates/terminal/terminal_list.html:79 +#: terminal/templates/terminal/terminal_list.html:80 msgid "Reject" msgstr "拒绝" @@ -4911,45 +4923,45 @@ msgstr "添加用户" msgid "Create user group" msgstr "创建用户组" -#: users/templates/users/user_group_list.html:114 +#: users/templates/users/user_group_list.html:115 msgid "This will delete the selected groups !!!" msgstr "删除选择组" -#: users/templates/users/user_group_list.html:123 +#: users/templates/users/user_group_list.html:124 msgid "UserGroups Deleted." msgstr "用户组删除" -#: users/templates/users/user_group_list.html:124 -#: users/templates/users/user_group_list.html:129 +#: users/templates/users/user_group_list.html:125 +#: users/templates/users/user_group_list.html:130 msgid "UserGroups Delete" msgstr "用户组删除" -#: users/templates/users/user_group_list.html:128 +#: users/templates/users/user_group_list.html:129 msgid "UserGroup Deleting failed." msgstr "用户组删除失败" -#: users/templates/users/user_list.html:250 +#: users/templates/users/user_list.html:251 msgid "This will delete the selected users !!!" msgstr "删除选中用户 !!!" -#: users/templates/users/user_list.html:266 +#: users/templates/users/user_list.html:267 msgid "User Deleted." msgstr "已被删除" -#: users/templates/users/user_list.html:267 -#: users/templates/users/user_list.html:271 +#: users/templates/users/user_list.html:268 +#: users/templates/users/user_list.html:272 msgid "User Delete" msgstr "删除" -#: users/templates/users/user_list.html:270 +#: users/templates/users/user_list.html:271 msgid "User Deleting failed." msgstr "用户删除失败" -#: users/templates/users/user_list.html:323 +#: users/templates/users/user_list.html:324 msgid "User is expired" msgstr "用户已失效" -#: users/templates/users/user_list.html:326 +#: users/templates/users/user_list.html:327 msgid "User is inactive" msgstr "用户已禁用" @@ -5484,7 +5496,7 @@ msgid "Run plan manually" msgstr "手动执行计划" #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:179 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:102 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:103 msgid "Execute failed" msgstr "执行失败" @@ -5708,7 +5720,7 @@ msgid "Run task manually" msgstr "手动执行任务" #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:181 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:98 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:99 msgid "Sync success" msgstr "同步成功" diff --git a/apps/users/utils.py b/apps/users/utils.py index 88564c2d3..3ccdc15b0 100644 --- a/apps/users/utils.py +++ b/apps/users/utils.py @@ -299,6 +299,12 @@ def increase_login_failed_count(username, ip): cache.set(key_limit, count, int(limit_time)*60) +def get_login_failed_count(username, ip): + key_limit = key_prefix_limit.format(username, ip) + count = cache.get(key_limit, 0) + return count + + def clean_failed_count(username, ip): key_limit = key_prefix_limit.format(username, ip) key_block = key_prefix_block.format(username) @@ -307,9 +313,8 @@ def clean_failed_count(username, ip): def is_block_login(username, ip): - key_limit = key_prefix_limit.format(username, ip) + count = get_login_failed_count(username, ip) key_block = key_prefix_block.format(username) - count = cache.get(key_limit, 0) limit_count = settings.SECURITY_LOGIN_LIMIT_COUNT limit_time = settings.SECURITY_LOGIN_LIMIT_TIME