From 86d76c53d69785229786767fa04235b0513e7fc6 Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 11 Mar 2024 18:24:25 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=20MongoDB=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=94=AF=E6=8C=81=20authSource=20?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=95=B0=E6=8D=AE=E5=BA=93=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/const/protocol.py | 8 ++++ apps/locale/ja/LC_MESSAGES/django.po | 62 ++++++++++++++++------------ apps/locale/zh/LC_MESSAGES/django.po | 62 ++++++++++++++++------------ 3 files changed, 80 insertions(+), 52 deletions(-) diff --git a/apps/assets/const/protocol.py b/apps/assets/const/protocol.py index 790899690..10c6794fe 100644 --- a/apps/assets/const/protocol.py +++ b/apps/assets/const/protocol.py @@ -187,6 +187,14 @@ class Protocol(ChoicesMixin, models.TextChoices): 'port': 27017, 'required': True, 'secret_types': ['password'], + 'setting': { + 'auth_source': { + 'type': 'str', + 'default': 'admin', + 'label': _('Auth source'), + 'help_text': _('The database to authenticate against') + } + } }, cls.redis: { 'port': 6379, diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index a5dca66e9..1a093def5 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: 2024-03-08 10:34+0800\n" +"POT-Creation-Date: 2024-03-11 18:22+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -294,7 +294,7 @@ msgstr "ソース ID" #: accounts/serializers/automations/change_secret.py:127 #: acls/serializers/base.py:124 acls/templates/acls/asset_login_reminder.html:7 #: assets/serializers/asset/common.py:128 assets/serializers/gateway.py:28 -#: audits/models.py:59 authentication/api/connection_token.py:405 +#: audits/models.py:59 authentication/api/connection_token.py:406 #: ops/models/base.py:18 perms/models/asset_permission.py:75 #: perms/serializers/permission.py:41 settings/serializers/msg.py:33 #: terminal/backends/command/models.py:18 terminal/models/session/session.py:33 @@ -799,7 +799,7 @@ msgstr "編集済み" #: acls/templates/acls/asset_login_reminder.html:6 #: assets/models/automations/base.py:19 #: assets/serializers/automations/base.py:20 -#: authentication/api/connection_token.py:404 ops/models/base.py:17 +#: authentication/api/connection_token.py:405 ops/models/base.py:17 #: ops/models/job.py:147 ops/serializers/job.py:19 #: terminal/templates/terminal/_msg_command_execute_alert.html:16 msgid "Assets" @@ -1427,7 +1427,7 @@ msgstr "無効" msgid "Basic" msgstr "基本" -#: assets/const/base.py:34 assets/const/protocol.py:252 +#: assets/const/base.py:34 assets/const/protocol.py:260 #: assets/models/asset/web.py:13 msgid "Script" msgstr "脚本" @@ -1576,15 +1576,23 @@ msgid "" "SQL Server version, Different versions have different connection drivers" msgstr "SQL Server のバージョン。バージョンによって接続ドライバが異なります" -#: assets/const/protocol.py:199 +#: assets/const/protocol.py:194 +msgid "Auth source" +msgstr "認証データベース" + +#: assets/const/protocol.py:195 +msgid "The database to authenticate against" +msgstr "認証するデータベース" + +#: assets/const/protocol.py:207 msgid "Auth username" msgstr "ユーザー名で認証する" -#: assets/const/protocol.py:222 +#: assets/const/protocol.py:230 msgid "Safe mode" msgstr "安全モード" -#: assets/const/protocol.py:224 +#: assets/const/protocol.py:232 msgid "" "When safe mode is enabled, some operations will be disabled, such as: New " "tab, right click, visit other website, etc." @@ -1592,24 +1600,24 @@ msgstr "" "安全モードが有効になっている場合、新しいタブ、右クリック、他のウェブサイトへ" "のアクセスなど、一部の操作が無効になります" -#: assets/const/protocol.py:229 assets/models/asset/web.py:9 +#: assets/const/protocol.py:237 assets/models/asset/web.py:9 #: assets/serializers/asset/info/spec.py:16 msgid "Autofill" msgstr "自動充填" -#: assets/const/protocol.py:237 assets/models/asset/web.py:10 +#: assets/const/protocol.py:245 assets/models/asset/web.py:10 msgid "Username selector" msgstr "ユーザー名ピッカー" -#: assets/const/protocol.py:242 assets/models/asset/web.py:11 +#: assets/const/protocol.py:250 assets/models/asset/web.py:11 msgid "Password selector" msgstr "パスワードセレクター" -#: assets/const/protocol.py:247 assets/models/asset/web.py:12 +#: assets/const/protocol.py:255 assets/models/asset/web.py:12 msgid "Submit selector" msgstr "ボタンセレクターを確認する" -#: assets/const/protocol.py:270 +#: assets/const/protocol.py:278 msgid "API mode" msgstr "APIモード" @@ -1946,7 +1954,7 @@ msgid "Public" msgstr "開ける" #: assets/models/platform.py:22 assets/serializers/platform.py:49 -#: settings/serializers/settings.py:66 +#: settings/serializers/settings.py:94 #: users/templates/users/reset_password.html:29 msgid "Setting" msgstr "設定" @@ -2445,11 +2453,11 @@ msgstr "タスク" msgid "-" msgstr "-" -#: audits/handler.py:117 +#: audits/handler.py:116 msgid "Yes" msgstr "是" -#: audits/handler.py:117 +#: audits/handler.py:116 msgid "No" msgstr "否" @@ -2685,19 +2693,19 @@ msgstr "" msgid "Anonymous account is not supported for this asset" msgstr "匿名アカウントはこのプロパティではサポートされていません" -#: authentication/api/connection_token.py:393 +#: authentication/api/connection_token.py:394 msgid "Account not found" msgstr "アカウントが見つかりません" -#: authentication/api/connection_token.py:396 +#: authentication/api/connection_token.py:397 msgid "Permission expired" msgstr "承認の有効期限が切れています" -#: authentication/api/connection_token.py:426 +#: authentication/api/connection_token.py:430 msgid "ACL action is reject: {}({})" msgstr "ACL アクションは拒否です: {}({})" -#: authentication/api/connection_token.py:430 +#: authentication/api/connection_token.py:434 msgid "ACL action is review" msgstr "ACL アクションはレビューです" @@ -2968,24 +2976,24 @@ msgstr "" msgid "{} days auto login" msgstr "{} 日自動ログイン" -#: authentication/forms.py:56 +#: authentication/forms.py:58 msgid "MFA Code" msgstr "MFAコード" -#: authentication/forms.py:57 +#: authentication/forms.py:59 msgid "MFA type" msgstr "MFAタイプ" -#: authentication/forms.py:65 +#: authentication/forms.py:67 #: authentication/templates/authentication/_captcha_field.html:15 msgid "Captcha" msgstr "キャプチャ" -#: authentication/forms.py:70 users/forms/profile.py:28 +#: authentication/forms.py:72 users/forms/profile.py:28 msgid "MFA code" msgstr "MFAコード" -#: authentication/forms.py:72 +#: authentication/forms.py:74 msgid "Dynamic code" msgstr "動的コード" @@ -6037,7 +6045,7 @@ msgstr "メール受信者" msgid "Multiple user using , split" msgstr "複数のユーザーを使用して、分割" -#: settings/serializers/settings.py:70 +#: settings/serializers/settings.py:62 #, python-format msgid "[%s] %s" msgstr "[%s] %s" @@ -7846,6 +7854,7 @@ msgstr "ディスクマウント" msgid "Current window" msgstr "現在のウィンドウ" +#: users/const.py:38 msgid "New window" msgstr "新しいウィンドウ" @@ -7945,7 +7954,7 @@ msgstr "有効なssh公開鍵ではありません" msgid "Public key" msgstr "公開キー" -#: users/models/preference.py:38 +#: users/models/preference.py:38 users/serializers/preference/preference.py:19 msgid "Preference" msgstr "ユーザー設定" @@ -8075,6 +8084,7 @@ msgstr "新しく設定されたパスワードが一致しない" msgid "Async loading of asset tree" msgstr "非同期ロード資産ツリー" +#: users/serializers/preference/luna.py:30 msgid "Connect default open method" msgstr "デフォルトの接続オープン方法" diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index b691e91f9..0346f9338 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: 2024-03-08 10:34+0800\n" +"POT-Creation-Date: 2024-03-11 18:22+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -293,7 +293,7 @@ msgstr "来源 ID" #: accounts/serializers/automations/change_secret.py:127 #: acls/serializers/base.py:124 acls/templates/acls/asset_login_reminder.html:7 #: assets/serializers/asset/common.py:128 assets/serializers/gateway.py:28 -#: audits/models.py:59 authentication/api/connection_token.py:405 +#: audits/models.py:59 authentication/api/connection_token.py:406 #: ops/models/base.py:18 perms/models/asset_permission.py:75 #: perms/serializers/permission.py:41 settings/serializers/msg.py:33 #: terminal/backends/command/models.py:18 terminal/models/session/session.py:33 @@ -797,7 +797,7 @@ msgstr "已修改" #: acls/templates/acls/asset_login_reminder.html:6 #: assets/models/automations/base.py:19 #: assets/serializers/automations/base.py:20 -#: authentication/api/connection_token.py:404 ops/models/base.py:17 +#: authentication/api/connection_token.py:405 ops/models/base.py:17 #: ops/models/job.py:147 ops/serializers/job.py:19 #: terminal/templates/terminal/_msg_command_execute_alert.html:16 msgid "Assets" @@ -1419,7 +1419,7 @@ msgstr "禁用" msgid "Basic" msgstr "基本" -#: assets/const/base.py:34 assets/const/protocol.py:252 +#: assets/const/base.py:34 assets/const/protocol.py:260 #: assets/models/asset/web.py:13 msgid "Script" msgstr "脚本" @@ -1567,39 +1567,47 @@ msgid "" "SQL Server version, Different versions have different connection drivers" msgstr "SQL Server 版本，不同版本有不同的连接驱动" -#: assets/const/protocol.py:199 +#: assets/const/protocol.py:194 +msgid "Auth source" +msgstr "认证数据库" + +#: assets/const/protocol.py:195 +msgid "The database to authenticate against" +msgstr "要进行身份验证的数据库" + +#: assets/const/protocol.py:207 msgid "Auth username" msgstr "使用用户名认证" -#: assets/const/protocol.py:222 +#: assets/const/protocol.py:230 msgid "Safe mode" msgstr "安全模式" -#: assets/const/protocol.py:224 +#: assets/const/protocol.py:232 msgid "" "When safe mode is enabled, some operations will be disabled, such as: New " "tab, right click, visit other website, etc." msgstr "" "当安全模式启用时，一些操作将被禁用，例如：新建标签页、右键、访问其它网站 等" -#: assets/const/protocol.py:229 assets/models/asset/web.py:9 +#: assets/const/protocol.py:237 assets/models/asset/web.py:9 #: assets/serializers/asset/info/spec.py:16 msgid "Autofill" msgstr "自动代填" -#: assets/const/protocol.py:237 assets/models/asset/web.py:10 +#: assets/const/protocol.py:245 assets/models/asset/web.py:10 msgid "Username selector" msgstr "用户名选择器" -#: assets/const/protocol.py:242 assets/models/asset/web.py:11 +#: assets/const/protocol.py:250 assets/models/asset/web.py:11 msgid "Password selector" msgstr "密码选择器" -#: assets/const/protocol.py:247 assets/models/asset/web.py:12 +#: assets/const/protocol.py:255 assets/models/asset/web.py:12 msgid "Submit selector" msgstr "确认按钮选择器" -#: assets/const/protocol.py:270 +#: assets/const/protocol.py:278 msgid "API mode" msgstr "API 模式" @@ -1938,7 +1946,7 @@ msgid "Public" msgstr "开放的" #: assets/models/platform.py:22 assets/serializers/platform.py:49 -#: settings/serializers/settings.py:66 +#: settings/serializers/settings.py:94 #: users/templates/users/reset_password.html:29 msgid "Setting" msgstr "设置" @@ -2428,11 +2436,11 @@ msgstr "任务" msgid "-" msgstr "-" -#: audits/handler.py:117 +#: audits/handler.py:116 msgid "Yes" msgstr "是" -#: audits/handler.py:117 +#: audits/handler.py:116 msgid "No" msgstr "否" @@ -2666,19 +2674,19 @@ msgstr "不允许使用可重复使用的连接令牌，未启用全局设置" msgid "Anonymous account is not supported for this asset" msgstr "匿名账号不支持当前资产" -#: authentication/api/connection_token.py:393 +#: authentication/api/connection_token.py:394 msgid "Account not found" msgstr "账号未找到" -#: authentication/api/connection_token.py:396 +#: authentication/api/connection_token.py:397 msgid "Permission expired" msgstr "授权已过期" -#: authentication/api/connection_token.py:426 +#: authentication/api/connection_token.py:430 msgid "ACL action is reject: {}({})" msgstr "ACL 动作是拒绝: {}({})" -#: authentication/api/connection_token.py:430 +#: authentication/api/connection_token.py:434 msgid "ACL action is review" msgstr "ACL 动作是复核" @@ -2939,24 +2947,24 @@ msgstr "您的密码已过期，先修改再登录" msgid "{} days auto login" msgstr "{} 天内自动登录" -#: authentication/forms.py:56 +#: authentication/forms.py:58 msgid "MFA Code" msgstr "MFA 验证码" -#: authentication/forms.py:57 +#: authentication/forms.py:59 msgid "MFA type" msgstr "MFA 类型" -#: authentication/forms.py:65 +#: authentication/forms.py:67 #: authentication/templates/authentication/_captcha_field.html:15 msgid "Captcha" msgstr "验证码" -#: authentication/forms.py:70 users/forms/profile.py:28 +#: authentication/forms.py:72 users/forms/profile.py:28 msgid "MFA code" msgstr "MFA 验证码" -#: authentication/forms.py:72 +#: authentication/forms.py:74 msgid "Dynamic code" msgstr "动态码" @@ -5955,7 +5963,7 @@ msgstr "邮件收件人" msgid "Multiple user using , split" msgstr "多个用户，使用 , 分割" -#: settings/serializers/settings.py:70 +#: settings/serializers/settings.py:62 #, python-format msgid "[%s] %s" msgstr "[%s] %s" @@ -7739,6 +7747,7 @@ msgstr "磁盘挂载" msgid "Current window" msgstr "当前窗口" +#: users/const.py:38 msgid "New window" msgstr "新窗口" @@ -7838,7 +7847,7 @@ msgstr "SSH密钥不合法" msgid "Public key" msgstr "SSH公钥" -#: users/models/preference.py:38 +#: users/models/preference.py:38 users/serializers/preference/preference.py:19 msgid "Preference" msgstr "用户设置" @@ -7968,6 +7977,7 @@ msgstr "两次密码不一致" msgid "Async loading of asset tree" msgstr "异步加载资产树" +#: users/serializers/preference/luna.py:30 msgid "Connect default open method" msgstr "连接默认打开方式"