From 21ac3eaf8bd78b5b01ce926aa44fc29a9a6d528b Mon Sep 17 00:00:00 2001 From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> Date: Fri, 24 May 2019 19:41:07 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E7=94=A8=E6=88=B7=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=86=E7=A0=81=E8=AE=BE=E7=BD=AE=E7=AD=96?= =?UTF-8?q?=E7=95=A5=20(#2731)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Update] 优化创建用户的密码策略功能 * [Update] 优化用户初始密码设置以及清除初始密码 * [Update] 优化创建用户的密码策略功能 * [Update]统一变量名前缀 * [Update] 用户密码策略去掉自定义策略 * [Update] 修改小问题 * [Update] 优化创建用户密码策略 * [Update] 翻译 * [Update] 优化mfa按钮排布和间距 * [Update] 优化mfa按钮样式由前端控制 * [Update] 优化前端密码策略按钮的显示与隐藏 * [Update] 用户创建设置密码添加密码校验弹窗 --- apps/locale/zh/LC_MESSAGES/django.mo | Bin 76566 -> 76482 bytes apps/locale/zh/LC_MESSAGES/django.po | 300 ++++++++++-------- apps/settings/api.py | 5 +- .../templates/settings/security_setting.html | 4 +- apps/users/forms.py | 10 + apps/users/templates/users/_user.html | 3 + apps/users/templates/users/user_create.html | 82 ++++- apps/users/views/user.py | 11 +- 8 files changed, 273 insertions(+), 142 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index cc3a0249dbb06b08f685868c4acd68f3b30d198b..fb8aab6444d1016140b90b68c22ae5d4fb64a578 100644 GIT binary patch delta 18401 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 delta 18459 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 PKI7siYnvqo24(v{D?kQ< diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 875e91c25..83393725d 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-05-24 12:02+0800\n" +"POT-Creation-Date: 2019-05-24 19:17+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -101,7 +101,7 @@ msgstr "运行参数" #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:13 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:14 #: xpack/plugins/cloud/models.py:187 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:65 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:63 #: xpack/plugins/orgs/templates/orgs/org_list.html:16 msgid "Asset" msgstr "资产" @@ -177,9 +177,9 @@ msgstr "系统用户" #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:61 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:12 #: xpack/plugins/cloud/models.py:49 xpack/plugins/cloud/models.py:119 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:52 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:50 #: xpack/plugins/cloud/templates/cloud/account_list.html:12 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:55 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:53 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:12 #: xpack/plugins/orgs/templates/orgs/org_detail.html:52 #: xpack/plugins/orgs/templates/orgs/org_list.html:12 @@ -244,8 +244,8 @@ msgstr "创建者" #: users/templates/users/user_group_detail.html:63 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:105 #: xpack/plugins/cloud/models.py:56 xpack/plugins/cloud/models.py:128 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:68 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:79 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:66 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:77 #: xpack/plugins/orgs/templates/orgs/org_detail.html:60 msgid "Date created" msgstr "创建日期" @@ -286,9 +286,9 @@ msgstr "创建日期" #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:117 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:19 #: xpack/plugins/cloud/models.py:54 xpack/plugins/cloud/models.py:125 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:72 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:70 #: xpack/plugins/cloud/templates/cloud/account_list.html:15 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:71 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:69 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:16 #: xpack/plugins/orgs/templates/orgs/org_detail.html:64 #: xpack/plugins/orgs/templates/orgs/org_list.html:22 @@ -443,11 +443,11 @@ msgstr "详情" #: users/templates/users/user_profile.html:187 #: users/templates/users/user_profile.html:196 #: 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:54 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:25 -#: xpack/plugins/cloud/templates/cloud/account_list.html:38 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:55 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:23 +#: xpack/plugins/cloud/templates/cloud/account_list.html:39 #: xpack/plugins/orgs/templates/orgs/org_detail.html:25 -#: xpack/plugins/orgs/templates/orgs/org_list.html:85 +#: xpack/plugins/orgs/templates/orgs/org_list.html:87 msgid "Update" msgstr "更新" @@ -481,13 +481,13 @@ msgstr "更新" #: users/templates/users/user_list.html:104 #: users/templates/users/user_list.html:108 #: 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:56 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:29 -#: xpack/plugins/cloud/templates/cloud/account_list.html:40 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:32 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:54 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:57 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:27 +#: xpack/plugins/cloud/templates/cloud/account_list.html:41 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:30 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:55 #: xpack/plugins/orgs/templates/orgs/org_detail.html:29 -#: xpack/plugins/orgs/templates/orgs/org_list.html:87 +#: xpack/plugins/orgs/templates/orgs/org_list.html:89 msgid "Delete" msgstr "删除" @@ -624,7 +624,7 @@ msgstr "节点管理" #: assets/models/cluster.py:19 assets/models/user.py:91 #: assets/templates/assets/asset_detail.html:80 templates/_nav.html:24 #: xpack/plugins/cloud/models.py:124 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:67 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:65 #: xpack/plugins/orgs/templates/orgs/org_list.html:18 msgid "Admin user" msgstr "管理用户" @@ -661,8 +661,8 @@ msgstr "网域" #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:55 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:15 #: xpack/plugins/cloud/models.py:123 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:63 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:66 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:61 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:64 msgid "Node" msgstr "节点" @@ -742,9 +742,8 @@ msgstr "密码或密钥密码" #: authentication/forms.py:13 #: authentication/templates/authentication/login.html:67 #: authentication/templates/authentication/new_login.html:93 -#: settings/forms.py:103 users/forms.py:15 users/forms.py:27 +#: settings/forms.py:103 users/forms.py:15 users/forms.py:33 #: users/templates/users/reset_password.html:53 -#: users/templates/users/user_create.html:10 #: users/templates/users/user_password_authentication.html:18 #: users/templates/users/user_password_update.html:43 #: users/templates/users/user_profile_update.html:40 @@ -1138,10 +1137,10 @@ msgstr "默认资产组" #: terminal/models.py:154 terminal/templates/terminal/command_list.html:32 #: terminal/templates/terminal/command_list.html:72 #: terminal/templates/terminal/session_list.html:33 -#: terminal/templates/terminal/session_list.html:71 users/forms.py:283 +#: terminal/templates/terminal/session_list.html:71 users/forms.py:293 #: users/models/user.py:36 users/models/user.py:467 users/serializers/v1.py:61 #: users/templates/users/user_group_detail.html:78 -#: users/templates/users/user_group_list.html:36 users/views/user.py:394 +#: users/templates/users/user_group_list.html:36 users/views/user.py:399 #: xpack/plugins/orgs/forms.py:26 #: xpack/plugins/orgs/templates/orgs/org_detail.html:113 #: xpack/plugins/orgs/templates/orgs/org_list.html:14 @@ -1216,7 +1215,7 @@ msgstr "连接" msgid "Org name" msgstr "组织名" -#: assets/serializers/asset_user.py:23 users/forms.py:230 +#: assets/serializers/asset_user.py:23 users/forms.py:240 #: users/models/user.py:91 users/templates/users/first_login.html:42 #: users/templates/users/user_password_update.html:46 #: users/templates/users/user_profile.html:68 @@ -1371,7 +1370,7 @@ msgstr "资产用户信息" #: assets/templates/assets/_asset_user_view_auth_modal.html:14 #: audits/models.py:99 audits/templates/audits/login_log_list.html:56 -#: users/forms.py:142 users/models/user.py:83 +#: users/forms.py:152 users/models/user.py:83 #: users/templates/users/first_login.html:45 msgid "MFA" msgstr "MFA" @@ -2233,7 +2232,7 @@ msgstr "原因" #: audits/models.py:101 audits/templates/audits/login_log_list.html:58 #: xpack/plugins/cloud/models.py:171 xpack/plugins/cloud/models.py:188 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:70 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:67 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:65 msgid "Status" msgstr "状态" @@ -2273,7 +2272,7 @@ msgstr "选择用户" #: terminal/templates/terminal/command_list.html:60 #: terminal/templates/terminal/session_list.html:61 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:52 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:50 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:48 msgid "Search" msgstr "搜索" @@ -2283,7 +2282,7 @@ msgstr "搜索" #: ops/templates/ops/task_detail.html:56 #: terminal/templates/terminal/session_list.html:70 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:64 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:62 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:60 msgid "ID" msgstr "ID" @@ -2544,8 +2543,8 @@ msgstr "欢迎回来，请输入用户名和密码登录" msgid "Please enable cookies and try again." msgstr "设置你的浏览器支持cookie" -#: authentication/views/login.py:172 users/views/user.py:540 -#: users/views/user.py:565 +#: authentication/views/login.py:172 users/views/user.py:545 +#: users/views/user.py:570 msgid "MFA code invalid, or ntp sync server time" msgstr "MFA验证码不正确，或者服务器端时间不对" @@ -2685,7 +2684,7 @@ msgid "Become" msgstr "Become" #: ops/models/adhoc.py:166 users/templates/users/user_group_detail.html:59 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:64 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:62 #: xpack/plugins/orgs/templates/orgs/org_detail.html:56 msgid "Create by" msgstr "创建者" @@ -2931,8 +2930,8 @@ 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:52 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:52 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:53 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:53 msgid "Run" msgstr "执行" @@ -2988,7 +2987,7 @@ msgstr "下载文件" #: perms/templates/perms/asset_permission_list.html:75 #: perms/templates/perms/asset_permission_list.html:122 #: perms/templates/perms/remote_app_permission_list.html:16 -#: templates/_nav.html:14 users/forms.py:253 users/models/group.py:26 +#: templates/_nav.html:14 users/forms.py:263 users/models/group.py:26 #: users/models/user.py:67 users/templates/users/_select_user_modal.html:16 #: users/templates/users/user_detail.html:213 #: users/templates/users/user_list.html:38 @@ -3117,7 +3116,7 @@ msgstr "创建授权规则" #: perms/templates/perms/asset_permission_list.html:73 #: perms/templates/perms/remote_app_permission_list.html:18 #: users/templates/users/user_list.html:40 xpack/plugins/cloud/models.py:53 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:60 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:58 #: xpack/plugins/cloud/templates/cloud/account_list.html:14 msgid "Validity" msgstr "有效" @@ -3685,8 +3684,8 @@ msgstr "端点后缀" #: settings/templates/settings/replay_storage_create.html:136 #: xpack/plugins/cloud/models.py:186 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:83 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:64 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:81 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:62 msgid "Region" msgstr "地域" @@ -3732,18 +3731,14 @@ msgstr "删除失败" msgid "Are you sure about deleting it?" msgstr "您确定删除吗?" -#: settings/utils.py:71 -msgid "User does not exist" -msgstr "用户不存在" - -#: settings/utils.py:74 -msgid "The user source is not LDAP" -msgstr "用户来源不是LDAP" - -#: settings/utils.py:155 +#: settings/utils.py:85 msgid "Search no entry matched in ou {}" msgstr "在ou:{}中没有匹配条目" +#: settings/utils.py:113 +msgid "The user source is not LDAP" +msgstr "用户来源不是LDAP" + #: settings/views.py:18 settings/views.py:44 settings/views.py:70 #: settings/views.py:99 settings/views.py:126 settings/views.py:138 #: settings/views.py:151 settings/views.py:177 templates/_nav.html:118 @@ -3775,14 +3770,14 @@ msgstr "文档" msgid "Commercial support" msgstr "商业支持" -#: templates/_header_bar.html:89 templates/_nav_user.html:26 users/forms.py:121 +#: templates/_header_bar.html:89 templates/_nav_user.html:26 users/forms.py:131 #: users/templates/users/_user.html:43 #: users/templates/users/first_login.html:39 #: users/templates/users/user_password_update.html:40 #: users/templates/users/user_profile.html:17 #: users/templates/users/user_profile_update.html:37 #: users/templates/users/user_profile_update.html:57 -#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:376 +#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:381 msgid "Profile" msgstr "个人信息" @@ -3876,9 +3871,9 @@ msgstr "" #: templates/_nav.html:10 users/views/group.py:27 users/views/group.py:43 #: users/views/group.py:59 users/views/group.py:75 users/views/group.py:91 -#: users/views/login.py:154 users/views/user.py:70 users/views/user.py:85 -#: users/views/user.py:124 users/views/user.py:202 users/views/user.py:363 -#: users/views/user.py:413 users/views/user.py:453 +#: users/views/login.py:154 users/views/user.py:70 users/views/user.py:86 +#: users/views/user.py:129 users/views/user.py:207 users/views/user.py:368 +#: users/views/user.py:418 users/views/user.py:458 msgid "Users" msgstr "用户管理" @@ -3919,7 +3914,7 @@ msgid "File manager" msgstr "文件管理" #: templates/_nav.html:68 terminal/views/command.py:50 -#: terminal/views/session.py:75 terminal/views/session.py:93 +#: terminal/views/session.py:74 terminal/views/session.py:92 #: terminal/views/session.py:115 terminal/views/terminal.py:31 #: terminal/views/terminal.py:46 terminal/views/terminal.py:58 msgid "Terminal" @@ -4299,11 +4294,11 @@ msgstr "接受终端注册" msgid "Info" msgstr "信息" -#: terminal/views/session.py:76 +#: terminal/views/session.py:75 msgid "Session online list" msgstr "在线会话" -#: terminal/views/session.py:94 +#: terminal/views/session.py:93 msgid "Session offline list" msgstr "离线会话" @@ -4336,7 +4331,15 @@ msgstr "你没有权限" msgid "Could not reset self otp, use profile reset instead" msgstr "不能再该页面重置MFA, 请去个人信息页面重置" -#: users/forms.py:32 users/models/user.py:71 +#: users/forms.py:25 +msgid "Reset link will be generated and sent to the user" +msgstr "生成重置密码链接，通过邮件发送给用户" + +#: users/forms.py:26 +msgid "Set password" +msgstr "设置密码" + +#: users/forms.py:38 users/models/user.py:71 #: users/templates/users/_select_user_modal.html:15 #: users/templates/users/user_detail.html:87 #: users/templates/users/user_list.html:37 @@ -4344,31 +4347,39 @@ msgstr "不能再该页面重置MFA, 请去个人信息页面重置" msgid "Role" msgstr "角色" -#: users/forms.py:35 users/forms.py:200 +#: users/forms.py:41 users/forms.py:210 msgid "ssh public key" msgstr "ssh公钥" -#: users/forms.py:36 users/forms.py:201 +#: users/forms.py:42 users/forms.py:211 msgid "ssh-rsa AAAA..." msgstr "" -#: users/forms.py:37 +#: users/forms.py:43 msgid "Paste user id_rsa.pub here." msgstr "复制用户公钥到这里" -#: users/forms.py:51 users/templates/users/user_detail.html:221 +#: users/forms.py:47 xpack/plugins/change_auth_plan/models.py:83 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:51 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:69 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:57 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:16 +msgid "Password strategy" +msgstr "密码策略" + +#: users/forms.py:61 users/templates/users/user_detail.html:221 msgid "Join user groups" msgstr "添加到用户组" -#: users/forms.py:85 users/forms.py:215 +#: users/forms.py:95 users/forms.py:225 msgid "Public key should not be the same as your old one." msgstr "不能和原来的密钥相同" -#: users/forms.py:89 users/forms.py:219 users/serializers/v1.py:47 +#: users/forms.py:99 users/forms.py:229 users/serializers/v1.py:47 msgid "Not a valid ssh public key" msgstr "ssh密钥不合法" -#: users/forms.py:127 +#: users/forms.py:137 msgid "" "Tip: when enabled, you will enter the MFA binding process the next time you " "log in. you can also directly bind in \"personal information -> quick " @@ -4377,11 +4388,11 @@ msgstr "" "提示：启用之后您将会在下次登录时进入MFA绑定流程；您也可以在（个人信息->快速修" "改->更改MFA设置）中直接绑定!" -#: users/forms.py:137 +#: users/forms.py:147 msgid "* Enable MFA authentication to make the account more secure." msgstr "* 启用MFA认证，使账号更加安全." -#: users/forms.py:147 +#: users/forms.py:157 msgid "" "In order to protect you and your company, please keep your account, password " "and key sensitive information properly. (for example: setting complex " @@ -4390,41 +4401,41 @@ msgstr "" "为了保护您和公司的安全，请妥善保管您的账户、密码和密钥等重要敏感信息；（如：" "设置复杂密码，启用MFA认证）" -#: users/forms.py:154 users/templates/users/first_login.html:48 +#: users/forms.py:164 users/templates/users/first_login.html:48 #: users/templates/users/first_login.html:107 #: users/templates/users/first_login.html:130 msgid "Finish" msgstr "完成" -#: users/forms.py:160 +#: users/forms.py:170 msgid "Old password" msgstr "原来密码" -#: users/forms.py:165 +#: users/forms.py:175 msgid "New password" msgstr "新密码" -#: users/forms.py:170 +#: users/forms.py:180 msgid "Confirm password" msgstr "确认密码" -#: users/forms.py:180 +#: users/forms.py:190 msgid "Old password error" msgstr "原来密码错误" -#: users/forms.py:188 +#: users/forms.py:198 msgid "Password does not match" msgstr "密码不一致" -#: users/forms.py:198 +#: users/forms.py:208 msgid "Automatically configure and download the SSH key" msgstr "自动配置并下载SSH密钥" -#: users/forms.py:202 +#: users/forms.py:212 msgid "Paste your id_rsa.pub here." msgstr "复制你的公钥到这里" -#: users/forms.py:236 users/forms.py:241 users/forms.py:287 +#: users/forms.py:246 users/forms.py:251 users/forms.py:297 #: xpack/plugins/orgs/forms.py:30 msgid "Select users" msgstr "选择用户" @@ -4471,7 +4482,7 @@ msgid "Date password last updated" msgstr "最后更新密码日期" #: users/models/user.py:136 users/templates/users/user_update.html:22 -#: users/views/login.py:47 users/views/login.py:108 users/views/user.py:426 +#: users/views/login.py:47 users/views/login.py:108 users/views/user.py:431 msgid "User auth from {}, go there change password" msgstr "用户认证源来自 {}, 请去相应系统修改密码" @@ -4522,7 +4533,7 @@ msgstr "安全令牌验证" #: users/templates/users/_base_otp.html:44 users/templates/users/_user.html:13 #: users/templates/users/user_profile_update.html:51 #: xpack/plugins/cloud/models.py:120 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:59 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:57 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:13 msgid "Account" msgstr "账户" @@ -4557,7 +4568,7 @@ msgid "Import users" msgstr "导入用户" #: users/templates/users/_user_update_modal.html:4 -#: users/templates/users/user_update.html:4 users/views/user.py:125 +#: users/templates/users/user_update.html:4 users/views/user.py:130 msgid "Update user" msgstr "更新用户" @@ -4635,12 +4646,14 @@ msgid "Reset password" msgstr "重置密码" #: users/templates/users/reset_password.html:59 +#: users/templates/users/user_create.html:15 #: users/templates/users/user_password_update.html:61 #: users/templates/users/user_update.html:13 msgid "Your password must satisfy" msgstr "您的密码必须满足：" #: users/templates/users/reset_password.html:60 +#: users/templates/users/user_create.html:16 #: users/templates/users/user_password_update.html:62 #: users/templates/users/user_update.html:14 msgid "Password strength" @@ -4651,52 +4664,54 @@ msgid "Password again" msgstr "再次输入密码" #: users/templates/users/reset_password.html:105 +#: users/templates/users/user_create.html:35 #: users/templates/users/user_password_update.html:99 #: users/templates/users/user_update.html:46 msgid "Very weak" msgstr "很弱" #: users/templates/users/reset_password.html:106 +#: users/templates/users/user_create.html:36 #: users/templates/users/user_password_update.html:100 #: users/templates/users/user_update.html:47 msgid "Weak" msgstr "弱" #: users/templates/users/reset_password.html:107 +#: users/templates/users/user_create.html:37 #: users/templates/users/user_password_update.html:101 #: users/templates/users/user_update.html:48 msgid "Normal" msgstr "正常" #: users/templates/users/reset_password.html:108 +#: users/templates/users/user_create.html:38 #: users/templates/users/user_password_update.html:102 #: users/templates/users/user_update.html:49 msgid "Medium" msgstr "一般" #: users/templates/users/reset_password.html:109 +#: users/templates/users/user_create.html:39 #: users/templates/users/user_password_update.html:103 #: users/templates/users/user_update.html:50 msgid "Strong" msgstr "强" #: users/templates/users/reset_password.html:110 +#: users/templates/users/user_create.html:40 #: users/templates/users/user_password_update.html:104 #: users/templates/users/user_update.html:51 msgid "Very strong" msgstr "很强" #: users/templates/users/user_create.html:4 -#: users/templates/users/user_list.html:28 users/views/user.py:85 +#: users/templates/users/user_list.html:28 users/views/user.py:87 msgid "Create user" msgstr "创建用户" -#: users/templates/users/user_create.html:12 -msgid "Reset link will be generated and sent to the user. " -msgstr "生成重置密码连接，通过邮件发送给用户" - #: users/templates/users/user_detail.html:19 -#: users/templates/users/user_granted_asset.html:18 users/views/user.py:203 +#: users/templates/users/user_granted_asset.html:18 users/views/user.py:208 msgid "User detail" msgstr "用户详情" @@ -4899,8 +4914,8 @@ msgstr "安装完成后点击下一步进入绑定页面（如已安装，直接 msgid "Administrator Settings force MFA login" msgstr "管理员设置强制使用MFA登录" -#: users/templates/users/user_profile.html:120 users/views/user.py:239 -#: users/views/user.py:293 +#: users/templates/users/user_profile.html:120 users/views/user.py:244 +#: users/views/user.py:298 msgid "User groups" msgstr "用户组" @@ -5179,7 +5194,7 @@ msgstr "Token错误或失效" msgid "Password not same" msgstr "密码不一致" -#: users/views/login.py:115 users/views/user.py:139 users/views/user.py:436 +#: users/views/login.py:115 users/views/user.py:144 users/views/user.py:441 msgid "* Your password does not meet the requirements" msgstr "* 您的密码不符合要求" @@ -5187,51 +5202,51 @@ msgstr "* 您的密码不符合要求" msgid "First login" msgstr "首次登录" -#: users/views/user.py:156 +#: users/views/user.py:161 msgid "Bulk update user success" msgstr "批量更新用户成功" -#: users/views/user.py:183 +#: users/views/user.py:188 msgid "Bulk update user" msgstr "批量更新用户" -#: users/views/user.py:268 +#: users/views/user.py:273 msgid "Invalid file." msgstr "文件不合法" -#: users/views/user.py:364 +#: users/views/user.py:369 msgid "User granted assets" msgstr "用户授权资产" -#: users/views/user.py:395 +#: users/views/user.py:400 msgid "Profile setting" msgstr "个人信息设置" -#: users/views/user.py:414 +#: users/views/user.py:419 msgid "Password update" msgstr "密码更新" -#: users/views/user.py:454 +#: users/views/user.py:459 msgid "Public key update" msgstr "密钥更新" -#: users/views/user.py:495 +#: users/views/user.py:500 msgid "Password invalid" msgstr "用户名或密码无效" -#: users/views/user.py:595 +#: users/views/user.py:600 msgid "MFA enable success" msgstr "MFA 绑定成功" -#: users/views/user.py:596 +#: users/views/user.py:601 msgid "MFA enable success, return login page" msgstr "MFA 绑定成功，返回到登录页面" -#: users/views/user.py:598 +#: users/views/user.py:603 msgid "MFA disable success" msgstr "MFA 解绑成功" -#: users/views/user.py:599 +#: users/views/user.py:604 msgid "MFA disable success, return login page" msgstr "MFA 解绑成功，返回登录页面" @@ -5324,14 +5339,6 @@ msgstr "周期执行" msgid "Regularly perform" msgstr "定期执行" -#: xpack/plugins/change_auth_plan/models.py:83 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:51 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:69 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:57 -#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:16 -msgid "Password strategy" -msgstr "密码策略" - #: xpack/plugins/change_auth_plan/models.py:87 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:74 msgid "Password rules" @@ -5404,7 +5411,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:101 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:102 msgid "Execute failed" msgstr "执行失败" @@ -5490,7 +5497,7 @@ msgid "Unavailable" msgstr "无效" #: xpack/plugins/cloud/models.py:50 -#: xpack/plugins/cloud/templates/cloud/account_detail.html:56 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:54 #: xpack/plugins/cloud/templates/cloud/account_list.html:13 msgid "Provider" msgstr "云服务商" @@ -5516,7 +5523,7 @@ msgid "Instances" msgstr "实例" #: xpack/plugins/cloud/models.py:126 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:75 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:73 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:17 msgid "Date last sync" msgstr "最后同步日期" @@ -5535,7 +5542,7 @@ msgstr "" #: xpack/plugins/cloud/models.py:173 xpack/plugins/cloud/models.py:189 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:71 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:68 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:66 msgid "Date sync" msgstr "同步日期" @@ -5552,8 +5559,8 @@ msgid "Sync instance task history" msgstr "同步实例任务历史" #: xpack/plugins/cloud/models.py:185 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:91 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:63 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:89 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:61 msgid "Instance" msgstr "实例" @@ -5573,7 +5580,7 @@ msgstr "AWS (国际)" msgid "Qcloud" msgstr "腾讯云" -#: xpack/plugins/cloud/templates/cloud/account_detail.html:22 +#: xpack/plugins/cloud/templates/cloud/account_detail.html:20 #: xpack/plugins/cloud/views.py:72 msgid "Account detail" msgstr "账户详情" @@ -5591,23 +5598,23 @@ msgstr "加载中..." msgid "Load failed" msgstr "加载失败" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:22 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:20 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:25 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:23 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:21 #: xpack/plugins/cloud/views.py:122 msgid "Sync task detail" msgstr "同步任务详情" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:25 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:23 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:28 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:26 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:24 #: xpack/plugins/cloud/views.py:137 msgid "Sync task history" msgstr "同步历史列表" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:28 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:26 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:31 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:29 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:27 #: xpack/plugins/cloud/views.py:188 msgid "Sync instance list" msgstr "同步实例列表" @@ -5640,7 +5647,7 @@ msgstr "执行次数" msgid "Instance count" msgstr "实例个数" -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:92 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:93 msgid "Sync success" msgstr "同步成功" @@ -5724,6 +5731,7 @@ msgid "This will restore default Settings of the interface !!!" msgstr "您确定要恢复默认初始化吗？" #: xpack/plugins/interface/templates/interface/interface.html:107 +#: xpack/plugins/interface/views.py:53 msgid "Restore default successfully." msgstr "恢复默认成功！" @@ -5736,13 +5744,9 @@ msgid "Interface" msgstr "界面" #: xpack/plugins/interface/views.py:49 -msgid "It is already in the default setting state！" +msgid "It is already in the default setting state!" msgstr "当前已经是初始化状态！" -#: xpack/plugins/interface/views.py:53 -msgid "Restore default successfully！" -msgstr "恢复默认成功！" - #: xpack/plugins/license/meta.py:11 xpack/plugins/license/models.py:94 #: xpack/plugins/license/templates/license/license_detail.html:50 #: xpack/plugins/license/templates/license/license_detail.html:55 @@ -5880,6 +5884,50 @@ msgstr "创建组织" msgid "Update org" msgstr "更新组织" +#~ msgid "User does not exist" +#~ msgstr "用户不存在" + +#~ msgid "Restore default successfully！" +#~ msgstr "恢复默认成功！" + +#~ msgid "The initial password has been cleared." +#~ msgstr "当前初始密码已经清除." + +#~ msgid "Clear initial password successfully." +#~ msgstr "清除初始密码成功." + +#~ msgid "User Initial Password" +#~ msgstr "用户初始密码" + +#~ msgid "Clear initial password" +#~ msgstr "清除初始密码" + +#~ msgid "This will be clear the initial password !!!" +#~ msgstr "这将会清除用户初始密码!!!" + +#~ msgid "Clear Initial Password" +#~ msgstr "清除初始密码" + +#~ msgid "Clear initial password failed." +#~ msgstr "清除初始密码失败." + +#~ msgid "INITIAL_PASSWORD" +#~ msgstr "初始化密码" + +#~ msgid "CUSTOM_PASSWORD" +#~ msgstr "自定义密码" + +#~ msgid "EMAIL_SET_PASSWORD" +#~ msgstr "邮件设置密码" + +#~ msgid "" +#~ "This will use the default initial password by the system. Please go to " +#~ "the system Settings application to set the initial password" +#~ msgstr "这将会使用系统设置的初始密码. 请先到系统设置应用里去设置初始密码." + +#~ msgid "The password cannot be the same as the initial password" +#~ msgstr "密码设置不能和系统设置的初始密码一致" + #~ msgid "Update user groups" #~ msgstr "更新用户组" diff --git a/apps/settings/api.py b/apps/settings/api.py index f2b3eb558..d7c789603 100644 --- a/apps/settings/api.py +++ b/apps/settings/api.py @@ -220,7 +220,4 @@ class DjangoSettingsAPI(APIView): data[k] = v except (json.JSONDecodeError, TypeError): data[k] = str(v) - return Response(data) - - - + return Response(data) \ No newline at end of file diff --git a/apps/settings/templates/settings/security_setting.html b/apps/settings/templates/settings/security_setting.html index f13410cdf..48206676d 100644 --- a/apps/settings/templates/settings/security_setting.html +++ b/apps/settings/templates/settings/security_setting.html @@ -33,8 +33,8 @@
-
-
+
+ {% if form.non_field_errors %}
{{ form.non_field_errors }} diff --git a/apps/users/forms.py b/apps/users/forms.py index 2ab6f11ac..cbca9c4fd 100644 --- a/apps/users/forms.py +++ b/apps/users/forms.py @@ -22,6 +22,12 @@ class UserCheckOtpCodeForm(forms.Form): class UserCreateUpdateForm(OrgModelForm): + EMAIL_SET_PASSWORD = _('Reset link will be generated and sent to the user') + CUSTOM_PASSWORD = _('Set password') + PASSWORD_STRATEGY_CHOICES = ( + (0, EMAIL_SET_PASSWORD), + (1, CUSTOM_PASSWORD) + ) role_choices = ((i, n) for i, n in User.ROLE_CHOICES if i != User.ROLE_APP) password = forms.CharField( label=_('Password'), widget=forms.PasswordInput, @@ -36,6 +42,10 @@ class UserCreateUpdateForm(OrgModelForm): widget=forms.Textarea(attrs={'placeholder': _('ssh-rsa AAAA...')}), help_text=_('Paste user id_rsa.pub here.') ) + password_strategy = forms.ChoiceField( + choices=PASSWORD_STRATEGY_CHOICES, required=True, initial=0, + widget=forms.RadioSelect(), label=_('Password strategy') + ) class Meta: model = User diff --git a/apps/users/templates/users/_user.html b/apps/users/templates/users/_user.html index 1db09db39..0e8764f6a 100644 --- a/apps/users/templates/users/_user.html +++ b/apps/users/templates/users/_user.html @@ -74,6 +74,9 @@ $(document).ready(function () { $('.select2').select2(); $('#id_date_expired').daterangepicker(dateOptions); + var mfa_radio = $('#id_otp_level'); + mfa_radio.addClass("form-inline"); + mfa_radio.children().css("margin-right","15px") }) {% endblock %} diff --git a/apps/users/templates/users/user_create.html b/apps/users/templates/users/user_create.html index 5760571e1..13bb26cbc 100644 --- a/apps/users/templates/users/user_create.html +++ b/apps/users/templates/users/user_create.html @@ -2,15 +2,83 @@ {% load i18n %} {% load bootstrap3 %} {% block user_template_title %}{% trans "Create user" %}{% endblock %} -{#{% block username %}#} -{# {% bootstrap_field form.username layout="horizontal" %}#} -{#{% endblock %}#} {% block password %} -
- -
- {% trans 'Reset link will be generated and sent to the user. ' %} + {% bootstrap_field form.password_strategy layout="horizontal" %} +
+ {% bootstrap_field form.password layout="horizontal" %} +
+ {# 密码popover #} +
+
+ {% endblock %} diff --git a/apps/users/views/user.py b/apps/users/views/user.py index a7515d030..69ed441ba 100644 --- a/apps/users/views/user.py +++ b/apps/users/views/user.py @@ -81,9 +81,14 @@ class UserCreateView(AdminUserRequiredMixin, SuccessMessageMixin, CreateView): success_message = create_success_msg def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - context.update({'app': _('Users'), 'action': _('Create user')}) - return context + check_rules = get_password_check_rules() + context = { + 'app': _('Users'), + 'action': _('Create user'), + 'password_check_rules': check_rules, + } + kwargs.update(context) + return super().get_context_data(**kwargs) def form_valid(self, form): user = form.save(commit=False)