pref: 修改 applet host

apps/terminal/models/applet/host.py

@@ -1,7 +1,14 @@
+import os
+from collections import defaultdict
+
 from django.db import models
 from django.utils.translation import gettext_lazy as _
+from django.utils import timezone
+from rest_framework.exceptions import ValidationError
+from simple_history.utils import bulk_create_with_history
 
 from common.db.models import JMSBaseModel
+from common.utils import random_string
 from assets.models import Host
 
 
@@ -9,14 +16,10 @@ __all__ = ['AppletHost', 'AppletHostDeployment']
 
 
 class AppletHost(Host):
-    LOCKING_ORG = '00000000-0000-0000-0000-000000000004'
-
-    account_automation = models.BooleanField(default=False, verbose_name=_('Account automation'))
     deploy_options = models.JSONField(default=dict, verbose_name=_('Deploy options'))
     inited = models.BooleanField(default=False, verbose_name=_('Inited'))
     date_inited = models.DateTimeField(null=True, blank=True, verbose_name=_('Date inited'))
     date_synced = models.DateTimeField(null=True, blank=True, verbose_name=_('Date synced'))
-    status = models.CharField(max_length=16, verbose_name=_('Status'))
     terminal = models.OneToOneField(
         'terminal.Terminal', on_delete=models.PROTECT, null=True, blank=True,
         related_name='applet_host', verbose_name=_('Terminal')
@@ -25,10 +28,78 @@ class AppletHost(Host):
         'Applet', verbose_name=_('Applet'),
         through='AppletPublication',  through_fields=('host', 'applet'),
     )
+    LOCKING_ORG = '00000000-0000-0000-0000-000000000004'
 
     def __str__(self):
         return self.name
 
+    @property
+    def status(self):
+        if self.terminal:
+            return 'online'
+        return self.terminal.status
+
+    def check_terminal_binding(self, request):
+        request_terminal = getattr(request.user, 'terminal', None)
+        if not request_terminal:
+            raise ValidationError('Request user has no terminal')
+
+        self.date_synced = timezone.now()
+        if not self.terminal:
+            self.terminal = request_terminal
+            self.save(update_fields=['terminal', 'date_synced'])
+        elif self.terminal and self.terminal != request_terminal:
+            raise ValidationError('Terminal has been set')
+        else:
+            self.save(update_fields=['date_synced'])
+
+    def check_applets_state(self, applets_value_list):
+        applets = self.applets.all()
+        name_version_mapper = {
+            value['name']: value['version']
+            for value in applets_value_list
+        }
+
+        status_applets = defaultdict(list)
+        for applet in applets:
+            if applet.name not in name_version_mapper:
+                status_applets['unpublished'].append(applet)
+            elif applet.version != name_version_mapper[applet.name]:
+                status_applets['not_match'].append(applet)
+            else:
+                status_applets['published'].append(applet)
+
+        for status, applets in status_applets.items():
+            self.publications.filter(applet__in=applets)\
+                .exclude(status=status)\
+                .update(status=status)
+
+    @staticmethod
+    def random_username():
+        return 'jms_' + random_string(8)
+
+    @staticmethod
+    def random_password():
+        return random_string(16, special_char=True)
+
+    def generate_accounts(self):
+        amount = int(os.getenv('TERMINAL_ACCOUNTS_AMOUNT', 100))
+        now_count = self.accounts.filter(privileged=False).count()
+        need = amount - now_count
+
+        accounts = []
+        account_model = self.accounts.model
+        for i in range(need):
+            username = self.random_username()
+            password = self.random_password()
+            account = account_model(
+                username=username, secret=password, name=username,
+                asset_id=self.id, secret_type='password', version=1,
+                org_id=self.LOCKING_ORG
+            )
+            accounts.append(account)
+        bulk_create_with_history(accounts, account_model, batch_size=20)
+
 
 class AppletHostDeployment(JMSBaseModel):
     host = models.ForeignKey('AppletHost', on_delete=models.CASCADE, verbose_name=_('Hosting'))

apps/terminal/models/component/status.py

@@ -22,7 +22,7 @@ class Status(models.Model):
     connections = models.IntegerField(verbose_name=_("Connections"), default=0)
     threads = models.IntegerField(verbose_name=_("Threads"), default=0)
     boot_time = models.FloatField(verbose_name=_("Boot Time"), default=0)
-    terminal = models.ForeignKey('terminal.Terminal', null=True, on_delete=models.CASCADE)
+    terminal = models.ForeignKey('terminal.Terminal', null=True, on_delete=models.CASCADE, related_name='status')
     date_created = models.DateTimeField(auto_now_add=True)
 
     CACHE_KEY = 'TERMINAL_STATUS_{}'

apps/terminal/models/component/terminal.py

@@ -9,7 +9,7 @@ from common.utils import get_logger
 from users.models import User
 from orgs.utils import tmp_to_root_org
 from .status import Status
-from terminal import const
+from terminal.const import TerminalTypeChoices as TypeChoices
 from terminal.const import ComponentStatusChoices as StatusChoice
 from ..session import Session
 
@@ -99,16 +99,13 @@ class Terminal(StorageMixin, TerminalStatusMixin, models.Model):
     id = models.UUIDField(default=uuid.uuid4, primary_key=True)
     name = models.CharField(max_length=128, verbose_name=_('Name'))
     type = models.CharField(
-        choices=const.TerminalTypeChoices.choices, default=const.TerminalTypeChoices.koko.value,
+        choices=TypeChoices.choices, default=TypeChoices.koko,
         max_length=64, verbose_name=_('type')
     )
     remote_addr = models.CharField(max_length=128, blank=True, verbose_name=_('Remote Address'))
-    ssh_port = models.IntegerField(verbose_name=_('SSH Port'), default=2222)
-    http_port = models.IntegerField(verbose_name=_('HTTP Port'), default=5000)
     command_storage = models.CharField(max_length=128, verbose_name=_("Command storage"), default='default')
     replay_storage = models.CharField(max_length=128, verbose_name=_("Replay storage"), default='default')
     user = models.OneToOneField(User, related_name='terminal', verbose_name='Application User', null=True, on_delete=models.CASCADE)
-    is_accepted = models.BooleanField(default=False, verbose_name='Is Accepted')
     is_deleted = models.BooleanField(default=False)
     date_created = models.DateTimeField(auto_now_add=True)
     comment = models.TextField(blank=True, verbose_name=_('Comment'))
@@ -167,9 +164,7 @@ class Terminal(StorageMixin, TerminalStatusMixin, models.Model):
 
     def __str__(self):
         status = "Active"
-        if not self.is_accepted:
-            status = "NotAccept"
-        elif self.is_deleted:
+        if self.is_deleted:
             status = "Deleted"
         elif not self.is_active:
             status = "Disable"
@@ -178,7 +173,6 @@ class Terminal(StorageMixin, TerminalStatusMixin, models.Model):
         return '%s: %s' % (self.name, status)
 
     class Meta:
-        ordering = ('is_accepted',)
         db_table = "terminal"
         verbose_name = _("Terminal")
         permissions = (