From c0ec0f1343e50dc645227ba69bf879236f0c92a3 Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <32935519+BaiJiangJie@users.noreply.github.com>
Date: Mon, 28 Jun 2021 10:32:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=AD=98=E5=82=A8=EF=BC=88=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E3=80=81=E5=BD=95=E5=83=8F=EF=BC=89=20(#6336)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 修改LDAP用户导入的组织为当前组织

* fix: 修改翻译信息

* feat: 支持设置默认存储

* feat: 支持设置默认存储(2)

* feat: 支持设置默认存储(3)
---
 .../migrations/0009_applicationuser.py        |  25 ++++++
 apps/locale/zh/LC_MESSAGES/django.mo          | Bin 76610 -> 76655 bytes
 apps/locale/zh/LC_MESSAGES/django.po          |  41 ++++-----
 apps/terminal/api/storage.py                  |   4 +-
 apps/terminal/filters.py                      |   2 +-
 .../migrations/0037_auto_20210623_1748.py     |  37 ++++++++
 apps/terminal/models/storage.py               |  44 +++++++---
 apps/terminal/models/terminal.py              |   6 ++
 apps/terminal/serializers/storage.py          |  79 ++++++++----------
 9 files changed, 158 insertions(+), 80 deletions(-)
 create mode 100644 apps/applications/migrations/0009_applicationuser.py
 create mode 100644 apps/terminal/migrations/0037_auto_20210623_1748.py

diff --git a/apps/applications/migrations/0009_applicationuser.py b/apps/applications/migrations/0009_applicationuser.py
new file mode 100644
index 000000000..7b3368ef9
--- /dev/null
+++ b/apps/applications/migrations/0009_applicationuser.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.1.6 on 2021-06-23 09:48
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0070_auto_20210426_1515'),
+        ('applications', '0008_auto_20210104_0435'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ApplicationUser',
+            fields=[
+            ],
+            options={
+                'proxy': True,
+                'indexes': [],
+                'constraints': [],
+            },
+            bases=('assets.systemuser',),
+        ),
+    ]
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 15e579624ab5182fea6e09feec7b40a2c87177ef..3d1ae71fe44dee0bbd06b8cfe0b813889664bfe3 100644
GIT binary patch
delta 21935
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
TU3z!T?7JgYYz%pjz3l%0O}v^Q

delta 21892
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

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 593fea0b1..483f95fa3 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JumpServer 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-22 19:04+0800\n"
+"POT-Creation-Date: 2021-06-25 17:12+0800\n"
 "PO-Revision-Date: 2021-05-20 10:54+0800\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: JumpServer team<ibuler@qq.com>\n"
@@ -23,9 +23,9 @@ msgstr ""
 #: assets/models/cmd_filter.py:21 assets/models/domain.py:21
 #: assets/models/group.py:20 assets/models/label.py:18 ops/mixin.py:24
 #: orgs/models.py:23 perms/models/base.py:49 settings/models.py:29
-#: terminal/models/storage.py:23 terminal/models/storage.py:90
-#: terminal/models/task.py:16 terminal/models/terminal.py:100
-#: users/forms/profile.py:32 users/models/group.py:15 users/models/user.py:550
+#: terminal/models/storage.py:23 terminal/models/task.py:16
+#: terminal/models/terminal.py:100 users/forms/profile.py:32
+#: users/models/group.py:15 users/models/user.py:550
 #: users/templates/users/_select_user_modal.html:13
 #: users/templates/users/user_asset_permission.html:37
 #: users/templates/users/user_asset_permission.html:154
@@ -59,11 +59,11 @@ msgstr "激活中"
 #: assets/models/domain.py:22 assets/models/domain.py:56
 #: assets/models/group.py:23 assets/models/label.py:23 ops/models/adhoc.py:37
 #: orgs/models.py:26 perms/models/base.py:57 settings/models.py:34
-#: terminal/models/storage.py:29 terminal/models/storage.py:96
-#: terminal/models/terminal.py:114 tickets/models/ticket.py:73
-#: users/models/group.py:16 users/models/user.py:583
-#: xpack/plugins/change_auth_plan/models.py:77 xpack/plugins/cloud/models.py:35
-#: xpack/plugins/cloud/models.py:98 xpack/plugins/gathered_user/models.py:26
+#: terminal/models/storage.py:26 terminal/models/terminal.py:114
+#: tickets/models/ticket.py:73 users/models/group.py:16
+#: users/models/user.py:583 xpack/plugins/change_auth_plan/models.py:77
+#: xpack/plugins/cloud/models.py:35 xpack/plugins/cloud/models.py:98
+#: xpack/plugins/gathered_user/models.py:26
 msgid "Comment"
 msgstr "备注"
 
@@ -257,7 +257,7 @@ msgstr "类别"
 #: perms/models/application_permission.py:23
 #: perms/serializers/application/permission.py:17
 #: perms/serializers/application/user_permission.py:34
-#: terminal/models/storage.py:26 terminal/models/storage.py:93
+#: terminal/models/storage.py:47 terminal/models/storage.py:108
 #: tickets/models/ticket.py:38
 #: tickets/serializers/ticket/meta/ticket_type/apply_application.py:27
 msgid "Type"
@@ -1202,7 +1202,7 @@ msgstr "主机 （显示名称）"
 msgid "Result"
 msgstr "结果"
 
-#: audits/serializers.py:92 terminal/serializers/storage.py:189
+#: audits/serializers.py:92 terminal/serializers/storage.py:195
 msgid "Hosts"
 msgstr "主机"
 
@@ -3252,6 +3252,10 @@ msgstr "线程数"
 msgid "Boot Time"
 msgstr "运行时间"
 
+#: terminal/models/storage.py:25
+msgid "Default storage"
+msgstr "默认存储"
+
 #: terminal/models/task.py:17
 msgid "Args"
 msgstr "参数"
@@ -3426,27 +3430,27 @@ msgstr "账户密钥"
 msgid "Endpoint suffix"
 msgstr "端点后缀"
 
-#: terminal/serializers/storage.py:166
+#: terminal/serializers/storage.py:172
 msgid "The address format is incorrect"
 msgstr "地址格式不正确"
 
-#: terminal/serializers/storage.py:173
+#: terminal/serializers/storage.py:179
 msgid "Host invalid"
 msgstr "主机无效"
 
-#: terminal/serializers/storage.py:176
+#: terminal/serializers/storage.py:182
 msgid "Port invalid"
 msgstr "端口无效"
 
-#: terminal/serializers/storage.py:192
+#: terminal/serializers/storage.py:198
 msgid "Index"
 msgstr "索引"
 
-#: terminal/serializers/storage.py:194
+#: terminal/serializers/storage.py:200
 msgid "Doc type"
 msgstr "文档类型"
 
-#: terminal/serializers/storage.py:196
+#: terminal/serializers/storage.py:202
 msgid "Ignore Certificate Verification"
 msgstr "忽略证书认证"
 
@@ -5114,6 +5118,3 @@ msgstr "旗舰版"
 #: xpack/plugins/license/models.py:77
 msgid "Community edition"
 msgstr "社区版"
-
-#~ msgid "Terminal command alert"
-#~ msgstr "终端命令告警"
diff --git a/apps/terminal/api/storage.py b/apps/terminal/api/storage.py
index 4aa3fecbb..db4470f75 100644
--- a/apps/terminal/api/storage.py
+++ b/apps/terminal/api/storage.py
@@ -36,7 +36,7 @@ class BaseStorageViewSetMixin:
 
 
 class CommandStorageViewSet(BaseStorageViewSetMixin, viewsets.ModelViewSet):
-    search_fields = ('name', 'type',)
+    search_fields = ('name', 'type')
     queryset = CommandStorage.objects.all()
     serializer_class = CommandStorageSerializer
     permission_classes = (IsSuperUser,)
@@ -103,7 +103,7 @@ class CommandStorageViewSet(BaseStorageViewSetMixin, viewsets.ModelViewSet):
 
 
 class ReplayStorageViewSet(BaseStorageViewSetMixin, viewsets.ModelViewSet):
-    filterset_fields = ('name', 'type',)
+    filterset_fields = ('name', 'type', 'is_default')
     search_fields = filterset_fields
     queryset = ReplayStorage.objects.all()
     serializer_class = ReplayStorageSerializer
diff --git a/apps/terminal/filters.py b/apps/terminal/filters.py
index a102c149c..81f548162 100644
--- a/apps/terminal/filters.py
+++ b/apps/terminal/filters.py
@@ -71,7 +71,7 @@ class CommandStorageFilter(filters.FilterSet):
 
     class Meta:
         model = CommandStorage
-        fields = ['real', 'name', 'type']
+        fields = ['real', 'name', 'type', 'is_default']
 
     def filter_real(self, queryset, name, value):
         if value:
diff --git a/apps/terminal/migrations/0037_auto_20210623_1748.py b/apps/terminal/migrations/0037_auto_20210623_1748.py
new file mode 100644
index 000000000..fde10b3b7
--- /dev/null
+++ b/apps/terminal/migrations/0037_auto_20210623_1748.py
@@ -0,0 +1,37 @@
+# Generated by Django 3.1.6 on 2021-06-23 09:48
+
+from django.db import migrations, models
+
+
+def set_default_storage(apps, schema_editor):
+    command_storage_model = apps.get_model("terminal", "CommandStorage")
+    command_storage = command_storage_model.objects.filter(name='default', type='server').first()
+    if command_storage:
+        command_storage.is_default = True
+        command_storage.save()
+    replay_storage_model = apps.get_model("terminal", "ReplayStorage")
+    replay_storage = replay_storage_model.objects.filter(name='default', type='server').first()
+    if replay_storage:
+        replay_storage.is_default = True
+        replay_storage.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('terminal', '0036_auto_20210604_1124'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='commandstorage',
+            name='is_default',
+            field=models.BooleanField(default=False, verbose_name='Default storage'),
+        ),
+        migrations.AddField(
+            model_name='replaystorage',
+            name='is_default',
+            field=models.BooleanField(default=False, verbose_name='Default storage'),
+        ),
+        migrations.RunPython(set_default_storage)
+    ]
diff --git a/apps/terminal/models/storage.py b/apps/terminal/models/storage.py
index 883e5f67a..7d4efcfbc 100644
--- a/apps/terminal/models/storage.py
+++ b/apps/terminal/models/storage.py
@@ -19,17 +19,41 @@ from .. import const
 logger = get_logger(__file__)
 
 
-class CommandStorage(CommonModelMixin):
+class CommonStorageModelMixin(models.Model):
     name = models.CharField(max_length=128, verbose_name=_("Name"), unique=True)
+    meta = EncryptJsonDictTextField(default={})
+    is_default = models.BooleanField(default=False, verbose_name=_('Default storage'))
+    comment = models.TextField(default='', blank=True, verbose_name=_('Comment'))
+
+    class Meta:
+        abstract = True
+
+    def __str__(self):
+        return self.name
+
+    def set_to_default(self):
+        self.is_default = True
+        self.save()
+        self.__class__.objects.select_for_update()\
+            .filter(is_default=True)\
+            .exclude(id=self.id)\
+            .update(is_default=False)
+
+    @classmethod
+    def default(cls):
+        objs = cls.objects.filter(is_default=True)
+        if not objs:
+            objs = cls.objects.filter(name='default', type='server')
+        if not objs:
+            objs = cls.objects.all()
+        return objs.first()
+
+
+class CommandStorage(CommonStorageModelMixin, CommonModelMixin):
     type = models.CharField(
         max_length=16, choices=const.CommandStorageTypeChoices.choices,
         default=const.CommandStorageTypeChoices.server.value, verbose_name=_('Type'),
     )
-    meta = EncryptJsonDictTextField(default={})
-    comment = models.TextField(default='', blank=True, verbose_name=_('Comment'))
-
-    def __str__(self):
-        return self.name
 
     @property
     def type_null(self):
@@ -86,17 +110,11 @@ class CommandStorage(CommonModelMixin):
             backend.pre_use_check()
 
 
-class ReplayStorage(CommonModelMixin):
-    name = models.CharField(max_length=128, verbose_name=_("Name"), unique=True)
+class ReplayStorage(CommonStorageModelMixin, CommonModelMixin):
     type = models.CharField(
         max_length=16, choices=const.ReplayStorageTypeChoices.choices,
         default=const.ReplayStorageTypeChoices.server.value, verbose_name=_('Type')
     )
-    meta = EncryptJsonDictTextField(default={})
-    comment = models.TextField(default='', blank=True, verbose_name=_('Comment'))
-
-    def __str__(self):
-        return self.name
 
     @property
     def type_null(self):
diff --git a/apps/terminal/models/terminal.py b/apps/terminal/models/terminal.py
index 77c9b1ce8..0c0c36771 100644
--- a/apps/terminal/models/terminal.py
+++ b/apps/terminal/models/terminal.py
@@ -176,6 +176,12 @@ class Terminal(StorageMixin, TerminalStatusMixin, models.Model):
         self.save()
         return
 
+    def save(self, **kwargs):
+        from .storage import CommandStorage, ReplayStorage
+        self.command_storage = CommandStorage.default().name
+        self.replay_storage = ReplayStorage.default().name
+        return super().save(**kwargs)
+
     def __str__(self):
         status = "Active"
         if not self.is_accepted:
diff --git a/apps/terminal/serializers/storage.py b/apps/terminal/serializers/storage.py
index cdd6e75a3..d0f803928 100644
--- a/apps/terminal/serializers/storage.py
+++ b/apps/terminal/serializers/storage.py
@@ -119,44 +119,6 @@ replay_storage_type_serializer_classes_mapping = {
     const.ReplayStorageTypeChoices.obs.value: ReplayStorageTypeOBSSerializer
 }
 
-# ReplayStorageSerializer
-
-
-class ReplayStorageSerializer(serializers.ModelSerializer):
-    meta = MethodSerializer()
-
-    class Meta:
-        model = ReplayStorage
-        fields = ['id', 'name', 'type', 'meta', 'comment']
-
-    def validate_meta(self, meta):
-        _meta = self.instance.meta if self.instance else {}
-        _meta.update(meta)
-        return _meta
-
-    def get_meta_serializer(self):
-        default_serializer = serializers.Serializer(read_only=True)
-
-        if isinstance(self.instance, ReplayStorage):
-            _type = self.instance.type
-        else:
-            _type = self.context['request'].query_params.get('type')
-
-        if _type:
-            serializer_class = replay_storage_type_serializer_classes_mapping.get(_type)
-        else:
-            serializer_class = default_serializer
-
-        if not serializer_class:
-            serializer_class = default_serializer
-
-        if isinstance(serializer_class, type):
-            serializer = serializer_class()
-        else:
-            serializer = serializer_class
-        return serializer
-
-
 # Command storage serializers
 # ---------------------------
 
@@ -204,15 +166,17 @@ command_storage_type_serializer_classes_mapping = {
     const.CommandStorageTypeChoices.es.value: CommandStorageTypeESSerializer
 }
 
-# CommandStorageSerializer
+
+# BaseStorageSerializer
 
 
-class CommandStorageSerializer(serializers.ModelSerializer):
+class BaseStorageSerializer(serializers.ModelSerializer):
+    storage_type_serializer_classes_mapping = {}
     meta = MethodSerializer()
 
     class Meta:
-        model = CommandStorage
-        fields = ['id', 'name', 'type', 'meta', 'comment']
+        model = None
+        fields = ['id', 'name', 'type', 'meta', 'is_default', 'comment']
 
     def validate_meta(self, meta):
         _meta = self.instance.meta if self.instance else {}
@@ -222,13 +186,13 @@ class CommandStorageSerializer(serializers.ModelSerializer):
     def get_meta_serializer(self):
         default_serializer = serializers.Serializer(read_only=True)
 
-        if isinstance(self.instance, CommandStorage):
+        if isinstance(self.instance, self.__class__.Meta.model):
             _type = self.instance.type
         else:
             _type = self.context['request'].query_params.get('type')
 
         if _type:
-            serializer_class = command_storage_type_serializer_classes_mapping.get(_type)
+            serializer_class = self.storage_type_serializer_classes_mapping.get(_type)
         else:
             serializer_class = default_serializer
 
@@ -240,3 +204,30 @@ class CommandStorageSerializer(serializers.ModelSerializer):
         else:
             serializer = serializer_class
         return serializer
+
+    def save(self, **kwargs):
+        instance = super().save(**kwargs)
+        if self.validated_data.get('is_default', False):
+            instance.set_to_default()
+        return instance
+
+
+# CommandStorageSerializer
+
+
+class CommandStorageSerializer(BaseStorageSerializer):
+    storage_type_serializer_classes_mapping = command_storage_type_serializer_classes_mapping
+
+    class Meta(BaseStorageSerializer.Meta):
+        model = CommandStorage
+
+
+# ReplayStorageSerializer
+
+
+class ReplayStorageSerializer(BaseStorageSerializer):
+    storage_type_serializer_classes_mapping = replay_storage_type_serializer_classes_mapping
+
+    class Meta(BaseStorageSerializer.Meta):
+        model = ReplayStorage
+