From f31ed0afb81d512f808a3fd1beac499576481404 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Wed, 23 Oct 2019 15:20:56 +0800
Subject: [PATCH 1/5] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=EF=BC=881.5.4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/jumpserver/const.py     | 2 +-
 apps/templates/_foot_js.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/jumpserver/const.py b/apps/jumpserver/const.py
index ec389a9ef..b932d6bb0 100644
--- a/apps/jumpserver/const.py
+++ b/apps/jumpserver/const.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 #
-VERSION = '1.5.3'
+VERSION = '1.5.4'
diff --git a/apps/templates/_foot_js.html b/apps/templates/_foot_js.html
index b33fb814f..f9cfbba59 100644
--- a/apps/templates/_foot_js.html
+++ b/apps/templates/_foot_js.html
@@ -7,7 +7,7 @@
 <script src="{% static "js/plugins/toastr/toastr.min.js" %}"></script>
 <script src="{% static "js/inspinia.js" %}"></script>
 <script type="text/javascript" src="{% url 'javascript-catalog' %}"></script>
-<script src="{% static "js/jumpserver.js" %}?v=4"></script>
+<script src="{% static "js/jumpserver.js" %}?v=5"></script>
 <script>
 activeNav();
 $(document).ready(function(){

From f8f1aee997b5dfa37f9842f372007bacc7cf759e Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Thu, 24 Oct 2019 12:08:48 +0800
Subject: [PATCH 2/5] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E5=8C=85=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 requirements/requirements.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 030e8dd16..14f0cfb07 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,5 +1,5 @@
 amqp==2.1.4
-ansible==2.8.0
+ansible==2.8.2
 asn1crypto==0.24.0
 bcrypt==3.1.4
 billiard==3.5.0.3
@@ -14,7 +14,7 @@ coreapi==2.3.3
 coreschema==0.0.4
 cryptography==2.3.1
 decorator==4.1.2
-Django==2.1.7
+Django==2.1.11
 django-auth-ldap==1.7.0
 django-bootstrap3==9.1.0
 django-celery-beat==1.4.0
@@ -27,7 +27,7 @@ django-simple-captcha==0.5.6
 djangorestframework==3.9.4
 djangorestframework-bulk==0.2.1
 docutils==0.14
-ecdsa==0.13
+ecdsa==0.13.3
 enum-compat==0.0.2
 ephem==3.7.6.0
 eventlet==0.24.1

From 3c5ebeeb208cbb797ba59221893e605f76cee832 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Thu, 24 Oct 2019 12:23:39 +0800
Subject: [PATCH 3/5] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 requirements/requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 14f0cfb07..d99c6ee27 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -47,7 +47,7 @@ olefile==0.44
 openapi-codec==1.3.2
 paramiko==2.4.2
 passlib==1.7.1
-Pillow==4.3.0
+Pillow==6.2.0
 pyasn1==0.4.2
 pycparser==2.19
 pycrypto==2.6.1
@@ -68,7 +68,7 @@ uritemplate==3.0.0
 urllib3==1.25.2
 vine==1.1.4
 drf-yasg==1.9.1
-Werkzeug==0.14.1
+Werkzeug==0.15.3
 drf-nested-routers==0.91
 aliyun-python-sdk-core-v3==2.9.1    
 aliyun-python-sdk-ecs==4.10.1   

From 36d98a237f617c439581c7958fda378d9971913a Mon Sep 17 00:00:00 2001
From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com>
Date: Thu, 24 Oct 2019 18:35:03 +0800
Subject: [PATCH 4/5] =?UTF-8?q?[Update]=20=E8=B5=84=E4=BA=A7=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=20Action=20=E6=B7=BB=E5=8A=A0=20Help=20text=20(#3383)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Update] 资产授权 Action 添加 Help text

* [Update] 资产授权 Action 添加 Help text（修改翻译）
---
 apps/locale/zh/LC_MESSAGES/django.mo | Bin 80782 -> 80782 bytes
 apps/locale/zh/LC_MESSAGES/django.po | 145 ++++++++++++++-------------
 apps/perms/forms/asset_permission.py |   8 +-
 3 files changed, 77 insertions(+), 76 deletions(-)

diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 3c2a395cb88e66e85f4d74cc057378acebb9e6dd..f6f15fd93f644e269b568b272c06909a755951e8 100644
GIT binary patch
delta 22
dcmeDC&eHdtWkcI}b`u3d3oB#8&AsOta{zEF2=)K~

delta 22
dcmeDC&eHdtWkcI}c0&b2b1MUb&AsOta{zDS2<`v?

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index d9e60b04a..1b88cc884 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jumpserver 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-21 17:00+0800\n"
+"POT-Creation-Date: 2019-10-24 18:31+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: Jumpserver team<ibuler@qq.com>\n"
@@ -78,15 +78,15 @@ msgstr "运行参数"
 #: assets/forms/domain.py:15 assets/forms/label.py:13
 #: assets/models/asset.py:295 assets/models/authbook.py:24
 #: assets/models/gathered_user.py:14 assets/serializers/admin_user.py:32
-#: assets/serializers/asset_user.py:82 assets/serializers/system_user.py:36
+#: assets/serializers/asset_user.py:82 assets/serializers/system_user.py:37
 #: assets/templates/assets/admin_user_list.html:46
 #: assets/templates/assets/domain_detail.html:60
 #: assets/templates/assets/domain_list.html:26
 #: assets/templates/assets/label_list.html:16
-#: assets/templates/assets/system_user_list.html:55 audits/models.py:19
+#: assets/templates/assets/system_user_list.html:51 audits/models.py:19
 #: audits/templates/audits/ftp_log_list.html:44
 #: audits/templates/audits/ftp_log_list.html:74
-#: perms/forms/asset_permission.py:80 perms/models/asset_permission.py:80
+#: perms/forms/asset_permission.py:84 perms/models/asset_permission.py:80
 #: perms/templates/perms/asset_permission_create_update.html:45
 #: perms/templates/perms/asset_permission_list.html:52
 #: perms/templates/perms/asset_permission_list.html:121
@@ -125,7 +125,7 @@ msgstr "资产"
 #: assets/templates/assets/domain_list.html:25
 #: assets/templates/assets/label_list.html:14
 #: assets/templates/assets/system_user_detail.html:58
-#: assets/templates/assets/system_user_list.html:51 ops/models/adhoc.py:37
+#: assets/templates/assets/system_user_list.html:47 ops/models/adhoc.py:37
 #: ops/templates/ops/task_detail.html:60 ops/templates/ops/task_list.html:11
 #: orgs/models.py:12 perms/models/base.py:48
 #: perms/templates/perms/asset_permission_detail.html:62
@@ -252,7 +252,7 @@ msgstr "创建日期"
 #: assets/templates/assets/domain_gateway_list.html:72
 #: assets/templates/assets/domain_list.html:28
 #: assets/templates/assets/system_user_detail.html:104
-#: assets/templates/assets/system_user_list.html:59 ops/models/adhoc.py:43
+#: assets/templates/assets/system_user_list.html:55 ops/models/adhoc.py:43
 #: orgs/models.py:18 perms/models/base.py:56
 #: perms/templates/perms/asset_permission_detail.html:102
 #: perms/templates/perms/remote_app_permission_detail.html:94
@@ -393,10 +393,10 @@ msgstr "详情"
 
 #: applications/templates/applications/remote_app_detail.html:21
 #: applications/templates/applications/remote_app_list.html:54
-#: assets/templates/assets/_asset_user_list.html:74
+#: assets/templates/assets/_asset_user_list.html:75
 #: assets/templates/assets/admin_user_detail.html:24
 #: assets/templates/assets/admin_user_list.html:26
-#: assets/templates/assets/admin_user_list.html:111
+#: assets/templates/assets/admin_user_list.html:74
 #: assets/templates/assets/asset_detail.html:26
 #: assets/templates/assets/asset_list.html:78
 #: assets/templates/assets/asset_list.html:167
@@ -409,8 +409,8 @@ msgstr "详情"
 #: assets/templates/assets/domain_list.html:54
 #: assets/templates/assets/label_list.html:39
 #: assets/templates/assets/system_user_detail.html:26
-#: assets/templates/assets/system_user_list.html:33
-#: assets/templates/assets/system_user_list.html:85 audits/models.py:33
+#: assets/templates/assets/system_user_list.html:29
+#: assets/templates/assets/system_user_list.html:81 audits/models.py:33
 #: perms/templates/perms/asset_permission_detail.html:30
 #: perms/templates/perms/asset_permission_list.html:178
 #: perms/templates/perms/remote_app_permission_detail.html:30
@@ -442,7 +442,7 @@ msgstr "更新"
 #: applications/templates/applications/remote_app_detail.html:25
 #: applications/templates/applications/remote_app_list.html:55
 #: assets/templates/assets/admin_user_detail.html:28
-#: assets/templates/assets/admin_user_list.html:112
+#: assets/templates/assets/admin_user_list.html:75
 #: assets/templates/assets/asset_detail.html:30
 #: assets/templates/assets/asset_list.html:168
 #: assets/templates/assets/cmd_filter_detail.html:33
@@ -454,7 +454,7 @@ msgstr "更新"
 #: assets/templates/assets/domain_list.html:55
 #: assets/templates/assets/label_list.html:40
 #: assets/templates/assets/system_user_detail.html:30
-#: assets/templates/assets/system_user_list.html:86 audits/models.py:34
+#: assets/templates/assets/system_user_list.html:82 audits/models.py:34
 #: authentication/templates/authentication/_access_key_modal.html:65
 #: ops/templates/ops/task_list.html:69
 #: perms/templates/perms/asset_permission_detail.html:34
@@ -510,7 +510,7 @@ msgstr "创建远程应用"
 #: assets/templates/assets/domain_gateway_list.html:73
 #: assets/templates/assets/domain_list.html:29
 #: assets/templates/assets/label_list.html:17
-#: assets/templates/assets/system_user_list.html:60 audits/models.py:38
+#: assets/templates/assets/system_user_list.html:56 audits/models.py:38
 #: audits/templates/audits/operate_log_list.html:47
 #: audits/templates/audits/operate_log_list.html:73
 #: authentication/templates/authentication/_access_key_modal.html:34
@@ -635,8 +635,9 @@ msgstr "网域"
 
 #: assets/forms/asset.py:69 assets/forms/asset.py:103 assets/forms/asset.py:116
 #: assets/forms/asset.py:152 assets/models/node.py:421
+#: assets/serializers/system_user.py:36
 #: assets/templates/assets/asset_create.html:42
-#: perms/forms/asset_permission.py:83 perms/forms/asset_permission.py:90
+#: perms/forms/asset_permission.py:87 perms/forms/asset_permission.py:94
 #: perms/templates/perms/asset_permission_list.html:53
 #: perms/templates/perms/asset_permission_list.html:74
 #: perms/templates/perms/asset_permission_list.html:124
@@ -695,7 +696,7 @@ msgstr "SSH网关，支持代理SSH,RDP和VNC"
 #: assets/templates/assets/admin_user_list.html:45
 #: assets/templates/assets/domain_gateway_list.html:71
 #: assets/templates/assets/system_user_detail.html:62
-#: assets/templates/assets/system_user_list.html:52 audits/models.py:80
+#: assets/templates/assets/system_user_list.html:48 audits/models.py:80
 #: audits/templates/audits/login_log_list.html:57 authentication/forms.py:13
 #: authentication/templates/authentication/login.html:65
 #: authentication/templates/authentication/new_login.html:92
@@ -820,7 +821,7 @@ msgstr "主机名"
 #: assets/models/user.py:113 assets/templates/assets/asset_detail.html:70
 #: assets/templates/assets/domain_gateway_list.html:70
 #: assets/templates/assets/system_user_detail.html:70
-#: assets/templates/assets/system_user_list.html:53
+#: assets/templates/assets/system_user_list.html:49
 #: terminal/templates/terminal/session_list.html:31
 #: terminal/templates/terminal/session_list.html:75
 msgid "Protocol"
@@ -1098,7 +1099,7 @@ msgstr "默认资产组"
 #: audits/templates/audits/password_change_log_list.html:56
 #: ops/templates/ops/command_execution_list.html:38
 #: ops/templates/ops/command_execution_list.html:63
-#: perms/forms/asset_permission.py:74 perms/forms/remote_app_permission.py:34
+#: perms/forms/asset_permission.py:78 perms/forms/remote_app_permission.py:34
 #: perms/models/base.py:49
 #: perms/templates/perms/asset_permission_create_update.html:41
 #: perms/templates/perms/asset_permission_list.html:50
@@ -1194,14 +1195,14 @@ msgid "Shell"
 msgstr "Shell"
 
 #: assets/models/user.py:117 assets/templates/assets/system_user_detail.html:66
-#: assets/templates/assets/system_user_list.html:54
+#: assets/templates/assets/system_user_list.html:50
 msgid "Login mode"
 msgstr "登录模式"
 
-#: assets/models/user.py:162 assets/templates/assets/user_asset_list.html:79
+#: assets/models/user.py:166 assets/templates/assets/user_asset_list.html:79
 #: audits/models.py:20 audits/templates/audits/ftp_log_list.html:52
 #: audits/templates/audits/ftp_log_list.html:75
-#: perms/forms/asset_permission.py:86 perms/forms/remote_app_permission.py:43
+#: perms/forms/asset_permission.py:90 perms/forms/remote_app_permission.py:43
 #: perms/models/asset_permission.py:82 perms/models/remote_app_permission.py:16
 #: perms/templates/perms/asset_permission_detail.html:140
 #: perms/templates/perms/asset_permission_list.html:54
@@ -1290,15 +1291,15 @@ msgstr "值"
 msgid "The same level node name cannot be the same"
 msgstr "同级别节点名字不能重复"
 
-#: assets/serializers/system_user.py:37
+#: assets/serializers/system_user.py:38
 msgid "Login mode display"
 msgstr "登录模式显示"
 
-#: assets/serializers/system_user.py:81
+#: assets/serializers/system_user.py:82
 msgid "* Automatic login mode must fill in the username."
 msgstr "自动登录模式，必须填写用户名"
 
-#: assets/serializers/system_user.py:92
+#: assets/serializers/system_user.py:93
 msgid "Password or private key required"
 msgstr "密码或密钥密码需要一个"
 
@@ -1436,8 +1437,8 @@ msgstr "资产列表"
 
 #: assets/templates/assets/_asset_list_modal.html:33
 #: assets/templates/assets/_node_tree.html:40
-#: ops/templates/ops/command_execution_create.html:49
-#: ops/templates/ops/command_execution_create.html:143
+#: ops/templates/ops/command_execution_create.html:70
+#: ops/templates/ops/command_execution_create.html:127
 #: users/templates/users/_granted_assets.html:7
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:66
 msgid "Loading"
@@ -1499,11 +1500,11 @@ msgstr "日期"
 msgid "Test datetime: "
 msgstr "测试日期: "
 
-#: assets/templates/assets/_asset_user_list.html:73
+#: assets/templates/assets/_asset_user_list.html:74
 msgid "View"
 msgstr "查看"
 
-#: assets/templates/assets/_asset_user_list.html:75
+#: assets/templates/assets/_asset_user_list.html:76
 #: assets/templates/assets/admin_user_assets.html:61
 #: assets/templates/assets/asset_asset_user_list.html:57
 #: assets/templates/assets/asset_detail.html:176
@@ -1512,7 +1513,7 @@ msgstr "查看"
 msgid "Test"
 msgstr "测试"
 
-#: assets/templates/assets/_asset_user_list.html:76
+#: assets/templates/assets/_asset_user_list.html:77
 #: assets/templates/assets/system_user_assets.html:72
 #: assets/templates/assets/system_user_detail.html:142
 msgid "Push"
@@ -1646,11 +1647,11 @@ msgstr "选择节点"
 
 #: assets/templates/assets/admin_user_detail.html:100
 #: assets/templates/assets/asset_detail.html:202
-#: assets/templates/assets/asset_list.html:422
+#: assets/templates/assets/asset_list.html:423
 #: assets/templates/assets/cmd_filter_detail.html:106
 #: assets/templates/assets/system_user_assets.html:97
 #: assets/templates/assets/system_user_detail.html:182
-#: assets/templates/assets/system_user_list.html:139
+#: assets/templates/assets/system_user_list.html:135
 #: authentication/templates/authentication/_mfa_confirm_modal.html:20
 #: settings/templates/settings/terminal_setting.html:168
 #: templates/_modal.html:23 terminal/templates/terminal/session_detail.html:112
@@ -1684,7 +1685,7 @@ msgstr "Jumpserver 使用该用户来 `推送系统用户`、`获取资产硬件
 
 #: assets/templates/assets/admin_user_list.html:16
 #: assets/templates/assets/asset_list.html:68
-#: assets/templates/assets/system_user_list.html:23
+#: assets/templates/assets/system_user_list.html:19
 #: audits/templates/audits/login_log_list.html:91
 #: users/templates/users/user_group_list.html:10
 #: users/templates/users/user_list.html:10
@@ -1695,7 +1696,7 @@ msgstr "导出"
 
 #: assets/templates/assets/admin_user_list.html:21
 #: assets/templates/assets/asset_list.html:73
-#: assets/templates/assets/system_user_list.html:28
+#: assets/templates/assets/system_user_list.html:24
 #: settings/templates/settings/_ldap_list_users_modal.html:93
 #: users/templates/users/user_group_list.html:15
 #: users/templates/users/user_list.html:15
@@ -1709,12 +1710,12 @@ msgstr "导入"
 msgid "Create admin user"
 msgstr "创建管理用户"
 
-#: assets/templates/assets/admin_user_list.html:162
-#: assets/templates/assets/admin_user_list.html:193
-#: assets/templates/assets/asset_list.html:303
-#: assets/templates/assets/asset_list.html:340
-#: assets/templates/assets/system_user_list.html:192
-#: assets/templates/assets/system_user_list.html:223
+#: assets/templates/assets/admin_user_list.html:125
+#: assets/templates/assets/admin_user_list.html:156
+#: assets/templates/assets/asset_list.html:304
+#: assets/templates/assets/asset_list.html:341
+#: assets/templates/assets/system_user_list.html:188
+#: assets/templates/assets/system_user_list.html:219
 #: users/templates/users/user_group_list.html:164
 #: users/templates/users/user_group_list.html:195
 #: users/templates/users/user_list.html:165
@@ -1854,8 +1855,8 @@ msgstr "仅显示当前节点资产"
 msgid "Displays all child node assets"
 msgstr "显示所有子节点资产"
 
-#: assets/templates/assets/asset_list.html:416
-#: assets/templates/assets/system_user_list.html:133
+#: assets/templates/assets/asset_list.html:417
+#: assets/templates/assets/system_user_list.html:129
 #: users/templates/users/user_detail.html:388
 #: users/templates/users/user_detail.html:414
 #: users/templates/users/user_detail.html:482
@@ -1865,12 +1866,12 @@ msgstr "显示所有子节点资产"
 msgid "Are you sure?"
 msgstr "你确认吗?"
 
-#: assets/templates/assets/asset_list.html:417
+#: assets/templates/assets/asset_list.html:418
 msgid "This will delete the selected assets !!!"
 msgstr "删除选择资产"
 
-#: assets/templates/assets/asset_list.html:420
-#: assets/templates/assets/system_user_list.html:137
+#: assets/templates/assets/asset_list.html:421
+#: assets/templates/assets/system_user_list.html:133
 #: settings/templates/settings/terminal_setting.html:166
 #: users/templates/users/user_detail.html:392
 #: users/templates/users/user_detail.html:418
@@ -1881,16 +1882,16 @@ msgstr "删除选择资产"
 msgid "Cancel"
 msgstr "取消"
 
-#: assets/templates/assets/asset_list.html:433
+#: assets/templates/assets/asset_list.html:434
 msgid "Asset Deleted."
 msgstr "已被删除"
 
-#: assets/templates/assets/asset_list.html:434
-#: assets/templates/assets/asset_list.html:438
+#: assets/templates/assets/asset_list.html:435
+#: assets/templates/assets/asset_list.html:439
 msgid "Asset Delete"
 msgstr "删除"
 
-#: assets/templates/assets/asset_list.html:437
+#: assets/templates/assets/asset_list.html:438
 msgid "Asset Deleting failed."
 msgstr "删除失败"
 
@@ -2037,7 +2038,7 @@ msgstr "Uid"
 msgid "Binding command filters"
 msgstr "绑定命令过滤器"
 
-#: assets/templates/assets/system_user_list.html:10
+#: assets/templates/assets/system_user_list.html:6
 msgid ""
 "System user is Jumpserver jump login assets used by the users, can be "
 "understood as the user login assets, such as web, sa, the dba (` ssh "
@@ -2048,7 +2049,7 @@ msgstr ""
 "web，sa，dba（`ssh web@some-host`），而不是使用某个用户的用户名跳转登录服务器"
 "（`ssh xiaoming@some-host`）；"
 
-#: assets/templates/assets/system_user_list.html:11
+#: assets/templates/assets/system_user_list.html:7
 msgid ""
 "In simple terms, users log into Jumpserver using their own username, and "
 "Jumpserver uses system users to log into assets. "
@@ -2056,7 +2057,7 @@ msgstr ""
 "简单来说是用户使用自己的用户名登录 Jumpserver，Jumpserver 使用系统用户登录资"
 "产。"
 
-#: assets/templates/assets/system_user_list.html:12
+#: assets/templates/assets/system_user_list.html:8
 msgid ""
 "When system users are created, if you choose auto push Jumpserver to use "
 "Ansible push system users into the asset, if the asset (Switch) does not "
@@ -2065,25 +2066,25 @@ msgstr ""
 "系统用户创建时，如果选择了自动推送，Jumpserver 会使用 Ansible 自动推送系统用"
 "户到资产中，如果资产（交换机）不支持 Ansible，请手动填写账号密码。"
 
-#: assets/templates/assets/system_user_list.html:43
+#: assets/templates/assets/system_user_list.html:39
 #: assets/views/system_user.py:47
 msgid "Create system user"
 msgstr "创建系统用户"
 
-#: assets/templates/assets/system_user_list.html:134
+#: assets/templates/assets/system_user_list.html:130
 msgid "This will delete the selected System Users !!!"
 msgstr "删除选择系统用户"
 
-#: assets/templates/assets/system_user_list.html:143
+#: assets/templates/assets/system_user_list.html:139
 msgid "System Users Deleted."
 msgstr "已被删除"
 
-#: assets/templates/assets/system_user_list.html:144
-#: assets/templates/assets/system_user_list.html:149
+#: assets/templates/assets/system_user_list.html:140
+#: assets/templates/assets/system_user_list.html:145
 msgid "System Users Delete"
 msgstr "删除系统用户"
 
-#: assets/templates/assets/system_user_list.html:148
+#: assets/templates/assets/system_user_list.html:144
 msgid "System Users Deleting failed."
 msgstr "系统用户删除失败"
 
@@ -2995,39 +2996,39 @@ msgstr "成功资产"
 msgid "Task log"
 msgstr "任务列表"
 
-#: ops/templates/ops/command_execution_create.html:90
+#: ops/templates/ops/command_execution_create.html:109
 #: terminal/templates/terminal/session_detail.html:95
 #: terminal/templates/terminal/session_detail.html:104
 msgid "Go"
 msgstr ""
 
-#: ops/templates/ops/command_execution_create.html:216
+#: ops/templates/ops/command_execution_create.html:194
 msgid "Selected assets"
 msgstr "已选择资产"
 
-#: ops/templates/ops/command_execution_create.html:219
+#: ops/templates/ops/command_execution_create.html:197
 msgid "In total"
 msgstr "总共"
 
-#: ops/templates/ops/command_execution_create.html:256
+#: ops/templates/ops/command_execution_create.html:234
 msgid ""
 "Select the left asset, select the running system user, execute command in "
 "batch"
 msgstr "选择左侧资产, 选择运行的系统用户，批量执行命令"
 
-#: ops/templates/ops/command_execution_create.html:299
+#: ops/templates/ops/command_execution_create.html:278
 msgid "Unselected assets"
 msgstr "没有选中资产"
 
-#: ops/templates/ops/command_execution_create.html:303
+#: ops/templates/ops/command_execution_create.html:282
 msgid "No input command"
 msgstr "没有输入命令"
 
-#: ops/templates/ops/command_execution_create.html:307
+#: ops/templates/ops/command_execution_create.html:286
 msgid "No system user was selected"
 msgstr "没有选择系统用户"
 
-#: ops/templates/ops/command_execution_create.html:317
+#: ops/templates/ops/command_execution_create.html:296
 msgid "Pending"
 msgstr "等待"
 
@@ -3123,7 +3124,13 @@ msgstr "未分组"
 msgid "Empty"
 msgstr "空"
 
-#: perms/forms/asset_permission.py:77 perms/forms/remote_app_permission.py:37
+#: perms/forms/asset_permission.py:24
+msgid ""
+"Tips: The RDP protocol does not support separate controls for uploading or "
+"downloading files"
+msgstr "提示：RDP 协议不支持单独控制上传或下载文件"
+
+#: perms/forms/asset_permission.py:81 perms/forms/remote_app_permission.py:37
 #: perms/models/base.py:50 perms/templates/perms/asset_permission_list.html:51
 #: perms/templates/perms/asset_permission_list.html:71
 #: perms/templates/perms/asset_permission_list.html:118
@@ -3136,12 +3143,6 @@ msgstr "空"
 msgid "User group"
 msgstr "用户组"
 
-#: perms/forms/asset_permission.py:93
-msgid ""
-"Tips: The RDP protocol does not support separate controls for uploading or "
-"downloading files"
-msgstr "提示：RDP 协议不支持单独控制上传或下载文件"
-
 #: perms/forms/asset_permission.py:103 perms/forms/remote_app_permission.py:53
 msgid "User or group at least one required"
 msgstr "用户和用户组至少选一个"
@@ -3218,7 +3219,7 @@ msgstr "添加资产"
 #: perms/templates/perms/remote_app_permission_user.html:124
 #: settings/templates/settings/terminal_setting.html:98
 #: settings/templates/settings/terminal_setting.html:120
-#: users/templates/users/user_group_detail.html:95
+#: users/templates/users/user_group_detail.html:92
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:80
 #: xpack/plugins/orgs/templates/orgs/org_detail.html:93
 #: xpack/plugins/orgs/templates/orgs/org_detail.html:130
diff --git a/apps/perms/forms/asset_permission.py b/apps/perms/forms/asset_permission.py
index a04efc767..8282f0880 100644
--- a/apps/perms/forms/asset_permission.py
+++ b/apps/perms/forms/asset_permission.py
@@ -20,6 +20,10 @@ class ActionField(forms.MultipleChoiceField):
         kwargs['initial'] = Action.ALL
         kwargs['label'] = _("Action")
         kwargs['widget'] = forms.CheckboxSelectMultiple()
+        kwargs['help_text'] = _(
+            'Tips: The RDP protocol does not support separate controls '
+            'for uploading or downloading files'
+        )
         super().__init__(*args, **kwargs)
 
     def to_python(self, value):
@@ -89,10 +93,6 @@ class AssetPermissionForm(OrgModelForm):
         labels = {
             'nodes': _("Node"),
         }
-        help_texts = {
-            'actions': _('Tips: The RDP protocol does not support separate '
-                        'controls for uploading or downloading files')
-        }
 
     def clean_user_groups(self):
         users = self.cleaned_data.get('users')

From a57df0e05fcfa90716b5cdc9f0b1a03b4ec41df4 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Fri, 25 Oct 2019 10:55:28 +0800
Subject: [PATCH 5/5] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E4=B8=BB?=
 =?UTF-8?q?=E6=9C=BA=E5=90=8D/=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0/=E7=BB=84=E7=BB=87=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E7=9A=84=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=EF=BC=88=E4=BF=AE=E6=94=B9=E4=B8=BA=E7=89=B9=E6=AE=8A=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E9=BB=91=E5=90=8D=E5=8D=95=EF=BC=89[/=20\]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/const.py                   |  10 +++++-----
 apps/assets/forms/asset.py             |   6 +++---
 apps/assets/forms/user.py              |   4 ++--
 apps/assets/serializers/asset.py       |  12 ++++++------
 apps/assets/serializers/system_user.py |  12 ++++++------
 apps/locale/zh/LC_MESSAGES/django.mo   | Bin 80782 -> 80725 bytes
 apps/locale/zh/LC_MESSAGES/django.po   |   6 +++---
 apps/orgs/serializers.py               |  12 ++++++------
 8 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/apps/assets/const.py b/apps/assets/const.py
index c23b700ba..7786d8f13 100644
--- a/apps/assets/const.py
+++ b/apps/assets/const.py
@@ -4,11 +4,11 @@
 from django.utils.translation import ugettext_lazy as _
 
 
-GENERAL_LIMIT_SPECIAL_CHARACTERS_HELP_TEXT = _(
-    'Only Numbers、letters、 chinese and characters ( {} ) are allowed'
-).format(" ".join(['.', '_', '@', '-']))
+GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_HELP_TEXT = _(
+    'Cannot contain special characters: [ {} ]'
+).format(" ".join(['/', '\\']))
 
-GENERAL_LIMIT_SPECIAL_CHARACTERS_PATTERN = r"^[\._@\w-]+$"
+GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_PATTERN = r"[/\\]"
 
-GENERAL_LIMIT_SPECIAL_CHARACTERS_ERROR_MSG = \
+GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_ERROR_MSG = \
     _("* The contains characters that are not allowed")
diff --git a/apps/assets/forms/asset.py b/apps/assets/forms/asset.py
index b6e5d3a42..805f49f24 100644
--- a/apps/assets/forms/asset.py
+++ b/apps/assets/forms/asset.py
@@ -7,7 +7,7 @@ from common.utils import get_logger
 from orgs.mixins.forms import OrgModelForm
 
 from ..models import Asset, Node
-from ..const import GENERAL_LIMIT_SPECIAL_CHARACTERS_HELP_TEXT
+from ..const import GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_HELP_TEXT
 
 
 logger = get_logger(__file__)
@@ -69,7 +69,7 @@ class AssetCreateForm(OrgModelForm):
             'nodes': _("Node"),
         }
         help_texts = {
-            'hostname': GENERAL_LIMIT_SPECIAL_CHARACTERS_HELP_TEXT,
+            'hostname': GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_HELP_TEXT,
             'admin_user': _(
                 'root or other NOPASSWD sudo privilege user existed in asset,'
                 'If asset is windows or other set any one, more see admin user left menu'
@@ -116,7 +116,7 @@ class AssetUpdateForm(OrgModelForm):
             'nodes': _("Node"),
         }
         help_texts = {
-            'hostname': GENERAL_LIMIT_SPECIAL_CHARACTERS_HELP_TEXT,
+            'hostname': GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_HELP_TEXT,
             'admin_user': _(
                 'root or other NOPASSWD sudo privilege user existed in asset,'
                 'If asset is windows or other set any one, more see admin user left menu'
diff --git a/apps/assets/forms/user.py b/apps/assets/forms/user.py
index b50639684..21626f4f6 100644
--- a/apps/assets/forms/user.py
+++ b/apps/assets/forms/user.py
@@ -6,7 +6,7 @@ from django.utils.translation import gettext_lazy as _
 from common.utils import validate_ssh_private_key, ssh_pubkey_gen, get_logger
 from orgs.mixins.forms import OrgModelForm
 from ..models import AdminUser, SystemUser
-from ..const import GENERAL_LIMIT_SPECIAL_CHARACTERS_HELP_TEXT
+from ..const import GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_HELP_TEXT
 
 logger = get_logger(__file__)
 __all__ = [
@@ -99,7 +99,7 @@ class SystemUserForm(OrgModelForm, PasswordAndKeyAuthForm):
             }),
         }
         help_texts = {
-            'name': GENERAL_LIMIT_SPECIAL_CHARACTERS_HELP_TEXT,
+            'name': GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_HELP_TEXT,
             'auto_push': _('Auto push system user to asset'),
             'priority': _('1-100, High level will be using login asset as default, '
                           'if user was granted more than 2 system user'),
diff --git a/apps/assets/serializers/asset.py b/apps/assets/serializers/asset.py
index f198aee76..a24374c13 100644
--- a/apps/assets/serializers/asset.py
+++ b/apps/assets/serializers/asset.py
@@ -9,8 +9,8 @@ from orgs.mixins.serializers import BulkOrgResourceModelSerializer
 from common.serializers import AdaptedBulkListSerializer
 from ..models import Asset, Node, Label
 from ..const import (
-    GENERAL_LIMIT_SPECIAL_CHARACTERS_PATTERN,
-    GENERAL_LIMIT_SPECIAL_CHARACTERS_ERROR_MSG
+    GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_PATTERN,
+    GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_ERROR_MSG
 )
 from .base import ConnectivitySerializer
 
@@ -98,10 +98,10 @@ class AssetSerializer(BulkOrgResourceModelSerializer):
 
     @staticmethod
     def validate_hostname(hostname):
-        pattern = GENERAL_LIMIT_SPECIAL_CHARACTERS_PATTERN
-        res = re.match(pattern, hostname)
-        if res is None:
-            msg = GENERAL_LIMIT_SPECIAL_CHARACTERS_ERROR_MSG
+        pattern = GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_PATTERN
+        res = re.search(pattern, hostname)
+        if res is not None:
+            msg = GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_ERROR_MSG
             raise serializers.ValidationError(msg)
         return hostname
 
diff --git a/apps/assets/serializers/system_user.py b/apps/assets/serializers/system_user.py
index 1340741e6..648af01a7 100644
--- a/apps/assets/serializers/system_user.py
+++ b/apps/assets/serializers/system_user.py
@@ -8,8 +8,8 @@ from common.utils import ssh_pubkey_gen
 from orgs.mixins.serializers import BulkOrgResourceModelSerializer
 from ..models import SystemUser
 from ..const import (
-    GENERAL_LIMIT_SPECIAL_CHARACTERS_PATTERN,
-    GENERAL_LIMIT_SPECIAL_CHARACTERS_ERROR_MSG
+    GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_PATTERN,
+    GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_ERROR_MSG
 )
 from .base import AuthSerializer, AuthSerializerMixin
 
@@ -41,10 +41,10 @@ class SystemUserSerializer(AuthSerializerMixin, BulkOrgResourceModelSerializer):
 
     @staticmethod
     def validate_name(name):
-        pattern = GENERAL_LIMIT_SPECIAL_CHARACTERS_PATTERN
-        res = re.match(pattern, name)
-        if res is None:
-            msg = GENERAL_LIMIT_SPECIAL_CHARACTERS_ERROR_MSG
+        pattern = GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_PATTERN
+        res = re.search(pattern, name)
+        if res is not None:
+            msg = GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_ERROR_MSG
             raise serializers.ValidationError(msg)
         return name
 
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index f6f15fd93f644e269b568b272c06909a755951e8..a6510ca5a41597f874d262fab0c92cdb24ef153b 100644
GIT binary patch
delta 19928
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
DoyPn{

delta 19988
zcmY-02Yim_+yC(^L?R?KB7%q{B35d|jH3368MR8S7DbiP8b#f;g;LzLYW&b)mo}yL
zY86$K(%RK(tk!I;D*m5u&ZDo_^S__h<$WH<d0ywb#(mS@bK+j$^!tJ91A~0Qp64AI
z=6QMXXUvJ0@fo~@g)v~b=M}>uSO{xl2)>Br@D(hNvoH|%U=G}eVR#5b@eFFbE0_y!
z4flLmiAN+fK=!viuMw8OaC{vLpbsN)4(7o%7H`D};-h9J79@U%T2Q_bZs205xIAis
zwNVpkGQvkA3av?KpjS{c9$^h8qXwLT+L8a6>#cq_<|lsuHSl><fA=vr<{IfHPyjVx
zf|-Qsx025i^)Q}9Dr$!PQCl_y)zMh2gwrty_n;<p0Hg6VYA5cYI?gr9<qM&9vI?rd
z#u$ZdQJ2uypMth_C>F-|P&=_4wG%r~9e$5l*ATVBE2wMu2(<%2@3?`YQ4=nU>bJVZ
ztx)}R#zNT7>GQ@@P=||ACw^{jcMZG)=0(&>9-}(WJK9Yk5w*1yP&<->+M%YXYu*~Q
zknX4z4?vAGJS)%jA5TFY&qB@cV~aCTck^D<%D+Qhnx8Gcfa>TvYT$>Mwe|F=ohgLc
z(c%`@Mol0U)n8l8$>H_j4^5ySY9*skGarw-rXQeIv;wt~b*O>2quL!n4SWhy@Cs_;
z@$b6xO5ir)vZ(&Ap(bz#eJVVqpp}J=aRWx8Iw*~raXHkAQZNqdV^QphsW=XA;bBxi
zJIA{7_oF6$2sQEJs0ICoTEM-rJpYX;WE<!1)>Kr(-dF_R!g@H<;^SC{_%>>wisRji
zYM@>?^-(utQ!I^LQTNJZRKJT+?be_s_Jy`s*KRWjt?)b47M(y1aL&AhrHF5$w!Gj3
zchi=_Uc@!<SzL<c@G$C<JVrfDp%dM}38<BqM)hCCM?u&AdDOtIF$g=NI_QRKH~@3t
zFjTvDFbF50R`wq1QhsPIN1gX22H|$pdEcNW@V(`ICn;!#zo1UIXAPd3xhHvEW%5xN
zkIhj74L}V%619MI)XprxU|fxAmw~$GyHGoQ9JSM#$oW3+76m>3Pf#z0@X79kBn%|3
zjk*^apl03!byL2MIdK?jBJZLGnvQzIEkpIY1+|lhQ2m|7^7t!;Grkv|?mA9D4OAZ0
zusMccn#G+lCvkVw%KD-%$xsZzQCI>eVm4fBuE%1;8Rk#ejQAnOGrrewis!Y*SFtJX
zK&>R_RCn!)ptd*xwbCl671c+ru#MRZHL>C51l&wK3;90sn!o3HF}M%4kWBPx1ve;Y
z#ebvXho~)jiosZZnmeHyYT!B;f~`;!dl5B}*H9ggHYcI(of)Y1dr{Z^2<FDq)7XD?
zc*!d6T7@^=brgz8)JLMWwl1oJKBx)5iMpwV;~GrI0a*2YeoNpdsDV~uC~m+!xCgb+
zqwll->hNb0LHHYn;Z@XAaUWHmXNG%`6hf`Ayu~S)m$)UWeOJ@~Ls0#VNA2KL%llCi
zS%$jA>wFaS{rxp+3x7e~EO$^HMb3056i2Nj8P#De)CwD7A~r>>Xdr6BLs0GCMeW>s
zmd`+4iXEth`1V`ks5Ll)n#d*81RkPhoO71zI1-hQL#?1Z>T#=&T5)Hqe;M_@7=)Ur
zAGOfAsK-15!}a_hqM)Bnzo2IH083+l->o1CHBdFwN}6Fl9E@7|1k{99<1@GgHIakn
zG1N|+LhVo{>XQ9|F?#+VQP2bmec-H!`H7pMzC604ZnmMQfk$ElPDi~jmZ824cVaA_
zH=m#eDmvTkU^&#**Fg2x5To_{r&7?$d!x2`pfwnU+S)Ow7s`B82Me(}eu|pF1=RVE
zQ9BSc$6cx@WQ)CGsI9Mz8n`v8T|4yYX6a2qTQdl?b;D36jz%?{f%+x06jN~<YC^$t
z-OZQ_)lWXuC5k~UqycKj(omPEC+5dDQ9CnvF8i;B^GMXkPp}eRMcw5w^W3#dL~VI8
zYNZWPH&shiyEdqSI-z#xb<{N<hML$o)Opj*xu|iM%wzxcysssp9oUN6f!(MR_oGhy
z5w(J|SRVgCofkddO{}z83!})Vp?0D#7Q`8-om^>dLG8dn9|fIo2DRmXp`QO7AG)7f
zrBDMm#d6pY)ozkGAJx%n)HU8}{*2n0zsyIdg=AmgCK8HTurJ0638*bDjhb;S)K<1f
zo!A`<V_%HK@u)5T5NqRFEQ!~#I7TjX?VdxmYmF8071ToJAUC7W+e<++{SGzIG4l*+
zi+@L5%R8ucPf#lkTIAXnzyidvSOlx0CjNrecd@uP>XN>JI)5Zq)bl@;g0^%A>hbsi
zb(fyNHh2xSqFRgH^ZhdF9vO?eiPFtEs4e{nHG!3=b{VK0-GW-ckEna$3>Mb&|EDzw
z{-2v!9IB%Vs1B;4CRhvAK`V<pSbbmAJ@N)>r+lahOhv79Hfq36Q0+FNF3Dc>X{9GA
zB;a+7#_%QX9bFcS5;sO&^WLZdMxi>IjHPfcYNETa6YfLR7hCE~MlGlgYGRF0<F;PP
z{wGuDWew+|uH~orEN;gbyk_~F%iJ}OMco^vP%Es8dWssM+IK}wXcTJTaTceeF7XW1
zj?7->b2IwX8m>pZST>?M*n+yoyHPVgjJk<VqITjUYAbJ|E>X6RocU4hOQ2q86|gk+
zwET3`0_OQF@u|7qDz>1WhW(g`M=idOTCw-B+uCPP6OF|<EMakD)P!21+IL5-_zf(C
zV^9n8EwG9esONt(>e?Mb&G0O0#n&vpYxUVbaUJGE?L-2q!}3@LYohvj71i%h)TNn%
zt#Ac$p3i$gL0cI3sp}vLHRIwKh?P-~Pjzg7ZBRGqT+}tsKyCFw)Pzr<-UAm=Pm8zQ
zO(drog}RwbU|v1{HLapKYNnl0TR#wkaX4ya?^-+!RX-bZ;9}H7KSoVtC2B`9FbH>A
z{4HuB$55Bz56s2*-oF&oFnERQI1eh0GK-=vK_Y5rDqt|yL9Mun#qCjB-W5yX>!^v%
zLA6_e+Ub?%HuUM8euRRy@)~NT*;cxh<VDT25b9<sgPK@P)K1k$ZDj}4wS676@~Noy
zb1@ZHTKqR^0zs?zV!}eJ*nbTWw%QF`6t&VM)Jm$NR?rZ0V=Csv_85ZQEbfb%_+ZQX
zQ2nN(`uou8KSAxp7pP0OYc>0?6?{uVGdqhK;3jITAD~XixyE%^05xz)RQqJqN*iDt
zwnt5P7?#9QmjBq?i+aIbLfs3GeH3)J7Fg>BtYp?VUqIErf>rQc)PNhY816^CO8-FZ
znD?2x_IWX$Fa<S{PS^#<Vqd&~_0X5P&OKJsP#qmZ-nQOl9FFPh-FHB?&)s)KJZ>T1
z5Y^uM!t-8&NPG(iV-j9Q-4hWR?r}}Vro=6f%kRy_5_<mYed*pveNi{#I4p;Yu@oLM
z@1a%_yMez8U}LO~K8rV_o{HP3OYjhN?VsQn4B6;;cX294;Fzzpqg?;l6cR}s#JYIf
zth9-LG9w;>74aj~N`JzcSZOnt1^41xSek9=fs3&_dRyHBdSD~MDcA{*VkLZb8<$7V
ze|HL+(R?h3YcUGHMcpjtF*n{d1Gc+34D*mLgj#Va%!Xw#J61rQR~hx#)<Nx1V+_Ss
z=+oW&5`~wrH>$(0Q4Now>QAFO`W?gZ7OKN+JKPqBpdPpU7>$V-iFHwzv;(T&!Km}c
zpeEqo!T#r?u!KZW%s{RD7;5F$Fbo5Bx(@TAI!r|6>!3PriR!Qmmcf3gYd;(F;u6#X
z)}tn{&GLtL`rM4qlZd0@AIy)@yWCA#0X4x?R0my96YPuXcnm5(6V>q|RDK;QzZ12S
z2hAU`Ch-~6&KC6T=ATU{6hjR>9d#`~LUphLwbCz9Te=6e;*+S3FQazkCThjG_PF+u
z*o!y;lQ12VaRaK|WmNyZI~3I66VzQ9_O-hi>!KRALtWeMs1*)E-K67CD_w}{XpP02
zQ0@0)6Fh}lX|ZqI#GXY>=s8T#^WU3-8cacL^#`aGEk_Nw2laFuN4=V_pf15})IAfj
z*S*V2p?0Vo*2V^?_Ty0#orXDZk@*n@>G@wtL0h>VwG*3A1MWk0a0YdA{f=7cZPbJx
zV;}~9>n>d=Y60=M6f5KB_!Fw#<bAH6Y37F*#Q5HF3VM@$hUM@I#$(ie_sXn}>S!GP
zfK?9ga|(mL;|aiburBVv?C2fjhb9CfTkQ44rZ^3CkNu3=;Xl!*EernMJ<l<ynHI+)
z0ld+$B5|WbZenj^4&oIUi=Ux(;xKBbPNF*g6?G5%i`x3I!)`}oa2#<m=D`hz+5b2S
z-;hv8nWzD7Vkq84-GteWxO*WC^AN{k3no}j5|3hAw3FYVR-Ss4$2l91A-+xg!;gIP
zDSw>5Q{W-o$@x=HaMnK*n*GcpMn$7jZsw0r1Bae=*E9;XGi5M0mPf6)28Lq;)K0cH
z`=fSfEUMiyEQ71@S^NnrV0PabS5X;bNOZ#z_zo7vk1-B+TKxs{3BF6d$XULMaS>_<
zFJcB>$1q%a&h6wna~lScKY+Sf!+)@fi&k;Ve>EXG>%R&WJ?~CULY<Og)<zB0$m(00
zT~Kd^ein~Ioi_tD)LhJqtE_&Dxev8>$1T2go@=SAf8P>;zqk{_QTcd_%bCwxzNOh2
zHE<tupgGih2ep9lsQ#v#3s4hX@r%zDwvu?2#9`D4RWG=I38;gmh<jlNoQ~b`64u7X
zzd9$G`^@0q+=Jd2HNi2cekWTz3riBu_gP`LRb0iQRNO+{?|Cos0>v(<{5;ev>nqfX
z4w@&;O!E$^-BUB-cXyYRL`|rQ>8ojl`lt?5%?@Tya}es9jz+CyI%;R;S^aMFu;tHK
z9GL0)4M#1YsKvFAd&uXdQqZ+{#T@D?ymX6~nHx|O+;5&hP3SjN$9K%|ORil7)Jkh%
zc5Hx}coQs+Z7@{tl3^5rNQ}=)@TxH9S^g8$1lL%8C&m+hZ}AP(1Rh}!7QXC^M@_ht
zS;g}8%%+m@z1G&CgW1y@qz2TFMy+51zJ=*l|HRCF#Z9mv>Q$D6Ik770ajR{%Lrv&4
z)J_b?tY3v=t>Qh@O6Q}V?==?hwfH1zBDYZ;+%=z?Ay-{K!i+&Jprpm+urhIq<zK(b
z{)dowi$vDVWfjv=Go6i^&@zn14Hh585aQoa*YXBd#fWQez*I90)vhC|zn3jP(Bh%j
z*niD%9ElP*1qa~g)*$W=H-WOK4(gyL+5)w;UCcL86HP}=bRnw!Cd==&_@tSM8uyOR
z5)aLwKV3zHSs2w(JZj)_7C(>bpqb^{peFRP)elFld;+T7`{o?WFTzmrzU5Z&CF+Ox
zR*R2eDDf$aFJTSh>lT;3?p9m@b@$h|_+`|2Lo6O^&bIsti#H$>^m+R!Xy(UITX)48
z1m18RMVZCTWYktaZ*iL0)$*@dJlf)^7B4neqi*g^S#tf4Qc#E2tifY5*G)H}D6<mk
z611|o8)}P3VlYm?yg1GBi!5G_+L5m;{|)9QKCHZ+|I-xm;$`!`8GOrKyC_r#Ma?8L
z#cYULKpV4{<%gqII>F+_=4x{j`gC*bwZ!+R_!NfW1=PfDSpErWA~|k5^O>>cvsjk;
z>ZpERH3#5);vp92z2nX=aEI%!4iiY|gbJtut6ALG8n!e$qwbMD=6I}5yaYeQ)2RN2
z{N?%^Yo?>}Gf@36vUu%Z?7zNVw~)|Hc-Ja&|LwN4AXXrsWbsQD4@6CPiMibT48zH9
zKz&E-!+dxZHGzLoZ_tpt?))$xg=a|QN8L<`R#6^xLRE|FV*+ui<p*Ha&4;bXPry=m
z0?XhN)cK|FSwE-=*Eds9=ljyEL1(j%H5g*?D2vlkE1Q8jahc`Upa#mYc$dZdQ0<PJ
z=dJ#VdDH3h?orTP`q(N8+;<(um}Rge_0>@C`fipVZ_Y$r)5R8lhFa-Xi}#@VKZ3dx
zS1kW1ORj&;2d*L#V`xwcbwVRlN8M0c+8edfnV1U~Tm4GQuSeaS+fi@CQ<i^#nqZEH
zuD?jsy-@`7>G^-2f;vvag4h+cb;D2-7-LSh{QIa5=UaXyYC`K#=WoSqc-;IM%MqV8
zL;m55i#P>+4Jpi_P!G>yZ;XB9c4Q)I0`o0if?3xZHGy50|H0ymR{xjj{p+6lFnpc%
z%P|roAG>~&9`pQbfQpu=Zq~uN<Qt;~Ot<_Tix*kE%Hq$>9hN_69>dC<f6C%KPuz<w
z64h_Q6ZT()3YMsanouh0W=TU`tDdOGZz8JwDpb3#Q0;c$R6L69vCC8UoPUYBG@Hz?
zQBTof)cF^D6x88m^KVp#0sLPf%#W%shsxKmxFzaZcSd#emc=8j{sYS|Mcqp)P?zir
za}VlL_>NiO3Tl8SsE)$}oMlk?`lyMtM|JoLYT(zgFurB+`>1wv%#Tnnru7z|LY;pJ
zb27en%PJn4LD}4Z5vYzzn3c>rW((Atvy=In<wv0=oQ`^I7ouLd`%vu<nrAVD@xAL5
zv^Dop-+IB>1G0WhMxtig9Cc!QOvG0$o`zc4V$?+UVFVsW?aUSPrq$oGID4S0&xKjf
zf4B;qP~5DBnoz3Q3Dsdgs~?2AcH>c(>O(Wb{NBt&P3#G(|J*rTTolz`68iLNtw=#D
z?PT^e2Vep6!%<uKKB_}M>V2^U^-8{I`J6#+ph(mLN}(p0Vy0o%LQo4B6cpgT|0h|+
z2j&9QjF+LdeuKr|Vk+?|)I^F0JCn`lu>|>M77s@C<3mkomc`4genYU&b+Cs-9U2_L
z+W1UPH`CUrfjXEyQ9Cur;*qEoO~z<^A2rZwb1UlngXT#y6LsDlpCukzA}GXFgqiux
zXw*uIp<YB)P#wQ$_O|*rQ4^Smn$R4}e}QVh7j;RFS?v3Rg6`S}s1rkTxocAd_2#RH
zI<YP4#2yxpK((J_@m$n^ADg>SD?DpnMD=scyzlgRfw^77a8!eWsFfyKoMJXa-85~i
zzK`WcqHf~JSQOWzCVm7p!P}^Q147;7n+J8%R>rJ<6@D?R;CbCq*Y;I&kU7$vfa>Ud
z)C3ozR=5szlWw&9K2$%aQSE<6-gMq=%l~8fz%VAv`^O8XpoSGt9o9k(&;UDP2h4hf
zVlm=Vr~&>(ofnkH8G$-K4pm>$;$+Nv3@uJW_1_V@Xv<!+#1vGAi%?s)3f18ji+5Xm
z6xHse#hDiWX+AWA{B=_zd>X2HUN>ZOvm5Fn3`R|DuDKpHqXVcJTrnS*IiGRu3!-M0
zjN>o`HKT3j0jvM%nSkC|dvT70I=qZk@xC=I7w#rj1NCju5;dW>QFq%c)Icjx1FSQ*
zS^WX?7k^syh^)U%WzXl%$c0*ZIO=K?w|qIX3aZDNW>d4h`HJ}ls-Jhv8Rkb;zY+Bt
z=j(jDOiNREKtjJcibXifnki;|)K;`aO{^>Gd##Vf)6IG2GSn8V!5GZ2_$X%G1!iW1
zy-e?r(2Sp2MZWwljx{TyPHc#pNE_4uFI&E^<%e24(e#^3P}gX!#owaF`_X3=m#_he
zr`DiBq#Gy=HE<7$2cQNXjp}d$_QAy#2N!VpIMjL7Q9IVi;?}71yIAb&X@x<k8I87h
zrn%T$ZEiw!xYyz%s1DCsd=YaH-?IEY^D*iY2S&Mx<wbU~uvdhFR`M*W<A&Ctl|P_n
zgiqh${m5vD0oGy&<{|c3e!4l^T!>oxN2mv4JqF^pmOqGE>Phnt)C``OQ3c)k6$;vS
zeJv6?A=T`Hn$Q~-4?_(&1=Z19i`QHIcI-g@2a8J;a{bjn{(Zq~X>pyxuAdiBThYC+
z-JbnOXux6CV6-{aoM(Pweqru3zc){zcJ31DHolAMH%GJ^I24Nz7qYmj&kFU;)@B#f
ziTx}dWR6CClTEeywW#lbFHzqE=S=+<JndA1SravIJJe1NM(w!IM?o{5Wr?Mj)gkH|
z>>S484b)pWPmEhxSya1PsDXQ1oQ{o%zrgDF5L2*HQFn>@qbBeT&e3oEqgK%;*3EdA
zc?xOZ-9b$xJ<h$QKSce5(oxh-JVo7v@$v45X*H}#+!Ei!si+?zPf?d7x|mye5*E~N
z{pT&w0o9-%>KE<^Y=SdUe<MDP`cV;=;BKBKs7urawW1esAoj++_!DZ&7Zwl5`uC#E
z_$=`?tcOvF?3BLiJ5i{DOR*jPjJ2?A3AY2UVO!#CB?G*du>-z{Td))6FXeV*AT}pn
zgdOo3*1-Cuoj%kx--`M1F#7a2&x;h~UDS$#%eWQgF{8~=sQN0XS5QsV`=g%a8=+o7
zEiCSc8n7GcaT|;ya1`oaJMWj_`B#V8lU##bW`5L(MN#$1mQS&KJ=D$E4t2@iGRLDX
z#RsVKms<R#)$c}KlA~6CBgyAF3V7C?7>Bx<%A#(X`j+oz_BY=~-SrbKUTJPLzczm`
z&!HxC4fR+)wtN9!S$j@V4QirR&<b@EzGU&6=DVmBPqTQDxeB$#UzxkH4)H<M4u+Ns
z@Ls?O)HtuA^1cyP7=s#kvNf2E8fXRP#7(FHcB8KSLDXY;6i4H4sOP*#dFO|y{(dws
zp!&Ox&*5WaB0evrg6p^$szE!m7wS?Bv3M$K0t+nu#N2>-(d<PH_|yzdc27ki)O(^a
zs=hC3oS_)0=YOIl7Mg2N18qZX)wihMIHyn@+_!vS#el5;w}mLwR(3|6_cH3K=#Ogu
zhUMQuwVP!5=~B=C0;^bIt}{29+s$uKGe3x$*cp5qZ=m|=Q^^f{1vQaBQ4_d_8aR7p
z_ae%LiNrO~mqeil1-(e7;Y_@O`*1`R{xX2|s=7Df64a~pDr$u#s<{_a8PwC_L%o_8
zpeA_0@@Fl6fSOS56gQ!QDLnuDZ1G}A)TW|pb=Tog)Bp!j6FY)hQJLqQl~DscZ>FI-
z?upu=K{yY`pw25?!~G4pI4W*}>c345o_}pkdlKrP3+iva{ZJi^M&{=w>gNrgT?84N
zxtsEZY*{I9Ai0g|jZc4$ZscDlr&p{#KXYi8TankU{(m2T(}oc~9-XXzFH;S_V7!L3
ze2yOPQ|`nO#OQi>_1QuG9JvK}n`08W{2DQ<*8LGjJc~MgxLLhb#Q%Nt#qkn#8^}NA
zSQNm&3;X@&8b*aYAS_JNH~fzqCUu!gq?_Sij{i~CCxb&@ZMBK-(Q+rpL*i3(_#4MX
zj$-5{QJ+Bh5ardln)nm^fwpB>%$xoRjmpRWMD#Z;uHk>50kmpK>qzp4{U;hFlzm8a
znj_9GK?`d1d4XIeb|oImS^A9fCpIo0@Tb3B<4R#AtX*B&UG>jyT(Sz^yWTKb^6vHi
zrgeR+ZLPYHKgMx2s~^6+sp~`CQvdD7B@@Gm&Rff}%!3Ci>#vyB*n5$<mcLe$s2<6*
znnXYMIP~x9t*PmT<;dUSI7_)JbuGyEpqvAz5$EQ}PJJN`eKsqHw>XMZ4z+w6|Ar<B
z$#ppEHI97L^u`4ocR99k^tYB9@nd4$#{2ytO`~HjQ!2(8?Wl>M=Kp>Q`s+502!EEE
zSl0JDt&%ye_<J=?^6_wbe-Jgp<D4{}R!50*qCOY0{^Wo5LGCfR?zFpzyNIvbI6Eop
zQ=i^{AlHxbPOG~~c_Hl!(dHY<w=MrGxo`C~m`246f+^O?DjN9wiK($MVU&L6*h@_;
zr|L6@mip}S_ehPXKAhTR9D``_xt;$dacw5@D)#5lrzOXI>VM0M*d+hj)RLt$sg0#S
zz5mx*&2CyvCO_YLQ@W1-acbkRGi3F8(Wjn2ty%e|H95B|$6p*zI0jI2%0^VHWc|VC
zSL-Y5rA1tb<85m<nYyk11I=P{)S`z%{_D-6Bmbq2@42kcdg_N!&gqY79_9OsTz4`r
z(KdlYpHOT0HGalXf}GxR|9x(dD?{7Qu^JYqf?ws{Rm#QKr?z;OcoqGY=QzQk&sXF&
z;|l7Zq1-JyZ)JY<dWASipXxL`<=@*pw(N5>IY8!L9E<#<_5S9#ON*-Hrce&#tVNW|
z`@>sA>%Rwip=7dAlS#G`@h|?mEo#S?B-%_?pN$-!66^B{xfuEj_b+V`5!r(%FEw>J
zD$-8{Y7Y1hv`7jl>c86}A?*_NJ;>>Ep7Jl07h`4G|71P#_2J#LasW1_pC~(LCUyF(
zM?Y@z_ib4|Bp=ZbTAc7N<=;}u`!}?VEnS%0QqEq7)j4WYAA(Ofic)@?vq$0A{>Lq2
z!{f*{RmZ4Lioa~Ds1W}4<?SR&^tWhLDdu^iKdin3XEwF+EJhjYU(_l(ppk!btMZYJ
zh`*sen&YLc-uO$o|1tfIvop&2V_L^HtU<fxwBdW7|7gQGR=dZ}IY#{m4t?S|>T~eh
zz?;iC`#ALZ%Ri=dRM|_E7Lh5%PJK-II>%u<b0p=#lp9!l#lN?8$>e|NC)WBnq!z@@
zImVGY%+ZaqKKe`Qw;c8TF=^3#kCSa>HC4&>qvb)1Kd1j6$*m;j``deu<0<iF?2Z3@
zE)dtUU=Zb*ocDk@KjkI#HxfhqOVc940x3Nu6OWz!yVGh11o#8mM1@5YcjV~JnWz1U
zZ7TWrD_7R1hpkb;kL13@**KnFey6;a`VWZrYfN$<apb0al)9-L8Psj((C0dJ|9vJ{
zzeA{Fi@k3w=5KCZu>M0xF_Jg!gkB`|yG)-ulrQ2jj>Xj9w-Z%2kGk)O50XD_`I7$l
z7b3!%5lttXlVgIv?hDZ|4QQ)RPi&5lsnJh3eeU?*exYPQ5&zN`l4`v~E|a?c9Pdyb
zgXcK*TH6tn^%+Whg2QL=49fTXA#Gy|)ui-4S`5JI%p+Or<@1ccZrj-SUnzCuSV--E
zpCeZO2*>-!w2cTmWSNOr%)hj4bU;`C_O?lV+Y|e2rClgbvv#@2ji5Y%E*EfAAuh<c
z#qkKo4QAPs{I9f`#c`ZiKSZ-p_lTnr<%Z<G=V-)vOZ;i=5(4)5hqS8}aL~WDUCEI1
zw8%%xKK^s<qKa0eG@oM!eQn1O&eNwc<);DueC^v;IYYRJ<9(WZj`ip^n&W%ofi&yH
zag_25PW=K$(Iz$PuANVmPHhfqZuz&juU&l&nGeY5Q_ta@#B)}jXo{Mg^^e7s)Stge
zhx`GF{w^I7!sF@VHR|gykCL=$;-A?e$=8J5>)07X%sJ%rd4V(j=8WfYISzMe?>Fk7
zP!1yBk)wmP?}zn>tI_rb^>5&RpX}6aA`W46eOA+sPms5qiu?Y$9V2|VvogG_$u#Ep
z@3X?nf8rjFB)W;<^#5@T;h0Nq3XQLj5616^hr8~xx;RGMmqVXW+U#(}tUtF}yVCrg
z{;^|ZKtuo4j!D&X(Yh=3cR7-1F~-gwOL-kVd}{Ik>BzfBaM<7C#ptkisa-=fiq-}E
zLtc#4|LD-WV<RoKlVWI9hT~)M7xBN(M*r>?qkLgxTQgD-wreeJp}Gb~F!}kImou7E
z&Z9GNE$*S+C)k2>9+HdZ_)ztHDp1}+`8;j%P=1;68~8nSZ7E-~b}Oh)5AggQI>lE{
zCHD^Tbkx5P>GK`OZO+rDD)~~B_v0fDeSXK${?9u_mwiOEoMR;|Zj#MTPopV6$L!LG
zFA(d~7I*s}b}FA3Lv2NBzOWkArc;h3x5aW%{uZ61y9ANZXARjSuILq@-z4(CaO9w;
zY2>R}yGR^O+gGh^Aocoe=V)d<=cY{?;-(pUJBJp@cr@%pY`p>f-;QfJ<n@<(4Sw_D
zyJPzIdh0D$ihHF`-vPbe>=oBzKu^j&2KRVHHF2flM!pkQI<CiHYWnvdIILICjKgym
zR|~Ejmz?rkrR0n^k6bR4G3sjPqIELgUzIsw%$3hJWxh8dbH?gRv)5;?oy!>fd1>7=
q3cqh!duh(3%vtYUPTzd#vnk{+ule-mw#gdd=C<^&ehLooRr-Gr5jolb

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 1b88cc884..fdc37654f 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jumpserver 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-24 18:31+0800\n"
+"POT-Creation-Date: 2019-10-25 10:52+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: Jumpserver team<ibuler@qq.com>\n"
@@ -583,8 +583,8 @@ msgid "Test if the assets under the node are connectable: {}"
 msgstr "测试节点下资产是否可连接: {}"
 
 #: assets/const.py:8
-msgid "Only Numbers、letters、 chinese and characters ( {} ) are allowed"
-msgstr "只允许包含数字、字母、中文和特殊字符（ {} ）"
+msgid "Cannot contain special characters: [ {} ]"
+msgstr "不能包含特殊字符：[ {} ]"
 
 #: assets/const.py:14
 msgid "* The contains characters that are not allowed"
diff --git a/apps/orgs/serializers.py b/apps/orgs/serializers.py
index 8f4df1e10..3ac7da732 100644
--- a/apps/orgs/serializers.py
+++ b/apps/orgs/serializers.py
@@ -5,8 +5,8 @@ from rest_framework import serializers
 from users.models import User, UserGroup
 from assets.models import Asset, Domain, AdminUser, SystemUser, Label
 from assets.const import (
-    GENERAL_LIMIT_SPECIAL_CHARACTERS_PATTERN,
-    GENERAL_LIMIT_SPECIAL_CHARACTERS_ERROR_MSG
+    GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_PATTERN,
+    GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_ERROR_MSG
 )
 from perms.models import AssetPermission
 from common.serializers import AdaptedBulkListSerializer
@@ -24,10 +24,10 @@ class OrgSerializer(ModelSerializer):
 
     @staticmethod
     def validate_name(name):
-        pattern = GENERAL_LIMIT_SPECIAL_CHARACTERS_PATTERN
-        res = re.match(pattern, name)
-        if res is None:
-            msg = GENERAL_LIMIT_SPECIAL_CHARACTERS_ERROR_MSG
+        pattern = GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_PATTERN
+        res = re.search(pattern, name)
+        if res is not None:
+            msg = GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_ERROR_MSG
             raise serializers.ValidationError(msg)
         return name