Commit 2fbaaa93 authored by ibuler's avatar ibuler

[Update] 修改不支持思科设备的bug

parent 4b742525
...@@ -43,6 +43,7 @@ class SSHConnection: ...@@ -43,6 +43,7 @@ class SSHConnection:
if asset.domain: if asset.domain:
sock = self.get_proxy_sock_v2(asset) sock = self.get_proxy_sock_v2(asset)
try:
try: try:
ssh.connect( ssh.connect(
asset.ip, port=asset.port, username=system_user.username, asset.ip, port=asset.port, username=system_user.username,
...@@ -51,6 +52,14 @@ class SSHConnection: ...@@ -51,6 +52,14 @@ class SSHConnection:
compress=True, auth_timeout=config['SSH_TIMEOUT'], compress=True, auth_timeout=config['SSH_TIMEOUT'],
look_for_keys=False, sock=sock look_for_keys=False, sock=sock
) )
except paramiko.AuthenticationException:
# 思科设备不支持秘钥登陆,提供秘钥,必然失败
ssh.connect(
asset.ip, port=asset.port, username=system_user.username,
password=system_user.password, timeout=config['SSH_TIMEOUT'],
compress=True, auth_timeout=config['SSH_TIMEOUT'],
look_for_keys=False, sock=sock, allow_agent=False,
)
transport = ssh.get_transport() transport = ssh.get_transport()
transport.set_keepalive(300) transport.set_keepalive(300)
except (paramiko.AuthenticationException, except (paramiko.AuthenticationException,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment