M41: harden trust boundaries and delivery

backend/app/api/routers/mcp_integrations.py

@@ -44,7 +44,7 @@ def get_correlation_id(
 def _audit_service_request(
     db: Session,
     *,
-    client_id: str,
+    reported_client_id: str,
     tool: str,
     status_label: str,
     correlation_id: str,
@@ -53,11 +53,19 @@ def _audit_service_request(
     record_audit_event(
         db,
         actor_type="service",
-        actor_label=client_id,
+        # The shared service token authenticates the Hub, not the caller identity that
+        # the Hub reports in a header. Keep attribution authoritative and retain the
+        # reported value only as explicitly non-authenticated diagnostic metadata.
+        actor_label="itworx-mcp-hub",
         action="mcp_tool_request",
         entity_type="mcp_tool",
         correlation_id=uuid.UUID(correlation_id),
-        metadata={"tool": tool, "status": status_label, **(metadata or {})},
+        metadata={
+            "tool": tool,
+            "status": status_label,
+            "reported_client_id": reported_client_id,
+            **(metadata or {}),
+        },
     )
     db.commit()
 
@@ -79,7 +87,7 @@ def operations_summary(
     _set_trace_headers(response, correlation_id, client.tenant)
     _audit_service_request(
         db,
-        client_id=client.client_id,
+        reported_client_id=client.reported_client_id,
         tool="fleet_ops_get_operations_summary",
         status_label="ok",
         correlation_id=correlation_id,
@@ -103,7 +111,7 @@ def attention_vehicles(
     _set_trace_headers(response, correlation_id, client.tenant)
     _audit_service_request(
         db,
-        client_id=client.client_id,
+        reported_client_id=client.reported_client_id,
         tool="fleet_ops_list_attention_vehicles",
         status_label="ok",
         correlation_id=correlation_id,
@@ -124,7 +132,7 @@ def vehicle_details(
     if vehicle is None:
         _audit_service_request(
             db,
-            client_id=client.client_id,
+            reported_client_id=client.reported_client_id,
             tool="fleet_ops_get_vehicle_details",
             status_label="not_found",
             correlation_id=correlation_id,
@@ -146,7 +154,7 @@ def vehicle_details(
 
     _audit_service_request(
         db,
-        client_id=client.client_id,
+        reported_client_id=client.reported_client_id,
         tool="fleet_ops_get_vehicle_details",
         status_label="ok",
         correlation_id=correlation_id,
@@ -182,7 +190,7 @@ def search_knowledge(
     response.headers["X-Sources-Returned"] = str(len(answer.sources))
     _audit_service_request(
         db,
-        client_id=client.client_id,
+        reported_client_id=client.reported_client_id,
         tool="fleet_ops_search_knowledge",
         status_label=answer.evidence_state,
         correlation_id=correlation_id,