fix: 修复密钥校验ansible不支持{%

pull/11337/head
feng 2023-08-17 18:25:13 +08:00 committed by Bryan
parent 2e840e3b05
commit 7506c7ea43
5 changed files with 42 additions and 32 deletions

View File

@ -39,6 +39,8 @@ def validate_password_for_ansible(password):
# Ansible 推送的时候不支持
if '{{' in password:
raise serializers.ValidationError(_('Password can not contains `{{` '))
if '{%' in password:
raise serializers.ValidationError(_('Password can not contains `{%` '))
# Ansible Windows 推送的时候不支持
if "'" in password:
raise serializers.ValidationError(_("Password can not contains `'` "))

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:810d46e14e09a2309a8d898bc391f33082bfc5c164dec246bd95cea8436e33ee
size 154540
oid sha256:f87b3d05a2f665ef21a4876b9af8ba651936220b35633d1dc6a93941000bd253
size 154676

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-17 15:30+0800\n"
"POT-Creation-Date: 2023-08-17 18:24+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -857,15 +857,19 @@ msgstr "アカウント接続のテスト"
msgid "Password can not contains `{{` "
msgstr "パスワードには '{{' を含まない"
#: accounts/utils.py:44
#: accounts/utils.py:43
msgid "Password can not contains `{%` "
msgstr "パスワードには '{%' を含まない"
#: accounts/utils.py:46
msgid "Password can not contains `'` "
msgstr "パスワードには `'` を含まない"
#: accounts/utils.py:46
#: accounts/utils.py:48
msgid "Password can not contains `\"` "
msgstr "パスワードには `\"` を含まない"
#: accounts/utils.py:52
#: accounts/utils.py:54
msgid "private key invalid or passphrase error"
msgstr "秘密鍵が無効またはpassphraseエラー"
@ -1032,7 +1036,7 @@ msgid "None of the reviewers belong to Organization `{}`"
msgstr "いずれのレビューアも組織 '{}' に属していません"
#: acls/serializers/rules/rules.py:20
#: xpack/plugins/cloud/serializers/task.py:133
#: xpack/plugins/cloud/serializers/task.py:137
msgid "IP address invalid: `{}`"
msgstr "IPアドレスが無効: '{}'"
@ -7696,7 +7700,7 @@ msgstr "クラウドアカウント"
msgid "Test cloud account"
msgstr "クラウドアカウントのテスト"
#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:147
#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:151
msgid "Regions"
msgstr "リージョン"
@ -7705,17 +7709,17 @@ msgid "Hostname strategy"
msgstr "ホスト名戦略"
#: xpack/plugins/cloud/models.py:100
#: xpack/plugins/cloud/serializers/task.py:150
#: xpack/plugins/cloud/serializers/task.py:154
msgid "IP network segment group"
msgstr "IPネットワークセグメントグループ"
#: xpack/plugins/cloud/models.py:103
#: xpack/plugins/cloud/serializers/task.py:155
#: xpack/plugins/cloud/serializers/task.py:159
msgid "Sync IP type"
msgstr "同期IPタイプ"
#: xpack/plugins/cloud/models.py:106
#: xpack/plugins/cloud/serializers/task.py:173
#: xpack/plugins/cloud/serializers/task.py:177
msgid "Always update"
msgstr "常に更新"
@ -7808,7 +7812,7 @@ msgstr "ルール一致"
msgid "Rule value"
msgstr "ルール値"
#: xpack/plugins/cloud/models.py:317
#: xpack/plugins/cloud/models.py:317 xpack/plugins/cloud/serializers/task.py:70
msgid "Strategy rule"
msgstr "戦略ルール"
@ -7820,7 +7824,7 @@ msgstr "アクション属性"
msgid "Action value"
msgstr "アクション値"
#: xpack/plugins/cloud/models.py:341
#: xpack/plugins/cloud/models.py:341 xpack/plugins/cloud/serializers/task.py:73
msgid "Strategy action"
msgstr "戦略アクション"
@ -8108,7 +8112,7 @@ msgstr "テストタイムアウト"
msgid "Project"
msgstr "project"
#: xpack/plugins/cloud/serializers/task.py:139
#: xpack/plugins/cloud/serializers/task.py:143
msgid ""
"Only instances matching the IP range will be synced. <br>If the instance "
"contains multiple IP addresses, the first IP address that matches will be "
@ -8122,11 +8126,11 @@ msgstr ""
"ドレスをランダムに一致させることを意味します。 <br> 例: "
"192.168.1.0/24,10.1.1.1-10.1.1.20。"
#: xpack/plugins/cloud/serializers/task.py:145
#: xpack/plugins/cloud/serializers/task.py:149
msgid "History count"
msgstr "実行回数"
#: xpack/plugins/cloud/serializers/task.py:146
#: xpack/plugins/cloud/serializers/task.py:150
msgid "Instance count"
msgstr "インスタンス数"

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:da4f312ed86d27fa8b6bde8da3bc70b0f32fe40811ee855f9fe81d89a68a646f
size 126402
oid sha256:f2f7fa427404ca2b2f5651cb1be3e84876dad9d72f14e488321a2dc84d4f4051
size 126472

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: JumpServer 0.3.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-17 15:30+0800\n"
"POT-Creation-Date: 2023-08-17 18:24+0800\n"
"PO-Revision-Date: 2021-05-20 10:54+0800\n"
"Last-Translator: ibuler <ibuler@qq.com>\n"
"Language-Team: JumpServer team<ibuler@qq.com>\n"
@ -857,15 +857,19 @@ msgstr "测试账号可连接性"
msgid "Password can not contains `{{` "
msgstr "密码不能包含 `{{` 字符"
#: accounts/utils.py:44
#: accounts/utils.py:43
msgid "Password can not contains `{%` "
msgstr "密码不能包含 `{%` 字符"
#: accounts/utils.py:46
msgid "Password can not contains `'` "
msgstr "密码不能包含 `'` 字符"
#: accounts/utils.py:46
#: accounts/utils.py:48
msgid "Password can not contains `\"` "
msgstr "密码不能包含 `\"` 字符"
#: accounts/utils.py:52
#: accounts/utils.py:54
msgid "private key invalid or passphrase error"
msgstr "密钥不合法或密钥密码错误"
@ -1031,7 +1035,7 @@ msgid "None of the reviewers belong to Organization `{}`"
msgstr "所有复核人都不属于组织 `{}`"
#: acls/serializers/rules/rules.py:20
#: xpack/plugins/cloud/serializers/task.py:133
#: xpack/plugins/cloud/serializers/task.py:137
msgid "IP address invalid: `{}`"
msgstr "IP 地址无效: `{}`"
@ -7588,7 +7592,7 @@ msgstr "云账号"
msgid "Test cloud account"
msgstr "测试云账号"
#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:147
#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers/task.py:151
msgid "Regions"
msgstr "地域"
@ -7597,17 +7601,17 @@ msgid "Hostname strategy"
msgstr "主机名策略"
#: xpack/plugins/cloud/models.py:100
#: xpack/plugins/cloud/serializers/task.py:150
#: xpack/plugins/cloud/serializers/task.py:154
msgid "IP network segment group"
msgstr "IP网段组"
#: xpack/plugins/cloud/models.py:103
#: xpack/plugins/cloud/serializers/task.py:155
#: xpack/plugins/cloud/serializers/task.py:159
msgid "Sync IP type"
msgstr "同步IP类型"
#: xpack/plugins/cloud/models.py:106
#: xpack/plugins/cloud/serializers/task.py:173
#: xpack/plugins/cloud/serializers/task.py:177
msgid "Always update"
msgstr "总是更新"
@ -7700,7 +7704,7 @@ msgstr "规则匹配"
msgid "Rule value"
msgstr "规则值"
#: xpack/plugins/cloud/models.py:317
#: xpack/plugins/cloud/models.py:317 xpack/plugins/cloud/serializers/task.py:70
msgid "Strategy rule"
msgstr "策略规则"
@ -7712,7 +7716,7 @@ msgstr "动作属性"
msgid "Action value"
msgstr "动作值"
#: xpack/plugins/cloud/models.py:341
#: xpack/plugins/cloud/models.py:341 xpack/plugins/cloud/serializers/task.py:73
msgid "Strategy action"
msgstr "策略动作"
@ -7999,7 +8003,7 @@ msgstr "测试超时时间"
msgid "Project"
msgstr "project"
#: xpack/plugins/cloud/serializers/task.py:139
#: xpack/plugins/cloud/serializers/task.py:143
msgid ""
"Only instances matching the IP range will be synced. <br>If the instance "
"contains multiple IP addresses, the first IP address that matches will be "
@ -8011,11 +8015,11 @@ msgstr ""
"到的 IP 地址将被用作创建的资产的 IP。<br>默认值 * 表示同步所有实例和随机匹配 "
"IP 地址。<br> 例如: 192.168.1.0/24,10.1.1.1-10.1.1.20。"
#: xpack/plugins/cloud/serializers/task.py:145
#: xpack/plugins/cloud/serializers/task.py:149
msgid "History count"
msgstr "执行次数"
#: xpack/plugins/cloud/serializers/task.py:146
#: xpack/plugins/cloud/serializers/task.py:150
msgid "Instance count"
msgstr "实例个数"