github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 修改测试网关端口错误时提示信息

pull/6830/head
Michael Bai 2021-09-13 18:47:20 +08:00 committed by Jiangjie.Bai
parent 17a5e919d5
commit 84d6b3de26
2 changed files with 55 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/assets/models/domain.py
View File

@ -120,6 +120,7 @@ class Gateway(BaseUser):
except(paramiko.AuthenticationException, except(paramiko.AuthenticationException,
paramiko.BadAuthenticationType, paramiko.BadAuthenticationType,
paramiko.SSHException, paramiko.SSHException,
paramiko.ChannelException,
paramiko.ssh_exception.NoValidConnectionsError, paramiko.ssh_exception.NoValidConnectionsError,
socket.gaierror) as e: socket.gaierror) as e:
err = str(e) err = str(e)
@ -128,6 +129,8 @@ class Gateway(BaseUser):
err = err.format(port=self.port, ip=self.ip) err = err.format(port=self.port, ip=self.ip)
elif err == 'Authentication failed.': elif err == 'Authentication failed.':
err = _('Authentication failed') err = _('Authentication failed')
elif err == 'Connect failed':
err = _('Connect failed')
self.is_connective = False self.is_connective = False
return False, err return False, err

103
apps/locale/zh/LC_MESSAGES/django.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: JumpServer 0.3.3\n" "Project-Id-Version: JumpServer 0.3.3\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-09-13 17:05+0800\n" "POT-Creation-Date: 2021-09-13 18:46+0800\n"
"PO-Revision-Date: 2021-05-20 10:54+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n"
"Last-Translator: ibuler <ibuler@qq.com>\n" "Last-Translator: ibuler <ibuler@qq.com>\n"
"Language-Team: JumpServer team<ibuler@qq.com>\n" "Language-Team: JumpServer team<ibuler@qq.com>\n"
@ -375,7 +375,7 @@ msgstr "目标URL"
#: applications/serializers/attrs/application_type/custom.py:25 #: applications/serializers/attrs/application_type/custom.py:25
#: applications/serializers/attrs/application_type/mysql_workbench.py:34 #: applications/serializers/attrs/application_type/mysql_workbench.py:34
#: applications/serializers/attrs/application_type/vmware_client.py:30 #: applications/serializers/attrs/application_type/vmware_client.py:30
#: assets/models/base.py:177 audits/signals_handler.py:63 #: assets/models/base.py:177 audits/signals_handler.py:65
#: authentication/forms.py:22 #: authentication/forms.py:22
#: authentication/templates/authentication/login.html:164 #: authentication/templates/authentication/login.html:164
#: settings/serializers/auth/ldap.py:44 users/forms/profile.py:21 #: settings/serializers/auth/ldap.py:44 users/forms/profile.py:21
@ -678,15 +678,19 @@ msgstr "命令复核"
msgid "Gateway" msgid "Gateway"
msgstr "网关" msgstr "网关"
#: assets/models/domain.py:127 #: assets/models/domain.py:128
#, python-brace-format #, python-brace-format
msgid "Unable to connect to port {port} on {ip}" msgid "Unable to connect to port {port} on {ip}"
msgstr "无法连接到 {ip} 上的端口 {port}" msgstr "无法连接到 {ip} 上的端口 {port}"
#: assets/models/domain.py:130 #: assets/models/domain.py:131
msgid "Authentication failed" msgid "Authentication failed"
msgstr "认证失败" msgstr "认证失败"
#: assets/models/domain.py:133
msgid "Connect failed"
msgstr "连接失败"
#: assets/models/gathered_user.py:16 #: assets/models/gathered_user.py:16
msgid "Present" msgid "Present"
msgstr "存在" msgstr "存在"
@ -1222,209 +1226,209 @@ msgstr "运行用户名称"
msgid "User display" msgid "User display"
msgstr "用户名称" msgstr "用户名称"
#: audits/signals_handler.py:62 #: audits/signals_handler.py:64
msgid "SSH Key" msgid "SSH Key"
msgstr "SSH 密钥" msgstr "SSH 密钥"
#: audits/signals_handler.py:64 #: audits/signals_handler.py:66
msgid "SSO" msgid "SSO"
msgstr "" msgstr ""
#: audits/signals_handler.py:65 #: audits/signals_handler.py:67
msgid "Auth Token" msgid "Auth Token"
msgstr "认证令牌" msgstr "认证令牌"
#: audits/signals_handler.py:66 #: audits/signals_handler.py:68
#: authentication/templates/authentication/login.html:210 #: authentication/templates/authentication/login.html:210
#: notifications/backends/__init__.py:11 #: notifications/backends/__init__.py:11
msgid "WeCom" msgid "WeCom"
msgstr "企业微信" msgstr "企业微信"
#: audits/signals_handler.py:67 #: audits/signals_handler.py:69
#: authentication/templates/authentication/login.html:215 #: authentication/templates/authentication/login.html:215
#: notifications/backends/__init__.py:12 #: notifications/backends/__init__.py:12
msgid "DingTalk" msgid "DingTalk"
msgstr "钉钉" msgstr "钉钉"
#: audits/signals_handler.py:100 #: audits/signals_handler.py:102
msgid "User and Organization" msgid "User and Organization"
msgstr "用户与组织" msgstr "用户与组织"
#: audits/signals_handler.py:101 #: audits/signals_handler.py:103
#, python-brace-format #, python-brace-format
msgid "{User} JOINED {Organization}" msgid "{User} JOINED {Organization}"
msgstr "{User} 加入 {Organization}" msgstr "{User} 加入 {Organization}"
#: audits/signals_handler.py:102 #: audits/signals_handler.py:104
#, python-brace-format #, python-brace-format
msgid "{User} LEFT {Organization}" msgid "{User} LEFT {Organization}"
msgstr "{User} 离开 {Organization}" msgstr "{User} 离开 {Organization}"
#: audits/signals_handler.py:105 #: audits/signals_handler.py:107
msgid "User and Group" msgid "User and Group"
msgstr "用户与用户组" msgstr "用户与用户组"
#: audits/signals_handler.py:106 #: audits/signals_handler.py:108
#, python-brace-format #, python-brace-format
msgid "{User} JOINED {UserGroup}" msgid "{User} JOINED {UserGroup}"
msgstr "{User} 加入 {UserGroup}" msgstr "{User} 加入 {UserGroup}"
#: audits/signals_handler.py:107 #: audits/signals_handler.py:109
#, python-brace-format #, python-brace-format
msgid "{User} LEFT {UserGroup}" msgid "{User} LEFT {UserGroup}"
msgstr "{User} 离开 {UserGroup}" msgstr "{User} 离开 {UserGroup}"
#: audits/signals_handler.py:110 #: audits/signals_handler.py:112
msgid "Asset and SystemUser" msgid "Asset and SystemUser"
msgstr "资产与系统用户" msgstr "资产与系统用户"
#: audits/signals_handler.py:111 #: audits/signals_handler.py:113
#, python-brace-format #, python-brace-format
msgid "{Asset} ADD {SystemUser}" msgid "{Asset} ADD {SystemUser}"
msgstr "{Asset} 添加 {SystemUser}" msgstr "{Asset} 添加 {SystemUser}"
#: audits/signals_handler.py:112 #: audits/signals_handler.py:114
#, python-brace-format #, python-brace-format
msgid "{Asset} REMOVE {SystemUser}" msgid "{Asset} REMOVE {SystemUser}"
msgstr "{Asset} 移除 {SystemUser}" msgstr "{Asset} 移除 {SystemUser}"
#: audits/signals_handler.py:115 #: audits/signals_handler.py:117
msgid "Node and Asset" msgid "Node and Asset"
msgstr "节点与资产" msgstr "节点与资产"
#: audits/signals_handler.py:116 #: audits/signals_handler.py:118
#, python-brace-format #, python-brace-format
msgid "{Node} ADD {Asset}" msgid "{Node} ADD {Asset}"
msgstr "{Node} 添加 {Asset}" msgstr "{Node} 添加 {Asset}"
#: audits/signals_handler.py:117 #: audits/signals_handler.py:119
#, python-brace-format #, python-brace-format
msgid "{Node} REMOVE {Asset}" msgid "{Node} REMOVE {Asset}"
msgstr "{Node} 移除 {Asset}" msgstr "{Node} 移除 {Asset}"
#: audits/signals_handler.py:120 #: audits/signals_handler.py:122
msgid "User asset permissions" msgid "User asset permissions"
msgstr "用户资产授权" msgstr "用户资产授权"
#: audits/signals_handler.py:121 #: audits/signals_handler.py:123
#, python-brace-format #, python-brace-format
msgid "{AssetPermission} ADD {User}" msgid "{AssetPermission} ADD {User}"
msgstr "{AssetPermission} 添加 {User}" msgstr "{AssetPermission} 添加 {User}"
#: audits/signals_handler.py:122 #: audits/signals_handler.py:124
#, python-brace-format #, python-brace-format
msgid "{AssetPermission} REMOVE {User}" msgid "{AssetPermission} REMOVE {User}"
msgstr "{AssetPermission} 移除 {User}" msgstr "{AssetPermission} 移除 {User}"
#: audits/signals_handler.py:125 #: audits/signals_handler.py:127
msgid "User group asset permissions" msgid "User group asset permissions"
msgstr "用户组资产授权" msgstr "用户组资产授权"
#: audits/signals_handler.py:126 #: audits/signals_handler.py:128
#, python-brace-format #, python-brace-format
msgid "{AssetPermission} ADD {UserGroup}" msgid "{AssetPermission} ADD {UserGroup}"
msgstr "{AssetPermission} 添加 {UserGroup}" msgstr "{AssetPermission} 添加 {UserGroup}"
#: audits/signals_handler.py:127 #: audits/signals_handler.py:129
#, python-brace-format #, python-brace-format
msgid "{AssetPermission} REMOVE {UserGroup}" msgid "{AssetPermission} REMOVE {UserGroup}"
msgstr "{AssetPermission} 移除 {UserGroup}" msgstr "{AssetPermission} 移除 {UserGroup}"
#: audits/signals_handler.py:130 perms/models/asset_permission.py:106 #: audits/signals_handler.py:132 perms/models/asset_permission.py:106
#: templates/_nav.html:78 users/templates/users/_user_detail_nav_header.html:31 #: templates/_nav.html:78 users/templates/users/_user_detail_nav_header.html:31
msgid "Asset permission" msgid "Asset permission"
msgstr "资产授权" msgstr "资产授权"
#: audits/signals_handler.py:131 #: audits/signals_handler.py:133
#, python-brace-format #, python-brace-format
msgid "{AssetPermission} ADD {Asset}" msgid "{AssetPermission} ADD {Asset}"
msgstr "{AssetPermission} 添加 {Asset}" msgstr "{AssetPermission} 添加 {Asset}"
#: audits/signals_handler.py:132 #: audits/signals_handler.py:134
#, python-brace-format #, python-brace-format
msgid "{AssetPermission} REMOVE {Asset}" msgid "{AssetPermission} REMOVE {Asset}"
msgstr "{AssetPermission} 移除 {Asset}" msgstr "{AssetPermission} 移除 {Asset}"
#: audits/signals_handler.py:135 #: audits/signals_handler.py:137
msgid "Node permission" msgid "Node permission"
msgstr "节点授权" msgstr "节点授权"
#: audits/signals_handler.py:136 #: audits/signals_handler.py:138
#, python-brace-format #, python-brace-format
msgid "{AssetPermission} ADD {Node}" msgid "{AssetPermission} ADD {Node}"
msgstr "{AssetPermission} 添加 {Node}" msgstr "{AssetPermission} 添加 {Node}"
#: audits/signals_handler.py:137 #: audits/signals_handler.py:139
#, python-brace-format #, python-brace-format
msgid "{AssetPermission} REMOVE {Node}" msgid "{AssetPermission} REMOVE {Node}"
msgstr "{AssetPermission} 移除 {Node}" msgstr "{AssetPermission} 移除 {Node}"
#: audits/signals_handler.py:140 #: audits/signals_handler.py:142
msgid "Asset permission and SystemUser" msgid "Asset permission and SystemUser"
msgstr "资产授权与系统用户" msgstr "资产授权与系统用户"
#: audits/signals_handler.py:141 #: audits/signals_handler.py:143
#, python-brace-format #, python-brace-format
msgid "{AssetPermission} ADD {SystemUser}" msgid "{AssetPermission} ADD {SystemUser}"
msgstr "{AssetPermission} 添加 {SystemUser}" msgstr "{AssetPermission} 添加 {SystemUser}"
#: audits/signals_handler.py:142 #: audits/signals_handler.py:144
#, python-brace-format #, python-brace-format
msgid "{AssetPermission} REMOVE {SystemUser}" msgid "{AssetPermission} REMOVE {SystemUser}"
msgstr "{AssetPermission} 移除 {SystemUser}" msgstr "{AssetPermission} 移除 {SystemUser}"
#: audits/signals_handler.py:145 #: audits/signals_handler.py:147
msgid "User application permissions" msgid "User application permissions"
msgstr "用户应用授权" msgstr "用户应用授权"
#: audits/signals_handler.py:146 #: audits/signals_handler.py:148
#, python-brace-format #, python-brace-format
msgid "{ApplicationPermission} ADD {User}" msgid "{ApplicationPermission} ADD {User}"
msgstr "{ApplicationPermission} 添加 {User}" msgstr "{ApplicationPermission} 添加 {User}"
#: audits/signals_handler.py:147 #: audits/signals_handler.py:149
#, python-brace-format #, python-brace-format
msgid "{ApplicationPermission} REMOVE {User}" msgid "{ApplicationPermission} REMOVE {User}"
msgstr "{ApplicationPermission} 移除 {User}" msgstr "{ApplicationPermission} 移除 {User}"
#: audits/signals_handler.py:150 #: audits/signals_handler.py:152
msgid "User group application permissions" msgid "User group application permissions"
msgstr "用户组应用授权" msgstr "用户组应用授权"
#: audits/signals_handler.py:151 #: audits/signals_handler.py:153
#, python-brace-format #, python-brace-format
msgid "{ApplicationPermission} ADD {UserGroup}" msgid "{ApplicationPermission} ADD {UserGroup}"
msgstr "{ApplicationPermission} 添加 {UserGroup}" msgstr "{ApplicationPermission} 添加 {UserGroup}"
#: audits/signals_handler.py:152 #: audits/signals_handler.py:154
#, python-brace-format #, python-brace-format
msgid "{ApplicationPermission} REMOVE {UserGroup}" msgid "{ApplicationPermission} REMOVE {UserGroup}"
msgstr "{ApplicationPermission} 移除 {UserGroup}" msgstr "{ApplicationPermission} 移除 {UserGroup}"
#: audits/signals_handler.py:155 perms/models/application_permission.py:37 #: audits/signals_handler.py:157 perms/models/application_permission.py:37
msgid "Application permission" msgid "Application permission"
msgstr "应用管理" msgstr "应用管理"
#: audits/signals_handler.py:156 #: audits/signals_handler.py:158
#, python-brace-format #, python-brace-format
msgid "{ApplicationPermission} ADD {Application}" msgid "{ApplicationPermission} ADD {Application}"
msgstr "{ApplicationPermission} 添加 {Application}" msgstr "{ApplicationPermission} 添加 {Application}"
#: audits/signals_handler.py:157 #: audits/signals_handler.py:159
#, python-brace-format #, python-brace-format
msgid "{ApplicationPermission} REMOVE {Application}" msgid "{ApplicationPermission} REMOVE {Application}"
msgstr "{ApplicationPermission} 移除 {Application}" msgstr "{ApplicationPermission} 移除 {Application}"
#: audits/signals_handler.py:160 #: audits/signals_handler.py:162
msgid "Application permission and SystemUser" msgid "Application permission and SystemUser"
msgstr "应用授权与系统用户" msgstr "应用授权与系统用户"
#: audits/signals_handler.py:161 #: audits/signals_handler.py:163
#, python-brace-format #, python-brace-format
msgid "{ApplicationPermission} ADD {SystemUser}" msgid "{ApplicationPermission} ADD {SystemUser}"
msgstr "{ApplicationPermission} 添加 {SystemUser}" msgstr "{ApplicationPermission} 添加 {SystemUser}"
#: audits/signals_handler.py:162 #: audits/signals_handler.py:164
#, python-brace-format #, python-brace-format
msgid "{ApplicationPermission} REMOVE {SystemUser}" msgid "{ApplicationPermission} REMOVE {SystemUser}"
msgstr "{ApplicationPermission} 移除 {SystemUser}" msgstr "{ApplicationPermission} 移除 {SystemUser}"
@ -6158,6 +6162,3 @@ msgstr "旗舰版"
#: xpack/plugins/license/models.py:77 #: xpack/plugins/license/models.py:77
msgid "Community edition" msgid "Community edition"
msgstr "社区版" msgstr "社区版"
#~ msgid "Health check token"
#~ msgstr "健康检查 Token"