diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py index 92355bdb3..cab2ebf3a 100644 --- a/apps/jumpserver/conf.py +++ b/apps/jumpserver/conf.py @@ -475,6 +475,7 @@ class Config(dict): 'SECURITY_SERVICE_ACCOUNT_REGISTRATION': True, 'SECURITY_VIEW_AUTH_NEED_MFA': True, 'SECURITY_MAX_IDLE_TIME': 30, + 'SECURITY_MAX_SESSION_TIME': 24, 'SECURITY_PASSWORD_EXPIRATION_TIME': 9999, 'SECURITY_PASSWORD_MIN_LENGTH': 6, 'SECURITY_ADMIN_USER_PASSWORD_MIN_LENGTH': 6, diff --git a/apps/jumpserver/settings/custom.py b/apps/jumpserver/settings/custom.py index e1f5c5709..9688f2c82 100644 --- a/apps/jumpserver/settings/custom.py +++ b/apps/jumpserver/settings/custom.py @@ -35,6 +35,7 @@ FTP_FILE_MAX_STORE = CONFIG.FTP_FILE_MAX_STORE SECURITY_MFA_AUTH = CONFIG.SECURITY_MFA_AUTH SECURITY_MFA_AUTH_ENABLED_FOR_THIRD_PARTY = CONFIG.SECURITY_MFA_AUTH_ENABLED_FOR_THIRD_PARTY SECURITY_MAX_IDLE_TIME = CONFIG.SECURITY_MAX_IDLE_TIME # Unit: minute +SECURITY_MAX_SESSION_TIME = CONFIG.SECURITY_MAX_SESSION_TIME # Unit: hour SECURITY_COMMAND_EXECUTION = CONFIG.SECURITY_COMMAND_EXECUTION SECURITY_COMMAND_BLACKLIST = CONFIG.SECURITY_COMMAND_BLACKLIST SECURITY_PASSWORD_EXPIRATION_TIME = CONFIG.SECURITY_PASSWORD_EXPIRATION_TIME # Unit: day diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index 8c13d0567..1c315331d 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: 2023-08-08 10:08+0800\n" +"POT-Creation-Date: 2023-08-08 17:55+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -213,7 +213,7 @@ msgstr "HashiCorp Vault" #: terminal/serializers/session.py:26 #: terminal/templates/terminal/_msg_command_warning.html:4 #: terminal/templates/terminal/_msg_session_sharing.html:4 -#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:212 +#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:253 msgid "Asset" msgstr "資産" @@ -248,7 +248,7 @@ msgstr "ソース ID" #: terminal/backends/command/models.py:18 terminal/models/session/session.py:33 #: terminal/templates/terminal/_msg_command_warning.html:8 #: terminal/templates/terminal/_msg_session_sharing.html:8 -#: tickets/models/ticket/command_confirm.py:13 xpack/plugins/cloud/models.py:85 +#: tickets/models/ticket/command_confirm.py:13 xpack/plugins/cloud/models.py:89 msgid "Account" msgstr "アカウント" @@ -273,16 +273,12 @@ msgid "Can push account" msgstr "アカウントをプッシュできます" #: accounts/models/automations/backup_account.py:27 -#, fuzzy -#| msgid "Recipient" msgid "Recipient part one" -msgstr "受信者" +msgstr "受信者 1" #: accounts/models/automations/backup_account.py:31 -#, fuzzy -#| msgid "Recipient" msgid "Recipient part two" -msgstr "受信者" +msgstr "受信者 2" #: accounts/models/automations/backup_account.py:40 #: accounts/models/automations/backup_account.py:110 @@ -319,7 +315,7 @@ msgid "Trigger mode" msgstr "トリガーモード" #: accounts/models/automations/backup_account.py:105 audits/models.py:194 -#: terminal/models/session/sharing.py:121 xpack/plugins/cloud/models.py:168 +#: terminal/models/session/sharing.py:121 xpack/plugins/cloud/models.py:205 msgid "Reason" msgstr "理由" @@ -508,14 +504,15 @@ msgstr "アカウントの確認" #: authentication/serializers/connect_token_secret.py:110 ops/mixin.py:21 #: ops/models/adhoc.py:20 ops/models/celery.py:15 ops/models/celery.py:57 #: ops/models/job.py:94 ops/models/playbook.py:28 ops/serializers/job.py:20 -#: orgs/models.py:80 perms/models/asset_permission.py:56 rbac/models/role.py:29 +#: orgs/models.py:82 perms/models/asset_permission.py:56 rbac/models/role.py:29 #: settings/models.py:32 settings/serializers/sms.py:6 #: terminal/models/applet/applet.py:32 terminal/models/component/endpoint.py:12 #: terminal/models/component/endpoint.py:92 #: terminal/models/component/storage.py:26 terminal/models/component/task.py:13 #: terminal/models/component/terminal.py:84 users/forms/profile.py:33 #: users/models/group.py:13 users/models/user.py:787 -#: xpack/plugins/cloud/models.py:28 +#: xpack/plugins/cloud/models.py:32 xpack/plugins/cloud/models.py:273 +#: xpack/plugins/cloud/serializers/task.py:68 msgid "Name" msgstr "名前" @@ -532,7 +529,7 @@ msgstr "特権アカウント" msgid "Is active" msgstr "アクティブです。" -#: accounts/models/template.py:19 +#: accounts/models/template.py:19 xpack/plugins/cloud/models.py:325 msgid "Account template" msgstr "アカウント テンプレート" @@ -771,7 +768,7 @@ msgstr "" #: terminal/models/component/endpoint.py:102 #: terminal/models/session/session.py:46 tickets/models/comment.py:32 #: tickets/models/ticket/general.py:297 users/models/user.py:826 -#: xpack/plugins/cloud/models.py:35 xpack/plugins/cloud/models.py:111 +#: xpack/plugins/cloud/models.py:39 xpack/plugins/cloud/models.py:109 msgid "Comment" msgstr "コメント" @@ -779,7 +776,9 @@ msgstr "コメント" msgid "" "Current only support login from AD/LDAP. Secret priority: Same account in " "asset secret > Login secret > Manual input" -msgstr "現在、AD/LDAPからのログインのみをサポートしています。シークレットの優先順位: 資産シークレット内の同じアカウント > ログインシークレット > 手動入力" +msgstr "" +"現在、AD/LDAPからのログインのみをサポートしています。シークレットの優先順位: " +"資産シークレット内の同じアカウント > ログインシークレット > 手動入力" #: accounts/serializers/automations/base.py:23 #: assets/models/asset/common.py:155 assets/models/automations/base.py:18 @@ -890,11 +889,13 @@ msgstr "警告" #: acls/models/base.py:37 assets/models/_user.py:51 #: assets/models/cmd_filter.py:76 terminal/models/component/endpoint.py:95 +#: xpack/plugins/cloud/models.py:275 msgid "Priority" msgstr "優先順位" #: acls/models/base.py:38 assets/models/_user.py:51 #: assets/models/cmd_filter.py:76 terminal/models/component/endpoint.py:96 +#: xpack/plugins/cloud/models.py:276 msgid "1-100, the lower the value will be match first" msgstr "1-100、低い値は最初に一致します" @@ -931,6 +932,7 @@ msgid "Command" msgstr "コマンド" #: acls/models/command_acl.py:17 assets/models/cmd_filter.py:59 +#: xpack/plugins/cloud/models.py:291 msgid "Regex" msgstr "正規情報" @@ -1027,7 +1029,7 @@ msgid "None of the reviewers belong to Organization `{}`" msgstr "いずれのレビューアも組織 '{}' に属していません" #: acls/serializers/rules/rules.py:20 -#: xpack/plugins/cloud/serializers/task.py:22 +#: xpack/plugins/cloud/serializers/task.py:133 msgid "IP address invalid: `{}`" msgstr "IPアドレスが無効: '{}'" @@ -1055,7 +1057,7 @@ msgstr "期間" msgid "Applications" msgstr "アプリケーション" -#: applications/models.py:16 xpack/plugins/cloud/models.py:33 +#: applications/models.py:16 xpack/plugins/cloud/models.py:37 #: xpack/plugins/cloud/serializers/account.py:63 msgid "Attrs" msgstr "ツールバーの" @@ -1453,14 +1455,13 @@ msgstr "アドレス" #: assets/models/asset/common.py:151 assets/models/platform.py:119 #: authentication/serializers/connect_token_secret.py:115 -#: perms/serializers/user_permission.py:24 -#: xpack/plugins/cloud/serializers/account_attrs.py:196 +#: perms/serializers/user_permission.py:24 xpack/plugins/cloud/models.py:321 msgid "Platform" msgstr "プラットフォーム" #: assets/models/asset/common.py:153 assets/models/domain.py:21 #: authentication/serializers/connect_token_secret.py:133 -#: perms/serializers/user_permission.py:29 +#: perms/serializers/user_permission.py:29 xpack/plugins/cloud/models.py:323 msgid "Domain" msgstr "ドメイン" @@ -1536,8 +1537,8 @@ msgstr "アセットの自動化タスク" #: terminal/models/component/status.py:30 terminal/serializers/applet.py:18 #: terminal/serializers/applet_host.py:115 tickets/models/ticket/general.py:283 #: tickets/serializers/super_ticket.py:13 -#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:164 -#: xpack/plugins/cloud/models.py:216 +#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:201 +#: xpack/plugins/cloud/models.py:257 msgid "Status" msgstr "ステータス" @@ -1601,7 +1602,7 @@ msgstr "資産グループ" #: assets/models/group.py:31 assets/models/platform.py:19 #: assets/serializers/platform.py:113 -#: xpack/plugins/cloud/providers/nutanix.py:32 +#: xpack/plugins/cloud/providers/nutanix.py:30 msgid "Default" msgstr "デフォルト" @@ -1651,7 +1652,7 @@ msgid "Parent key" msgstr "親キー" #: assets/models/node.py:558 perms/serializers/permission.py:35 -#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:96 +#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:322 msgid "Node" msgstr "ノード" @@ -1792,7 +1793,8 @@ msgstr "" #: assets/serializers/asset/common.py:124 assets/serializers/platform.py:129 #: authentication/serializers/connect_token_secret.py:29 #: authentication/serializers/connect_token_secret.py:72 -#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:99 +#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:324 +#: xpack/plugins/cloud/serializers/task.py:31 msgid "Protocols" msgstr "プロトコル" @@ -2123,7 +2125,7 @@ msgid "Change password" msgstr "パスワードを変更する" #: audits/const.py:35 settings/serializers/terminal.py:6 -#: terminal/models/applet/host.py:26 terminal/models/component/terminal.py:163 +#: terminal/models/applet/host.py:26 terminal/models/component/terminal.py:164 #: terminal/serializers/session.py:49 terminal/serializers/session.py:63 msgid "Terminal" msgstr "ターミナル" @@ -3806,7 +3808,7 @@ msgid "Date last run" msgstr "最終実行日" #: ops/models/base.py:51 ops/models/job.py:190 -#: xpack/plugins/cloud/models.py:162 +#: xpack/plugins/cloud/models.py:199 msgid "Result" msgstr "結果" @@ -4022,7 +4024,7 @@ msgstr "組織のリソース ({}) は削除できません" msgid "App organizations" msgstr "アプリ組織" -#: orgs/mixins/models.py:57 orgs/mixins/serializers.py:25 orgs/models.py:89 +#: orgs/mixins/models.py:57 orgs/mixins/serializers.py:25 orgs/models.py:91 #: rbac/const.py:7 rbac/models/rolebinding.py:56 #: rbac/serializers/rolebinding.py:44 settings/serializers/auth/ldap.py:63 #: terminal/templates/terminal/_msg_command_warning.html:21 @@ -4035,30 +4037,34 @@ msgstr "組織" msgid "Org name" msgstr "組織名" -#: orgs/models.py:13 +#: orgs/models.py:14 msgid "GLOBAL" msgstr "グローバル組織" -#: orgs/models.py:15 +#: orgs/models.py:16 msgid "DEFAULT" msgstr "デフォルト組織" -#: orgs/models.py:17 +#: orgs/models.py:18 msgid "SYSTEM" msgstr "システム組織" -#: orgs/models.py:81 rbac/models/role.py:36 terminal/models/applet/applet.py:40 +#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:40 msgid "Builtin" msgstr "ビルトイン" -#: orgs/models.py:91 +#: orgs/models.py:93 msgid "Can view root org" msgstr "グローバル組織を表示できます" -#: orgs/models.py:92 +#: orgs/models.py:94 msgid "Can view all joined org" msgstr "参加しているすべての組織を表示できます" +#: orgs/models.py:233 +msgid "Can not delete virtual org" +msgstr "" + #: orgs/tasks.py:9 msgid "Refresh organization cache" msgstr "組織キャッシュを更新する" @@ -5333,62 +5339,71 @@ msgstr "接続最大アイドル時間(分)" msgid "If idle time more than it, disconnect connection." msgstr "この設定以上の操作がない場合、接続は切断されます" -#: settings/serializers/security.py:171 +#: settings/serializers/security.py:172 + +msgid "Session max connection time (hour)" +msgstr "セッション最大接続時間(時間)" + +#: settings/serializers/security.py:173 +msgid "If session connection time more than it, disconnect connection." +msgstr "セッション接続時間がこれを超えると、接続が切断されます" + +#: settings/serializers/security.py:176 msgid "Remember manual auth" msgstr "手動入力パスワードの保存" -#: settings/serializers/security.py:174 +#: settings/serializers/security.py:179 msgid "Insecure command alert" msgstr "安全でないコマンドアラート" -#: settings/serializers/security.py:177 +#: settings/serializers/security.py:182 msgid "Email recipient" msgstr "メール受信者" -#: settings/serializers/security.py:178 +#: settings/serializers/security.py:183 msgid "Multiple user using , split" msgstr "複数のユーザーを使用して、分割" -#: settings/serializers/security.py:181 +#: settings/serializers/security.py:186 msgid "Operation center" msgstr "職業センター" -#: settings/serializers/security.py:182 +#: settings/serializers/security.py:187 msgid "Allow user run batch command or not using ansible" msgstr "ユーザー実行バッチコマンドを許可するか、ansibleを使用しない" -#: settings/serializers/security.py:186 +#: settings/serializers/security.py:191 msgid "Operation center command blacklist" msgstr "オペレーション センター コマンド ブラックリスト" -#: settings/serializers/security.py:187 +#: settings/serializers/security.py:192 msgid "Commands that are not allowed execute." msgstr "実行が許可されていないコマンド" -#: settings/serializers/security.py:190 +#: settings/serializers/security.py:195 msgid "Session share" msgstr "セッション共有" -#: settings/serializers/security.py:191 +#: settings/serializers/security.py:196 msgid "Enabled, Allows user active session to be shared with other users" msgstr "" "ユーザーのアクティブなセッションを他のユーザーと共有できるようにします。" -#: settings/serializers/security.py:195 +#: settings/serializers/security.py:200 msgid "Unused user timeout (day)" msgstr "" -#: settings/serializers/security.py:196 +#: settings/serializers/security.py:201 msgid "" "Detect infrequent users daily and disable them if they exceed the " "predetermined time limit." msgstr "" -#: settings/serializers/security.py:199 +#: settings/serializers/security.py:204 msgid "Remote Login Protection" msgstr "リモートログイン保護" -#: settings/serializers/security.py:201 +#: settings/serializers/security.py:206 msgid "" "The system determines whether the login IP address belongs to a common login " "city. If the account is logged in from a common login city, the system sends " @@ -5657,8 +5672,8 @@ msgstr "期限切れです。" #, python-format msgid "" "\n" -" Your password has expired, please click this link update password.\n" +" Your password has expired, please click this link update password.\n" " " msgstr "" "\n" @@ -5679,34 +5694,34 @@ msgid "" " " msgstr "" "\n" -" クリックしてください リンク パスワードの更新\n" +" クリックしてください リンク パスワードの更新\n" " " #: templates/_message.html:43 #, python-format msgid "" "\n" -" Your information was incomplete. Please click this link to complete your information.\n" +" Your information was incomplete. Please click this link to complete your information.\n" " " msgstr "" "\n" -" あなたの情報が不完全なので、クリックしてください。 リンク 補完\n" +" あなたの情報が不完全なので、クリックしてください。 リンク 補完\n" " " #: templates/_message.html:56 #, python-format msgid "" "\n" -" Your ssh public key not set or expired. Please click this link to update\n" +" Your ssh public key not set or expired. Please click this link to update\n" " " msgstr "" "\n" -" SSHキーが設定されていないか無効になっている場合は、 リンク 更新\n" +" SSHキーが設定されていないか無効になっている場合は、 リンク 更新\n" " " #: templates/_mfa_login_field.html:28 @@ -6098,7 +6113,7 @@ msgstr "リモートアドレス" msgid "Application User" msgstr "ユーザーの適用" -#: terminal/models/component/terminal.py:165 +#: terminal/models/component/terminal.py:166 msgid "Can view terminal config" msgstr "ターミナル構成を表示できます" @@ -6455,7 +6470,7 @@ msgstr "アクセスキー" msgid "Access key secret" msgstr "アクセスキーシークレット" -#: terminal/serializers/storage.py:67 xpack/plugins/cloud/models.py:209 +#: terminal/serializers/storage.py:67 xpack/plugins/cloud/models.py:250 msgid "Region" msgstr "リージョン" @@ -7013,7 +7028,7 @@ msgid "Not a valid ssh public key" msgstr "有効なssh公開鍵ではありません" #: users/forms/profile.py:173 users/models/user.py:820 -#: xpack/plugins/cloud/serializers/account_attrs.py:206 +#: xpack/plugins/cloud/serializers/account_attrs.py:203 msgid "Public key" msgstr "公開キー" @@ -7042,7 +7057,7 @@ msgid "OTP secret key" msgstr "OTP 秘密" #: users/models/user.py:817 -#: xpack/plugins/cloud/serializers/account_attrs.py:209 +#: xpack/plugins/cloud/serializers/account_attrs.py:206 msgid "Private key" msgstr "ssh秘密鍵" @@ -7216,10 +7231,8 @@ msgid "Periodic check user expired" msgstr "ユーザーの有効期限の定期的な検出" #: users/tasks.py:83 -#, fuzzy -#| msgid "Check user expired" msgid "Check unused users" -msgstr "ユーザーの有効期限が切れていることを確認する" +msgstr "未使用のユーザーを確認する" #: users/templates/users/_msg_account_expire_reminder.html:7 msgid "Your account will expire in" @@ -7483,11 +7496,11 @@ msgstr "パスワードの成功をリセットし、ログインページに戻 msgid "XPACK" msgstr "XPack" -#: xpack/plugins/cloud/api.py:38 +#: xpack/plugins/cloud/api.py:56 msgid "Test connection successful" msgstr "テスト接続成功" -#: xpack/plugins/cloud/api.py:40 +#: xpack/plugins/cloud/api.py:58 msgid "Test connection failed: {}" msgstr "テスト接続に失敗しました: {}" @@ -7575,7 +7588,7 @@ msgstr "プライベートIP" msgid "Public IP" msgstr "パブリックIP" -#: xpack/plugins/cloud/const.py:38 +#: xpack/plugins/cloud/const.py:38 xpack/plugins/cloud/models.py:295 msgid "Instance name" msgstr "インスタンス名" @@ -7603,78 +7616,158 @@ msgstr "同期済み" msgid "Released" msgstr "リリース済み" +#: xpack/plugins/cloud/manager.py:53 +msgid "Account unavailable" +msgstr "利用できないアカウント" + #: xpack/plugins/cloud/meta.py:9 msgid "Cloud center" msgstr "クラウドセンター" -#: xpack/plugins/cloud/models.py:30 +#: xpack/plugins/cloud/models.py:34 msgid "Provider" msgstr "プロバイダー" -#: xpack/plugins/cloud/models.py:34 +#: xpack/plugins/cloud/models.py:38 msgid "Validity" msgstr "有効性" -#: xpack/plugins/cloud/models.py:39 +#: xpack/plugins/cloud/models.py:43 msgid "Cloud account" msgstr "クラウドアカウント" -#: xpack/plugins/cloud/models.py:41 +#: xpack/plugins/cloud/models.py:45 msgid "Test cloud account" msgstr "クラウドアカウントのテスト" -#: xpack/plugins/cloud/models.py:88 xpack/plugins/cloud/serializers/task.py:36 +#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:147 msgid "Regions" msgstr "リージョン" -#: xpack/plugins/cloud/models.py:91 +#: xpack/plugins/cloud/models.py:95 msgid "Hostname strategy" msgstr "ホスト名戦略" -#: xpack/plugins/cloud/models.py:102 xpack/plugins/cloud/serializers/task.py:39 +#: xpack/plugins/cloud/models.py:100 +#: xpack/plugins/cloud/serializers/task.py:150 msgid "IP network segment group" msgstr "IPネットワークセグメントグループ" -#: xpack/plugins/cloud/models.py:105 xpack/plugins/cloud/serializers/task.py:44 +#: xpack/plugins/cloud/models.py:103 +#: xpack/plugins/cloud/serializers/task.py:155 msgid "Sync IP type" msgstr "同期IPタイプ" -#: xpack/plugins/cloud/models.py:108 xpack/plugins/cloud/serializers/task.py:61 +#: xpack/plugins/cloud/models.py:106 +#: xpack/plugins/cloud/serializers/task.py:173 msgid "Always update" msgstr "常に更新" -#: xpack/plugins/cloud/models.py:114 +#: xpack/plugins/cloud/models.py:112 msgid "Date last sync" msgstr "最終同期日" -#: xpack/plugins/cloud/models.py:119 xpack/plugins/cloud/models.py:160 +#: xpack/plugins/cloud/models.py:115 xpack/plugins/cloud/models.py:313 +#: xpack/plugins/cloud/models.py:337 +msgid "Strategy" +msgstr "戦略" + +#: xpack/plugins/cloud/models.py:120 xpack/plugins/cloud/models.py:197 msgid "Sync instance task" msgstr "インスタンスの同期タスク" -#: xpack/plugins/cloud/models.py:171 xpack/plugins/cloud/models.py:219 +#: xpack/plugins/cloud/models.py:208 xpack/plugins/cloud/models.py:260 msgid "Date sync" msgstr "日付の同期" -#: xpack/plugins/cloud/models.py:175 +#: xpack/plugins/cloud/models.py:212 +msgid "Sync instance snapshot" +msgstr "インスタンススナップショットの同期" + +#: xpack/plugins/cloud/models.py:216 msgid "Sync instance task execution" msgstr "インスタンスタスクの同期実行" -#: xpack/plugins/cloud/models.py:199 +#: xpack/plugins/cloud/models.py:240 msgid "Sync task" msgstr "同期タスク" -#: xpack/plugins/cloud/models.py:203 +#: xpack/plugins/cloud/models.py:244 msgid "Sync instance task history" msgstr "インスタンスタスク履歴の同期" -#: xpack/plugins/cloud/models.py:206 +#: xpack/plugins/cloud/models.py:247 msgid "Instance" msgstr "インスタンス" -#: xpack/plugins/cloud/models.py:223 +#: xpack/plugins/cloud/models.py:264 msgid "Sync instance detail" msgstr "同期インスタンスの詳細" +#: xpack/plugins/cloud/models.py:281 +msgid "Task strategy" +msgstr "タスク戦略" + +#: xpack/plugins/cloud/models.py:285 +msgid "Exact" +msgstr "" + +#: xpack/plugins/cloud/models.py:286 +msgid "Not" +msgstr "否" + +#: xpack/plugins/cloud/models.py:287 +msgid "In" +msgstr "イン" + +#: xpack/plugins/cloud/models.py:288 +msgid "Contains" +msgstr "含む" + +#: xpack/plugins/cloud/models.py:289 +msgid "Startswith" +msgstr "始まる" + +#: xpack/plugins/cloud/models.py:290 +msgid "Endswith" +msgstr "終わる" + +#: xpack/plugins/cloud/models.py:296 +msgid "Instance platform" +msgstr "インスタンス名" + +#: xpack/plugins/cloud/models.py:297 +msgid "Instance address" +msgstr "インスタンスアドレス" + +#: xpack/plugins/cloud/models.py:304 +msgid "Rule attr" +msgstr "ルール属性" + +#: xpack/plugins/cloud/models.py:308 +msgid "Rule match" +msgstr "ルール一致" + +#: xpack/plugins/cloud/models.py:310 +msgid "Rule value" +msgstr "ルール値" + +#: xpack/plugins/cloud/models.py:317 +msgid "Strategy rule" +msgstr "戦略ルール" + +#: xpack/plugins/cloud/models.py:332 +msgid "Action attr" +msgstr "アクション属性" + +#: xpack/plugins/cloud/models.py:334 +msgid "Action value" +msgstr "アクション値" + +#: xpack/plugins/cloud/models.py:341 +msgid "Strategy action" +msgstr "戦略アクション" + #: xpack/plugins/cloud/providers/aws_international.py:18 msgid "China (Beijing)" msgstr "中国 (北京)" @@ -7783,7 +7876,7 @@ msgid "CN East-Suzhou" msgstr "華東-蘇州" #: xpack/plugins/cloud/providers/baiducloud.py:57 -#: xpack/plugins/cloud/providers/huaweicloud.py:50 +#: xpack/plugins/cloud/providers/huaweicloud.py:49 msgid "CN-Hong Kong" msgstr "中国-香港" @@ -7801,66 +7894,66 @@ msgid "CN East-Shanghai" msgstr "華東-上海" #: xpack/plugins/cloud/providers/baiducloud.py:61 -#: xpack/plugins/cloud/providers/huaweicloud.py:49 +#: xpack/plugins/cloud/providers/huaweicloud.py:51 msgid "AP-Singapore" msgstr "アジア太平洋-シンガポール" -#: xpack/plugins/cloud/providers/huaweicloud.py:37 -msgid "AF-Johannesburg" -msgstr "アフリカ-ヨハネスブルク" - -#: xpack/plugins/cloud/providers/huaweicloud.py:38 -msgid "CN North-Beijing4" -msgstr "華北-北京4" - #: xpack/plugins/cloud/providers/huaweicloud.py:39 msgid "CN North-Beijing1" msgstr "華北-北京1" #: xpack/plugins/cloud/providers/huaweicloud.py:40 -msgid "CN East-Shanghai2" -msgstr "華東-上海2" +msgid "CN North-Beijing4" +msgstr "華北-北京4" #: xpack/plugins/cloud/providers/huaweicloud.py:41 -msgid "CN East-Shanghai1" -msgstr "華東-上海1" - -#: xpack/plugins/cloud/providers/huaweicloud.py:43 -msgid "LA-Mexico City1" -msgstr "LA-メキシコCity1" - -#: xpack/plugins/cloud/providers/huaweicloud.py:44 -msgid "LA-Santiago" -msgstr "ラテンアメリカ-サンディエゴ" - -#: xpack/plugins/cloud/providers/huaweicloud.py:45 -msgid "LA-Sao Paulo1" -msgstr "ラミー・サンパウロ1" - -#: xpack/plugins/cloud/providers/huaweicloud.py:46 -msgid "EU-Paris" -msgstr "ヨーロッパ-パリ" - -#: xpack/plugins/cloud/providers/huaweicloud.py:47 -msgid "CN Southwest-Guiyang1" -msgstr "南西-貴陽1" - -#: xpack/plugins/cloud/providers/huaweicloud.py:48 -msgid "AP-Bangkok" -msgstr "アジア太平洋-バンコク" - -#: xpack/plugins/cloud/providers/huaweicloud.py:52 -msgid "CN Northeast-Dalian" -msgstr "华北-大连" - -#: xpack/plugins/cloud/providers/huaweicloud.py:53 msgid "CN North-Ulanqab1" msgstr "華北-ウランチャブ一" -#: xpack/plugins/cloud/providers/huaweicloud.py:54 +#: xpack/plugins/cloud/providers/huaweicloud.py:43 +msgid "CN South-Shenzhen" +msgstr "華南-広州" + +#: xpack/plugins/cloud/providers/huaweicloud.py:44 msgid "CN South-Guangzhou-InvitationOnly" msgstr "華南-広州-友好ユーザー環境" +#: xpack/plugins/cloud/providers/huaweicloud.py:45 +msgid "CN East-Shanghai2" +msgstr "華東-上海2" + +#: xpack/plugins/cloud/providers/huaweicloud.py:46 +msgid "CN East-Shanghai1" +msgstr "華東-上海1" + +#: xpack/plugins/cloud/providers/huaweicloud.py:48 +msgid "CN Southwest-Guiyang1" +msgstr "南西-貴陽1" + +#: xpack/plugins/cloud/providers/huaweicloud.py:50 +msgid "AP-Bangkok" +msgstr "アジア太平洋-バンコク" + +#: xpack/plugins/cloud/providers/huaweicloud.py:53 +msgid "AF-Johannesburg" +msgstr "アフリカ-ヨハネスブルク" + +#: xpack/plugins/cloud/providers/huaweicloud.py:54 +msgid "LA-Mexico City1" +msgstr "LA-メキシコCity1" + +#: xpack/plugins/cloud/providers/huaweicloud.py:55 +msgid "LA-Santiago" +msgstr "ラテンアメリカ-サンディエゴ" + +#: xpack/plugins/cloud/providers/huaweicloud.py:56 +msgid "LA-Sao Paulo1" +msgstr "ラミー・サンパウロ1" + +#: xpack/plugins/cloud/providers/huaweicloud.py:58 +msgid "TR-Istanbul" +msgstr "" + #: xpack/plugins/cloud/providers/jdcloud.py:126 msgid "CN East-Suqian" msgstr "華東-宿遷" @@ -7889,7 +7982,7 @@ msgstr "サブスクリプションID" #: xpack/plugins/cloud/serializers/account_attrs.py:103 #: xpack/plugins/cloud/serializers/account_attrs.py:119 #: xpack/plugins/cloud/serializers/account_attrs.py:149 -#: xpack/plugins/cloud/serializers/account_attrs.py:202 +#: xpack/plugins/cloud/serializers/account_attrs.py:199 msgid "API Endpoint" msgstr "APIエンドポイント" @@ -7955,11 +8048,11 @@ msgstr "テストポート" msgid "Test timeout" msgstr "テストタイムアウト" -#: xpack/plugins/cloud/serializers/account_attrs.py:212 +#: xpack/plugins/cloud/serializers/account_attrs.py:209 msgid "Project" msgstr "project" -#: xpack/plugins/cloud/serializers/task.py:28 +#: xpack/plugins/cloud/serializers/task.py:139 msgid "" "Only instances matching the IP range will be synced.
If the instance " "contains multiple IP addresses, the first IP address that matches will be " @@ -7973,11 +8066,11 @@ msgstr "" "ドレスをランダムに一致させることを意味します。
例: " "192.168.1.0/24,10.1.1.1-10.1.1.20。" -#: xpack/plugins/cloud/serializers/task.py:34 +#: xpack/plugins/cloud/serializers/task.py:145 msgid "History count" msgstr "実行回数" -#: xpack/plugins/cloud/serializers/task.py:35 +#: xpack/plugins/cloud/serializers/task.py:146 msgid "Instance count" msgstr "インスタンス数" @@ -7989,10 +8082,6 @@ msgstr "同期インスタンス タスクを実行する" msgid "Period clean sync instance task execution" msgstr "同期インスタンス タスクの実行記録を定期的にクリアする" -#: xpack/plugins/cloud/utils.py:68 -msgid "Account unavailable" -msgstr "利用できないアカウント" - #: xpack/plugins/interface/api.py:52 msgid "Restore default successfully." msgstr "デフォルトの復元に成功しました。" @@ -8057,6 +8146,12 @@ msgstr "究極のエディション" msgid "Community edition" msgstr "コミュニティ版" +#~ msgid "EU-Paris" +#~ msgstr "ヨーロッパ-パリ" + +#~ msgid "CN Northeast-Dalian" +#~ msgstr "华北-大连" + #~ msgid "Current only support login from AD/LDAP" #~ msgstr "現在、AD/LDAPからのログインのみサポートしています" diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 054fca398..7eeae8dc5 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: 2023-08-08 10:08+0800\n" +"POT-Creation-Date: 2023-08-08 17:55+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -212,7 +212,7 @@ msgstr "HashiCorp Vault" #: terminal/serializers/session.py:26 #: terminal/templates/terminal/_msg_command_warning.html:4 #: terminal/templates/terminal/_msg_session_sharing.html:4 -#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:212 +#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:253 msgid "Asset" msgstr "资产" @@ -247,7 +247,7 @@ msgstr "来源 ID" #: terminal/backends/command/models.py:18 terminal/models/session/session.py:33 #: terminal/templates/terminal/_msg_command_warning.html:8 #: terminal/templates/terminal/_msg_session_sharing.html:8 -#: tickets/models/ticket/command_confirm.py:13 xpack/plugins/cloud/models.py:85 +#: tickets/models/ticket/command_confirm.py:13 xpack/plugins/cloud/models.py:89 msgid "Account" msgstr "账号" @@ -272,16 +272,12 @@ msgid "Can push account" msgstr "可以推送账号" #: accounts/models/automations/backup_account.py:27 -#, fuzzy -#| msgid "Recipient" msgid "Recipient part one" -msgstr "收件人" +msgstr "收件人部分一" #: accounts/models/automations/backup_account.py:31 -#, fuzzy -#| msgid "Recipient" msgid "Recipient part two" -msgstr "收件人" +msgstr "收件人部分二" #: accounts/models/automations/backup_account.py:40 #: accounts/models/automations/backup_account.py:110 @@ -318,7 +314,7 @@ msgid "Trigger mode" msgstr "触发模式" #: accounts/models/automations/backup_account.py:105 audits/models.py:194 -#: terminal/models/session/sharing.py:121 xpack/plugins/cloud/models.py:168 +#: terminal/models/session/sharing.py:121 xpack/plugins/cloud/models.py:205 msgid "Reason" msgstr "原因" @@ -507,14 +503,15 @@ msgstr "账号验证" #: authentication/serializers/connect_token_secret.py:110 ops/mixin.py:21 #: ops/models/adhoc.py:20 ops/models/celery.py:15 ops/models/celery.py:57 #: ops/models/job.py:94 ops/models/playbook.py:28 ops/serializers/job.py:20 -#: orgs/models.py:80 perms/models/asset_permission.py:56 rbac/models/role.py:29 +#: orgs/models.py:82 perms/models/asset_permission.py:56 rbac/models/role.py:29 #: settings/models.py:32 settings/serializers/sms.py:6 #: terminal/models/applet/applet.py:32 terminal/models/component/endpoint.py:12 #: terminal/models/component/endpoint.py:92 #: terminal/models/component/storage.py:26 terminal/models/component/task.py:13 #: terminal/models/component/terminal.py:84 users/forms/profile.py:33 #: users/models/group.py:13 users/models/user.py:787 -#: xpack/plugins/cloud/models.py:28 +#: xpack/plugins/cloud/models.py:32 xpack/plugins/cloud/models.py:273 +#: xpack/plugins/cloud/serializers/task.py:68 msgid "Name" msgstr "名称" @@ -531,7 +528,7 @@ msgstr "特权账号" msgid "Is active" msgstr "激活" -#: accounts/models/template.py:19 +#: accounts/models/template.py:19 xpack/plugins/cloud/models.py:325 msgid "Account template" msgstr "账号模版" @@ -771,7 +768,7 @@ msgstr "" #: terminal/models/component/endpoint.py:102 #: terminal/models/session/session.py:46 tickets/models/comment.py:32 #: tickets/models/ticket/general.py:297 users/models/user.py:826 -#: xpack/plugins/cloud/models.py:35 xpack/plugins/cloud/models.py:111 +#: xpack/plugins/cloud/models.py:39 xpack/plugins/cloud/models.py:109 msgid "Comment" msgstr "备注" @@ -779,7 +776,9 @@ msgstr "备注" msgid "" "Current only support login from AD/LDAP. Secret priority: Same account in " "asset secret > Login secret > Manual input" -msgstr "当前仅支持 AD/LDAP 登录方式用户。 同名账号密码生效顺序: 资产上存在的同名账号密码 > 登录密码 > 手动输入" +msgstr "" +"当前仅支持 AD/LDAP 登录方式用户。 同名账号密码生效顺序: 资产上存在的同名账号" +"密码 > 登录密码 > 手动输入" #: accounts/serializers/automations/base.py:23 #: assets/models/asset/common.py:155 assets/models/automations/base.py:18 @@ -890,11 +889,13 @@ msgstr "告警" #: acls/models/base.py:37 assets/models/_user.py:51 #: assets/models/cmd_filter.py:76 terminal/models/component/endpoint.py:95 +#: xpack/plugins/cloud/models.py:275 msgid "Priority" msgstr "优先级" #: acls/models/base.py:38 assets/models/_user.py:51 #: assets/models/cmd_filter.py:76 terminal/models/component/endpoint.py:96 +#: xpack/plugins/cloud/models.py:276 msgid "1-100, the lower the value will be match first" msgstr "优先级可选范围为 1-100 (数值越小越优先)" @@ -931,6 +932,7 @@ msgid "Command" msgstr "命令" #: acls/models/command_acl.py:17 assets/models/cmd_filter.py:59 +#: xpack/plugins/cloud/models.py:291 msgid "Regex" msgstr "正则表达式" @@ -1026,7 +1028,7 @@ msgid "None of the reviewers belong to Organization `{}`" msgstr "所有复核人都不属于组织 `{}`" #: acls/serializers/rules/rules.py:20 -#: xpack/plugins/cloud/serializers/task.py:22 +#: xpack/plugins/cloud/serializers/task.py:133 msgid "IP address invalid: `{}`" msgstr "IP 地址无效: `{}`" @@ -1054,7 +1056,7 @@ msgstr "时段" msgid "Applications" msgstr "应用管理" -#: applications/models.py:16 xpack/plugins/cloud/models.py:33 +#: applications/models.py:16 xpack/plugins/cloud/models.py:37 #: xpack/plugins/cloud/serializers/account.py:63 msgid "Attrs" msgstr "属性" @@ -1451,14 +1453,13 @@ msgstr "地址" #: assets/models/asset/common.py:151 assets/models/platform.py:119 #: authentication/serializers/connect_token_secret.py:115 -#: perms/serializers/user_permission.py:24 -#: xpack/plugins/cloud/serializers/account_attrs.py:196 +#: perms/serializers/user_permission.py:24 xpack/plugins/cloud/models.py:321 msgid "Platform" msgstr "系统平台" #: assets/models/asset/common.py:153 assets/models/domain.py:21 #: authentication/serializers/connect_token_secret.py:133 -#: perms/serializers/user_permission.py:29 +#: perms/serializers/user_permission.py:29 xpack/plugins/cloud/models.py:323 msgid "Domain" msgstr "网域" @@ -1534,8 +1535,8 @@ msgstr "资产自动化任务" #: terminal/models/component/status.py:30 terminal/serializers/applet.py:18 #: terminal/serializers/applet_host.py:115 tickets/models/ticket/general.py:283 #: tickets/serializers/super_ticket.py:13 -#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:164 -#: xpack/plugins/cloud/models.py:216 +#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:201 +#: xpack/plugins/cloud/models.py:257 msgid "Status" msgstr "状态" @@ -1599,7 +1600,7 @@ msgstr "资产组" #: assets/models/group.py:31 assets/models/platform.py:19 #: assets/serializers/platform.py:113 -#: xpack/plugins/cloud/providers/nutanix.py:32 +#: xpack/plugins/cloud/providers/nutanix.py:30 msgid "Default" msgstr "默认" @@ -1649,7 +1650,7 @@ msgid "Parent key" msgstr "ssh私钥" #: assets/models/node.py:558 perms/serializers/permission.py:35 -#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:96 +#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:322 msgid "Node" msgstr "节点" @@ -1788,7 +1789,8 @@ msgstr "资产中批量更新平台,不符合平台类型跳过的资产" #: assets/serializers/asset/common.py:124 assets/serializers/platform.py:129 #: authentication/serializers/connect_token_secret.py:29 #: authentication/serializers/connect_token_secret.py:72 -#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:99 +#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:324 +#: xpack/plugins/cloud/serializers/task.py:31 msgid "Protocols" msgstr "协议组" @@ -2112,7 +2114,7 @@ msgid "Change password" msgstr "改密" #: audits/const.py:35 settings/serializers/terminal.py:6 -#: terminal/models/applet/host.py:26 terminal/models/component/terminal.py:163 +#: terminal/models/applet/host.py:26 terminal/models/component/terminal.py:164 #: terminal/serializers/session.py:49 terminal/serializers/session.py:63 msgid "Terminal" msgstr "终端" @@ -3764,7 +3766,7 @@ msgid "Date last run" msgstr "最后运行日期" #: ops/models/base.py:51 ops/models/job.py:190 -#: xpack/plugins/cloud/models.py:162 +#: xpack/plugins/cloud/models.py:199 msgid "Result" msgstr "结果" @@ -3979,7 +3981,7 @@ msgstr "组织存在资源 ({}) 不能被删除" msgid "App organizations" msgstr "组织管理" -#: orgs/mixins/models.py:57 orgs/mixins/serializers.py:25 orgs/models.py:89 +#: orgs/mixins/models.py:57 orgs/mixins/serializers.py:25 orgs/models.py:91 #: rbac/const.py:7 rbac/models/rolebinding.py:56 #: rbac/serializers/rolebinding.py:44 settings/serializers/auth/ldap.py:63 #: terminal/templates/terminal/_msg_command_warning.html:21 @@ -3992,30 +3994,34 @@ msgstr "组织" msgid "Org name" msgstr "组织名称" -#: orgs/models.py:13 +#: orgs/models.py:14 msgid "GLOBAL" msgstr "全局组织" -#: orgs/models.py:15 +#: orgs/models.py:16 msgid "DEFAULT" msgstr "默认组织" -#: orgs/models.py:17 +#: orgs/models.py:18 msgid "SYSTEM" msgstr "系统组织" -#: orgs/models.py:81 rbac/models/role.py:36 terminal/models/applet/applet.py:40 +#: orgs/models.py:83 rbac/models/role.py:36 terminal/models/applet/applet.py:40 msgid "Builtin" msgstr "内置的" -#: orgs/models.py:91 +#: orgs/models.py:93 msgid "Can view root org" msgstr "可以查看全局组织" -#: orgs/models.py:92 +#: orgs/models.py:94 msgid "Can view all joined org" msgstr "可以查看所有加入的组织" +#: orgs/models.py:233 +msgid "Can not delete virtual org" +msgstr "" + #: orgs/tasks.py:9 msgid "Refresh organization cache" msgstr "刷新组织缓存" @@ -5266,61 +5272,69 @@ msgstr "连接最大空闲时间(分)" msgid "If idle time more than it, disconnect connection." msgstr "提示:如果超过该配置没有操作,连接会被断开" -#: settings/serializers/security.py:171 +#: settings/serializers/security.py:172 +msgid "Session max connection time (hour)" +msgstr "会话连接最大时间(时)" + +#: settings/serializers/security.py:173 +msgid "If session connection time more than it, disconnect connection." +msgstr "提示:如果会话连接超过该配置,连接会被断开" + +#: settings/serializers/security.py:176 msgid "Remember manual auth" msgstr "保存手动输入密码" -#: settings/serializers/security.py:174 +#: settings/serializers/security.py:179 msgid "Insecure command alert" msgstr "危险命令告警" -#: settings/serializers/security.py:177 +#: settings/serializers/security.py:182 msgid "Email recipient" msgstr "邮件收件人" -#: settings/serializers/security.py:178 +#: settings/serializers/security.py:183 msgid "Multiple user using , split" msgstr "多个用户,使用 , 分割" -#: settings/serializers/security.py:181 +#: settings/serializers/security.py:186 msgid "Operation center" msgstr "作业中心" -#: settings/serializers/security.py:182 +#: settings/serializers/security.py:187 msgid "Allow user run batch command or not using ansible" msgstr "是否允许用户使用 ansible 执行批量命令" -#: settings/serializers/security.py:186 +#: settings/serializers/security.py:191 msgid "Operation center command blacklist" msgstr "作业中心命令黑名单" -#: settings/serializers/security.py:187 +#: settings/serializers/security.py:192 msgid "Commands that are not allowed execute." msgstr "不允许执行的命令" -#: settings/serializers/security.py:190 +#: settings/serializers/security.py:195 msgid "Session share" msgstr "会话分享" -#: settings/serializers/security.py:191 +#: settings/serializers/security.py:196 msgid "Enabled, Allows user active session to be shared with other users" msgstr "开启后允许用户分享已连接的资产会话给他人,协同工作" -#: settings/serializers/security.py:195 +#: settings/serializers/security.py:200 msgid "Unused user timeout (day)" msgstr "" -#: settings/serializers/security.py:196 +#: settings/serializers/security.py:201 msgid "" "Detect infrequent users daily and disable them if they exceed the " "predetermined time limit." msgstr "" -#: settings/serializers/security.py:199 +#: settings/serializers/security.py:204 msgid "Remote Login Protection" msgstr "异地登录保护" -#: settings/serializers/security.py:201 +#: settings/serializers/security.py:206 msgid "" "The system determines whether the login IP address belongs to a common login " "city. If the account is logged in from a common login city, the system sends " @@ -5581,13 +5595,13 @@ msgstr "过期。" #, python-format msgid "" "\n" -" Your password has expired, please click this link update password.\n" +" Your password has expired, please click this link update password.\n" " " msgstr "" "\n" -" 您的密码已经过期,请点击 链接 更新密码\n" +" 您的密码已经过期,请点击 链接 更新密码\n" " " #: templates/_message.html:30 @@ -5611,8 +5625,8 @@ msgstr "" #, python-format msgid "" "\n" -" Your information was incomplete. Please click this link to complete your information.\n" +" Your information was incomplete. Please click this link to complete your information.\n" " " msgstr "" "\n" @@ -5624,13 +5638,13 @@ msgstr "" #, python-format msgid "" "\n" -" Your ssh public key not set or expired. Please click this link to update\n" +" Your ssh public key not set or expired. Please click this link to update\n" " " msgstr "" "\n" -" 您的SSH密钥没有设置或已失效,请点击 链接 更新\n" +" 您的SSH密钥没有设置或已失效,请点击 链接 更新\n" " " #: templates/_mfa_login_field.html:28 @@ -6017,7 +6031,7 @@ msgstr "远端地址" msgid "Application User" msgstr "应用用户" -#: terminal/models/component/terminal.py:165 +#: terminal/models/component/terminal.py:166 msgid "Can view terminal config" msgstr "可以查看终端配置" @@ -6368,7 +6382,7 @@ msgstr "Access key ID(AK)" msgid "Access key secret" msgstr "Access key secret(SK)" -#: terminal/serializers/storage.py:67 xpack/plugins/cloud/models.py:209 +#: terminal/serializers/storage.py:67 xpack/plugins/cloud/models.py:250 msgid "Region" msgstr "地域" @@ -6920,7 +6934,7 @@ msgid "Not a valid ssh public key" msgstr "SSH密钥不合法" #: users/forms/profile.py:173 users/models/user.py:820 -#: xpack/plugins/cloud/serializers/account_attrs.py:206 +#: xpack/plugins/cloud/serializers/account_attrs.py:203 msgid "Public key" msgstr "SSH公钥" @@ -6949,7 +6963,7 @@ msgid "OTP secret key" msgstr "OTP 密钥" #: users/models/user.py:817 -#: xpack/plugins/cloud/serializers/account_attrs.py:209 +#: xpack/plugins/cloud/serializers/account_attrs.py:206 msgid "Private key" msgstr "ssh私钥" @@ -7122,8 +7136,6 @@ msgid "Periodic check user expired" msgstr "周期检测用户过期" #: users/tasks.py:83 -#, fuzzy -#| msgid "Check user expired" msgid "Check unused users" msgstr "校验用户已过期" @@ -7377,11 +7389,11 @@ msgstr "重置密码成功,返回到登录页面" msgid "XPACK" msgstr "XPack" -#: xpack/plugins/cloud/api.py:38 +#: xpack/plugins/cloud/api.py:56 msgid "Test connection successful" msgstr "测试成功" -#: xpack/plugins/cloud/api.py:40 +#: xpack/plugins/cloud/api.py:58 msgid "Test connection failed: {}" msgstr "测试连接失败:{}" @@ -7469,7 +7481,7 @@ msgstr "私有IP" msgid "Public IP" msgstr "公网IP" -#: xpack/plugins/cloud/const.py:38 +#: xpack/plugins/cloud/const.py:38 xpack/plugins/cloud/models.py:295 msgid "Instance name" msgstr "实例名称" @@ -7497,78 +7509,158 @@ msgstr "已同步" msgid "Released" msgstr "已释放" +#: xpack/plugins/cloud/manager.py:53 +msgid "Account unavailable" +msgstr "账号无效" + #: xpack/plugins/cloud/meta.py:9 msgid "Cloud center" msgstr "云管中心" -#: xpack/plugins/cloud/models.py:30 +#: xpack/plugins/cloud/models.py:34 msgid "Provider" msgstr "云服务商" -#: xpack/plugins/cloud/models.py:34 +#: xpack/plugins/cloud/models.py:38 msgid "Validity" msgstr "有效" -#: xpack/plugins/cloud/models.py:39 +#: xpack/plugins/cloud/models.py:43 msgid "Cloud account" msgstr "云账号" -#: xpack/plugins/cloud/models.py:41 +#: xpack/plugins/cloud/models.py:45 msgid "Test cloud account" msgstr "测试云账号" -#: xpack/plugins/cloud/models.py:88 xpack/plugins/cloud/serializers/task.py:36 +#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:147 msgid "Regions" msgstr "地域" -#: xpack/plugins/cloud/models.py:91 +#: xpack/plugins/cloud/models.py:95 msgid "Hostname strategy" msgstr "主机名策略" -#: xpack/plugins/cloud/models.py:102 xpack/plugins/cloud/serializers/task.py:39 +#: xpack/plugins/cloud/models.py:100 +#: xpack/plugins/cloud/serializers/task.py:150 msgid "IP network segment group" msgstr "IP网段组" -#: xpack/plugins/cloud/models.py:105 xpack/plugins/cloud/serializers/task.py:44 +#: xpack/plugins/cloud/models.py:103 +#: xpack/plugins/cloud/serializers/task.py:155 msgid "Sync IP type" msgstr "同步IP类型" -#: xpack/plugins/cloud/models.py:108 xpack/plugins/cloud/serializers/task.py:61 +#: xpack/plugins/cloud/models.py:106 +#: xpack/plugins/cloud/serializers/task.py:173 msgid "Always update" msgstr "总是更新" -#: xpack/plugins/cloud/models.py:114 +#: xpack/plugins/cloud/models.py:112 msgid "Date last sync" msgstr "最后同步日期" -#: xpack/plugins/cloud/models.py:119 xpack/plugins/cloud/models.py:160 +#: xpack/plugins/cloud/models.py:115 xpack/plugins/cloud/models.py:313 +#: xpack/plugins/cloud/models.py:337 +msgid "Strategy" +msgstr "策略" + +#: xpack/plugins/cloud/models.py:120 xpack/plugins/cloud/models.py:197 msgid "Sync instance task" msgstr "同步实例任务" -#: xpack/plugins/cloud/models.py:171 xpack/plugins/cloud/models.py:219 +#: xpack/plugins/cloud/models.py:208 xpack/plugins/cloud/models.py:260 msgid "Date sync" msgstr "同步日期" -#: xpack/plugins/cloud/models.py:175 +#: xpack/plugins/cloud/models.py:212 +msgid "Sync instance snapshot" +msgstr "同步实例快照" + +#: xpack/plugins/cloud/models.py:216 msgid "Sync instance task execution" msgstr "同步实例任务执行" -#: xpack/plugins/cloud/models.py:199 +#: xpack/plugins/cloud/models.py:240 msgid "Sync task" msgstr "同步任务" -#: xpack/plugins/cloud/models.py:203 +#: xpack/plugins/cloud/models.py:244 msgid "Sync instance task history" msgstr "同步实例任务历史" -#: xpack/plugins/cloud/models.py:206 +#: xpack/plugins/cloud/models.py:247 msgid "Instance" msgstr "实例" -#: xpack/plugins/cloud/models.py:223 +#: xpack/plugins/cloud/models.py:264 msgid "Sync instance detail" msgstr "同步实例详情" +#: xpack/plugins/cloud/models.py:281 +msgid "Task strategy" +msgstr "密码策略" + +#: xpack/plugins/cloud/models.py:285 +msgid "Exact" +msgstr "" + +#: xpack/plugins/cloud/models.py:286 +msgid "Not" +msgstr "否" + +#: xpack/plugins/cloud/models.py:287 +msgid "In" +msgstr "在..里面" + +#: xpack/plugins/cloud/models.py:288 +msgid "Contains" +msgstr "包含" + +#: xpack/plugins/cloud/models.py:289 +msgid "Startswith" +msgstr "以..开头" + +#: xpack/plugins/cloud/models.py:290 +msgid "Endswith" +msgstr "以..结尾" + +#: xpack/plugins/cloud/models.py:296" +msgid "Instance platform" +msgstr "实例平台" + +#: xpack/plugins/cloud/models.py:297 +msgid "Instance address" +msgstr "实例地址" + +#: xpack/plugins/cloud/models.py:304 +msgid "Rule attr" +msgstr "规则属性" + +#: xpack/plugins/cloud/models.py:308 +msgid "Rule match" +msgstr "规则匹配" + +#: xpack/plugins/cloud/models.py:310 +msgid "Rule value" +msgstr "规则值" + +#: xpack/plugins/cloud/models.py:317 +msgid "Strategy rule" +msgstr "策略规则" + +#: xpack/plugins/cloud/models.py:332 +msgid "Action attr" +msgstr "动作属性" + +#: xpack/plugins/cloud/models.py:334 +msgid "Action value" +msgstr "动作值" + +#: xpack/plugins/cloud/models.py:341 +msgid "Strategy action" +msgstr "策略动作" + #: xpack/plugins/cloud/providers/aws_international.py:18 msgid "China (Beijing)" msgstr "中国(北京)" @@ -7677,7 +7769,7 @@ msgid "CN East-Suzhou" msgstr "华东-苏州" #: xpack/plugins/cloud/providers/baiducloud.py:57 -#: xpack/plugins/cloud/providers/huaweicloud.py:50 +#: xpack/plugins/cloud/providers/huaweicloud.py:49 msgid "CN-Hong Kong" msgstr "中国-香港" @@ -7695,66 +7787,66 @@ msgid "CN East-Shanghai" msgstr "华东-上海" #: xpack/plugins/cloud/providers/baiducloud.py:61 -#: xpack/plugins/cloud/providers/huaweicloud.py:49 +#: xpack/plugins/cloud/providers/huaweicloud.py:51 msgid "AP-Singapore" msgstr "亚太-新加坡" -#: xpack/plugins/cloud/providers/huaweicloud.py:37 -msgid "AF-Johannesburg" -msgstr "非洲-约翰内斯堡" - -#: xpack/plugins/cloud/providers/huaweicloud.py:38 -msgid "CN North-Beijing4" -msgstr "华北-北京4" - #: xpack/plugins/cloud/providers/huaweicloud.py:39 msgid "CN North-Beijing1" msgstr "华北-北京1" #: xpack/plugins/cloud/providers/huaweicloud.py:40 -msgid "CN East-Shanghai2" -msgstr "华东-上海2" +msgid "CN North-Beijing4" +msgstr "华北-北京4" #: xpack/plugins/cloud/providers/huaweicloud.py:41 -msgid "CN East-Shanghai1" -msgstr "华东-上海1" - -#: xpack/plugins/cloud/providers/huaweicloud.py:43 -msgid "LA-Mexico City1" -msgstr "拉美-墨西哥城一" - -#: xpack/plugins/cloud/providers/huaweicloud.py:44 -msgid "LA-Santiago" -msgstr "拉美-圣地亚哥" - -#: xpack/plugins/cloud/providers/huaweicloud.py:45 -msgid "LA-Sao Paulo1" -msgstr "拉美-圣保罗一" - -#: xpack/plugins/cloud/providers/huaweicloud.py:46 -msgid "EU-Paris" -msgstr "欧洲-巴黎" - -#: xpack/plugins/cloud/providers/huaweicloud.py:47 -msgid "CN Southwest-Guiyang1" -msgstr "西南-贵阳1" - -#: xpack/plugins/cloud/providers/huaweicloud.py:48 -msgid "AP-Bangkok" -msgstr "亚太-曼谷" - -#: xpack/plugins/cloud/providers/huaweicloud.py:52 -msgid "CN Northeast-Dalian" -msgstr "华北-大连" - -#: xpack/plugins/cloud/providers/huaweicloud.py:53 msgid "CN North-Ulanqab1" msgstr "华北-乌兰察布一" -#: xpack/plugins/cloud/providers/huaweicloud.py:54 +#: xpack/plugins/cloud/providers/huaweicloud.py:43 +msgid "CN South-Shenzhen" +msgstr "华南-广州" + +#: xpack/plugins/cloud/providers/huaweicloud.py:44 msgid "CN South-Guangzhou-InvitationOnly" msgstr "华南-广州-友好用户环境" +#: xpack/plugins/cloud/providers/huaweicloud.py:45 +msgid "CN East-Shanghai2" +msgstr "华东-上海2" + +#: xpack/plugins/cloud/providers/huaweicloud.py:46 +msgid "CN East-Shanghai1" +msgstr "华东-上海1" + +#: xpack/plugins/cloud/providers/huaweicloud.py:48 +msgid "CN Southwest-Guiyang1" +msgstr "西南-贵阳1" + +#: xpack/plugins/cloud/providers/huaweicloud.py:50 +msgid "AP-Bangkok" +msgstr "亚太-曼谷" + +#: xpack/plugins/cloud/providers/huaweicloud.py:53 +msgid "AF-Johannesburg" +msgstr "非洲-约翰内斯堡" + +#: xpack/plugins/cloud/providers/huaweicloud.py:54 +msgid "LA-Mexico City1" +msgstr "拉美-墨西哥城一" + +#: xpack/plugins/cloud/providers/huaweicloud.py:55 +msgid "LA-Santiago" +msgstr "拉美-圣地亚哥" + +#: xpack/plugins/cloud/providers/huaweicloud.py:56 +msgid "LA-Sao Paulo1" +msgstr "拉美-圣保罗一" + +#: xpack/plugins/cloud/providers/huaweicloud.py:58 +msgid "TR-Istanbul" +msgstr "" + #: xpack/plugins/cloud/providers/jdcloud.py:126 msgid "CN East-Suqian" msgstr "华东-宿迁" @@ -7783,7 +7875,7 @@ msgstr "订阅 ID" #: xpack/plugins/cloud/serializers/account_attrs.py:103 #: xpack/plugins/cloud/serializers/account_attrs.py:119 #: xpack/plugins/cloud/serializers/account_attrs.py:149 -#: xpack/plugins/cloud/serializers/account_attrs.py:202 +#: xpack/plugins/cloud/serializers/account_attrs.py:199 msgid "API Endpoint" msgstr "API 端点" @@ -7848,11 +7940,11 @@ msgstr "测试端口" msgid "Test timeout" msgstr "测试超时时间" -#: xpack/plugins/cloud/serializers/account_attrs.py:212 +#: xpack/plugins/cloud/serializers/account_attrs.py:209 msgid "Project" msgstr "project" -#: xpack/plugins/cloud/serializers/task.py:28 +#: xpack/plugins/cloud/serializers/task.py:139 msgid "" "Only instances matching the IP range will be synced.
If the instance " "contains multiple IP addresses, the first IP address that matches will be " @@ -7864,11 +7956,11 @@ msgstr "" "到的 IP 地址将被用作创建的资产的 IP。
默认值 * 表示同步所有实例和随机匹配 " "IP 地址。
例如: 192.168.1.0/24,10.1.1.1-10.1.1.20。" -#: xpack/plugins/cloud/serializers/task.py:34 +#: xpack/plugins/cloud/serializers/task.py:145 msgid "History count" msgstr "执行次数" -#: xpack/plugins/cloud/serializers/task.py:35 +#: xpack/plugins/cloud/serializers/task.py:146 msgid "Instance count" msgstr "实例个数" @@ -7880,10 +7972,6 @@ msgstr "执行同步实例任务" msgid "Period clean sync instance task execution" msgstr "定期清除同步实例任务执行记录" -#: xpack/plugins/cloud/utils.py:68 -msgid "Account unavailable" -msgstr "账号无效" - #: xpack/plugins/interface/api.py:52 msgid "Restore default successfully." msgstr "恢复默认成功!" @@ -7948,6 +8036,12 @@ msgstr "旗舰版" msgid "Community edition" msgstr "社区版" +#~ msgid "EU-Paris" +#~ msgstr "欧洲-巴黎" + +#~ msgid "CN Northeast-Dalian" +#~ msgstr "华北-大连" + #~ msgid "Current only support login from AD/LDAP" #~ msgstr "当前仅支持 AD/LDAP 方式登录的用户" diff --git a/apps/settings/serializers/security.py b/apps/settings/serializers/security.py index 8c000cd8e..e2571415e 100644 --- a/apps/settings/serializers/security.py +++ b/apps/settings/serializers/security.py @@ -167,6 +167,11 @@ class SecuritySettingSerializer(SecurityPasswordRuleSerializer, SecurityAuthSeri label=_('Connection max idle time (minute)'), help_text=_('If idle time more than it, disconnect connection.') ) + SECURITY_MAX_SESSION_TIME = serializers.IntegerField( + min_value=1, max_value=99999, required=False, + label=_('Session max connection time (hour)'), + help_text=_('If session connection time more than it, disconnect connection.') + ) SECURITY_LUNA_REMEMBER_AUTH = serializers.BooleanField( label=_("Remember manual auth") ) diff --git a/apps/terminal/models/component/terminal.py b/apps/terminal/models/component/terminal.py index f2b0f9148..9955abf03 100644 --- a/apps/terminal/models/component/terminal.py +++ b/apps/terminal/models/component/terminal.py @@ -131,6 +131,7 @@ class Terminal(StorageMixin, TerminalStatusMixin, JMSBaseModel): 'SECURITY_MAX_IDLE_TIME': settings.SECURITY_MAX_IDLE_TIME, 'SECURITY_SESSION_SHARE': settings.SECURITY_SESSION_SHARE, 'FTP_FILE_MAX_STORE': settings.FTP_FILE_MAX_STORE, + 'SECURITY_MAX_SESSION_TIME': settings.SECURITY_MAX_SESSION_TIME, }) return configs