feat: 添加命令复核逻辑; 添加命令复核工单; 5

apps/assets/models/cmd_filter.py

@@ -117,6 +117,7 @@ class CommandFilterRule(OrgModelMixin):
                 'apply_run_command': run_command,
                 'apply_from_session_id': str(session.id),
                 'apply_from_cmd_filter_rule_id': str(cmd_filter_rule.id),
+                'apply_from_cmd_filter_id': str(cmd_filter_rule.filter.id)
             },
             'org_id': org_id,
         }

apps/tickets/handler/command_confirm.py

@@ -12,6 +12,7 @@ class Handler(BaseHandler):
         apply_run_command = self.ticket.meta.get('apply_run_command')
         apply_from_session_id = self.ticket.meta.get('apply_from_session_id')
         apply_from_cmd_filter_rule_id = self.ticket.meta.get('apply_from_cmd_filter_rule_id')
+        apply_from_cmd_filter_id = self.ticket.meta.get('apply_from_cmd_filter_id')
 
         applied_body = '''{}: {},
             {}: {},
@@ -26,5 +27,6 @@ class Handler(BaseHandler):
             _("Applied run command"), apply_run_command,
             _("Applied from session"), apply_from_session_id,
             _("Applied from command filter rules"), apply_from_cmd_filter_rule_id,
+            _("Applied from command filter"), apply_from_cmd_filter_id,
         )
         return applied_body

apps/tickets/serializers/ticket/meta/ticket_type/command_confirm.py

@@ -19,6 +19,7 @@ class ApplySerializer(serializers.Serializer):
     apply_from_cmd_filter_rule_id = serializers.UUIDField(
         required=False, label=_('From cmd filter rule')
     )
+    apply_from_cmd_filter_id = serializers.UUIDField(required=False, label=_('From cmd filter'))
 
 
 class CommandConfirmSerializer(ApplySerializer):