Merge pull request #10409 from jumpserver/pr@dev@perf_job_permission

perf: 优化 job permission

apps/ops/api/job.py

@@ -1,23 +1,25 @@
 from django.conf import settings
 from django.db.models import Count
 from django.db.transaction import atomic
-from rest_framework.views import APIView
 from django.shortcuts import get_object_or_404
 from rest_framework.response import Response
+from rest_framework.views import APIView
 
+from common.permissions import IsValidUser
 from ops.const import Types
 from ops.models import Job, JobExecution
 from ops.serializers.job import JobSerializer, JobExecutionSerializer
 
-__all__ = ['JobViewSet', 'JobExecutionViewSet', 'JobRunVariableHelpAPIView',
+__all__ = [
-           'JobAssetDetail', 'JobExecutionTaskDetail', 'FrequentUsernames']
+    'JobViewSet', 'JobExecutionViewSet', 'JobRunVariableHelpAPIView',
+    'JobAssetDetail', 'JobExecutionTaskDetail', 'FrequentUsernames'
+]
 
 from ops.tasks import run_ops_job_execution
 from ops.variables import JMS_JOB_VARIABLE_HELP
 from orgs.mixins.api import OrgBulkModelViewSet
 from orgs.utils import tmp_to_org, get_current_org
 from accounts.models import Account
-from rbac.permissions import RBACPermission
 
 
 def set_task_to_serializer_data(serializer, task):
@@ -28,7 +30,6 @@ def set_task_to_serializer_data(serializer, task):
 
 class JobViewSet(OrgBulkModelViewSet):
     serializer_class = JobSerializer
-    permission_classes = (RBACPermission,)
     search_fields = ('name', 'comment')
     model = Job
 
@@ -70,9 +71,9 @@ class JobViewSet(OrgBulkModelViewSet):
 class JobExecutionViewSet(OrgBulkModelViewSet):
     serializer_class = JobExecutionSerializer
     http_method_names = ('get', 'post', 'head', 'options',)
-    permission_classes = (RBACPermission,)
     model = JobExecution
     search_fields = ('material',)
+    filterset_fields = ['status', 'job_id']
 
     @atomic
     def perform_create(self, serializer):
@@ -88,41 +89,32 @@ class JobExecutionViewSet(OrgBulkModelViewSet):
     def get_queryset(self):
         queryset = super().get_queryset()
         queryset = queryset.filter(creator=self.request.user)
-        job_id = self.request.query_params.get('job_id')
-        if job_id:
-            queryset = queryset.filter(job_id=job_id)
         return queryset
 
 
-class JobRunVariableHelpAPIView(APIView):
-    rbac_perms = ()
-    permission_classes = ()
-
-    def get(self, request, **kwargs):
-        return Response(data=JMS_JOB_VARIABLE_HELP)
-
-
 class JobAssetDetail(APIView):
-    rbac_perms = ()
+    rbac_perms = {
-    permission_classes = ()
+        'get': ['ops.view_jobexecution'],
+    }
 
     def get(self, request, **kwargs):
-        execution_id = request.query_params.get('execution_id')
+        execution_id = request.query_params.get('execution_id', '')
-        if execution_id:
         execution = get_object_or_404(JobExecution, id=execution_id)
         return Response(data=execution.assent_result_detail)
 
 
 class JobExecutionTaskDetail(APIView):
-    rbac_perms = ()
+    rbac_perms = {
-    permission_classes = ()
+        'get': ['ops.view_jobexecution'],
+    }
 
     def get(self, request, **kwargs):
         org = get_current_org()
         task_id = str(kwargs.get('task_id'))
-        if task_id:
+
         with tmp_to_org(org):
             execution = get_object_or_404(JobExecution, task_id=task_id)
+
         return Response(data={
             'status': execution.status,
             'is_finished': execution.is_finished,
@@ -132,12 +124,20 @@ class JobExecutionTaskDetail(APIView):
         })
 
 
-class FrequentUsernames(APIView):
+class JobRunVariableHelpAPIView(APIView):
-    rbac_perms = ()
+    permission_classes = [IsValidUser]
-    permission_classes = ()
 
     def get(self, request, **kwargs):
-        top_accounts = Account.objects.exclude(username='root').exclude(username__startswith='jms_').values(
+        return Response(data=JMS_JOB_VARIABLE_HELP)
-            'username').annotate(
+
-            total=Count('username')).order_by('total')[:5]
+
+class FrequentUsernames(APIView):
+    permission_classes = [IsValidUser]
+
+    def get(self, request, **kwargs):
+        top_accounts = Account.objects.exclude(username='root') \
+                           .exclude(username__startswith='jms_') \
+                           .values('username') \
+                           .annotate(total=Count('username')) \
+                           .order_by('total')[:5]
         return Response(data=top_accounts)