Merge branch 'v3' of github.com:jumpserver/jumpserver into v3

apps/assets/models/domain.py

@@ -9,12 +9,13 @@ from django.utils.translation import ugettext_lazy as _
 
 from common.utils import get_logger, lazyproperty
 from orgs.mixins.models import OrgModelMixin
-from assets.models import Host
+from assets.models import Host, Platform
 from assets.const import GATEWAY_NAME
+from orgs.mixins.models import OrgManager
 
 logger = get_logger(__file__)
 
-__all__ = ['Domain']
+__all__ = ['Domain', 'Gateway']
 
 
 class Domain(OrgModelMixin):
@@ -33,10 +34,7 @@ class Domain(OrgModelMixin):
 
     @classmethod
     def get_gateway_queryset(cls):
-        queryset = Host.objects.filter(
+        return Gateway.objects.all()
-            platform__name=GATEWAY_NAME
-        )
-        return queryset
 
     @lazyproperty
     def gateways(self):
@@ -55,63 +53,30 @@ class Domain(OrgModelMixin):
             return random.choice(self.gateways)
 
 
+class GatewayManager(OrgManager):
+    def get_queryset(self):
+        queryset = super().get_queryset()
+        queryset = queryset.filter(platform__name=GATEWAY_NAME)
+        return queryset
+
+    def bulk_create(self, objs, batch_size=None, ignore_conflicts=False):
+        platform = Gateway().default_platform
+        for obj in objs:
+            obj.platform_id = platform.id
+        return super().bulk_create(objs, batch_size, ignore_conflicts)
+
+
 class Gateway(Host):
+    objects = GatewayManager()
+
     class Meta:
         proxy = True
 
-    def test_connective(self, local_port=None):
+    @lazyproperty
-        if local_port is None:
+    def default_platform(self):
-            local_port = self.port
+        return Platform.objects.get(name=GATEWAY_NAME, internal=True)
 
-        client = paramiko.SSHClient()
+    def save(self, *args, **kwargs):
-        client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+        platform = self.default_platform
-        proxy = paramiko.SSHClient()
+        self.platform_id = platform.id
-        proxy.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+        return super().save(*args, **kwargs)
-
-        try:
-            proxy.connect(self.ip, port=self.port,
-                          username=self.username,
-                          password=self.password,
-                          pkey=self.private_key_obj)
-        except(paramiko.AuthenticationException,
-               paramiko.BadAuthenticationType,
-               paramiko.SSHException,
-               paramiko.ChannelException,
-               paramiko.ssh_exception.NoValidConnectionsError,
-               socket.gaierror) as e:
-            err = str(e)
-            if err.startswith('[Errno None] Unable to connect to port'):
-                err = _('Unable to connect to port {port} on {ip}')
-                err = err.format(port=self.port, ip=self.ip)
-            elif err == 'Authentication failed.':
-                err = _('Authentication failed')
-            elif err == 'Connect failed':
-                err = _('Connect failed')
-            self.is_connective = False
-            return False, err
-
-        try:
-            sock = proxy.get_transport().open_channel(
-                'direct-tcpip', ('127.0.0.1', local_port), ('127.0.0.1', 0)
-            )
-            client.connect("127.0.0.1", port=local_port,
-                           username=self.username,
-                           password=self.password,
-                           key_filename=self.private_key_file,
-                           sock=sock,
-                           timeout=5)
-        except (paramiko.SSHException,
-                paramiko.ssh_exception.SSHException,
-                paramiko.ChannelException,
-                paramiko.AuthenticationException,
-                TimeoutError) as e:
-
-            err = getattr(e, 'text', str(e))
-            if err == 'Connect failed':
-                err = _('Connect failed')
-            self.is_connective = False
-            return False, err
-        finally:
-            client.close()
-        self.is_connective = True
-        return True, None

apps/assets/serializers/domain.py

@@ -93,15 +93,6 @@ class GatewaySerializer(BulkOrgResourceModelSerializer, WritableNestedModelSeria
         validated_data.pop('passphrase', None)
         return username, password, private_key
 
-    @staticmethod
-    def generate_default_data():
-        platform = Platform.objects.get(name=GATEWAY_NAME, internal=True)
-        # node = Node.objects.all().order_by('date_created').first()
-        data = {
-            'platform': platform,
-        }
-        return data
-
     @staticmethod
     def create_accounts(instance, username, password, private_key):
         account_name = f'{instance.name}-{_("Gateway")}'
@@ -135,7 +126,6 @@ class GatewaySerializer(BulkOrgResourceModelSerializer, WritableNestedModelSeria
 
     def create(self, validated_data):
         auth_fields = self.clean_auth_fields(validated_data)
-        validated_data.update(self.generate_default_data())
         instance = super().create(validated_data)
         self.create_accounts(instance, *auth_fields)
         return instance