pref: 修改 applet host

apps/terminal/api/applet/applet.py

@@ -13,9 +13,9 @@ from rest_framework.response import Response
 from rest_framework.serializers import ValidationError
 
 from common.utils import is_uuid
+from common.drf.serializers import FileSerializer
 from terminal import serializers
 from terminal.models import AppletPublication, Applet
-from terminal.serializers import AppletUploadSerializer
 
 
 __all__ = ['AppletViewSet', 'AppletPublicationViewSet']
@@ -59,7 +59,7 @@ class DownloadUploadMixin:
             raise ValidationError({'error': 'Missing name in manifest.yml'})
         return manifest, tmp_dir
 
-    @action(detail=False, methods=['post'], serializer_class=AppletUploadSerializer)
+    @action(detail=False, methods=['post'], serializer_class=FileSerializer)
     def upload(self, request, *args, **kwargs):
         manifest, tmp_dir = self.extract_and_check_file(request)
         name = manifest['name']

apps/terminal/api/applet/host.py

@@ -2,6 +2,8 @@ from rest_framework import viewsets
 from rest_framework.decorators import action
 from rest_framework.response import Response
 
+from common.drf.api import JMSModelViewSet
+from orgs.utils import tmp_to_builtin_org
 from terminal import serializers
 from terminal.models import AppletHost, Applet, AppletHostDeployment
 from terminal.tasks import run_applet_host_deployment
@@ -10,26 +12,34 @@ from terminal.tasks import run_applet_host_deployment
 __all__ = ['AppletHostViewSet', 'AppletHostDeploymentViewSet']
 
 
-class AppletHostViewSet(viewsets.ModelViewSet):
+class AppletHostViewSet(JMSModelViewSet):
     serializer_class = serializers.AppletHostSerializer
     queryset = AppletHost.objects.all()
+    rbac_perms = {
+        'accounts': 'terminal.view_applethost',
+        'reports': '*'
+    }
 
-    @action(methods=['post'], detail=True)
-    def report(self, request, *args, **kwargs):
-        # TODO:
-        # 1. 上报 安装的 Applets 每小时
-        # 2. Host 和 Terminal 关联
+    @action(methods=['post'], detail=True, serializer_class=serializers.AppletHostReportSerializer)
+    def reports(self, request, *args, **kwargs):
+        # 1. Host 和 Terminal 关联
+        # 2. 上报 安装的 Applets 每小时
         instance = self.get_object()
-        instance.sync()
+        serializer = self.get_serializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+
+        data = serializer.validated_data
+        instance.check_terminal_binding(request)
+        instance.check_applets_state(data['applets'])
         return Response({'msg': 'ok'})
 
-    @action(methods=['get'], detail=True)
+    @action(methods=['get'], detail=True, serializer_class=serializers.AppletHostAccountSerializer)
     def accounts(self, request, *args, **kwargs):
-        # TODO:
-        # 1. 返回 host 上的所有用户, host 可以去创建和更新 每小时
-        # 2. 密码长度最少 8 位，包含大小写字母和数字和特殊字符
-        instance = self.get_object()
-        return Response(instance.get_accounts())
+        host = self.get_object()
+        with tmp_to_builtin_org(system=1):
+            accounts = host.accounts.all().filter(privileged=False)
+        response = self.get_paginated_response_from_queryset(accounts)
+        return response
 
 
 class AppletHostDeploymentViewSet(viewsets.ModelViewSet):

apps/terminal/api/component/status.py

@@ -52,7 +52,7 @@ class StatusViewSet(viewsets.ModelViewSet):
         terminal_id = self.kwargs.get("terminal", None)
         if terminal_id:
             terminal = get_object_or_404(Terminal, id=terminal_id)
-            return terminal.status_set.all()
+            return terminal.status.all()
         return super().get_queryset()
 
 

apps/terminal/api/component/terminal.py

@@ -42,37 +42,6 @@ class TerminalViewSet(JMSBulkModelViewSet):
         self.perform_destroy(instance)
         return Response(status=status.HTTP_204_NO_CONTENT)
 
-    def create(self, request, *args, **kwargs):
-        if isinstance(request.data, list):
-            raise exceptions.BulkCreateNotSupport()
-
-        name = request.data.get('name')
-        remote_ip = request.META.get('REMOTE_ADDR')
-        x_real_ip = request.META.get('X-Real-IP')
-        remote_addr = x_real_ip or remote_ip
-
-        terminal = get_object_or_none(Terminal, name=name, is_deleted=False)
-        if terminal:
-            msg = 'Terminal name %s already used' % name
-            return Response({'msg': msg}, status=409)
-
-        serializer = self.serializer_class(data={
-            'name': name, 'remote_addr': remote_addr
-        })
-
-        if serializer.is_valid():
-            terminal = serializer.save()
-
-            # App should use id, token get access key, if accepted
-            token = uuid.uuid4().hex
-            cache.set(token, str(terminal.id), 3600)
-            data = {"id": str(terminal.id), "token": token, "msg": "Need accept"}
-            return Response(data, status=201)
-        else:
-            data = serializer.errors
-            logger.error("Register terminal error: {}".format(data))
-            return Response(data, status=400)
-
     def filter_queryset(self, queryset):
         queryset = super().filter_queryset(queryset)
         s = self.request.query_params.get('status')