fix: 修复操作应用/应用授权/acl等未记录日志的问题3

apps/audits/signals_handler.py

@@ -26,11 +26,21 @@ json_render = JSONRenderer()
 
 
 MODELS_NEED_RECORD = (
-    'User', 'UserGroup', 'Asset', 'Node', 'AdminUser', 'SystemUser',
+    # users
-    'Domain', 'Gateway', 'Organization', 'AssetPermission', 'CommandFilter',
+    'User', 'UserGroup',
-    'CommandFilterRule', 'License', 'Setting', 'Account', 'SyncInstanceTask',
+    # assets
-    'Platform', 'ChangeAuthPlan', 'GatherUserTask',
+    'Asset', 'Node', 'AdminUser', 'SystemUser', 'Domain', 'Gateway', 'CommandFilterRule',
-    'RemoteApp', 'RemoteAppPermission', 'DatabaseApp', 'DatabaseAppPermission',
+    'CommandFilter', 'Platform',
+    # applications
+    'Application',
+    # orgs
+    'Organization',
+    # settings
+    'Setting',
+    # perms
+    'AssetPermission', 'ApplicationPermission',
+    # xpack
+    'License', 'Account', 'SyncInstanceTask', 'ChangeAuthPlan', 'GatherUserTask',
 )
 
 

apps/orgs/utils.py

@@ -84,16 +84,26 @@ def set_org_mapper(org_mapper):
 
 def get_org_mapper():
     org_mapper = _find('org_mapper')
-    if org_mapper is None:
+    return org_mapper
-        org_mapper = construct_org_mapper()
+
-        set_org_mapper(org_mapper)
+
+def update_org_mapper():
+    org_mapper = construct_org_mapper()
+    set_org_mapper(org_mapper)
     return org_mapper
 
 
 def get_org_by_id(org_id):
     org_id = str(org_id)
     org_mapper = get_org_mapper()
+    if not org_mapper:
+        org_mapper = update_org_mapper()
+
     org = org_mapper.get(org_id)
+    if not org:
+        # 解决celery缓存org_mapper问题
+        org_mapper = update_org_mapper()
+        org = org_mapper.get(org_id)
     return org
 
 

apps/terminal/api/session.py

@@ -42,10 +42,10 @@ class SessionViewSet(OrgBulkModelViewSet):
         'display': serializers.SessionDisplaySerializer,
     }
     permission_classes = (IsOrgAdminOrAppUser, )
-    filterset_fields = [
+    search_fields = [
-        "user", "asset", "system_user", "remote_addr",
+        "user", "asset", "system_user", "remote_addr", "protocol", "is_finished", 'login_from',
-        "protocol", "terminal", "is_finished", 'login_from',
     ]
+    filterset_fields = search_fields + ['terminal']
     date_range_filter_fields = [
         ('date_start', ('date_from', 'date_to'))
     ]

apps/users/serializers/user.py

@@ -69,7 +69,7 @@ class UserSerializer(CommonBulkSerializerMixin, serializers.ModelSerializer):
         ]
 
         read_only_fields = [
-            'date_joined', 'last_login', 'created_by', 'is_first_login', 'source'
+            'date_joined', 'last_login', 'created_by', 'is_first_login',
         ]
 
         extra_kwargs = {

jms

@@ -227,17 +227,17 @@ def get_start_daphne_kwargs():
 
 def get_start_celery_ansible_kwargs():
     print("\n- Start Celery as Distributed Task Queue: Ansible")
-    return get_start_worker_kwargs('ansible', 4)
+    return get_start_worker_kwargs('ansible', 2)
 
 
 def get_start_celery_default_kwargs():
     print("\n- Start Celery as Distributed Task Queue: Celery")
-    return get_start_worker_kwargs('celery', 4)
+    return get_start_worker_kwargs('celery', 2)
 
 
 def get_start_celery_node_tree_kwargs():
     print("\n- Start Celery as Distributed Task Queue: NodeTree")
-    return get_start_worker_kwargs('node_tree', 2)
+    return get_start_worker_kwargs('node_tree', 1)
 
 
 def get_start_celery_heavy_tasks_kwargs():

requirements/requirements.txt

@@ -98,7 +98,7 @@ ipython
 huaweicloud-sdk-python==1.0.21
 django-redis==4.11.0
 python-redis-lock==3.5.0
-jumpserver-django-oidc-rp==0.3.7.5
+jumpserver-django-oidc-rp==0.3.7.6
 django-mysql==3.9.0
 gmssl==3.2.1
 azure-mgmt-compute==4.6.2