From d2ad10af9a8cda61577aea9fca2ad071bfbf6aaa Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 31 Jan 2018 17:04:15 +0800 Subject: [PATCH 01/12] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E7=BB=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/templates/assets/asset_group_detail.html | 6 +++--- apps/assets/templates/assets/cluster_assets.html | 6 +++--- apps/assets/templates/assets/user_asset_list.html | 5 +---- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/apps/assets/templates/assets/asset_group_detail.html b/apps/assets/templates/assets/asset_group_detail.html index dda393e0d..16810a0c8 100644 --- a/apps/assets/templates/assets/asset_group_detail.html +++ b/apps/assets/templates/assets/asset_group_detail.html @@ -50,7 +50,6 @@ {% trans 'Hostname' %} {% trans 'IP' %} {% trans 'Port' %} - {% trans 'Type' %} {% trans 'Alive' %} {% trans 'Action' %} @@ -180,8 +179,9 @@ function initTable() { }} ], ajax_url: '{% url "api-assets:asset-list" %}?asset_group_id={{ asset_group.id }}', - columns: [{data: "hostname" }, {data: "ip" }, {data: "port" }, - {data: "get_type_display" }, {data: "is_connective" }, {data: "id"}], + columns: [ + {data: "hostname" }, {data: "ip" }, {data: "port" }, + {data: "is_connective" }, {data: "id"}], op_html: $('#actions').html() }; jumpserver.initServerSideDataTable(options); diff --git a/apps/assets/templates/assets/cluster_assets.html b/apps/assets/templates/assets/cluster_assets.html index b2e33e578..4eb9dec63 100644 --- a/apps/assets/templates/assets/cluster_assets.html +++ b/apps/assets/templates/assets/cluster_assets.html @@ -51,7 +51,6 @@ {% trans 'Hostname' %} {% trans 'IP' %} {% trans 'Port' %} - {% trans 'Type' %} {% trans 'Alive' %} {% trans 'Action' %} @@ -172,8 +171,9 @@ function initTable() { }} ], ajax_url: '{% url "api-assets:asset-list" %}?cluster_id={{ cluster.id }}', - columns: [{data: "hostname" }, {data: "ip" }, {data: "port" }, - {data: "get_type_display" }, {data: "is_connective" }, {data: "id"}], + columns: [ + {data: "hostname" }, {data: "ip" }, {data: "port" }, + {data: "is_connective" }, {data: "id"}], op_html: $('#actions').html() }; jumpserver.initServerSideDataTable(options); diff --git a/apps/assets/templates/assets/user_asset_list.html b/apps/assets/templates/assets/user_asset_list.html index 4a91d4f65..31581f3c3 100644 --- a/apps/assets/templates/assets/user_asset_list.html +++ b/apps/assets/templates/assets/user_asset_list.html @@ -19,8 +19,6 @@ {% trans 'Hostname' %} {% trans 'IP' %} {% trans 'Port' %} - {% trans 'Type' %} - {% trans 'Env' %} {% trans 'Hardware' %} {% trans 'Active' %} {% trans 'Connective' %} @@ -68,8 +66,7 @@ function initTable() { ajax_url: '{% url "api-assets:user-asset-list" %}', columns: [ {data: "id"}, {data: "hostname" }, {data: "ip" }, {data: "port" }, - {data: "get_type_display" }, {data: "get_env_display"}, {data: "hardware_info"}, - {data: "is_active" }, {data: "is_connective"} + {data: "hardware_info"}, {data: "is_active" }, {data: "is_connective"} ], op_html: $('#actions').html() }; From 97dd411ab86b746cad2f1511eddd982403c2f474 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 31 Jan 2018 17:06:04 +0800 Subject: [PATCH 02/12] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E7=BB=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/templates/assets/asset_group_detail.html | 4 ++-- apps/assets/templates/assets/cluster_assets.html | 4 ++-- apps/assets/templates/assets/user_asset_list.html | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/assets/templates/assets/asset_group_detail.html b/apps/assets/templates/assets/asset_group_detail.html index 16810a0c8..b779ce0f9 100644 --- a/apps/assets/templates/assets/asset_group_detail.html +++ b/apps/assets/templates/assets/asset_group_detail.html @@ -165,14 +165,14 @@ function initTable() { var detail_btn = '' + cellData + ''; $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }}, - {targets: 4, createdCell: function (td, cellData) { + {targets: 3, createdCell: function (td, cellData) { if (!cellData) { $(td).html('') } else { $(td).html('') } }}, - {targets: 5, createdCell: function (td, cellData, rowData) { + {targets: 4, createdCell: function (td, cellData, rowData) { var update_btn = '{% trans "Update" %}'.replace('{{ DEFAULT_PK }}', rowData.id); var del_btn = '{% trans "Remove" %}'.replace('{{ DEFAULT_PK }}', rowData.id); $(td).html(update_btn + del_btn) diff --git a/apps/assets/templates/assets/cluster_assets.html b/apps/assets/templates/assets/cluster_assets.html index 4eb9dec63..0582ac643 100644 --- a/apps/assets/templates/assets/cluster_assets.html +++ b/apps/assets/templates/assets/cluster_assets.html @@ -158,14 +158,14 @@ function initTable() { var detail_btn = '' + cellData + ''; $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }}, - {targets: 4, createdCell: function (td, cellData) { + {targets: 3, createdCell: function (td, cellData) { if (!cellData) { $(td).html('') } else { $(td).html('') } }}, - {targets: 5, createdCell: function (td, cellData, rowData) { + {targets: 4, createdCell: function (td, cellData, rowData) { var update_btn = '{% trans "Update" %}'.replace('{{ DEFAULT_PK }}', rowData.id); $(td).html(update_btn) }} diff --git a/apps/assets/templates/assets/user_asset_list.html b/apps/assets/templates/assets/user_asset_list.html index 31581f3c3..5c9fa2633 100644 --- a/apps/assets/templates/assets/user_asset_list.html +++ b/apps/assets/templates/assets/user_asset_list.html @@ -42,14 +42,14 @@ function initTable() { var detail_btn = '' + cellData + ''; $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }}, - {targets: 7, createdCell: function (td, cellData) { + {targets: 5, createdCell: function (td, cellData) { if (!cellData) { $(td).html('') } else { $(td).html('') } }}, - {targets: 8, createdCell: function (td, cellData) { + {targets: 6, createdCell: function (td, cellData) { if (cellData == 'Unknown'){ $(td).html('') } else if (!cellData) { From 1c7212014b21e8e1cbea3db023967fa86bc0cd9c Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 31 Jan 2018 18:48:07 +0800 Subject: [PATCH 03/12] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E6=94=B9=E5=88=9B?= =?UTF-8?q?=E5=BB=BAlabel=E6=97=B6=E6=8A=A5=E9=94=99=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/label.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/assets/models/label.py b/apps/assets/models/label.py index 990a71ca8..10038d5d4 100644 --- a/apps/assets/models/label.py +++ b/apps/assets/models/label.py @@ -29,6 +29,10 @@ class Label(models.Model): for name in names: yield name, cls.objects.filter(name=name) + @property + def asset_count(self): + return self.assets.count() + def __str__(self): return "{}:{}".format(self.name, self.value) From 5f2ca58d6228fc16a68be00c5ddb696eb9820b37 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 31 Jan 2018 18:59:43 +0800 Subject: [PATCH 04/12] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E6=94=B9label=20api?= =?UTF-8?q?=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/label.py | 4 ---- apps/assets/serializers.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/apps/assets/models/label.py b/apps/assets/models/label.py index 10038d5d4..990a71ca8 100644 --- a/apps/assets/models/label.py +++ b/apps/assets/models/label.py @@ -29,10 +29,6 @@ class Label(models.Model): for name in names: yield name, cls.objects.filter(name=name) - @property - def asset_count(self): - return self.assets.count() - def __str__(self): return "{}:{}".format(self.name, self.value) diff --git a/apps/assets/serializers.py b/apps/assets/serializers.py index 08a27b358..3b871e5ba 100644 --- a/apps/assets/serializers.py +++ b/apps/assets/serializers.py @@ -297,7 +297,7 @@ class LabelSerializer(serializers.ModelSerializer): @staticmethod def get_asset_count(obj): - return obj.asset_count + return obj.assets.count() def get_field_names(self, declared_fields, info): fields = super().get_field_names(declared_fields, info) From 2b4880c78472981e0877de7afdf52dc208923738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= Date: Thu, 1 Feb 2018 10:20:33 +0800 Subject: [PATCH 05/12] Update README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 0177c1abe..0f9df8bb2 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,11 @@ demo使用了开发者模式，并发只能为1 参见 https://github.com/jumpserver/jumpserver/milestone/2 +### SDK + +- python: https://github.com/jumpserver/jumpserver-python-sdk +- java: https://github.com/KaiJunYan/jumpserver-java-sdk.git + ### Docs 开发者文档 From 21a7202587dae810af12ea876e6d67362d149109 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 1 Feb 2018 12:33:05 +0800 Subject: [PATCH 06/12] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8Dldap?= =?UTF-8?q?=E8=AE=A4=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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 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 \n" "Language-Team: Jumpserver team\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 "连接" From 45f6a62989e4a21912ef1e0b6ef55c3f08d497e6 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 1 Feb 2018 12:37:45 +0800 Subject: [PATCH 07/12] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E4=B8=80?= =?UTF-8?q?=E5=A4=84=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/common/api.py | 2 +- apps/i18n/zh/LC_MESSAGES/django.mo | Bin 32040 -> 32093 bytes apps/i18n/zh/LC_MESSAGES/django.po | 9 +++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/apps/common/api.py b/apps/common/api.py index e75f6147a..eb108e94e 100644 --- a/apps/common/api.py +++ b/apps/common/api.py @@ -88,7 +88,7 @@ class LDAPTestingAPI(APIView): user[attr] = getattr(entry, mapping) users.append(user) if len(users) > 0: - return Response({"msg": "Match {} s users".format(len(users))}) + return Response({"msg": _("Match {} s users").format(len(users))}) else: return Response({"error": "Have user but attr mapping error"}, status=401) else: diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo index 427132b968402d3fd08928f243d95923ed9d587b..a081929ebac7444c3763c8875da4f88a3dfddf48 100644 GIT binary patch delta 10759 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\n" "Language-Team: Jumpserver team\n" @@ -1258,6 +1258,10 @@ msgstr "邮件已经发送{}, 请检查" msgid "Test ldap success" msgstr "连接LDAP成功" +#: common/api.py:91 +msgid "Match {} s users" +msgstr "匹配 {} 个用户" + #: common/const.py:6 #, python-format msgid "%(name)s was created successfully" @@ -1357,7 +1361,8 @@ msgstr "LDAP属性映射" msgid "" "User attr map present how to map LDAP user attr to jumpserver, username,name," "email is jumpserver attr" -msgstr "用户属性映射代表怎样将LDAP中用户属性映射到jumpserver用户上，username, name," +msgstr "" +"用户属性映射代表怎样将LDAP中用户属性映射到jumpserver用户上，username, name," "email 是jumpserver的属性" #: common/forms.py:137 From 83ad72e04bb2c9d6f51f6355b400435dc86877a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= Date: Thu, 1 Feb 2018 17:54:26 +0800 Subject: [PATCH 08/12] Update README.md --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0f9df8bb2..4959e544f 100644 --- a/README.md +++ b/README.md @@ -24,9 +24,15 @@ Jumpserver是一款使用Python, Django开发的开源跳板机系统, 助力互 * Python 3.6 * Django 1.11 -### Install 安装 +### 快速启动 -    [详细安装](https://github.com/jumpserver/jumpserver/wiki/v0.5.0-%E5%9F%BA%E4%BA%8E-CentOS7) +``` +$ docker run -p 8080:80 -p 2222:2222 jumpserver:0.5.0-beta2 +``` + +### 详细安装步骤 + +    [文档](https://github.com/jumpserver/jumpserver/wiki/v0.5.0-%E5%9F%BA%E4%BA%8E-CentOS7) ### Usage 使用 From 9ffe1b5ab5faa4a41a8e4446f816791c4d17ecf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= Date: Thu, 1 Feb 2018 17:56:04 +0800 Subject: [PATCH 09/12] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4959e544f..378382ac2 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ Jumpserver是一款使用Python, Django开发的开源跳板机系统, 助力互 ``` $ docker run -p 8080:80 -p 2222:2222 jumpserver:0.5.0-beta2 ``` +更多见 [Dockerfile](https://github.com/jumpserver/Dockerfile.git) ### 详细安装步骤 From 64da4002810422a2fb19f750f061b52b95615bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= Date: Thu, 1 Feb 2018 17:57:50 +0800 Subject: [PATCH 10/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 378382ac2..c46b42520 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Jumpserver是一款使用Python, Django开发的开源跳板机系统, 助力互 ### 快速启动 ``` -$ docker run -p 8080:80 -p 2222:2222 jumpserver:0.5.0-beta2 +$ docker run -p 8080:80 -p 2222:2222 jumpserver/jumpserver:0.5.0-beta2 ``` 更多见 [Dockerfile](https://github.com/jumpserver/Dockerfile.git) From 114289edafccd18803e32078675c09ab4f675a71 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 2 Feb 2018 19:04:09 +0800 Subject: [PATCH 11/12] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E6=94=B9=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/forms.py | 2 +- apps/assets/tasks.py | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/apps/assets/forms.py b/apps/assets/forms.py index d8cd0b352..a7ba67364 100644 --- a/apps/assets/forms.py +++ b/apps/assets/forms.py @@ -308,7 +308,7 @@ class SystemUserForm(PasswordAndKeyAuthForm): auto_generate_key = self.cleaned_data.get('auto_generate_key', False) private_key, public_key = super().gen_keys() - if not self.instance and auto_generate_key: + if auto_generate_key: logger.info('Auto generate key and set system user auth') system_user.auto_gen_auth() else: diff --git a/apps/assets/tasks.py b/apps/assets/tasks.py index ca0a32e4e..4fc5b023b 100644 --- a/apps/assets/tasks.py +++ b/apps/assets/tasks.py @@ -314,8 +314,10 @@ def get_push_system_user_tasks(system_user): if system_user.username == "root": return [] - tasks = [ - { + tasks = [] + + if system_user.password: + tasks.append({ 'name': 'Add user {}'.format(system_user.username), 'action': { 'module': 'user', @@ -324,8 +326,9 @@ def get_push_system_user_tasks(system_user): encrypt_password(system_user.password, salt="K3mIlKK"), ), } - }, - { + }) + if system_user.public_key: + tasks.append({ 'name': 'Set {} authorized key'.format(system_user.username), 'action': { 'module': 'authorized_key', @@ -333,8 +336,9 @@ def get_push_system_user_tasks(system_user): system_user.username, system_user.public_key ) } - }, - { + }) + if system_user.sudo: + tasks.append({ 'name': 'Set {} sudo setting'.format(system_user.username), 'action': { 'module': 'lineinfile', @@ -345,8 +349,7 @@ def get_push_system_user_tasks(system_user): system_user.sudo, ) } - } - ] + }) return tasks From 6edd3f6cf8e56df2c75a68786f46bc4e49f399a8 Mon Sep 17 00:00:00 2001 From: liuzheng712 Date: Mon, 5 Feb 2018 21:54:57 +0800 Subject: [PATCH 12/12] feat: rdp support --- apps/assets/models/user.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/assets/models/user.py b/apps/assets/models/user.py index aa44a539c..e536f7902 100644 --- a/apps/assets/models/user.py +++ b/apps/assets/models/user.py @@ -212,8 +212,10 @@ class AdminUser(AssetUser): class SystemUser(AssetUser): SSH_PROTOCOL = 'ssh' + RDP_PROTOCOL = 'rdp' PROTOCOL_CHOICES = ( (SSH_PROTOCOL, 'ssh'), + (RDP_PROTOCOL, 'rdp'), ) cluster = models.ManyToManyField('assets.Cluster', blank=True, verbose_name=_("Cluster"))