Merge pull request #135 from jumpserver/dev

Dev

Author: ibuler

coco/connection.py

@@ -37,12 +37,16 @@ def get_ssh_client(self, asset, system_user):
         ssh = paramiko.SSHClient()
         ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
         sock = None
+        error = ''
 
         if not system_user.password and not system_user.private_key:
             self.get_system_user_auth(system_user)
 
         if asset.domain:
             sock = self.get_proxy_sock_v2(asset)
+            if not sock:
+                error = 'Connect gateway failed;'
+                logger.error(error)
 
         try:
             try:
@@ -81,9 +85,9 @@ def get_ssh_client(self, asset, system_user):
                 system_user.username, asset.ip, asset.port,
                 password_short, key_fingerprint,
             ))
-            return None, None, str(e)
+            return None, None, error + '\n' + str(e)
         except (socket.error, TimeoutError) as e:
-            return None, None, str(e)
+            return None, None, error + '\n' + str(e)
         return ssh, sock, None
 
     def get_transport(self, asset, system_user):
@@ -126,9 +130,9 @@ def get_proxy_sock_v2(asset):
                             password=gateway.password,
                             pkey=gateway.private_key_obj,
                             timeout=config['SSH_TIMEOUT'])
-            except(paramiko.AuthenticationException,
-                   paramiko.BadAuthenticationType,
-                   SSHException):
+            except (paramiko.AuthenticationException,
+                    paramiko.BadAuthenticationType,
+                    SSHException, socket.error):
                 continue
             sock = ssh.get_transport().open_channel(
                 'direct-tcpip', (asset.ip, asset.port), ('127.0.0.1', 0)

coco/httpd/elfinder/connector.py

@@ -136,6 +136,7 @@ def get_request_commands(self):
             return cmd
         else:
             self.response['error'] = 'No valid command found'
+            return None, None
 
     def run(self, request):
         """ Main entry point for running commands. Attemps to run a command