[rudycelekli]

Bug

injectAuthMetadata (internal/server/mcp.go) builds the argument map that gets stored on the activity record. It copies the caller's arguments, then adds the _auth_* identity keys that the auth context has. It adds only the keys that exist for that caller:

• an agent token adds auth_type, agent_name and token_prefix, but not user_id or user_email;
• an admin caller adds only auth_type.

So when the caller sends one of the missing keys itself, it survives. Those keys are what the activity log trusts for identity:

• internal/runtime/activity_service.go copies _auth_user_id / _auth_user_email onto ActivityRecord.UserID / UserEmail. That is the field the server-edition per-user activity view filters on.
• _auth_agent_name is what the agent_name filter matches and what EffectiveTokenName falls back to when the record has no token name, which is always the case for an admin caller.

activityArgsFromRequest already strips caller-sent _auth_* keys for the two management tools, for exactly this reason (see the comment there). The normal call_tool_*, direct-mode, retrieve_tools and describe_tool paths go through injectAuthMetadata and did not.

Trigger

Any connected MCP client, or a model steered by a tool result, calls a tool with extra arguments such as:

{"query": "x", "_auth_user_id": "<another user's id>", "_auth_agent_name": "ci-bot"}

The activity row is then attributed to that user, or to the ci-bot agent token, instead of the real caller.

Fix

Run security.StripInternalArgs on the copy before adding the real identity keys. The caller's own args map, which is what gets forwarded upstream, is not changed. Activity views already strip _auth_* from the displayed arguments, so nothing visible is lost.

Test

TestInjectAuthMetadata_DropsCallerSuppliedAuthKeys: an agent context with forged _auth_user_id, _auth_user_email, _auth_agent_name and _auth_token_prefix arguments. The result must carry the token's real agent name and prefix, and no user id or email. With no auth context, the forged keys must also be gone. The original map must be unchanged.

Commands run

• CGO_ENABLED=0 go test -count=1 -run 'TestInjectAuthMetadata|TestGetAuthMetadata|Activity' ./internal/server/: ok
• On current main, and again with the one-line fix reverted, the new test fails: the forged _auth_user_id and _auth_user_email are present, and the no-auth result still has all four forged keys.
• go vet ./internal/server/: ok

I did not run the full ./internal/server package locally.

[codecov-commenter]

⚠️ Please install the to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!