perf: 在线会话添加活跃状态过滤 (#12134)

Co-authored-by: feng <1304903146@qq.com>

apps/audits/api.py

@@ -29,6 +29,7 @@ from terminal.models import default_storage
 from users.models import User
 from .backends import TYPE_ENGINE_MAPPING
 from .const import ActivityChoices
+from .filters import UserSessionFilterSet
 from .models import (
     FTPLog, UserLoginLog, OperateLog, PasswordChangeLog,
     ActivityLog, JobLog, UserSession
@@ -255,7 +256,7 @@ class PasswordChangeLogViewSet(OrgReadonlyModelViewSet):
 class UserSessionViewSet(CommonApiMixin, viewsets.ModelViewSet):
     http_method_names = ('get', 'post', 'head', 'options', 'trace')
     serializer_class = UserSessionSerializer
-    filterset_fields = ['id', 'ip', 'city', 'type']
+    filterset_class = UserSessionFilterSet
     search_fields = ['id', 'ip', 'city']
     rbac_perms = {
         'offline': ['audits.offline_usersession']

apps/audits/filters.py

@@ -1,11 +1,12 @@
-from django.db.models import F, Value
+from django.core.cache import cache
-from django.db.models.functions import Concat
+from django_filters import rest_framework as drf_filters
-from django_filters.rest_framework import CharFilter
 from rest_framework import filters
 from rest_framework.compat import coreapi, coreschema
 
-from orgs.utils import current_org
 from common.drf.filters import BaseFilterSet
+from notifications.ws import WS_SESSION_KEY
+from orgs.utils import current_org
+from .models import UserSession
 
 __all__ = ['CurrentOrgMembersFilter']
 
@@ -34,21 +35,21 @@ class CurrentOrgMembersFilter(filters.BaseFilterBackend):
             queryset = queryset.filter(user__in=self._get_user_list())
         return queryset
 
-#
+
-# class CommandExecutionFilter(BaseFilterSet):
+class UserSessionFilterSet(BaseFilterSet):
-#     hostname_ip = CharFilter(method='filter_hostname_ip')
+    is_active = drf_filters.BooleanFilter(method='filter_is_active')
-#
+
-#     class Meta:
+    @staticmethod
-#         model = CommandExecution.hosts.through
+    def filter_is_active(queryset, name, is_active):
-#         fields = (
+        redis_client = cache.client.get_client()
-#             'id', 'asset', 'commandexecution', 'hostname_ip'
+        members = redis_client.smembers(WS_SESSION_KEY)
-#         )
+        members = [member.decode('utf-8') for member in members]
-#
+        if is_active:
-#     def filter_hostname_ip(self, queryset, name, value):
+            queryset = queryset.filter(key__in=members)
-#         queryset = queryset.annotate(
+        else:
-#             hostname_ip=Concat(
+            queryset = queryset.exclude(key__in=members)
-#                 F('asset__hostname'), Value('('),
+        return queryset
-#                 F('asset__address'), Value(')')
+
-#             )
+    class Meta:
-#         ).filter(hostname_ip__icontains=value)
+        model = UserSession
-#         return queryset
+        fields = ['id', 'ip', 'city', 'type']