From 21a7202587dae810af12ea876e6d67362d149109 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 1 Feb 2018 12:33:05 +0800
Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8Dldap=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/forms.py               |   2 +-
 apps/common/forms.py               |   7 +-
 apps/i18n/zh/LC_MESSAGES/django.mo | Bin 32510 -> 32040 bytes
 apps/i18n/zh/LC_MESSAGES/django.po | 490 ++++++++++++++---------------
 4 files changed, 247 insertions(+), 252 deletions(-)

diff --git a/apps/assets/forms.py b/apps/assets/forms.py
index c93f75626..d8cd0b352 100644
--- a/apps/assets/forms.py
+++ b/apps/assets/forms.py
@@ -127,7 +127,7 @@ class AssetBulkUpdateForm(forms.ModelForm):
                 attrs={'class': 'select2', 'data-placeholder': _('Select asset groups')}
             ),
             'labels': forms.SelectMultiple(
-                attrs={'class': 'select2', 'data-placeholder': _('Select lables')}
+                attrs={'class': 'select2', 'data-placeholder': _('Select labels')}
             ),
         }
 
diff --git a/apps/common/forms.py b/apps/common/forms.py
index 9b88af3b9..882a7ab7a 100644
--- a/apps/common/forms.py
+++ b/apps/common/forms.py
@@ -117,7 +117,8 @@ class LDAPSettingForm(BaseForm):
         label=_("User OU"), initial='ou=tech,dc=jumpserver,dc=org'
     )
     AUTH_LDAP_SEARCH_FILTER = forms.CharField(
-        label=_("User search filter"), initial='(cn=%(user)s)'
+        label=_("User search filter"), initial='(cn=%(user)s)',
+        help_text=_("User search filter must contain ([cn,uid,sAMAccountName,...]=%(user)s)")
     )
     AUTH_LDAP_USER_ATTR_MAP = DictField(
         label=_("User attr map"),
@@ -125,13 +126,15 @@ class LDAPSettingForm(BaseForm):
             "username": "cn",
             "name": "sn",
             "email": "mail"
-        })
+        }),
+        help_text=_("User attr map present how to map LDAP user attr to jumpserver, username,name,email is jumpserver attr")
     )
     # AUTH_LDAP_GROUP_SEARCH_OU = CONFIG.AUTH_LDAP_GROUP_SEARCH_OU
     # AUTH_LDAP_GROUP_SEARCH_FILTER = CONFIG.AUTH_LDAP_GROUP_SEARCH_FILTER
     AUTH_LDAP_START_TLS = forms.BooleanField(
         label=_("Use SSL"), initial=False, required=False
     )
+    AUTH_LDAP = forms.BooleanField(label=_("Enable LDAP auth"), initial=False)
 
 
 class TerminalSettingForm(BaseForm):
diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo
index 4848a6f135717c82505d96f4d303668a008e68c6..427132b968402d3fd08928f243d95923ed9d587b 100644
GIT binary patch
delta 11877
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

delta 12293
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
a^L$lLcGARYp%<4e&zrSMJugpe;rTxw7FB-$

diff --git a/apps/i18n/zh/LC_MESSAGES/django.po b/apps/i18n/zh/LC_MESSAGES/django.po
index 1074337e4..e9f9e4371 100644
--- a/apps/i18n/zh/LC_MESSAGES/django.po
+++ b/apps/i18n/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: 2018-01-26 16:38+0800\n"
+"POT-Creation-Date: 2018-02-01 12:29+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"
@@ -17,41 +17,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: assets/forms.py:22 assets/forms.py:69 assets/forms.py:125 perms/forms.py:37
+#: assets/forms.py:21 assets/forms.py:67 assets/forms.py:127 perms/forms.py:37
 #: perms/templates/perms/asset_permission_asset.html:116 users/forms.py:245
 msgid "Select asset groups"
 msgstr "选择资产组"
 
-#: assets/forms.py:25 assets/forms.py:72
+#: assets/forms.py:24 assets/forms.py:70 assets/forms.py:115
 #: assets/templates/assets/admin_user_detail.html:92
 msgid "Select cluster"
 msgstr "选择集群"
 
-#: assets/forms.py:28 assets/forms.py:75
+#: assets/forms.py:27 assets/forms.py:73
 msgid "Select admin user"
 msgstr "选择管理用户"
 
-#: assets/forms.py:31 assets/forms.py:78
-#: assets/templates/assets/asset_create.html:38
+#: assets/forms.py:30 assets/forms.py:76 assets/forms.py:130
+#: assets/templates/assets/asset_create.html:36
 msgid "Select labels"
 msgstr "选择标签"
 
-#: assets/forms.py:40 assets/forms.py:87
+#: assets/forms.py:39 assets/forms.py:85
 msgid "Host level admin user, If not set using cluster admin user default"
 msgstr "主机级别管理用户，如果没有设置则默认使用集群级别管理用户"
 
-#: assets/forms.py:47 assets/forms.py:94
+#: assets/forms.py:46 assets/forms.py:92
 msgid "You need set a admin user if cluster not have"
 msgstr "集群没有管理用户，你需要为集群设置管理用户或设置一个主机级别的管理用户"
 
-#: assets/forms.py:105 assets/forms.py:109 assets/forms.py:154
-#: assets/forms.py:413 assets/templates/assets/asset_group_detail.html:75
+#: assets/forms.py:99 assets/forms.py:103 assets/forms.py:163
+#: assets/forms.py:358 assets/templates/assets/asset_group_detail.html:74
 #: perms/forms.py:34 perms/templates/perms/asset_permission_asset.html:88
 #: users/forms.py:242
 msgid "Select assets"
 msgstr "选择资产"
 
-#: assets/forms.py:114 assets/models/asset.py:55
+#: assets/forms.py:108 assets/models/asset.py:36
 #: assets/templates/assets/admin_user_assets.html:61
 #: assets/templates/assets/asset_detail.html:69
 #: assets/templates/assets/asset_group_detail.html:52
@@ -63,7 +63,13 @@ msgstr "选择资产"
 msgid "Port"
 msgstr "端口"
 
-#: assets/forms.py:151 assets/forms.py:411 assets/models/asset.py:173
+#: assets/forms.py:111 assets/models/asset.py:38 assets/models/cluster.py:40
+#: assets/models/user.py:219 assets/templates/assets/asset_detail.html:81
+#: assets/templates/assets/asset_list.html:41 templates/_nav.html:24
+msgid "Cluster"
+msgstr "集群"
+
+#: assets/forms.py:160 assets/forms.py:356 assets/models/asset.py:147
 #: assets/templates/assets/admin_user_list.html:24
 #: assets/templates/assets/asset_group_list.html:16
 #: assets/templates/assets/label_list.html:16
@@ -80,22 +86,22 @@ msgstr "端口"
 msgid "Asset"
 msgstr "资产"
 
-#: assets/forms.py:188 perms/forms.py:40
+#: assets/forms.py:197 perms/forms.py:40
 #: perms/templates/perms/asset_permission_detail.html:144 users/forms.py:248
 msgid "Select system users"
 msgstr "选择系统用户"
 
-#: assets/forms.py:190
+#: assets/forms.py:199
 #: assets/templates/assets/_asset_group_bulk_update_modal.html:22
 #: assets/templates/assets/cluster_list.html:22
 msgid "System users"
 msgstr "系统用户"
 
-#: assets/forms.py:192
+#: assets/forms.py:201
 msgid "Selected system users will be create at cluster assets"
 msgstr "选择的系统用户将会在该集群资产上创建"
 
-#: assets/forms.py:200 assets/forms.py:275 assets/forms.py:335
+#: assets/forms.py:209 assets/forms.py:291 assets/forms.py:332
 #: assets/models/cluster.py:18 assets/models/group.py:20
 #: assets/models/label.py:17 assets/models/user.py:28
 #: assets/templates/assets/admin_user_detail.html:56
@@ -127,17 +133,16 @@ msgstr "选择的系统用户将会在该集群资产上创建"
 msgid "Name"
 msgstr "名称"
 
-#: assets/forms.py:206
+#: assets/forms.py:215
 msgid "Cluster level admin user"
 msgstr "集群级别管理用户"
 
-#: assets/forms.py:227
-msgid "Password or private key password"
+#: assets/forms.py:236
+msgid "Password or private key passphrase"
 msgstr "密码或秘钥密码"
 
-#: assets/forms.py:228 assets/forms.py:289 assets/models/user.py:30
-#: common/forms.py:113 users/forms.py:16 users/forms.py:24
-#: users/templates/users/login.html:56
+#: assets/forms.py:237 assets/models/user.py:30 common/forms.py:113
+#: users/forms.py:16 users/forms.py:24 users/templates/users/login.html:56
 #: users/templates/users/reset_password.html:52
 #: users/templates/users/user_create.html:11
 #: users/templates/users/user_password_update.html:40
@@ -146,19 +151,19 @@ msgstr "密码或秘钥密码"
 msgid "Password"
 msgstr "密码"
 
-#: assets/forms.py:231 assets/forms.py:291 users/models/user.py:45
+#: assets/forms.py:240 users/models/user.py:45
 msgid "Private key"
 msgstr "ssh私钥"
 
-#: assets/forms.py:256 assets/forms.py:317 assets/forms.py:381
+#: assets/forms.py:250
 msgid "Invalid private key"
 msgstr "ssh密钥不合法"
 
-#: assets/forms.py:267
+#: assets/forms.py:259
 msgid "Password and private key file must be input one"
 msgstr "密码和私钥, 必须输入一个"
 
-#: assets/forms.py:276 assets/forms.py:336 assets/models/user.py:29
+#: assets/forms.py:292 assets/forms.py:333 assets/models/user.py:29
 #: assets/templates/assets/admin_user_detail.html:60
 #: assets/templates/assets/admin_user_list.html:23
 #: assets/templates/assets/system_user_detail.html:62
@@ -174,79 +179,31 @@ msgstr "密码和私钥, 必须输入一个"
 msgid "Username"
 msgstr "用户名"
 
-#: assets/forms.py:324 assets/forms.py:387
-msgid "Auth info required, private_key or password"
-msgstr "密钥和密码必须填写一个"
-
-#: assets/forms.py:340
+#: assets/forms.py:337
 msgid " Select clusters"
 msgstr "选择集群"
 
-#: assets/forms.py:347
+#: assets/forms.py:344
 msgid "If auto push checked, system user will be create at cluster assets"
 msgstr "如果选择了自动推送，系统用户将会创建在集群资产上"
 
-#: assets/forms.py:348
+#: assets/forms.py:345
 msgid "Auto push system user to asset"
 msgstr "自动推送系统用户到资产"
 
-#: assets/forms.py:349
+#: assets/forms.py:346
 msgid ""
 "High level will be using login asset as default, if user was granted more "
 "than 2 system user"
 msgstr "高优先级的系统用户将会作为默认登录用户"
 
-#: assets/models/asset.py:34
-msgid "In use"
-msgstr "使用中"
-
-#: assets/models/asset.py:35
-msgid "Out of use"
-msgstr "未使用"
-
-#: assets/models/asset.py:38
-msgid "Server"
-msgstr "物理机"
-
-#: assets/models/asset.py:39
-msgid "VM"
-msgstr "虚拟机"
-
-#: assets/models/asset.py:40
-msgid "Switch"
-msgstr "交换机"
-
-#: assets/models/asset.py:41
-msgid "Router"
-msgstr "路由器"
-
-#: assets/models/asset.py:42
-msgid "Firewall"
-msgstr "防火墙"
-
-#: assets/models/asset.py:43
-msgid "Storage"
-msgstr "存储"
-
-#: assets/models/asset.py:46
-msgid "Production"
-msgstr "生产环境"
-
-#: assets/models/asset.py:47
-msgid "Development"
-msgstr "开发环境"
-
-#: assets/models/asset.py:48
-msgid "Testing"
-msgstr "测试环境"
-
-#: assets/models/asset.py:53 assets/templates/assets/admin_user_assets.html:60
+#: assets/models/asset.py:34 assets/templates/assets/admin_user_assets.html:60
 #: assets/templates/assets/asset_detail.html:61
 #: assets/templates/assets/asset_group_detail.html:51
 #: assets/templates/assets/asset_list.html:39
 #: assets/templates/assets/cluster_assets.html:52
 #: assets/templates/assets/system_user_asset.html:53
-#: assets/templates/assets/user_asset_list.html:20 common/forms.py:140
+#: assets/templates/assets/user_asset_list.html:20 common/forms.py:143
 #: perms/templates/perms/asset_permission_asset.html:55
 #: users/templates/users/login_log_list.html:52
 #: users/templates/users/user_granted_asset.html:49
@@ -254,139 +211,109 @@ msgstr "测试环境"
 msgid "IP"
 msgstr "IP"
 
-#: assets/models/asset.py:54 assets/templates/assets/admin_user_assets.html:59
+#: assets/models/asset.py:35 assets/templates/assets/admin_user_assets.html:59
 #: assets/templates/assets/asset_detail.html:57
 #: assets/templates/assets/asset_group_detail.html:50
 #: assets/templates/assets/asset_list.html:38
 #: assets/templates/assets/cluster_assets.html:51
 #: assets/templates/assets/system_user_asset.html:52
-#: assets/templates/assets/user_asset_list.html:19 common/forms.py:139
+#: assets/templates/assets/user_asset_list.html:19 common/forms.py:142
 #: perms/templates/perms/asset_permission_asset.html:54
 #: users/templates/users/user_granted_asset.html:48
 #: users/templates/users/user_group_granted_asset.html:49
 msgid "Hostname"
 msgstr "主机名"
 
-#: assets/models/asset.py:56 assets/templates/assets/asset_detail.html:213
+#: assets/models/asset.py:37 assets/templates/assets/asset_detail.html:189
 #: assets/views/asset.py:220 assets/views/asset.py:260
 msgid "Asset groups"
 msgstr "资产组"
 
-#: assets/models/asset.py:57 assets/models/cluster.py:40
-#: assets/models/user.py:219 assets/templates/assets/asset_detail.html:85
-#: assets/templates/assets/asset_list.html:41 templates/_nav.html:24
-msgid "Cluster"
-msgstr "集群"
-
-#: assets/models/asset.py:58 assets/models/label.py:20
-#: assets/templates/assets/asset_detail.html:129
+#: assets/models/asset.py:39 assets/models/label.py:20
+#: assets/templates/assets/asset_detail.html:113
 msgid "Is active"
 msgstr "激活"
 
-#: assets/models/asset.py:59 assets/templates/assets/asset_detail.html:133
-msgid "Asset type"
-msgstr "系统类型"
-
-#: assets/models/asset.py:60 assets/templates/assets/asset_detail.html:137
-msgid "Asset environment"
-msgstr "资产环境"
-
-#: assets/models/asset.py:61 assets/templates/assets/asset_detail.html:125
-msgid "Asset status"
-msgstr "资产状态"
-
-#: assets/models/asset.py:64 assets/models/cluster.py:19
+#: assets/models/asset.py:42 assets/models/cluster.py:19
 #: assets/models/user.py:190 assets/templates/assets/asset_detail.html:73
 #: assets/templates/assets/cluster_list.html:20 templates/_nav.html:25
 msgid "Admin user"
 msgstr "管理用户"
 
-#: assets/models/asset.py:67 assets/templates/assets/asset_detail.html:65
+#: assets/models/asset.py:45 assets/templates/assets/asset_detail.html:65
 msgid "Public IP"
 msgstr "公网IP"
 
-#: assets/models/asset.py:68
-msgid "Remote control card IP"
-msgstr "远控卡IP"
-
-#: assets/models/asset.py:69 assets/templates/assets/asset_detail.html:89
-msgid "Cabinet number"
-msgstr "机柜编号"
-
-#: assets/models/asset.py:70 assets/templates/assets/asset_detail.html:93
-msgid "Cabinet position"
-msgstr "机柜层号"
-
-#: assets/models/asset.py:71 assets/templates/assets/asset_detail.html:145
+#: assets/models/asset.py:46 assets/templates/assets/asset_detail.html:121
 msgid "Asset number"
 msgstr "资产编号"
 
-#: assets/models/asset.py:74 assets/templates/assets/asset_detail.html:97
+#: assets/models/asset.py:49 assets/templates/assets/asset_detail.html:85
 msgid "Vendor"
 msgstr "制造商"
 
-#: assets/models/asset.py:75 assets/templates/assets/asset_detail.html:101
+#: assets/models/asset.py:50 assets/templates/assets/asset_detail.html:89
 msgid "Model"
 msgstr "型号"
 
-#: assets/models/asset.py:76 assets/templates/assets/asset_detail.html:141
+#: assets/models/asset.py:51 assets/templates/assets/asset_detail.html:117
 msgid "Serial number"
 msgstr "序列号"
 
-#: assets/models/asset.py:78
+#: assets/models/asset.py:53
 msgid "CPU model"
 msgstr "CPU型号"
 
-#: assets/models/asset.py:79
+#: assets/models/asset.py:54
 msgid "CPU count"
 msgstr "CPU数量"
 
-#: assets/models/asset.py:80
+#: assets/models/asset.py:55
 msgid "CPU cores"
 msgstr "CPU核数"
 
-#: assets/models/asset.py:81 assets/templates/assets/asset_detail.html:109
+#: assets/models/asset.py:56 assets/templates/assets/asset_detail.html:97
 msgid "Memory"
 msgstr "内存"
 
-#: assets/models/asset.py:82
+#: assets/models/asset.py:57
 msgid "Disk total"
 msgstr "硬盘大小"
 
-#: assets/models/asset.py:83
+#: assets/models/asset.py:58
 msgid "Disk info"
 msgstr "硬盘信息"
 
-#: assets/models/asset.py:85 assets/templates/assets/asset_detail.html:117
+#: assets/models/asset.py:60 assets/templates/assets/asset_detail.html:105
 msgid "Platform"
 msgstr "系统平台"
 
-#: assets/models/asset.py:86 assets/templates/assets/asset_detail.html:121
+#: assets/models/asset.py:61 assets/templates/assets/asset_detail.html:109
 msgid "OS"
 msgstr "操作系统"
 
-#: assets/models/asset.py:87
+#: assets/models/asset.py:62
 msgid "OS version"
 msgstr "系统版本"
 
-#: assets/models/asset.py:88
+#: assets/models/asset.py:63
 msgid "OS arch"
 msgstr "系统架构"
 
-#: assets/models/asset.py:89
+#: assets/models/asset.py:64
 msgid "Hostname raw"
 msgstr "主机名原始"
 
-#: assets/models/asset.py:91 assets/templates/assets/asset_create.html:34
-#: assets/templates/assets/asset_detail.html:250
-#: assets/templates/assets/asset_update.html:39 templates/_nav.html:27
+#: assets/models/asset.py:66 assets/templates/assets/asset_create.html:32
+#: assets/templates/assets/asset_detail.html:226
+#: assets/templates/assets/asset_update.html:37 templates/_nav.html:27
 msgid "Labels"
 msgstr "标签管理"
 
-#: assets/models/asset.py:93 assets/models/cluster.py:28
+#: assets/models/asset.py:67 assets/models/cluster.py:28
 #: assets/models/group.py:21 assets/models/user.py:36
 #: assets/templates/assets/admin_user_detail.html:68
-#: assets/templates/assets/asset_detail.html:149
+#: assets/templates/assets/asset_detail.html:125
 #: assets/templates/assets/cluster_detail.html:93
 #: assets/templates/assets/system_user_detail.html:96
 #: ops/templates/ops/adhoc_detail.html:86 perms/models.py:22
@@ -395,7 +322,7 @@ msgstr "标签管理"
 msgid "Created by"
 msgstr "创建者"
 
-#: assets/models/asset.py:94 assets/models/cluster.py:26
+#: assets/models/asset.py:68 assets/models/cluster.py:26
 #: assets/models/group.py:22 assets/models/label.py:23
 #: assets/templates/assets/admin_user_detail.html:64
 #: assets/templates/assets/cluster_detail.html:89
@@ -407,11 +334,11 @@ msgstr "创建者"
 msgid "Date created"
 msgstr "创建日期"
 
-#: assets/models/asset.py:95 assets/models/cluster.py:29
+#: assets/models/asset.py:69 assets/models/cluster.py:29
 #: assets/models/group.py:23 assets/models/label.py:21 assets/models/user.py:33
 #: assets/templates/assets/admin_user_detail.html:72
 #: assets/templates/assets/admin_user_list.html:28
-#: assets/templates/assets/asset_detail.html:157
+#: assets/templates/assets/asset_detail.html:133
 #: assets/templates/assets/asset_group_list.html:17
 #: assets/templates/assets/cluster_detail.html:97
 #: assets/templates/assets/system_user_detail.html:100
@@ -486,7 +413,7 @@ msgstr "默认资产组"
 #: terminal/templates/terminal/session_list.html:33
 #: terminal/templates/terminal/session_list.html:71 users/forms.py:190
 #: users/models/user.py:30 users/templates/users/user_group_detail.html:78
-#: users/views/user.py:337
+#: users/templates/users/user_group_list.html:13 users/views/user.py:337
 msgid "User"
 msgstr "用户"
 
@@ -672,8 +599,8 @@ msgid "Basic"
 msgstr "基本"
 
 #: assets/templates/assets/_system_user.html:45
-#: assets/templates/assets/asset_create.html:26
-#: assets/templates/assets/asset_update.html:31
+#: assets/templates/assets/asset_create.html:24
+#: assets/templates/assets/asset_update.html:29
 #: assets/templates/assets/system_user_update.html:7
 #: users/templates/users/user_create.html:9
 #: users/templates/users/user_update.html:6
@@ -685,8 +612,8 @@ msgid "Auto generate key"
 msgstr "自动生成秘钥"
 
 #: assets/templates/assets/_system_user.html:65
-#: assets/templates/assets/asset_create.html:60
-#: assets/templates/assets/asset_update.html:70
+#: assets/templates/assets/asset_create.html:58
+#: assets/templates/assets/asset_update.html:62
 #: assets/templates/assets/cluster_create_update.html:46
 #: perms/templates/perms/asset_permission_create_update.html:45
 #: terminal/templates/terminal/terminal_update.html:41
@@ -696,9 +623,9 @@ msgstr "其它"
 #: assets/templates/assets/_system_user.html:71
 #: assets/templates/assets/admin_user_create_update.html:45
 #: assets/templates/assets/asset_bulk_update.html:23
-#: assets/templates/assets/asset_create.html:67
+#: assets/templates/assets/asset_create.html:65
 #: assets/templates/assets/asset_group_create.html:16
-#: assets/templates/assets/asset_update.html:78
+#: assets/templates/assets/asset_update.html:69
 #: assets/templates/assets/cluster_create_update.html:54
 #: assets/templates/assets/label_create_update.html:16
 #: common/templates/common/basic_setting.html:58
@@ -720,10 +647,10 @@ msgstr "重置"
 #: assets/templates/assets/_system_user.html:72
 #: assets/templates/assets/admin_user_create_update.html:46
 #: assets/templates/assets/asset_bulk_update.html:24
-#: assets/templates/assets/asset_create.html:68
+#: assets/templates/assets/asset_create.html:66
 #: assets/templates/assets/asset_group_create.html:17
 #: assets/templates/assets/asset_list.html:61
-#: assets/templates/assets/asset_update.html:79
+#: assets/templates/assets/asset_update.html:70
 #: assets/templates/assets/cluster_create_update.html:55
 #: assets/templates/assets/label_create_update.html:17
 #: common/templates/common/basic_setting.html:59
@@ -768,10 +695,10 @@ msgstr "资产列表"
 #: assets/templates/assets/admin_user_list.html:83
 #: assets/templates/assets/asset_detail.html:24
 #: assets/templates/assets/asset_group_detail.html:18
-#: assets/templates/assets/asset_group_detail.html:177
-#: assets/templates/assets/asset_group_list.html:38
+#: assets/templates/assets/asset_group_detail.html:176
+#: assets/templates/assets/asset_group_list.html:42
 #: assets/templates/assets/asset_list.html:106
-#: assets/templates/assets/cluster_assets.html:170
+#: assets/templates/assets/cluster_assets.html:169
 #: assets/templates/assets/cluster_detail.html:25
 #: assets/templates/assets/cluster_list.html:43
 #: assets/templates/assets/label_list.html:38
@@ -779,12 +706,12 @@ msgstr "资产列表"
 #: assets/templates/assets/system_user_detail.html:26
 #: assets/templates/assets/system_user_list.html:84
 #: perms/templates/perms/asset_permission_detail.html:30
-#: perms/templates/perms/asset_permission_list.html:73
+#: perms/templates/perms/asset_permission_list.html:78
 #: terminal/templates/terminal/terminal_detail.html:16
 #: terminal/templates/terminal/terminal_list.html:71
 #: users/templates/users/user_detail.html:25
 #: users/templates/users/user_group_detail.html:28
-#: users/templates/users/user_group_list.html:39
+#: users/templates/users/user_group_list.html:43
 #: users/templates/users/user_list.html:76
 msgid "Update"
 msgstr "更新"
@@ -794,7 +721,7 @@ msgstr "更新"
 #: assets/templates/assets/admin_user_list.html:84
 #: assets/templates/assets/asset_detail.html:28
 #: assets/templates/assets/asset_group_detail.html:22
-#: assets/templates/assets/asset_group_list.html:39
+#: assets/templates/assets/asset_group_list.html:43
 #: assets/templates/assets/asset_list.html:107
 #: assets/templates/assets/cluster_detail.html:29
 #: assets/templates/assets/cluster_list.html:44
@@ -803,11 +730,11 @@ msgstr "更新"
 #: assets/templates/assets/system_user_list.html:85
 #: ops/templates/ops/task_list.html:71
 #: perms/templates/perms/asset_permission_detail.html:34
-#: perms/templates/perms/asset_permission_list.html:74
+#: perms/templates/perms/asset_permission_list.html:79
 #: terminal/templates/terminal/terminal_list.html:73
 #: users/templates/users/user_detail.html:30
 #: users/templates/users/user_group_detail.html:32
-#: users/templates/users/user_group_list.html:41
+#: users/templates/users/user_group_list.html:45
 #: users/templates/users/user_list.html:80
 #: users/templates/users/user_list.html:84
 msgid "Delete"
@@ -820,9 +747,6 @@ msgid "Asset list of "
 msgstr "资产列表"
 
 #: assets/templates/assets/admin_user_assets.html:62
-#: assets/templates/assets/asset_group_detail.html:53
-#: assets/templates/assets/cluster_assets.html:54
-#: assets/templates/assets/user_asset_list.html:22
 #: common/templates/common/terminal_setting.html:63
 #: users/templates/users/login_log_list.html:50
 msgid "Type"
@@ -830,7 +754,7 @@ msgstr "类型"
 
 #: assets/templates/assets/admin_user_assets.html:63
 #: assets/templates/assets/admin_user_list.html:25
-#: assets/templates/assets/asset_detail.html:403
+#: assets/templates/assets/asset_detail.html:365
 #: assets/templates/assets/asset_list.html:44
 #: assets/templates/assets/system_user_asset.html:55
 #: assets/templates/assets/system_user_list.html:27
@@ -838,7 +762,7 @@ msgid "Reachable"
 msgstr "可连接"
 
 #: assets/templates/assets/admin_user_assets.html:75
-#: assets/templates/assets/cluster_assets.html:68
+#: assets/templates/assets/cluster_assets.html:67
 #: assets/templates/assets/system_user_asset.html:67
 #: assets/templates/assets/system_user_detail.html:112
 #: perms/templates/perms/asset_permission_detail.html:110
@@ -846,12 +770,12 @@ msgid "Quick update"
 msgstr "快速更新"
 
 #: assets/templates/assets/admin_user_assets.html:81
-#: assets/templates/assets/asset_detail.html:199
+#: assets/templates/assets/asset_detail.html:175
 msgid "Test connective"
 msgstr "测试可连接性"
 
 #: assets/templates/assets/admin_user_assets.html:84
-#: assets/templates/assets/asset_detail.html:202
+#: assets/templates/assets/asset_detail.html:178
 #: assets/templates/assets/system_user_asset.html:84
 msgid "Test"
 msgstr "测试"
@@ -871,10 +795,10 @@ msgid "Using this as cluster admin user"
 msgstr "使用集群管理用户"
 
 #: assets/templates/assets/admin_user_detail.html:101
-#: assets/templates/assets/asset_detail.html:230
-#: assets/templates/assets/asset_group_list.html:81
+#: assets/templates/assets/asset_detail.html:206
+#: assets/templates/assets/asset_group_list.html:85
 #: assets/templates/assets/asset_list.html:242
-#: assets/templates/assets/cluster_assets.html:104
+#: assets/templates/assets/cluster_assets.html:103
 #: assets/templates/assets/cluster_list.html:89
 #: assets/templates/assets/system_user_detail.html:164
 #: assets/templates/assets/system_user_list.html:134 templates/_modal.html:16
@@ -883,7 +807,7 @@ msgstr "使用集群管理用户"
 #: users/templates/users/user_detail.html:364
 #: users/templates/users/user_detail.html:387
 #: users/templates/users/user_group_create_update.html:32
-#: users/templates/users/user_group_list.html:82
+#: users/templates/users/user_group_list.html:86
 #: users/templates/users/user_list.html:196
 #: users/templates/users/user_profile.html:181
 msgid "Confirm"
@@ -902,10 +826,10 @@ msgid "Ratio"
 msgstr "比例"
 
 #: assets/templates/assets/admin_user_list.html:29
-#: assets/templates/assets/asset_group_detail.html:55
+#: assets/templates/assets/asset_group_detail.html:54
 #: assets/templates/assets/asset_group_list.html:18
 #: assets/templates/assets/asset_list.html:45
-#: assets/templates/assets/cluster_assets.html:56
+#: assets/templates/assets/cluster_assets.html:55
 #: assets/templates/assets/cluster_list.html:23
 #: assets/templates/assets/label_list.html:17
 #: assets/templates/assets/system_user_list.html:31
@@ -919,14 +843,14 @@ msgstr "比例"
 msgid "Action"
 msgstr "动作"
 
-#: assets/templates/assets/asset_create.html:30
-#: assets/templates/assets/asset_update.html:35
+#: assets/templates/assets/asset_create.html:28
+#: assets/templates/assets/asset_update.html:33
 msgid "Group"
 msgstr "组"
 
-#: assets/templates/assets/asset_create.html:36
+#: assets/templates/assets/asset_create.html:34
 #: assets/templates/assets/asset_list.html:27
-#: assets/templates/assets/asset_update.html:41
+#: assets/templates/assets/asset_update.html:39
 msgid "Label"
 msgstr "标签"
 
@@ -935,34 +859,30 @@ msgstr "标签"
 msgid "Asset detail"
 msgstr "资产详情"
 
-#: assets/templates/assets/asset_detail.html:81
-msgid "Remote card IP"
-msgstr "远控卡IP"
-
-#: assets/templates/assets/asset_detail.html:105
+#: assets/templates/assets/asset_detail.html:93
 msgid "CPU"
 msgstr "CPU"
 
-#: assets/templates/assets/asset_detail.html:113
+#: assets/templates/assets/asset_detail.html:101
 msgid "Disk"
 msgstr "硬盘"
 
-#: assets/templates/assets/asset_detail.html:153
+#: assets/templates/assets/asset_detail.html:129
 #: users/templates/users/user_detail.html:103
 #: users/templates/users/user_profile.html:88
 msgid "Date joined"
 msgstr "创建日期"
 
-#: assets/templates/assets/asset_detail.html:169
+#: assets/templates/assets/asset_detail.html:145
 #: terminal/templates/terminal/session_detail.html:81
 #: users/templates/users/user_detail.html:122
 #: users/templates/users/user_profile.html:130
 msgid "Quick modify"
 msgstr "快速修改"
 
-#: assets/templates/assets/asset_detail.html:175
+#: assets/templates/assets/asset_detail.html:151
 #: assets/templates/assets/asset_list.html:43
-#: assets/templates/assets/user_asset_list.html:25 perms/models.py:20
+#: assets/templates/assets/user_asset_list.html:23 perms/models.py:20
 #: perms/templates/perms/asset_permission_create_update.html:47
 #: perms/templates/perms/asset_permission_detail.html:116
 #: terminal/templates/terminal/terminal_list.html:34
@@ -973,19 +893,19 @@ msgstr "快速修改"
 msgid "Active"
 msgstr "激活中"
 
-#: assets/templates/assets/asset_detail.html:191
+#: assets/templates/assets/asset_detail.html:167
 msgid "Refresh hardware"
 msgstr "更新硬件信息"
 
-#: assets/templates/assets/asset_detail.html:194
+#: assets/templates/assets/asset_detail.html:170
 msgid "Refresh"
 msgstr "刷新"
 
-#: assets/templates/assets/asset_detail.html:221
+#: assets/templates/assets/asset_detail.html:197
 msgid "Join asset groups"
 msgstr "添加到资产组"
 
-#: assets/templates/assets/asset_detail.html:345
+#: assets/templates/assets/asset_detail.html:307
 #: users/templates/users/user_detail.html:273
 msgid "Update successfully!"
 msgstr "更新成功"
@@ -994,17 +914,17 @@ msgstr "更新成功"
 msgid "Group assets"
 msgstr "组下资产"
 
-#: assets/templates/assets/asset_group_detail.html:54
-#: assets/templates/assets/cluster_assets.html:55
+#: assets/templates/assets/asset_group_detail.html:53
+#: assets/templates/assets/cluster_assets.html:54
 #: terminal/templates/terminal/terminal_list.html:35
 msgid "Alive"
 msgstr "在线"
 
-#: assets/templates/assets/asset_group_detail.html:67
+#: assets/templates/assets/asset_group_detail.html:66
 msgid "Add assets to this group"
 msgstr "添加资产到该组"
 
-#: assets/templates/assets/asset_group_detail.html:84
+#: assets/templates/assets/asset_group_detail.html:83
 #: perms/templates/perms/asset_permission_asset.html:97
 #: perms/templates/perms/asset_permission_detail.html:153
 #: perms/templates/perms/asset_permission_user.html:97
@@ -1013,7 +933,7 @@ msgstr "添加资产到该组"
 msgid "Add"
 msgstr "添加"
 
-#: assets/templates/assets/asset_group_detail.html:178
+#: assets/templates/assets/asset_group_detail.html:177
 msgid "Remove"
 msgstr "移除"
 
@@ -1022,40 +942,40 @@ msgstr "移除"
 msgid "Create asset group"
 msgstr "创建资产组"
 
-#: assets/templates/assets/asset_group_list.html:76
+#: assets/templates/assets/asset_group_list.html:80
 #: assets/templates/assets/asset_list.html:237
 #: assets/templates/assets/cluster_list.html:84
 #: assets/templates/assets/system_user_list.html:129
 #: users/templates/users/user_detail.html:334
 #: users/templates/users/user_detail.html:359
-#: users/templates/users/user_group_list.html:77
+#: users/templates/users/user_group_list.html:81
 #: users/templates/users/user_list.html:191
 msgid "Are you sure?"
 msgstr "你确认吗?"
 
-#: assets/templates/assets/asset_group_list.html:77
-#: users/templates/users/user_group_list.html:78
+#: assets/templates/assets/asset_group_list.html:81
+#: users/templates/users/user_group_list.html:82
 msgid "This will delete the selected groups !!!"
 msgstr "删除选择组"
 
-#: assets/templates/assets/asset_group_list.html:85
+#: assets/templates/assets/asset_group_list.html:89
 msgid "Group deleted"
 msgstr "组已被删除"
 
-#: assets/templates/assets/asset_group_list.html:86
-#: assets/templates/assets/asset_group_list.html:91
+#: assets/templates/assets/asset_group_list.html:90
+#: assets/templates/assets/asset_group_list.html:95
 msgid "Group Delete"
 msgstr "删除"
 
-#: assets/templates/assets/asset_group_list.html:90
+#: assets/templates/assets/asset_group_list.html:94
 msgid "Group deleting failed."
 msgstr "删除失败"
 
-#: assets/templates/assets/asset_group_list.html:153
+#: assets/templates/assets/asset_group_list.html:157
 msgid "The selected asset groups has been updated successfully."
 msgstr "更新成功"
 
-#: assets/templates/assets/asset_group_list.html:154
+#: assets/templates/assets/asset_group_list.html:158
 msgid "AssetGroup Updated"
 msgstr "资产组更新"
 
@@ -1074,7 +994,7 @@ msgid "Create asset"
 msgstr "创建资产"
 
 #: assets/templates/assets/asset_list.html:42
-#: assets/templates/assets/user_asset_list.html:24
+#: assets/templates/assets/user_asset_list.html:22
 msgid "Hardware"
 msgstr "硬件"
 
@@ -1117,35 +1037,31 @@ msgstr "删除"
 msgid "Asset Deleting failed."
 msgstr "删除失败"
 
-#: assets/templates/assets/asset_update.html:60
+#: assets/templates/assets/asset_update.html:58
 msgid "Configuration"
 msgstr "配置"
 
-#: assets/templates/assets/asset_update.html:65
-msgid "Location"
-msgstr "位置"
-
 #: assets/templates/assets/cluster_assets.html:23
 #: assets/templates/assets/cluster_assets.html:31
 #: assets/templates/assets/cluster_detail.html:21
 msgid "Cluster assets"
 msgstr "集群中资产"
 
-#: assets/templates/assets/cluster_assets.html:74
+#: assets/templates/assets/cluster_assets.html:73
 #: assets/templates/assets/system_user_asset.html:81
 msgid "Test assets connective"
 msgstr "测试资产可连接性"
 
-#: assets/templates/assets/cluster_assets.html:77
+#: assets/templates/assets/cluster_assets.html:76
 #: ops/templates/ops/task_list.html:70
 msgid "Run"
 msgstr "执行"
 
-#: assets/templates/assets/cluster_assets.html:87
+#: assets/templates/assets/cluster_assets.html:86
 msgid "Add assets to"
 msgstr "添加资产到"
 
-#: assets/templates/assets/cluster_assets.html:95
+#: assets/templates/assets/cluster_assets.html:94
 msgid "Select asset"
 msgstr "选择资产"
 
@@ -1253,11 +1169,7 @@ msgstr "删除系统用户"
 msgid "System Users Deleting failed."
 msgstr "系统用户删除失败"
 
-#: assets/templates/assets/user_asset_list.html:23
-msgid "Env"
-msgstr "环境"
-
-#: assets/templates/assets/user_asset_list.html:26
+#: assets/templates/assets/user_asset_list.html:24
 msgid "Connective"
 msgstr "连接性"
 
@@ -1400,7 +1312,7 @@ msgstr "SMTP密码"
 msgid "Some provider use token except password"
 msgstr "一些邮件提供商需要输入的是Token"
 
-#: common/forms.py:96 common/forms.py:133
+#: common/forms.py:96 common/forms.py:135
 msgid "Use SSL"
 msgstr "使用SSL"
 
@@ -1432,36 +1344,52 @@ msgstr "用户OU"
 msgid "User search filter"
 msgstr "用户过滤器"
 
-#: common/forms.py:123
+#: common/forms.py:121
+#, python-format
+msgid "User search filter must contain ([cn,uid,sAMAccountName,...]=%(user)s)"
+msgstr "用户过滤器必须包含([cn,uid,sAMAccountName,...]=%(user)s)"
+
+#: common/forms.py:124
 msgid "User attr map"
 msgstr "LDAP属性映射"
 
-#: common/forms.py:143
+#: common/forms.py:130
+msgid ""
+"User attr map present how to map LDAP user attr to jumpserver, username,name,"
+"email is jumpserver attr"
+msgstr "用户属性映射代表怎样将LDAP中用户属性映射到jumpserver用户上，username, name,"
+"email 是jumpserver的属性"
+
+#: common/forms.py:137
+msgid "Enable LDAP auth"
+msgstr "启用LDAP认证"
+
+#: common/forms.py:146
 msgid "List sort by"
 msgstr "资产列表排序"
 
-#: common/forms.py:146
+#: common/forms.py:149
 msgid "Heartbeat interval"
 msgstr "心跳间隔"
 
-#: common/forms.py:146 ops/models.py:32
+#: common/forms.py:149 ops/models.py:32
 msgid "Units: seconds"
 msgstr "单位: 秒"
 
-#: common/forms.py:149
+#: common/forms.py:152
 msgid "Password auth"
 msgstr "密码认证"
 
-#: common/forms.py:152
+#: common/forms.py:155
 msgid "Public key auth"
 msgstr "秘钥认证"
 
-#: common/forms.py:155 common/templates/common/terminal_setting.html:58
+#: common/forms.py:158 common/templates/common/terminal_setting.html:58
 #: terminal/forms.py:21 terminal/models.py:19
 msgid "Command storage"
 msgstr "命令存储"
 
-#: common/forms.py:156
+#: common/forms.py:159
 msgid ""
 "Set terminal storage setting, `default` is the using as default,You can set "
 "other storage and some terminal using"
@@ -1855,7 +1783,6 @@ msgid "Create asset permission "
 msgstr "创建资产权限"
 
 #: perms/templates/perms/asset_permission_detail.html:66
-#: users/templates/users/user_group_list.html:13
 msgid "User count"
 msgstr "用户数量"
 
@@ -1995,8 +1922,8 @@ msgid "Close"
 msgstr "关闭"
 
 #: templates/_nav.html:9 users/views/group.py:28 users/views/group.py:44
-#: users/views/group.py:62 users/views/group.py:79 users/views/login.py:197
-#: users/views/login.py:246 users/views/user.py:57 users/views/user.py:72
+#: users/views/group.py:62 users/views/group.py:79 users/views/login.py:200
+#: users/views/login.py:249 users/views/user.py:57 users/views/user.py:72
 #: users/views/user.py:91 users/views/user.py:147 users/views/user.py:304
 #: users/views/user.py:318 users/views/user.py:355 users/views/user.py:377
 msgid "Users"
@@ -2623,16 +2550,16 @@ msgstr "可用"
 msgid "Create user group"
 msgstr "创建用户组"
 
-#: users/templates/users/user_group_list.html:86
+#: users/templates/users/user_group_list.html:90
 msgid "UserGroups Deleted."
 msgstr "用户组删除"
 
-#: users/templates/users/user_group_list.html:87
-#: users/templates/users/user_group_list.html:92
+#: users/templates/users/user_group_list.html:91
+#: users/templates/users/user_group_list.html:96
 msgid "UserGroups Delete"
 msgstr "用户组删除"
 
-#: users/templates/users/user_group_list.html:91
+#: users/templates/users/user_group_list.html:95
 msgid "UserGroup Deleting failed."
 msgstr "用户组删除失败"
 
@@ -2824,52 +2751,52 @@ msgstr "用户组列表"
 msgid "Update user group"
 msgstr "编辑用户组"
 
-#: users/views/login.py:54
+#: users/views/login.py:56
 msgid "Please enable cookies and try again."
 msgstr "设置你的浏览器支持cookie"
 
-#: users/views/login.py:87
+#: users/views/login.py:90
 msgid "Logout success"
 msgstr "退出登录成功"
 
-#: users/views/login.py:88
+#: users/views/login.py:91
 msgid "Logout success, return login page"
 msgstr "退出登录成功，返回到登录页面"
 
-#: users/views/login.py:104
+#: users/views/login.py:107
 msgid "Email address invalid, please input again"
 msgstr "邮箱地址错误，重新输入"
 
-#: users/views/login.py:117
+#: users/views/login.py:120
 msgid "Send reset password message"
 msgstr "发送重置密码邮件"
 
-#: users/views/login.py:118
+#: users/views/login.py:121
 msgid "Send reset password mail success, login your mail box and follow it "
 msgstr ""
 "发送重置邮件成功, 请登录邮箱查看, 按照提示操作 (如果没收到,请等待3-5分钟)"
 
-#: users/views/login.py:132
+#: users/views/login.py:135
 msgid "Reset password success"
 msgstr "重置密码成功"
 
-#: users/views/login.py:133
+#: users/views/login.py:136
 msgid "Reset password success, return to login page"
 msgstr "重置密码成功，返回到登录页面"
 
-#: users/views/login.py:150 users/views/login.py:163
+#: users/views/login.py:153 users/views/login.py:166
 msgid "Token invalid or expired"
 msgstr "Token错误或失效"
 
-#: users/views/login.py:159
+#: users/views/login.py:162
 msgid "Password not same"
 msgstr "密码不一致"
 
-#: users/views/login.py:197
+#: users/views/login.py:200
 msgid "First login"
 msgstr "首次登陆"
 
-#: users/views/login.py:247
+#: users/views/login.py:250
 msgid "Login log list"
 msgstr "登录日志"
 
@@ -2901,6 +2828,74 @@ msgstr "密码更新"
 msgid "Public key update"
 msgstr "秘钥更新"
 
+#, fuzzy
+#~| msgid "Select labels"
+#~ msgid "Select lables"
+#~ msgstr "选择标签"
+
+#~ msgid "Auth info required, private_key or password"
+#~ msgstr "密钥和密码必须填写一个"
+
+#~ msgid "In use"
+#~ msgstr "使用中"
+
+#~ msgid "Out of use"
+#~ msgstr "未使用"
+
+#~ msgid "Server"
+#~ msgstr "物理机"
+
+#~ msgid "VM"
+#~ msgstr "虚拟机"
+
+#~ msgid "Switch"
+#~ msgstr "交换机"
+
+#~ msgid "Router"
+#~ msgstr "路由器"
+
+#~ msgid "Firewall"
+#~ msgstr "防火墙"
+
+#~ msgid "Storage"
+#~ msgstr "存储"
+
+#~ msgid "Production"
+#~ msgstr "生产环境"
+
+#~ msgid "Development"
+#~ msgstr "开发环境"
+
+#~ msgid "Testing"
+#~ msgstr "测试环境"
+
+#~ msgid "Asset type"
+#~ msgstr "系统类型"
+
+#~ msgid "Asset environment"
+#~ msgstr "资产环境"
+
+#~ msgid "Asset status"
+#~ msgstr "资产状态"
+
+#~ msgid "Remote control card IP"
+#~ msgstr "远控卡IP"
+
+#~ msgid "Cabinet number"
+#~ msgstr "机柜编号"
+
+#~ msgid "Cabinet position"
+#~ msgstr "机柜层号"
+
+#~ msgid "Remote card IP"
+#~ msgstr "远控卡IP"
+
+#~ msgid "Location"
+#~ msgstr "位置"
+
+#~ msgid "Env"
+#~ msgstr "环境"
+
 #~ msgid "Default using cluster admin user"
 #~ msgstr "默认使用管理用户"
 
@@ -2913,8 +2908,5 @@ msgstr "秘钥更新"
 #~ msgid "This will reset the user\\"
 #~ msgstr "重置"
 
-#~ msgid "Enable LDAP Auth"
-#~ msgstr "LDAP认证"
-
 #~ msgid "Connect"
 #~ msgstr "连接"