From b6f86e8fb61b3c3e1078ac1c1af5a8945d681f4a Mon Sep 17 00:00:00 2001 From: jiangweidong Date: Mon, 14 Nov 2022 17:16:30 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=BF=98=E8=AE=B0?= =?UTF-8?q?=E5=AF=86=E7=A0=81=EF=BC=8C=E7=94=A8=E6=88=B7=E6=97=A0=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E6=97=B6=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/authentication/api/password.py | 9 +- apps/authentication/forms.py | 2 +- apps/locale/ja/LC_MESSAGES/django.po | 183 ++++++++++-------- apps/locale/zh/LC_MESSAGES/django.po | 129 ++++++------ .../templates/users/forgot_password.html | 10 +- apps/users/views/profile/reset.py | 77 ++++---- 6 files changed, 227 insertions(+), 183 deletions(-) diff --git a/apps/authentication/api/password.py b/apps/authentication/api/password.py index dbade3a33..da3e86510 100644 --- a/apps/authentication/api/password.py +++ b/apps/authentication/api/password.py @@ -4,6 +4,7 @@ from rest_framework.permissions import AllowAny from django.utils.translation import ugettext as _ from django.template.loader import render_to_string from django.core.cache import cache +from django.shortcuts import reverse from common.utils.verify_code import SendAndVerifyCodeUtil from common.permissions import IsValidUser @@ -37,10 +38,14 @@ class UserResetPasswordSendCodeApi(CreateAPIView): return user, None def create(self, request, *args, **kwargs): + token = request.GET.get('token') + userinfo = cache.get(token) + if not userinfo: + return reverse('authentication:forgot-previewing') + serializer = self.get_serializer(data=request.data) serializer.is_valid(raise_exception=True) - token = request.GET.get('token') - username = cache.get(token) + username = userinfo.get('username') form_type = serializer.validated_data['form_type'] code = random_string(6, lower=False, upper=False) other_args = {} diff --git a/apps/authentication/forms.py b/apps/authentication/forms.py index e80407d15..747b821ea 100644 --- a/apps/authentication/forms.py +++ b/apps/authentication/forms.py @@ -62,7 +62,7 @@ class CustomCaptchaTextInput(CaptchaTextInput): class CaptchaMixin(forms.Form): - captcha = CaptchaField(widget=CustomCaptchaTextInput) + captcha = CaptchaField(widget=CustomCaptchaTextInput, label=_('Captcha')) class ChallengeMixin(forms.Form): diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index 028ab7b56..2db11ff18 100644 --- a/apps/locale/ja/LC_MESSAGES/django.po +++ b/apps/locale/ja/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-11-10 16:37+0800\n" +"POT-Creation-Date: 2022-11-14 17:07+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -161,7 +161,7 @@ msgstr "コンマ区切り文字列の形式。* はすべて一致すること #: authentication/models.py:260 #: authentication/templates/authentication/_msg_different_city.html:9 #: authentication/templates/authentication/_msg_oauth_bind.html:9 -#: ops/models/adhoc.py:159 users/forms/profile.py:32 users/forms/profile.py:109 +#: ops/models/adhoc.py:159 users/forms/profile.py:32 users/forms/profile.py:112 #: users/models/user.py:671 users/templates/users/_msg_user_created.html:12 #: xpack/plugins/change_auth_plan/models/asset.py:34 #: xpack/plugins/change_auth_plan/models/asset.py:195 @@ -224,7 +224,7 @@ msgid "None of the reviewers belong to Organization `{}`" msgstr "いずれのレビューアも組織 '{}' に属していません" #: acls/serializers/rules/rules.py:20 -#: xpack/plugins/cloud/serializers/task.py:23 +#: xpack/plugins/cloud/serializers/task.py:24 msgid "IP address invalid: `{}`" msgstr "IPアドレスが無効: '{}'" @@ -324,7 +324,7 @@ msgstr "タイプ" msgid "Domain" msgstr "ドメイン" -#: applications/models/application.py:230 xpack/plugins/cloud/models.py:33 +#: applications/models/application.py:230 xpack/plugins/cloud/models.py:32 #: xpack/plugins/cloud/serializers/account.py:64 msgid "Attrs" msgstr "ツールバーの" @@ -363,7 +363,7 @@ msgstr "タイプ表示" #: orgs/models.py:72 orgs/models.py:223 perms/models/base.py:92 #: users/models/group.py:18 users/models/user.py:937 #: xpack/plugins/change_auth_plan/models/base.py:45 -#: xpack/plugins/cloud/models.py:125 +#: xpack/plugins/cloud/models.py:127 msgid "Date created" msgstr "作成された日付" @@ -608,7 +608,7 @@ msgstr "ホスト名生" #: assets/models/asset.py:215 assets/serializers/account.py:16 #: assets/serializers/asset.py:65 perms/serializers/asset/user_permission.py:41 -#: xpack/plugins/cloud/models.py:107 xpack/plugins/cloud/serializers/task.py:43 +#: xpack/plugins/cloud/models.py:106 xpack/plugins/cloud/serializers/task.py:44 msgid "Protocols" msgstr "プロトコル" @@ -630,7 +630,7 @@ msgstr "アクティブです。" msgid "Admin user" msgstr "管理ユーザー" -#: assets/models/asset.py:225 +#: assets/models/asset.py:225 xpack/plugins/cloud/const.py:32 msgid "Public IP" msgstr "パブリックIP" @@ -649,7 +649,7 @@ msgstr "ラベル" #: orgs/models.py:225 perms/models/base.py:91 users/models/user.py:720 #: users/serializers/group.py:33 #: xpack/plugins/change_auth_plan/models/base.py:48 -#: xpack/plugins/cloud/models.py:122 xpack/plugins/gathered_user/models.py:30 +#: xpack/plugins/cloud/models.py:124 xpack/plugins/gathered_user/models.py:30 msgid "Created by" msgstr "によって作成された" @@ -761,7 +761,7 @@ msgstr "トリガーモード" #: xpack/plugins/change_auth_plan/models/base.py:201 #: xpack/plugins/change_auth_plan/serializers/app.py:66 #: xpack/plugins/change_auth_plan/serializers/asset.py:180 -#: xpack/plugins/cloud/models.py:179 +#: xpack/plugins/cloud/models.py:181 msgid "Reason" msgstr "理由" @@ -791,7 +791,7 @@ msgstr "OK" #: assets/models/base.py:32 audits/models.py:136 #: xpack/plugins/change_auth_plan/serializers/app.py:88 #: xpack/plugins/change_auth_plan/serializers/asset.py:199 -#: xpack/plugins/cloud/const.py:36 +#: xpack/plugins/cloud/const.py:41 msgid "Failed" msgstr "失敗しました" @@ -842,10 +842,7 @@ msgstr "帯域幅" msgid "Contact" msgstr "連絡先" -#: assets/models/cluster.py:22 authentication/serializers/password_mfa.py:25 -#: users/forms/profile.py:103 users/models/user.py:693 -#: users/templates/users/forgot_password.html:55 -#: users/templates/users/forgot_password.html:121 +#: assets/models/cluster.py:22 users/models/user.py:693 msgid "Phone" msgstr "電話" @@ -1011,7 +1008,7 @@ msgid "Parent key" msgstr "親キー" #: assets/models/node.py:566 assets/serializers/system_user.py:267 -#: xpack/plugins/cloud/models.py:96 xpack/plugins/cloud/serializers/task.py:70 +#: xpack/plugins/cloud/models.py:95 xpack/plugins/cloud/serializers/task.py:72 msgid "Node" msgstr "ノード" @@ -1168,8 +1165,8 @@ msgstr "CPU情報" msgid "Actions" msgstr "アクション" -#: assets/serializers/backup.py:31 ops/mixin.py:106 ops/mixin.py:147 -#: settings/serializers/auth/ldap.py:66 +#: assets/serializers/backup.py:31 ops/mixin.py:26 ops/mixin.py:106 +#: ops/mixin.py:147 settings/serializers/auth/ldap.py:66 #: xpack/plugins/change_auth_plan/serializers/base.py:43 msgid "Periodic perform" msgstr "定期的なパフォーマンス" @@ -1579,8 +1576,8 @@ msgid "MFA" msgstr "MFA" #: audits/models.py:146 terminal/models/status.py:33 -#: tickets/models/ticket/general.py:281 xpack/plugins/cloud/models.py:175 -#: xpack/plugins/cloud/models.py:227 +#: tickets/models/ticket/general.py:281 xpack/plugins/cloud/models.py:177 +#: xpack/plugins/cloud/models.py:229 msgid "Status" msgstr "ステータス" @@ -1617,7 +1614,7 @@ msgid "Hosts display" msgstr "ホスト表示" #: audits/serializers.py:102 ops/models/command.py:27 -#: xpack/plugins/cloud/models.py:173 +#: xpack/plugins/cloud/models.py:175 msgid "Result" msgstr "結果" @@ -1681,16 +1678,16 @@ msgstr "この操作には、MFAを検証する必要があります" msgid "Current user not support mfa type: {}" msgstr "現在のユーザーはmfaタイプをサポートしていません: {}" -#: authentication/api/password.py:30 terminal/api/session.py:224 -#: users/views/profile/reset.py:45 users/views/profile/reset.py:107 +#: authentication/api/password.py:31 terminal/api/session.py:224 +#: users/views/profile/reset.py:44 msgid "User does not exist: {}" msgstr "ユーザーが存在しない: {}" -#: authentication/api/password.py:30 +#: authentication/api/password.py:31 users/views/profile/reset.py:122 msgid "No user matched" msgstr "ユーザーにマッチしなかった" -#: authentication/api/password.py:34 +#: authentication/api/password.py:35 msgid "" "The user is from {}, please go to the corresponding system to change the " "password" @@ -1698,10 +1695,10 @@ msgstr "" "ユーザーは {}からです。対応するシステムにアクセスしてパスワードを変更してくだ" "さい。" -#: authentication/api/password.py:61 +#: authentication/api/password.py:59 #: authentication/templates/authentication/login.html:256 -#: users/templates/users/forgot_password.html:33 -#: users/templates/users/forgot_password.html:34 +#: users/templates/users/forgot_password.html:27 +#: users/templates/users/forgot_password.html:28 #: users/templates/users/forgot_password_previewing.html:13 #: users/templates/users/forgot_password_previewing.html:14 msgid "Forgot password" @@ -1957,6 +1954,11 @@ msgstr "MFAコード" msgid "MFA type" msgstr "MFAタイプ" +#: authentication/forms.py:65 +#: authentication/templates/authentication/_captcha_field.html:15 +msgid "Captcha" +msgstr "キャプチャ" + #: authentication/forms.py:70 users/forms/profile.py:28 msgid "MFA code" msgstr "MFAコード" @@ -2012,12 +2014,15 @@ msgstr "Radius globalが有効になり、無効にできません" #: authentication/mfa/sms.py:7 msgid "SMS verify code invalid" -msgstr "SMS検証コードが無効" +msgstr "メッセージ検証コードが無効" -#: authentication/mfa/sms.py:12 settings/serializers/auth/sms.py:27 -#: users/templates/users/forgot_password.html:74 +#: authentication/mfa/sms.py:12 authentication/serializers/password_mfa.py:16 +#: authentication/serializers/password_mfa.py:24 +#: settings/serializers/auth/sms.py:27 users/forms/profile.py:103 +#: users/forms/profile.py:106 users/templates/users/forgot_password.html:111 +#: users/views/profile/reset.py:74 msgid "SMS" -msgstr "SMS" +msgstr "メッセージ" #: authentication/mfa/sms.py:13 msgid "SMS verification code" @@ -2136,7 +2141,7 @@ msgid "binding reminder" msgstr "バインディングリマインダー" #: authentication/serializers/connection_token.py:23 -#: xpack/plugins/cloud/models.py:34 +#: xpack/plugins/cloud/models.py:33 msgid "Validity" msgstr "有効性" @@ -2148,21 +2153,21 @@ msgstr "期限切れ時間" msgid "Asset or application required" msgstr "アセットまたはアプリが必要" -#: authentication/serializers/password_mfa.py:25 -#: authentication/serializers/password_mfa.py:29 -#: users/templates/users/forgot_password.html:117 -msgid "The {} cannot be empty" -msgstr "{} 空にしてはならない" - -#: authentication/serializers/password_mfa.py:29 +#: authentication/serializers/password_mfa.py:16 +#: authentication/serializers/password_mfa.py:24 #: notifications/backends/__init__.py:10 settings/serializers/email.py:19 #: settings/serializers/email.py:50 users/forms/profile.py:102 -#: users/models/user.py:675 users/templates/users/forgot_password.html:51 -#: users/templates/users/forgot_password.html:70 -#: users/templates/users/forgot_password.html:126 +#: users/forms/profile.py:106 users/models/user.py:675 +#: users/templates/users/forgot_password.html:116 +#: users/views/profile/reset.py:68 msgid "Email" msgstr "メール" +#: authentication/serializers/password_mfa.py:29 +#: users/templates/users/forgot_password.html:107 +msgid "The {} cannot be empty" +msgstr "{} 空にしてはならない" + #: authentication/serializers/token.py:79 #: perms/serializers/application/permission.py:20 #: perms/serializers/application/permission.py:41 @@ -2225,10 +2230,6 @@ msgstr "閉じる" msgid "Play CAPTCHA as audio file" msgstr "CAPTCHAをオーディオファイルとして再生する" -#: authentication/templates/authentication/_captcha_field.html:15 -msgid "Captcha" -msgstr "キャプチャ" - #: authentication/templates/authentication/_mfa_confirm_modal.html:5 msgid "MFA confirm" msgstr "MFA確認" @@ -2254,7 +2255,7 @@ msgstr "コードエラー" #: authentication/templates/authentication/_msg_reset_password_code.html:9 #: authentication/templates/authentication/_msg_rest_password_success.html:2 #: authentication/templates/authentication/_msg_rest_public_key_success.html:2 -#: jumpserver/conf.py:406 ops/tasks.py:145 ops/tasks.py:148 +#: jumpserver/conf.py:413 ops/tasks.py:145 ops/tasks.py:148 #: perms/templates/perms/_msg_item_permissions_expire.html:3 #: perms/templates/perms/_msg_permed_items_expire.html:3 #: tickets/templates/tickets/approve_check_password.html:33 @@ -2313,7 +2314,7 @@ msgstr "新しいものを要求する" #: authentication/templates/authentication/_msg_reset_password_code.html:12 #: terminal/models/sharing.py:26 terminal/models/sharing.py:80 -#: users/forms/profile.py:104 users/templates/users/forgot_password.html:59 +#: users/forms/profile.py:104 users/templates/users/forgot_password.html:65 msgid "Verify code" msgstr "コードの確認" @@ -2738,11 +2739,11 @@ msgstr "特殊文字を含むべきではない" msgid "The mobile phone number format is incorrect" msgstr "携帯電話番号の形式が正しくありません" -#: jumpserver/conf.py:405 +#: jumpserver/conf.py:412 msgid "Create account successfully" msgstr "アカウントを正常に作成" -#: jumpserver/conf.py:407 +#: jumpserver/conf.py:414 msgid "Your account has been created successfully" msgstr "アカウントが正常に作成されました" @@ -4761,17 +4762,16 @@ msgstr "" " " #: templates/_mfa_login_field.html:28 -#: users/templates/users/forgot_password.html:61 msgid "Send verification code" msgstr "確認コードを送信" #: templates/_mfa_login_field.html:106 -#: users/templates/users/forgot_password.html:139 +#: users/templates/users/forgot_password.html:129 msgid "Wait: " msgstr "待つ:" #: templates/_mfa_login_field.html:116 -#: users/templates/users/forgot_password.html:155 +#: users/templates/users/forgot_password.html:145 msgid "The verification code has been sent" msgstr "確認コードが送信されました" @@ -5248,7 +5248,7 @@ msgstr "アクセスキー" msgid "Access key secret" msgstr "アクセスキーシークレット" -#: terminal/serializers/storage.py:65 xpack/plugins/cloud/models.py:220 +#: terminal/serializers/storage.py:65 xpack/plugins/cloud/models.py:222 msgid "Region" msgstr "リージョン" @@ -5774,40 +5774,40 @@ msgstr "パスワードの確認" msgid "Password does not match" msgstr "パスワードが一致しない" -#: users/forms/profile.py:115 +#: users/forms/profile.py:118 msgid "Old password" msgstr "古いパスワード" -#: users/forms/profile.py:125 +#: users/forms/profile.py:128 msgid "Old password error" msgstr "古いパスワードエラー" -#: users/forms/profile.py:135 +#: users/forms/profile.py:138 msgid "Automatically configure and download the SSH key" msgstr "SSHキーの自動設定とダウンロード" -#: users/forms/profile.py:137 +#: users/forms/profile.py:140 msgid "ssh public key" msgstr "ssh公開キー" -#: users/forms/profile.py:138 +#: users/forms/profile.py:141 msgid "ssh-rsa AAAA..." msgstr "ssh-rsa AAAA.." -#: users/forms/profile.py:139 +#: users/forms/profile.py:142 msgid "Paste your id_rsa.pub here." msgstr "ここにid_rsa.pubを貼り付けます。" -#: users/forms/profile.py:152 +#: users/forms/profile.py:155 msgid "Public key should not be the same as your old one." msgstr "公開鍵は古いものと同じであってはなりません。" -#: users/forms/profile.py:156 users/serializers/profile.py:100 +#: users/forms/profile.py:159 users/serializers/profile.py:100 #: users/serializers/profile.py:183 users/serializers/profile.py:210 msgid "Not a valid ssh public key" msgstr "有効なssh公開鍵ではありません" -#: users/forms/profile.py:167 users/models/user.py:706 +#: users/forms/profile.py:170 users/models/user.py:706 msgid "Public key" msgstr "公開キー" @@ -5887,7 +5887,7 @@ msgstr "ユーザーパスワード履歴" msgid "Reset password" msgstr "パスワードのリセット" -#: users/notifications.py:85 users/views/profile/reset.py:172 +#: users/notifications.py:85 users/views/profile/reset.py:189 msgid "Reset password success" msgstr "パスワードのリセット成功" @@ -6079,11 +6079,28 @@ msgstr "あなたのssh公開鍵はサイト管理者によってリセットさ msgid "click here to set your password" msgstr "ここをクリックしてパスワードを設定してください" -#: users/templates/users/forgot_password.html:38 -msgid "Input your email, that will send a mail to your" -msgstr "あなたのメールを入力し、それはあなたにメールを送信します" +#: users/templates/users/forgot_password.html:32 +msgid "Input your email account, that will send a email to your" +msgstr "電子メールアカウントを入力し、メールをメールアドレスに送信します" -#: users/templates/users/forgot_password.html:64 +#: users/templates/users/forgot_password.html:35 +msgid "" +"Enter your mobile number and a verification code will be sent to your phone" +msgstr "携帯電話番号を入力すると認証コードが送信されます" + +#: users/templates/users/forgot_password.html:57 +msgid "Email account" +msgstr "メールアドレスアカウント" + +#: users/templates/users/forgot_password.html:61 +msgid "Mobile number" +msgstr "携帯番号" + +#: users/templates/users/forgot_password.html:68 +msgid "Send" +msgstr "送信" + +#: users/templates/users/forgot_password.html:72 #: users/templates/users/forgot_password_previewing.html:30 msgid "Submit" msgstr "送信" @@ -6234,23 +6251,23 @@ msgstr "OTP無効化成功、ログインページを返す" msgid "Password invalid" msgstr "パスワード無効" -#: users/views/profile/reset.py:96 users/views/profile/reset.py:107 +#: users/views/profile/reset.py:144 users/views/profile/reset.py:155 msgid "Token invalid or expired" msgstr "トークンが無効または期限切れ" -#: users/views/profile/reset.py:145 +#: users/views/profile/reset.py:160 msgid "User auth from {}, go there change password" msgstr "ユーザー認証ソース {}, 対応するシステムにパスワードを変更してください" -#: users/views/profile/reset.py:152 +#: users/views/profile/reset.py:167 msgid "* Your password does not meet the requirements" msgstr "* パスワードが要件を満たしていない" -#: users/views/profile/reset.py:158 +#: users/views/profile/reset.py:173 msgid "* The new password cannot be the last {} passwords" msgstr "* 新しいパスワードを最後の {} パスワードにすることはできません" -#: users/views/profile/reset.py:173 +#: users/views/profile/reset.py:190 msgid "Reset password success, return to login page" msgstr "パスワードの成功をリセットし、ログインページに戻る" @@ -6521,27 +6538,27 @@ msgstr "プライベートIP" msgid "Instance name" msgstr "インスタンス名" -#: xpack/plugins/cloud/const.py:32 +#: xpack/plugins/cloud/const.py:37 msgid "Instance name and Partial IP" msgstr "インスタンス名と部分IP" -#: xpack/plugins/cloud/const.py:37 +#: xpack/plugins/cloud/const.py:42 msgid "Succeed" msgstr "成功" -#: xpack/plugins/cloud/const.py:41 +#: xpack/plugins/cloud/const.py:46 msgid "Unsync" msgstr "同期していません" -#: xpack/plugins/cloud/const.py:42 +#: xpack/plugins/cloud/const.py:47 msgid "New Sync" msgstr "新しい同期" -#: xpack/plugins/cloud/const.py:43 +#: xpack/plugins/cloud/const.py:48 msgid "Synced" msgstr "同期済み" -#: xpack/plugins/cloud/const.py:44 +#: xpack/plugins/cloud/const.py:49 msgid "Released" msgstr "リリース済み" @@ -6549,19 +6566,19 @@ msgstr "リリース済み" msgid "Cloud center" msgstr "クラウドセンター" -#: xpack/plugins/cloud/models.py:30 +#: xpack/plugins/cloud/models.py:29 msgid "Provider" msgstr "プロバイダー" -#: xpack/plugins/cloud/models.py:39 +#: xpack/plugins/cloud/models.py:38 msgid "Cloud account" msgstr "クラウドアカウント" -#: xpack/plugins/cloud/models.py:41 +#: xpack/plugins/cloud/models.py:40 msgid "Test cloud account" msgstr "クラウドアカウントのテスト" -#: xpack/plugins/cloud/models.py:85 xpack/plugins/cloud/serializers/task.py:67 +#: xpack/plugins/cloud/models.py:84 xpack/plugins/cloud/serializers/task.py:69 msgid "Account" msgstr "アカウント" diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 3bf37b362..f2255f996 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: JumpServer 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-11-10 10:55+0800\n" +"POT-Creation-Date: 2022-11-14 17:07+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -160,7 +160,7 @@ msgstr "格式为逗号分隔的字符串, * 表示匹配所有. " #: authentication/models.py:260 #: authentication/templates/authentication/_msg_different_city.html:9 #: authentication/templates/authentication/_msg_oauth_bind.html:9 -#: ops/models/adhoc.py:159 users/forms/profile.py:32 users/forms/profile.py:109 +#: ops/models/adhoc.py:159 users/forms/profile.py:32 users/forms/profile.py:112 #: users/models/user.py:671 users/templates/users/_msg_user_created.html:12 #: xpack/plugins/change_auth_plan/models/asset.py:34 #: xpack/plugins/change_auth_plan/models/asset.py:195 @@ -837,10 +837,7 @@ msgstr "带宽" msgid "Contact" msgstr "联系人" -#: assets/models/cluster.py:22 authentication/serializers/password_mfa.py:25 -#: users/forms/profile.py:103 users/models/user.py:693 -#: users/templates/users/forgot_password.html:55 -#: users/templates/users/forgot_password.html:121 +#: assets/models/cluster.py:22 users/models/user.py:693 msgid "Phone" msgstr "手机" @@ -1669,25 +1666,25 @@ msgstr "此操作需要验证您的 MFA" msgid "Current user not support mfa type: {}" msgstr "当前用户不支持 MFA 类型: {}" -#: authentication/api/password.py:30 terminal/api/session.py:224 -#: users/views/profile/reset.py:45 users/views/profile/reset.py:107 +#: authentication/api/password.py:31 terminal/api/session.py:224 +#: users/views/profile/reset.py:44 msgid "User does not exist: {}" msgstr "用户不存在: {}" -#: authentication/api/password.py:30 +#: authentication/api/password.py:31 users/views/profile/reset.py:122 msgid "No user matched" msgstr "没有匹配到用户" -#: authentication/api/password.py:34 +#: authentication/api/password.py:35 msgid "" "The user is from {}, please go to the corresponding system to change the " "password" msgstr "用户来自 {} 请去相应系统修改密码" -#: authentication/api/password.py:61 +#: authentication/api/password.py:59 #: authentication/templates/authentication/login.html:256 -#: users/templates/users/forgot_password.html:33 -#: users/templates/users/forgot_password.html:34 +#: users/templates/users/forgot_password.html:27 +#: users/templates/users/forgot_password.html:28 #: users/templates/users/forgot_password_previewing.html:13 #: users/templates/users/forgot_password_previewing.html:14 msgid "Forgot password" @@ -1934,6 +1931,11 @@ msgstr "MFA 验证码" msgid "MFA type" msgstr "MFA 类型" +#: authentication/forms.py:65 +#: authentication/templates/authentication/_captcha_field.html:15 +msgid "Captcha" +msgstr "验证码" + #: authentication/forms.py:70 users/forms/profile.py:28 msgid "MFA code" msgstr "MFA 验证码" @@ -1990,8 +1992,11 @@ msgstr "Radius MFA 全局开启，无法被禁用" msgid "SMS verify code invalid" msgstr "短信验证码校验失败" -#: authentication/mfa/sms.py:12 settings/serializers/auth/sms.py:27 -#: users/templates/users/forgot_password.html:74 +#: authentication/mfa/sms.py:12 authentication/serializers/password_mfa.py:16 +#: authentication/serializers/password_mfa.py:24 +#: settings/serializers/auth/sms.py:27 users/forms/profile.py:103 +#: users/forms/profile.py:106 users/templates/users/forgot_password.html:111 +#: users/views/profile/reset.py:74 msgid "SMS" msgstr "短信" @@ -2120,20 +2125,20 @@ msgstr "过期时间" msgid "Asset or application required" msgstr "资产或应用必填" -#: authentication/serializers/password_mfa.py:25 -#: authentication/serializers/password_mfa.py:29 -#: users/templates/users/forgot_password.html:117 -msgid "The {} cannot be empty" -msgstr "{} 不能为空" - -#: authentication/serializers/password_mfa.py:29 +#: authentication/serializers/password_mfa.py:16 +#: authentication/serializers/password_mfa.py:24 #: notifications/backends/__init__.py:10 settings/serializers/email.py:19 #: settings/serializers/email.py:50 users/forms/profile.py:102 -#: users/models/user.py:675 users/templates/users/forgot_password.html:51 -#: users/templates/users/forgot_password.html:70 -#: users/templates/users/forgot_password.html:126 +#: users/forms/profile.py:106 users/models/user.py:675 +#: users/templates/users/forgot_password.html:116 +#: users/views/profile/reset.py:68 msgid "Email" -msgstr "邮件" +msgstr "邮箱" + +#: authentication/serializers/password_mfa.py:29 +#: users/templates/users/forgot_password.html:107 +msgid "The {} cannot be empty" +msgstr "{} 不能为空" #: authentication/serializers/token.py:79 #: perms/serializers/application/permission.py:20 @@ -2197,10 +2202,6 @@ msgstr "关闭" msgid "Play CAPTCHA as audio file" msgstr "语言播放验证码" -#: authentication/templates/authentication/_captcha_field.html:15 -msgid "Captcha" -msgstr "验证码" - #: authentication/templates/authentication/_mfa_confirm_modal.html:5 msgid "MFA confirm" msgstr "MFA 认证校验" @@ -2226,7 +2227,7 @@ msgstr "代码错误" #: authentication/templates/authentication/_msg_reset_password_code.html:9 #: authentication/templates/authentication/_msg_rest_password_success.html:2 #: authentication/templates/authentication/_msg_rest_public_key_success.html:2 -#: jumpserver/conf.py:406 ops/tasks.py:145 ops/tasks.py:148 +#: jumpserver/conf.py:413 ops/tasks.py:145 ops/tasks.py:148 #: perms/templates/perms/_msg_item_permissions_expire.html:3 #: perms/templates/perms/_msg_permed_items_expire.html:3 #: tickets/templates/tickets/approve_check_password.html:33 @@ -2281,7 +2282,7 @@ msgstr "重新申请" #: authentication/templates/authentication/_msg_reset_password_code.html:12 #: terminal/models/sharing.py:26 terminal/models/sharing.py:80 -#: users/forms/profile.py:104 users/templates/users/forgot_password.html:59 +#: users/forms/profile.py:104 users/templates/users/forgot_password.html:65 msgid "Verify code" msgstr "验证码" @@ -2701,11 +2702,11 @@ msgstr "不能包含特殊字符" msgid "The mobile phone number format is incorrect" msgstr "手机号格式不正确" -#: jumpserver/conf.py:405 +#: jumpserver/conf.py:412 msgid "Create account successfully" msgstr "创建账号成功" -#: jumpserver/conf.py:407 +#: jumpserver/conf.py:414 msgid "Your account has been created successfully" msgstr "你的账号已创建成功" @@ -4686,17 +4687,16 @@ msgstr "" " " #: templates/_mfa_login_field.html:28 -#: users/templates/users/forgot_password.html:61 msgid "Send verification code" msgstr "发送验证码" #: templates/_mfa_login_field.html:106 -#: users/templates/users/forgot_password.html:139 +#: users/templates/users/forgot_password.html:129 msgid "Wait: " msgstr "等待：" #: templates/_mfa_login_field.html:116 -#: users/templates/users/forgot_password.html:155 +#: users/templates/users/forgot_password.html:145 msgid "The verification code has been sent" msgstr "验证码已发送" @@ -5683,40 +5683,40 @@ msgstr "确认密码" msgid "Password does not match" msgstr "密码不一致" -#: users/forms/profile.py:115 +#: users/forms/profile.py:118 msgid "Old password" msgstr "原来密码" -#: users/forms/profile.py:125 +#: users/forms/profile.py:128 msgid "Old password error" msgstr "原来密码错误" -#: users/forms/profile.py:135 +#: users/forms/profile.py:138 msgid "Automatically configure and download the SSH key" msgstr "自动配置并下载SSH密钥" -#: users/forms/profile.py:137 +#: users/forms/profile.py:140 msgid "ssh public key" msgstr "SSH公钥" -#: users/forms/profile.py:138 +#: users/forms/profile.py:141 msgid "ssh-rsa AAAA..." msgstr "ssh-rsa AAAA..." -#: users/forms/profile.py:139 +#: users/forms/profile.py:142 msgid "Paste your id_rsa.pub here." msgstr "复制你的公钥到这里" -#: users/forms/profile.py:152 +#: users/forms/profile.py:155 msgid "Public key should not be the same as your old one." msgstr "不能和原来的密钥相同" -#: users/forms/profile.py:156 users/serializers/profile.py:100 +#: users/forms/profile.py:159 users/serializers/profile.py:100 #: users/serializers/profile.py:183 users/serializers/profile.py:210 msgid "Not a valid ssh public key" msgstr "SSH密钥不合法" -#: users/forms/profile.py:167 users/models/user.py:706 +#: users/forms/profile.py:170 users/models/user.py:706 msgid "Public key" msgstr "SSH公钥" @@ -5796,7 +5796,7 @@ msgstr "用户密码历史" msgid "Reset password" msgstr "重置密码" -#: users/notifications.py:85 users/views/profile/reset.py:172 +#: users/notifications.py:85 users/views/profile/reset.py:189 msgid "Reset password success" msgstr "重置密码成功" @@ -5986,11 +5986,28 @@ msgstr "你的 SSH 密钥已经被管理员重置" msgid "click here to set your password" msgstr "点击这里设置密码" -#: users/templates/users/forgot_password.html:38 -msgid "Input your email, that will send a mail to your" -msgstr "输入您的邮箱, 将会发一封重置邮件到您的邮箱中" +#: users/templates/users/forgot_password.html:32 +msgid "Input your email account, that will send a email to your" +msgstr "输入您的邮箱账号, 将会发一封重置邮件到您的邮箱中" -#: users/templates/users/forgot_password.html:64 +#: users/templates/users/forgot_password.html:35 +msgid "" +"Enter your mobile number and a verification code will be sent to your phone" +msgstr "输入您的手机号码，验证码将发送到您的手机" + +#: users/templates/users/forgot_password.html:57 +msgid "Email account" +msgstr "邮箱账号" + +#: users/templates/users/forgot_password.html:61 +msgid "Mobile number" +msgstr "手机号码" + +#: users/templates/users/forgot_password.html:68 +msgid "Send" +msgstr "发送" + +#: users/templates/users/forgot_password.html:72 #: users/templates/users/forgot_password_previewing.html:30 msgid "Submit" msgstr "提交" @@ -6133,23 +6150,23 @@ msgstr "MFA(OTP) 禁用成功，返回登录页面" msgid "Password invalid" msgstr "用户名或密码无效" -#: users/views/profile/reset.py:129 users/views/profile/reset.py:140 +#: users/views/profile/reset.py:144 users/views/profile/reset.py:155 msgid "Token invalid or expired" msgstr "Token错误或失效" -#: users/views/profile/reset.py:145 +#: users/views/profile/reset.py:160 msgid "User auth from {}, go there change password" msgstr "用户认证源来自 {}, 请去相应系统修改密码" -#: users/views/profile/reset.py:152 +#: users/views/profile/reset.py:167 msgid "* Your password does not meet the requirements" msgstr "* 您的密码不符合要求" -#: users/views/profile/reset.py:158 +#: users/views/profile/reset.py:173 msgid "* The new password cannot be the last {} passwords" msgstr "* 新密码不能是最近 {} 次的密码" -#: users/views/profile/reset.py:173 +#: users/views/profile/reset.py:190 msgid "Reset password success, return to login page" msgstr "重置密码成功，返回到登录页面" diff --git a/apps/users/templates/users/forgot_password.html b/apps/users/templates/users/forgot_password.html index 8aa2adc69..755e48dcf 100644 --- a/apps/users/templates/users/forgot_password.html +++ b/apps/users/templates/users/forgot_password.html @@ -29,10 +29,10 @@ {% block content %}

- {% trans 'Input your email, that will send a mail to your' %} + {% trans 'Input your email account, that will send a email to your' %}

- Enter your phone number and a verification code will be sent to your phone + {% trans 'Enter your mobile number and a verification code will be sent to your phone' %}

{% if 'code' in form.errors %} @@ -54,18 +54,18 @@ {% bootstrap_field form.form_type layout="horizontal" %}
+ placeholder="{% trans 'Email account' %}" value="{{ email }}">
+ placeholder="{% trans 'Mobile number' %}" value="{{ sms }}">
diff --git a/apps/users/views/profile/reset.py b/apps/users/views/profile/reset.py index efe9d207c..fd68efb87 100644 --- a/apps/users/views/profile/reset.py +++ b/apps/users/views/profile/reset.py @@ -1,27 +1,26 @@ # ~*~ coding: utf-8 ~*~ from __future__ import unicode_literals -from django.views.generic import RedirectView -from django.shortcuts import reverse, redirect -from django.utils.translation import ugettext as _ -from django.conf import settings -from django.urls import reverse_lazy -from django.views.generic import FormView -from django.core.cache import cache -from users.notifications import ResetPasswordSuccessMsg -from common.utils import get_object_or_none, FlashMessageUtil, random_string +from common.utils import FlashMessageUtil, get_object_or_none, random_string from common.utils.verify_code import SendAndVerifyCodeUtil -from ...models import User -from ...utils import ( - get_password_check_rules, check_password_rules, -) -from ... import forms +from django.conf import settings +from django.core.cache import cache +from django.shortcuts import redirect, reverse +from django.urls import reverse_lazy +from django.utils.translation import ugettext as _ +from django.views.generic import FormView, RedirectView +from users.notifications import ResetPasswordSuccessMsg +from ... import forms +from ...models import User +from ...utils import check_password_rules, get_password_check_rules __all__ = [ - 'UserLoginView', 'UserResetPasswordView', 'UserForgotPasswordView', - 'UserForgotPasswordPreviewingView' + 'UserLoginView', + 'UserResetPasswordView', + 'UserForgotPasswordView', + 'UserForgotPasswordPreviewingView', ] @@ -46,7 +45,8 @@ class UserForgotPasswordPreviewingView(FormView): return super().form_invalid(form) token = random_string(36) - cache.set(token, username, 5 * 60) + user_map = {'username': user.username, 'phone': user.phone, 'email': user.email} + cache.set(token, user_map, 5 * 60) return redirect(self.get_redirect_url(token)) @@ -56,19 +56,18 @@ class UserForgotPasswordView(FormView): def get(self, request, *args, **kwargs): token = self.request.GET.get('token') - username = cache.get(token) - if not username: + userinfo = cache.get(token) + if not userinfo: return redirect(self.get_redirect_url(return_previewing=True)) else: - return super().get(request, *args, **kwargs) + context = self.get_context_data(has_phone=bool(userinfo['phone'])) + return self.render_to_response(context) @staticmethod - def get_validate_backends_context(): - validate_backends = [ - {'name': _('Email'), 'is_active': True, 'value': 'email'} - ] + def get_validate_backends_context(has_phone): + validate_backends = [{'name': _('Email'), 'is_active': True, 'value': 'email'}] if settings.XPACK_ENABLED: - if settings.SMS_ENABLED: + if settings.SMS_ENABLED and has_phone: is_active = True else: is_active = False @@ -76,19 +75,18 @@ class UserForgotPasswordView(FormView): validate_backends.append(sms_backend) return {'validate_backends': validate_backends} - def get_context_data(self, **kwargs): + def get_context_data(self, has_phone=False, **kwargs): context = super().get_context_data(**kwargs) form = context['form'] - if getattr(form, 'errors', None): - e = getattr(form, 'errors') - context['errors'] = e - context['form_type'] = 'email' - context['XPACK_ENABLED'] = settings.XPACK_ENABLED + cleaned_data = getattr(form, 'cleaned_data', {}) for k, v in cleaned_data.items(): if v: context[k] = v - validate_backends = self.get_validate_backends_context() + + context['form_type'] = 'email' + context['XPACK_ENABLED'] = settings.XPACK_ENABLED + validate_backends = self.get_validate_backends_context(has_phone) context.update(validate_backends) return context @@ -102,10 +100,15 @@ class UserForgotPasswordView(FormView): def form_valid(self, form): token = self.request.GET.get('token') - username = cache.get(token) + userinfo = cache.get(token) + if not userinfo: + return redirect(self.get_redirect_url(return_previewing=True)) + + username = userinfo.get('username') form_type = form.cleaned_data['form_type'] - code = form.cleaned_data['code'] target = form.cleaned_data[form_type] + code = form.cleaned_data['code'] + try: sender_util = SendAndVerifyCodeUtil(target, backend=form_type) sender_util.verify(code) @@ -116,7 +119,7 @@ class UserForgotPasswordView(FormView): query_key = 'phone' if form_type == 'sms' else form_type user = get_object_or_none(User, **{'username': username, query_key: target}) if not user: - form.add_error('username', _('User does not exist: {}').format(username)) + form.add_error('code', _('No user matched')) return super().form_invalid(form) return redirect(self.get_redirect_url(user)) @@ -167,7 +170,9 @@ class UserResetPasswordView(FormView): if user.is_history_password(password): limit_count = settings.OLD_PASSWORD_HISTORY_LIMIT_COUNT - error = _('* The new password cannot be the last {} passwords').format(limit_count) + error = _('* The new password cannot be the last {} passwords').format( + limit_count + ) form.add_error('new_password', error) return self.form_invalid(form)