From 79a371eb6ca1b0c28d8685320af7ed6866dcc527 Mon Sep 17 00:00:00 2001 From: xinwen Date: Wed, 9 Dec 2020 18:17:10 +0800 Subject: [PATCH] =?UTF-8?q?perf(auth):=20=E5=AF=86=E7=A0=81=E8=BF=87?= =?UTF-8?q?=E6=9C=9F=E5=90=8E=EF=BC=8C=E8=B5=B0=E9=87=8D=E7=BD=AE=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E6=B5=81=E7=A8=8B=20#530?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/authentication/errors.py | 11 +- apps/authentication/mixins.py | 41 ++-- apps/authentication/urls/view_urls.py | 1 + apps/authentication/views/login.py | 19 +- apps/locale/zh/LC_MESSAGES/django.mo | Bin 62514 -> 62680 bytes apps/locale/zh/LC_MESSAGES/django.po | 274 ++++++++++++++------------ 6 files changed, 202 insertions(+), 144 deletions(-) diff --git a/apps/authentication/errors.py b/apps/authentication/errors.py index 26363363e..8cea830e1 100644 --- a/apps/authentication/errors.py +++ b/apps/authentication/errors.py @@ -218,5 +218,14 @@ class PasswdTooSimple(JMSException): default_detail = _('Your password is too simple, please change it for security') def __init__(self, url, *args, **kwargs): - super(PasswdTooSimple, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) + self.url = url + + +class PasswordRequireResetError(JMSException): + default_code = 'passwd_has_expired' + default_detail = _('Your password has expired, please reset before logging in') + + def __init__(self, url, *args, **kwargs): + super().__init__(*args, **kwargs) self.url = url diff --git a/apps/authentication/mixins.py b/apps/authentication/mixins.py index 1d9335743..87b989283 100644 --- a/apps/authentication/mixins.py +++ b/apps/authentication/mixins.py @@ -110,9 +110,8 @@ class AuthMixin: raise CredentialError(error=errors.reason_user_inactive) elif not user.is_active: raise CredentialError(error=errors.reason_user_inactive) - elif user.password_has_expired: - raise CredentialError(error=errors.reason_password_expired) + self._check_password_require_reset_or_not(user) self._check_passwd_is_too_simple(user, password) clean_failed_count(username, ip) @@ -123,20 +122,34 @@ class AuthMixin: return user @classmethod - def _check_passwd_is_too_simple(cls, user, password): + def generate_reset_password_url_with_flash_msg(cls, user: User, flash_view_name): + reset_passwd_url = reverse('authentication:reset-password') + query_str = urlencode({ + 'token': user.generate_reset_token() + }) + reset_passwd_url = f'{reset_passwd_url}?{query_str}' + + flash_page_url = reverse(flash_view_name) + query_str = urlencode({ + 'redirect_url': reset_passwd_url + }) + return f'{flash_page_url}?{query_str}' + + @classmethod + def _check_passwd_is_too_simple(cls, user: User, password): if user.is_superuser and password == 'admin': - reset_passwd_url = reverse('authentication:reset-password') - query_str = urlencode({ - 'token': user.generate_reset_token() - }) - reset_passwd_url = f'{reset_passwd_url}?{query_str}' + url = cls.generate_reset_password_url_with_flash_msg( + user, 'authentication:passwd-too-simple-flash-msg' + ) + raise errors.PasswdTooSimple(url) - flash_page_url = reverse('authentication:passwd-too-simple-flash-msg') - query_str = urlencode({ - 'redirect_url': reset_passwd_url - }) - - raise errors.PasswdTooSimple(f'{flash_page_url}?{query_str}') + @classmethod + def _check_password_require_reset_or_not(cls, user: User): + if user.password_has_expired: + url = cls.generate_reset_password_url_with_flash_msg( + user, 'authentication:passwd-has-expired-flash-msg' + ) + raise errors.PasswordRequireResetError(url) def check_user_auth_if_need(self, decrypt_passwd=False): request = self.request diff --git a/apps/authentication/urls/view_urls.py b/apps/authentication/urls/view_urls.py index 467e32d0d..a95342fa6 100644 --- a/apps/authentication/urls/view_urls.py +++ b/apps/authentication/urls/view_urls.py @@ -22,6 +22,7 @@ urlpatterns = [ name='forgot-password-sendmail-success'), path('password/reset/', users_view.UserResetPasswordView.as_view(), name='reset-password'), path('password/too-simple-flash-msg/', views.FlashPasswdTooSimpleMsgView.as_view(), name='passwd-too-simple-flash-msg'), + path('password/has-expired-msg/', views.FlashPasswdHasExpiredMsgView.as_view(), name='passwd-has-expired-flash-msg'), path('password/reset/success/', users_view.UserResetPasswordSuccessView.as_view(), name='reset-password-success'), path('password/verify/', users_view.UserVerifyPasswordView.as_view(), name='user-verify-password'), diff --git a/apps/authentication/views/login.py b/apps/authentication/views/login.py index 4210315c5..dcff66905 100644 --- a/apps/authentication/views/login.py +++ b/apps/authentication/views/login.py @@ -32,7 +32,7 @@ from ..forms import get_user_login_form_cls __all__ = [ 'UserLoginView', 'UserLogoutView', 'UserLoginGuardView', 'UserLoginWaitConfirmView', - 'FlashPasswdTooSimpleMsgView', + 'FlashPasswdTooSimpleMsgView', 'FlashPasswdHasExpiredMsgView' ] @@ -96,7 +96,7 @@ class UserLoginView(mixins.AuthMixin, FormView): new_form._errors = form.errors context = self.get_context_data(form=new_form) return self.render_to_response(context) - except errors.PasswdTooSimple as e: + except (errors.PasswdTooSimple, errors.PasswordRequireResetError) as e: return redirect(e.url) self.clear_rsa_key() return self.redirect_to_guard_view() @@ -250,3 +250,18 @@ class FlashPasswdTooSimpleMsgView(TemplateView): 'auto_redirect': True, } return self.render_to_response(context) + + +@method_decorator(never_cache, name='dispatch') +class FlashPasswdHasExpiredMsgView(TemplateView): + template_name = 'flash_message_standalone.html' + + def get(self, request, *args, **kwargs): + context = { + 'title': _('Please change your password'), + 'messages': _('Your password has expired, please reset before logging in'), + 'interval': 5, + 'redirect_url': request.GET.get('redirect_url'), + 'auto_redirect': True, + } + return self.render_to_response(context) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 801d192a25d63277c13e07a5f7992a9312c557b3..211388dd871be071493b0820f3e599a00cd8b372 100644 GIT binary patch delta 18370 zcmZA91$dTa`^WKnBS(xFwT;+_!C-X5h|%3hH)E6_CC!6$3OKsE1Syq9iHXt(2);;& zG)VZOpdkLgzg;Kq;qkwZUm=^Q!~%I%2M7uDyQiY}`C5Bka;%7H zu^OhvCYS}=V>k{n=V315-589Qk^AwUV{!Zg3u6K9CY<%X_ozgY7=}4w7uVY9%&r64YVk!)1&mChXGu$kK+Hge-!rGV#+hGdU_dcMafy1oBMARKG zQU_dV@kZ1MY(p)45VPWG)c89XfWIM6(|dy{(d*#m3BdG(8BiO@jXv$XEEQP|HE~1K zLLD#y`=Czf6YP%%uq;M(bp5)c795BL@I%axD=--zN6mK{b)r`>1E%W4`D=&SJGq_a zLmgES)J`j)o^gHD9d^Zx*dKK=<1iOaLmlmA)Ix_)&-@f>1LsleT( zJDCHVK5x7w=AoY92Gld&k2SB3) z{@YQ}oz24nxD<5~38*7Hjhgrx>Q3&Wj{GGCW5!sw(J0hLtD)ZV2B>*PVp1HBI*}=; zaVs&9^}T&m^m+UawcvG3hEGr%dx3gHuTk$rKo2)@7Sx^QM2(BIe0j`G9D};k?ih$4 zqE2`ss{bPNsj`WR?r<+^$45|)-~?)dYnFeC+UQHvglXd3iG-p~B+BC2n2oqK>Jbh= zz3r1RCoabncrcFh*XJ;SgzoITHC#9EqK@>5wZFn};$%JDryxHjCvJzK*cH`(3~Jsf zs2iAzI;r)j{yR`NzNaVWucQ5zga-a#-o!BChnNym_i}fh2{myf>L^R2?yN5A8FxnA zNGxjHK#NDB)|rADKOeP$)jldZ%AKek9!4GIDU0u60P%0AiQk|m4(RRfEF-2M&WoBb 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 P+JEQZyj@qGxAp%&BY+-P5)n{(5$Pp}^r{F5 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 NQGZ1z`TlAV@PAe=N3;L{ diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index cefa4bf2a..7ddf14999 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: 2020-11-17 17:24+0800\n" +"POT-Creation-Date: 2020-12-09 18:14+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -17,22 +17,22 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: applications/const.py:53 applications/models/application.py:34 +#: applications/const.py:53 applications/models/application.py:33 msgid "Custom" msgstr "自定义" -#: applications/models/application.py:61 applications/models/database_app.py:29 +#: applications/models/application.py:60 applications/models/database_app.py:29 #: applications/serializers/database_app.py:16 #: applications/serializers/remote_app.py:69 #: users/templates/users/user_granted_database_app.html:37 msgid "Database" msgstr "数据库" -#: applications/models/application.py:62 +#: applications/models/application.py:61 msgid "Remote app" msgstr "远程应用" -#: applications/models/application.py:122 +#: applications/models/application.py:121 #: applications/models/database_app.py:18 applications/models/k8s_app.py:11 #: applications/models/remote_app.py:21 assets/models/asset.py:149 #: assets/models/base.py:234 assets/models/cluster.py:18 @@ -41,7 +41,7 @@ msgstr "远程应用" #: orgs/models.py:23 perms/models/base.py:48 settings/models.py:27 #: terminal/models.py:28 terminal/models.py:372 terminal/models.py:404 #: terminal/models.py:441 users/forms/profile.py:20 users/models/group.py:15 -#: users/models/user.py:505 users/templates/users/_select_user_modal.html:13 +#: users/models/user.py:501 users/templates/users/_select_user_modal.html:13 #: users/templates/users/user_asset_permission.html:37 #: users/templates/users/user_asset_permission.html:154 #: users/templates/users/user_database_app_permission.html:36 @@ -58,12 +58,12 @@ msgstr "远程应用" msgid "Name" msgstr "名称" -#: applications/models/application.py:123 assets/models/asset.py:198 +#: applications/models/application.py:122 assets/models/asset.py:198 #: assets/models/domain.py:27 assets/models/domain.py:54 msgid "Domain" msgstr "网域" -#: applications/models/application.py:124 +#: applications/models/application.py:123 #: applications/serializers/application.py:16 assets/models/label.py:21 #: perms/models/application_permission.py:19 #: perms/serializers/application/permission.py:16 @@ -71,7 +71,7 @@ msgstr "网域" msgid "Category" msgstr "分类" -#: applications/models/application.py:125 +#: applications/models/application.py:124 #: applications/models/database_app.py:22 applications/models/k8s_app.py:14 #: applications/serializers/application.py:17 assets/models/cmd_filter.py:52 #: perms/models/application_permission.py:20 @@ -84,7 +84,7 @@ msgstr "类型" # msgid "Date created" # msgstr "创建日期" -#: applications/models/application.py:128 +#: applications/models/application.py:127 #: applications/models/database_app.py:33 applications/models/k8s_app.py:18 #: applications/models/remote_app.py:45 assets/models/asset.py:154 #: assets/models/asset.py:230 assets/models/base.py:239 @@ -94,15 +94,15 @@ msgstr "类型" #: assets/models/label.py:23 ops/models/adhoc.py:37 orgs/models.py:26 #: perms/models/base.py:56 settings/models.py:32 terminal/models.py:38 #: terminal/models.py:411 terminal/models.py:448 tickets/models/ticket.py:43 -#: users/models/group.py:16 users/models/user.py:538 +#: users/models/group.py:16 users/models/user.py:534 #: users/templates/users/user_detail.html:115 #: users/templates/users/user_granted_database_app.html:38 #: users/templates/users/user_granted_remote_app.html:37 #: users/templates/users/user_group_detail.html:62 #: users/templates/users/user_group_list.html:16 #: users/templates/users/user_profile.html:138 -#: xpack/plugins/change_auth_plan/models.py:77 xpack/plugins/cloud/models.py:54 -#: xpack/plugins/cloud/models.py:149 xpack/plugins/gathered_user/models.py:26 +#: xpack/plugins/change_auth_plan/models.py:77 xpack/plugins/cloud/models.py:55 +#: xpack/plugins/cloud/models.py:150 xpack/plugins/gathered_user/models.py:26 msgid "Comment" msgstr "备注" @@ -114,9 +114,9 @@ msgstr "主机" #: applications/models/database_app.py:27 #: applications/serializers/database_app.py:14 -#: applications/serializers/database_app.py:21 -#: applications/serializers/database_app.py:25 -#: applications/serializers/database_app.py:29 +#: applications/serializers/database_app.py:20 +#: applications/serializers/database_app.py:24 +#: applications/serializers/database_app.py:28 #: applications/serializers/remote_app.py:68 assets/models/asset.py:195 #: assets/models/domain.py:52 msgid "Port" @@ -159,7 +159,7 @@ msgstr "Kubernetes应用" #: users/templates/users/user_asset_permission.html:70 #: users/templates/users/user_granted_remote_app.html:36 #: xpack/plugins/change_auth_plan/models.py:282 -#: xpack/plugins/cloud/models.py:278 +#: xpack/plugins/cloud/models.py:279 msgid "Asset" msgstr "资产" @@ -182,10 +182,10 @@ msgstr "参数" #: assets/models/cmd_filter.py:26 assets/models/cmd_filter.py:60 #: assets/models/group.py:21 common/db/models.py:67 common/mixins/models.py:49 #: orgs/models.py:24 orgs/models.py:400 perms/models/base.py:54 -#: users/models/user.py:546 users/serializers/group.py:35 +#: users/models/user.py:542 users/serializers/group.py:35 #: users/templates/users/user_detail.html:97 -#: xpack/plugins/change_auth_plan/models.py:81 xpack/plugins/cloud/models.py:57 -#: xpack/plugins/cloud/models.py:155 xpack/plugins/gathered_user/models.py:30 +#: xpack/plugins/change_auth_plan/models.py:81 xpack/plugins/cloud/models.py:58 +#: xpack/plugins/cloud/models.py:156 xpack/plugins/gathered_user/models.py:30 msgid "Created by" msgstr "创建者" @@ -198,7 +198,7 @@ msgstr "创建者" #: common/mixins/models.py:50 ops/models/adhoc.py:38 ops/models/command.py:27 #: orgs/models.py:25 orgs/models.py:398 perms/models/base.py:55 #: users/models/group.py:18 users/templates/users/user_group_detail.html:58 -#: xpack/plugins/cloud/models.py:60 xpack/plugins/cloud/models.py:158 +#: xpack/plugins/cloud/models.py:61 xpack/plugins/cloud/models.py:159 msgid "Date created" msgstr "创建日期" @@ -211,7 +211,7 @@ msgstr "创建日期" msgid "RemoteApp" msgstr "远程应用" -#: applications/serializers/database_app.py:50 +#: applications/serializers/database_app.py:49 #: applications/serializers/k8s_app.py:17 #: applications/serializers/remote_app.py:162 audits/serializers.py:26 msgid "Type for display" @@ -237,7 +237,7 @@ msgstr "目标URL" #: authentication/forms.py:11 #: authentication/templates/authentication/login.html:21 #: authentication/templates/authentication/xpack_login.html:101 -#: ops/models/adhoc.py:148 users/forms/profile.py:19 users/models/user.py:503 +#: ops/models/adhoc.py:148 users/forms/profile.py:19 users/models/user.py:499 #: users/templates/users/_select_user_modal.html:14 #: users/templates/users/user_detail.html:53 #: users/templates/users/user_list.html:15 @@ -300,6 +300,10 @@ msgid "You can't update the root node name" msgstr "不能修改根节点名称" #: assets/api/node.py:65 +msgid "You can't delete the root node ({})" +msgstr "不能删除根节点 ({})" + +#: assets/api/node.py:68 msgid "Deletion failed and the node contains children or assets" msgstr "删除失败，节点包含子节点或资产" @@ -334,7 +338,7 @@ msgstr "系统平台" #: assets/models/asset.py:191 assets/serializers/asset_user.py:45 #: assets/serializers/gathered_user.py:20 settings/serializers/settings.py:51 -#: tickets/api/request_asset_perm.py:63 +#: tickets/api/request_asset_perm.py:67 #: tickets/serializers/request_asset_perm.py:25 #: users/templates/users/_granted_assets.html:25 #: users/templates/users/user_asset_permission.html:157 @@ -366,7 +370,7 @@ msgstr "激活" #: assets/models/asset.py:203 assets/models/cluster.py:19 #: assets/models/user.py:66 templates/_nav.html:44 -#: xpack/plugins/cloud/models.py:142 xpack/plugins/cloud/serializers.py:84 +#: xpack/plugins/cloud/models.py:143 xpack/plugins/cloud/serializers.py:115 msgid "Admin user" msgstr "管理用户" @@ -480,7 +484,7 @@ msgstr "带宽" msgid "Contact" msgstr "联系人" -#: assets/models/cluster.py:22 users/models/user.py:524 +#: assets/models/cluster.py:22 users/models/user.py:520 #: users/templates/users/user_detail.html:62 msgid "Phone" msgstr "手机" @@ -506,7 +510,7 @@ msgid "Default" msgstr "默认" #: assets/models/cluster.py:36 assets/models/label.py:14 -#: users/models/user.py:665 +#: users/models/user.py:661 msgid "System" msgstr "系统" @@ -617,7 +621,7 @@ msgstr "默认资产组" #: tickets/models/ticket.py:30 tickets/models/ticket.py:136 #: tickets/serializers/request_asset_perm.py:66 #: tickets/serializers/ticket.py:31 users/forms/group.py:15 -#: users/models/user.py:159 users/models/user.py:653 +#: users/models/user.py:159 users/models/user.py:649 #: users/serializers/group.py:20 #: users/templates/users/user_asset_permission.html:38 #: users/templates/users/user_asset_permission.html:64 @@ -631,7 +635,7 @@ msgstr "默认资产组" msgid "User" msgstr "用户" -#: assets/models/label.py:19 assets/models/node.py:398 settings/models.py:28 +#: assets/models/label.py:19 assets/models/node.py:401 settings/models.py:28 msgid "Value" msgstr "值" @@ -643,24 +647,24 @@ msgstr "新节点" msgid "empty" msgstr "空" -#: assets/models/node.py:397 perms/models/asset_permission.py:144 +#: assets/models/node.py:400 perms/models/asset_permission.py:144 msgid "Key" msgstr "键" -#: assets/models/node.py:399 +#: assets/models/node.py:402 msgid "Full value" msgstr "全称" -#: assets/models/node.py:402 perms/models/asset_permission.py:148 +#: assets/models/node.py:405 perms/models/asset_permission.py:148 msgid "Parent key" msgstr "ssh私钥" -#: assets/models/node.py:411 assets/serializers/system_user.py:190 +#: assets/models/node.py:414 assets/serializers/system_user.py:190 #: perms/forms/asset_permission.py:92 perms/forms/asset_permission.py:99 #: users/templates/users/user_asset_permission.html:41 #: users/templates/users/user_asset_permission.html:73 #: users/templates/users/user_asset_permission.html:158 -#: xpack/plugins/cloud/models.py:138 xpack/plugins/cloud/serializers.py:85 +#: xpack/plugins/cloud/models.py:139 xpack/plugins/cloud/serializers.py:116 msgid "Node" msgstr "节点" @@ -732,7 +736,7 @@ msgstr "用户组" #: perms/models/remote_app_permission.py:16 templates/_nav.html:45 #: terminal/backends/command/models.py:20 #: terminal/backends/command/serializers.py:14 terminal/models.py:194 -#: tickets/api/request_asset_perm.py:64 +#: tickets/api/request_asset_perm.py:68 #: tickets/serializers/request_asset_perm.py:27 #: users/templates/users/_granted_assets.html:27 #: users/templates/users/user_asset_permission.html:42 @@ -782,15 +786,15 @@ msgstr "管理用户名称" msgid "Nodes name" msgstr "节点名称" -#: assets/serializers/asset.py:110 +#: assets/serializers/asset.py:107 msgid "Hardware info" msgstr "硬件信息" -#: assets/serializers/asset.py:111 orgs/mixins/serializers.py:26 +#: assets/serializers/asset.py:108 orgs/mixins/serializers.py:26 msgid "Org name" msgstr "组织名称" -#: assets/serializers/asset.py:165 assets/serializers/asset.py:196 +#: assets/serializers/asset.py:162 assets/serializers/asset.py:193 msgid "Connectivity" msgstr "连接" @@ -805,14 +809,14 @@ msgid "Backend" msgstr "后端" #: assets/serializers/asset_user.py:75 users/forms/profile.py:148 -#: users/models/user.py:535 users/templates/users/user_password_update.html:48 +#: users/models/user.py:531 users/templates/users/user_password_update.html:48 #: users/templates/users/user_profile.html:69 #: users/templates/users/user_profile_update.html:46 #: users/templates/users/user_pubkey_update.html:46 msgid "Public key" msgstr "SSH公钥" -#: assets/serializers/asset_user.py:79 users/models/user.py:532 +#: assets/serializers/asset_user.py:79 users/models/user.py:528 msgid "Private key" msgstr "ssh私钥" @@ -937,20 +941,20 @@ msgstr "收集资产上的用户" msgid "System user is dynamic: {}" msgstr "系统用户是动态的: {}" -#: assets/tasks/push_system_user.py:215 +#: assets/tasks/push_system_user.py:224 msgid "Start push system user for platform: [{}]" msgstr "推送系统用户到平台: [{}]" -#: assets/tasks/push_system_user.py:216 +#: assets/tasks/push_system_user.py:225 #: assets/tasks/system_user_connectivity.py:81 msgid "Hosts count: {}" msgstr "主机数量: {}" -#: assets/tasks/push_system_user.py:235 assets/tasks/push_system_user.py:253 +#: assets/tasks/push_system_user.py:264 assets/tasks/push_system_user.py:290 msgid "Push system users to assets: {}" msgstr "推送系统用户到入资产: {}" -#: assets/tasks/push_system_user.py:243 +#: assets/tasks/push_system_user.py:276 msgid "Push system users to asset: {}({}) => {}" msgstr "推送系统用户到入资产: {}({}) => {}" @@ -1105,7 +1109,7 @@ msgstr "启用" msgid "-" msgstr "" -#: audits/models.py:96 xpack/plugins/cloud/models.py:213 +#: audits/models.py:96 xpack/plugins/cloud/models.py:214 msgid "Failed" msgstr "失败" @@ -1128,20 +1132,20 @@ msgstr "用户代理" #: audits/models.py:104 #: authentication/templates/authentication/_mfa_confirm_modal.html:14 #: authentication/templates/authentication/login_otp.html:6 -#: users/forms/profile.py:52 users/models/user.py:527 -#: users/serializers/user.py:228 users/templates/users/user_detail.html:77 +#: users/forms/profile.py:52 users/models/user.py:523 +#: users/serializers/user.py:232 users/templates/users/user_detail.html:77 #: users/templates/users/user_profile.html:87 msgid "MFA" msgstr "多因子认证" #: audits/models.py:105 xpack/plugins/change_auth_plan/models.py:303 -#: xpack/plugins/cloud/models.py:226 +#: xpack/plugins/cloud/models.py:227 msgid "Reason" msgstr "原因" #: audits/models.py:106 tickets/serializers/request_asset_perm.py:64 -#: tickets/serializers/ticket.py:29 xpack/plugins/cloud/models.py:223 -#: xpack/plugins/cloud/models.py:281 +#: tickets/serializers/ticket.py:29 xpack/plugins/cloud/models.py:224 +#: xpack/plugins/cloud/models.py:282 msgid "Status" msgstr "状态" @@ -1167,7 +1171,7 @@ msgid "Is success" msgstr "是否成功" #: audits/serializers.py:76 ops/models/command.py:24 -#: xpack/plugins/cloud/models.py:221 +#: xpack/plugins/cloud/models.py:222 msgid "Result" msgstr "结果" @@ -1327,6 +1331,10 @@ msgstr "SSO 认证关闭了" msgid "Your password is too simple, please change it for security" msgstr "你的密码过于简单，为了安全，请修改" +#: authentication/errors.py:227 authentication/views/login.py:262 +msgid "Your password has expired, please reset before logging in" +msgstr "您的密码已过期，请先修改再登录" + #: authentication/forms.py:26 authentication/forms.py:34 #: authentication/templates/authentication/login.html:39 #: authentication/templates/authentication/xpack_login.html:119 @@ -1389,7 +1397,7 @@ msgid "Show" msgstr "显示" #: authentication/templates/authentication/_access_key_modal.html:66 -#: users/models/user.py:425 users/serializers/user.py:225 +#: users/models/user.py:421 users/serializers/user.py:229 #: users/templates/users/user_profile.html:94 #: users/templates/users/user_profile.html:163 #: users/templates/users/user_profile.html:166 @@ -1398,7 +1406,7 @@ msgid "Disable" msgstr "禁用" #: authentication/templates/authentication/_access_key_modal.html:67 -#: users/models/user.py:426 users/serializers/user.py:226 +#: users/models/user.py:422 users/serializers/user.py:230 #: users/templates/users/user_profile.html:92 #: users/templates/users/user_profile.html:170 msgid "Enable" @@ -1538,7 +1546,7 @@ msgstr "退出登录成功" msgid "Logout success, return login page" msgstr "退出登录成功，返回到登录页面" -#: authentication/views/login.py:246 +#: authentication/views/login.py:246 authentication/views/login.py:261 msgid "Please change your password" msgstr "请修改密码" @@ -1556,10 +1564,9 @@ msgstr "%(name)s 更新成功" msgid "Updated by" msgstr "更新人" -#: common/drf/parsers/csv.py:22 -#, python-format -msgid "The max size of CSV is %d bytes" -msgstr "CSV 文件最大为 %d 字节" +#: common/drf/parsers/base.py:16 +msgid "The file content overflowed (The maximum length `{}` bytes)" +msgstr "" #: common/exceptions.py:15 #, python-format @@ -1838,7 +1845,7 @@ msgid "The current organization cannot be deleted" msgstr "当前组织不能被删除" #: orgs/mixins/models.py:56 orgs/mixins/serializers.py:25 orgs/models.py:41 -#: orgs/models.py:395 orgs/serializers.py:80 orgs/serializers.py:91 +#: orgs/models.py:395 orgs/serializers.py:79 msgid "Organization" msgstr "组织" @@ -1850,7 +1857,7 @@ msgstr "组织管理员" msgid "Organization auditor" msgstr "组织审计员" -#: orgs/models.py:397 users/forms/user.py:27 users/models/user.py:515 +#: orgs/models.py:397 users/forms/user.py:27 users/models/user.py:511 #: users/templates/users/_select_user_modal.html:15 #: users/templates/users/user_detail.html:73 #: users/templates/users/user_list.html:16 @@ -1883,7 +1890,7 @@ msgstr "提示：RDP 协议不支持单独控制上传或下载文件" #: perms/forms/asset_permission.py:86 perms/forms/database_app_permission.py:41 #: perms/forms/remote_app_permission.py:43 perms/models/base.py:50 #: templates/_nav.html:21 users/forms/user.py:168 users/models/group.py:31 -#: users/models/user.py:511 users/templates/users/_select_user_modal.html:16 +#: users/models/user.py:507 users/templates/users/_select_user_modal.html:16 #: users/templates/users/user_asset_permission.html:39 #: users/templates/users/user_asset_permission.html:67 #: users/templates/users/user_database_app_permission.html:38 @@ -1957,7 +1964,7 @@ msgid "Asset permission" msgstr "资产授权" #: perms/models/base.py:53 tickets/serializers/request_asset_perm.py:31 -#: users/models/user.py:543 users/templates/users/user_detail.html:93 +#: users/models/user.py:539 users/templates/users/user_detail.html:93 #: users/templates/users/user_profile.html:120 msgid "Date expired" msgstr "失效日期" @@ -1982,7 +1989,7 @@ msgid "" "permission type. ({})" msgstr "应用列表中包含与授权类型不同的应用。({})" -#: perms/serializers/asset/permission.py:58 users/serializers/user.py:76 +#: perms/serializers/asset/permission.py:58 users/serializers/user.py:80 msgid "Is expired" msgstr "是否过期" @@ -1991,7 +1998,7 @@ msgstr "是否过期" #: perms/serializers/database_app_permission.py:62 #: perms/serializers/k8s_app_permission.py:41 #: perms/serializers/k8s_app_permission.py:60 -#: perms/serializers/remote_app_permission.py:36 users/serializers/user.py:75 +#: perms/serializers/remote_app_permission.py:36 users/serializers/user.py:79 msgid "Is valid" msgstr "账户是否有效" @@ -2040,7 +2047,7 @@ msgstr "远程应用数量" msgid "Favorite" msgstr "收藏夹" -#: perms/utils/asset/user_permission.py:526 +#: perms/utils/asset/user_permission.py:522 msgid "Please wait while your data is being initialized" msgstr "数据正在初始化，请稍等" @@ -2849,46 +2856,46 @@ msgstr "" msgid "Ticket has %s" msgstr "工单已%s" -#: tickets/api/request_asset_perm.py:62 +#: tickets/api/request_asset_perm.py:66 #: tickets/serializers/request_asset_perm.py:23 msgid "IP group" msgstr "IP组" -#: tickets/api/request_asset_perm.py:65 +#: tickets/api/request_asset_perm.py:69 #: tickets/serializers/request_asset_perm.py:35 msgid "Confirmed assets" msgstr "确认的资产" -#: tickets/api/request_asset_perm.py:66 +#: tickets/api/request_asset_perm.py:70 msgid "Confirmed system users" msgstr "确认的系统用户" -#: tickets/api/request_asset_perm.py:87 +#: tickets/api/request_asset_perm.py:91 msgid "Confirm assets first" msgstr "请先确认资产" -#: tickets/api/request_asset_perm.py:90 +#: tickets/api/request_asset_perm.py:94 msgid "Confirmed assets changed" msgstr "确认的资产变更了" -#: tickets/api/request_asset_perm.py:94 +#: tickets/api/request_asset_perm.py:98 msgid "Confirm system-users first" msgstr "请先确认系统用户" -#: tickets/api/request_asset_perm.py:98 +#: tickets/api/request_asset_perm.py:102 msgid "Confirmed system-users changed" msgstr "确认的系统用户变更了" -#: tickets/api/request_asset_perm.py:104 tickets/api/request_asset_perm.py:111 -#: xpack/plugins/cloud/models.py:214 +#: tickets/api/request_asset_perm.py:108 tickets/api/request_asset_perm.py:115 +#: xpack/plugins/cloud/models.py:215 msgid "Succeed" msgstr "成功" -#: tickets/api/request_asset_perm.py:118 +#: tickets/api/request_asset_perm.py:122 msgid "From request ticket: {} {}" msgstr "来自工单申请: {} {}" -#: tickets/api/request_asset_perm.py:120 +#: tickets/api/request_asset_perm.py:124 msgid "{} request assets, approved by {}" msgstr "{} 申请资产，通过人 {}" @@ -3063,7 +3070,7 @@ msgstr "" " \n" " " -#: users/api/user.py:190 +#: users/api/user.py:199 msgid "Could not reset self otp, use profile reset instead" msgstr "不能在该页面重置多因子认证, 请去个人信息页面重置" @@ -3109,7 +3116,7 @@ msgstr "确认密码" msgid "Password does not match" msgstr "密码不一致" -#: users/forms/profile.py:89 users/models/user.py:507 +#: users/forms/profile.py:89 users/models/user.py:503 #: users/templates/users/user_detail.html:57 #: users/templates/users/user_profile.html:59 msgid "Email" @@ -3145,12 +3152,12 @@ msgid "Public key should not be the same as your old one." msgstr "不能和原来的密钥相同" #: users/forms/profile.py:137 users/forms/user.py:90 -#: users/serializers/user.py:188 users/serializers/user.py:270 -#: users/serializers/user.py:328 +#: users/serializers/user.py:192 users/serializers/user.py:274 +#: users/serializers/user.py:332 msgid "Not a valid ssh public key" msgstr "SSH密钥不合法" -#: users/forms/user.py:31 users/models/user.py:550 +#: users/forms/user.py:31 users/models/user.py:546 #: users/templates/users/user_detail.html:89 #: users/templates/users/user_list.html:18 #: users/templates/users/user_profile.html:102 @@ -3192,31 +3199,31 @@ msgstr "系统管理员" msgid "System auditor" msgstr "系统审计员" -#: users/models/user.py:427 users/templates/users/user_profile.html:90 +#: users/models/user.py:423 users/templates/users/user_profile.html:90 msgid "Force enable" msgstr "强制启用" -#: users/models/user.py:494 +#: users/models/user.py:490 msgid "Local" msgstr "数据库" -#: users/models/user.py:518 +#: users/models/user.py:514 msgid "Avatar" msgstr "头像" -#: users/models/user.py:521 users/templates/users/user_detail.html:68 +#: users/models/user.py:517 users/templates/users/user_detail.html:68 msgid "Wechat" msgstr "微信" -#: users/models/user.py:554 +#: users/models/user.py:550 msgid "Date password last updated" msgstr "最后更新密码日期" -#: users/models/user.py:661 +#: users/models/user.py:657 msgid "Administrator" msgstr "管理员" -#: users/models/user.py:664 +#: users/models/user.py:660 msgid "Administrator is the super user of system" msgstr "Administrator是初始的超级管理员" @@ -3236,55 +3243,55 @@ msgstr "是否可更新" msgid "Can delete" msgstr "是否可删除" -#: users/serializers/user.py:49 users/serializers/user.py:81 +#: users/serializers/user.py:49 users/serializers/user.py:85 msgid "Organization role name" msgstr "组织角色名称" -#: users/serializers/user.py:74 users/serializers/user.py:241 +#: users/serializers/user.py:78 users/serializers/user.py:245 msgid "Is first login" msgstr "首次登录" -#: users/serializers/user.py:77 +#: users/serializers/user.py:81 msgid "Avatar url" msgstr "头像路径" -#: users/serializers/user.py:79 +#: users/serializers/user.py:83 msgid "Groups name" msgstr "用户组名" -#: users/serializers/user.py:80 +#: users/serializers/user.py:84 msgid "Source name" msgstr "用户来源名" -#: users/serializers/user.py:82 +#: users/serializers/user.py:86 msgid "Super role name" msgstr "超级角色名称" -#: users/serializers/user.py:83 +#: users/serializers/user.py:87 msgid "Total role name" msgstr "汇总角色名称" -#: users/serializers/user.py:84 +#: users/serializers/user.py:88 msgid "MFA enabled" msgstr "是否开启多因子认证" -#: users/serializers/user.py:85 +#: users/serializers/user.py:89 msgid "MFA force enabled" msgstr "强制启用多因子认证" -#: users/serializers/user.py:108 +#: users/serializers/user.py:112 msgid "Role limit to {}" msgstr "角色只能为 {}" -#: users/serializers/user.py:120 users/serializers/user.py:294 +#: users/serializers/user.py:124 users/serializers/user.py:298 msgid "Password does not match security rules" msgstr "密码不满足安全规则" -#: users/serializers/user.py:286 +#: users/serializers/user.py:290 msgid "The old password is incorrect" msgstr "旧密码错误" -#: users/serializers/user.py:300 +#: users/serializers/user.py:304 msgid "The newly set password is inconsistent" msgstr "两次密码不一致" @@ -3298,7 +3305,7 @@ msgstr "安全令牌验证" #: users/templates/users/_base_otp.html:14 users/templates/users/_user.html:13 #: users/templates/users/user_profile_update.html:55 -#: xpack/plugins/cloud/models.py:124 xpack/plugins/cloud/serializers.py:83 +#: xpack/plugins/cloud/models.py:125 xpack/plugins/cloud/serializers.py:114 msgid "Account" msgstr "账户" @@ -3462,7 +3469,7 @@ msgstr "很强" #: users/templates/users/user_database_app_permission.html:41 #: users/templates/users/user_list.html:19 #: users/templates/users/user_remote_app_permission.html:41 -#: xpack/plugins/cloud/models.py:51 +#: xpack/plugins/cloud/models.py:52 msgid "Validity" msgstr "有效" @@ -4240,75 +4247,75 @@ msgstr "" msgid "Access key secret" msgstr "" -#: xpack/plugins/cloud/models.py:65 +#: xpack/plugins/cloud/models.py:66 msgid "Cloud account" msgstr "云账号" -#: xpack/plugins/cloud/models.py:120 +#: xpack/plugins/cloud/models.py:121 msgid "Instance name" msgstr "实例名称" -#: xpack/plugins/cloud/models.py:121 +#: xpack/plugins/cloud/models.py:122 msgid "Instance name and Partial IP" msgstr "实例名称和部分IP" -#: xpack/plugins/cloud/models.py:127 xpack/plugins/cloud/serializers.py:59 +#: xpack/plugins/cloud/models.py:128 xpack/plugins/cloud/serializers.py:90 msgid "Regions" msgstr "地域" -#: xpack/plugins/cloud/models.py:130 +#: xpack/plugins/cloud/models.py:131 msgid "Instances" msgstr "实例" -#: xpack/plugins/cloud/models.py:134 +#: xpack/plugins/cloud/models.py:135 msgid "Hostname strategy" msgstr "主机名策略" -#: xpack/plugins/cloud/models.py:146 xpack/plugins/cloud/serializers.py:87 +#: xpack/plugins/cloud/models.py:147 xpack/plugins/cloud/serializers.py:118 msgid "Always update" msgstr "总是更新" -#: xpack/plugins/cloud/models.py:152 +#: xpack/plugins/cloud/models.py:153 msgid "Date last sync" msgstr "最后同步日期" -#: xpack/plugins/cloud/models.py:163 xpack/plugins/cloud/models.py:219 +#: xpack/plugins/cloud/models.py:164 xpack/plugins/cloud/models.py:220 msgid "Sync instance task" msgstr "同步实例任务" -#: xpack/plugins/cloud/models.py:229 xpack/plugins/cloud/models.py:284 +#: xpack/plugins/cloud/models.py:230 xpack/plugins/cloud/models.py:285 msgid "Date sync" msgstr "同步日期" -#: xpack/plugins/cloud/models.py:257 +#: xpack/plugins/cloud/models.py:258 msgid "Unsync" msgstr "未同步" -#: xpack/plugins/cloud/models.py:258 +#: xpack/plugins/cloud/models.py:259 msgid "New Sync" msgstr "新同步" -#: xpack/plugins/cloud/models.py:259 +#: xpack/plugins/cloud/models.py:260 msgid "Synced" msgstr "已同步" -#: xpack/plugins/cloud/models.py:260 +#: xpack/plugins/cloud/models.py:261 msgid "Released" msgstr "已释放" -#: xpack/plugins/cloud/models.py:265 +#: xpack/plugins/cloud/models.py:266 msgid "Sync task" msgstr "同步任务" -#: xpack/plugins/cloud/models.py:269 +#: xpack/plugins/cloud/models.py:270 msgid "Sync instance task history" msgstr "同步实例任务历史" -#: xpack/plugins/cloud/models.py:272 +#: xpack/plugins/cloud/models.py:273 msgid "Instance" msgstr "实例" -#: xpack/plugins/cloud/models.py:275 +#: xpack/plugins/cloud/models.py:276 msgid "Region" msgstr "地域" @@ -4324,6 +4331,10 @@ msgstr "AWS (国际)" msgid "AWS (China)" msgstr "AWS (中国)" +#: xpack/plugins/cloud/providers/azure_.py:18 +msgid "Azure (China)" +msgstr "Azure (中国)" + #: xpack/plugins/cloud/providers/huaweicloud.py:20 msgid "Huawei Cloud" msgstr "华为云" @@ -4384,15 +4395,23 @@ msgstr "拉美-圣地亚哥" msgid "Tencent Cloud" msgstr "腾讯云" -#: xpack/plugins/cloud/serializers.py:57 +#: xpack/plugins/cloud/serializers.py:26 +msgid "Tenant ID" +msgstr "" + +#: xpack/plugins/cloud/serializers.py:30 +msgid "Subscription ID" +msgstr "" + +#: xpack/plugins/cloud/serializers.py:88 msgid "History count" msgstr "执行次数" -#: xpack/plugins/cloud/serializers.py:58 +#: xpack/plugins/cloud/serializers.py:89 msgid "Instance count" msgstr "实例个数" -#: xpack/plugins/cloud/serializers.py:86 +#: xpack/plugins/cloud/serializers.py:117 #: xpack/plugins/gathered_user/serializers.py:20 msgid "Periodic display" msgstr "定时执行" @@ -4485,14 +4504,15 @@ msgstr "旗舰版" msgid "Community edition" msgstr "社区版" +#, python-format +#~ msgid "The max size of CSV is %d bytes" +#~ msgstr "CSV 文件最大为 %d 字节" + #, fuzzy #~| msgid "Confirmed system user" #~ msgid "Confirmed systemusers" #~ msgstr "确认的系统用户" -#~ msgid "Azure (China)" -#~ msgstr "Azure (中国)" - #~ msgid "MFA level" #~ msgstr "多因子认证级别"