Merge pull request #43 from jumpserver/dev

Dev

coco/proxy.py

@@ -87,12 +87,14 @@ class ProxyServer:
         pass
 
     def get_proxy_sock(self, asset):
+        sock = None
         domain = self.app.service.get_domain_detail_with_gateway(
             asset.domain
         )
-        sock = None
+        if not domain.has_ssh_gateway():
+            return None
         for i in domain.gateways:
-            gateway = domain.random_gateway()
+            gateway = domain.random_ssh_gateway()
             proxy_command = [
                 "ssh", "-p", str(gateway.port),
                 "{}@{}".format(gateway.username, gateway.ip),

requirements/requirements.txt

@@ -20,7 +20,7 @@ Jinja2==2.10
 jmespath==0.9.3
 jms-es-sdk==0.5.2
 jms-storage==0.0.12
-jumpserver-python-sdk==0.0.34
+jumpserver-python-sdk==0.0.35
 MarkupSafe==1.0
 oss2==2.4.0
 paramiko==2.4.0