feat: Update v3.10.8

v3.10.8 master to v3.10

GITSHA

@@ -0,0 +1 @@
+913c0d140d5fa000c732f2941bb306bb04897d71

apps/jumpserver/api.py

@@ -187,14 +187,14 @@ class DatesLoginMetricMixin:
 
     def get_dates_login_times_assets(self):
         assets = self.sessions_queryset.values("asset") \
-            .annotate(total=Count("asset")) \
+            .annotate(total=Count("asset", distinct=True)) \
             .annotate(last=Cast(Max("date_start"), output_field=CharField())) \
             .order_by("-total")
         return list(assets[:10])
 
     def get_dates_login_times_users(self):
         users = self.sessions_queryset.values("user_id") \
-            .annotate(total=Count("user_id")) \
+            .annotate(total=Count("user_id", distinct=True)) \
             .annotate(user=Max('user')) \
             .annotate(last=Cast(Max("date_start"), output_field=CharField())) \
             .order_by("-total")

apps/jumpserver/const.py

@@ -8,7 +8,7 @@ __all__ = ['BASE_DIR', 'PROJECT_DIR', 'VERSION', 'CONFIG']
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 PROJECT_DIR = os.path.dirname(BASE_DIR)
-VERSION = '2.0.0'
+VERSION = 'v3.10.8'
 CONFIG = ConfigManager.load_user_config()
 
 

apps/ops/signal_handlers.py

@@ -134,9 +134,10 @@ def task_sent_handler(headers=None, body=None, **kwargs):
     args, kwargs, __ = body
 
     try:
-        args = list(args)
+        args = json.loads(json.dumps(list(args), cls=JSONEncoder))
         kwargs = json.loads(json.dumps(kwargs, cls=JSONEncoder))
     except Exception as e:
+        logger.error('Parse task args or kwargs error (Need handle): {}'.format(e))
         args = []
         kwargs = {}
 
@@ -151,11 +152,13 @@ def task_sent_handler(headers=None, body=None, **kwargs):
     request = get_current_request()
     if request and request.user.is_authenticated:
         data['creator'] = request.user
-    try:
-        CeleryTaskExecution.objects.create(**data)
-    except Exception as e:
-        logger.error(e)
-    CeleryTask.objects.filter(name=task).update(date_last_publish=timezone.now())
+
+    with transaction.atomic():
+        try:
+            CeleryTaskExecution.objects.create(**data)
+        except Exception as e:
+            logger.error('Create celery task execution error: {}'.format(e))
+        CeleryTask.objects.filter(name=task).update(date_last_publish=timezone.now())
 
 
 @receiver(django_ready)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "jumpserver"
-version = "v3.9"
+version = "v3.10.8"
 description = "广受欢迎的开源堡垒机"
 authors = ["ibuler <ibuler@qq.com>"]
 license = "GPLv3"