Repository navigation
fix(gateway): run turns as the signed-in account, not a claimed sender #259
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
f9328a0
perf(gateway): verify each request's account token once
Telli bac8ec7
fix(gateway): require operator role for the /ws/live model bridge
Telli 4e64d0e
feat(companion): check the account role before opening chat
Telli 00e20e0
fix(gateway): run turns as the signed-in account, not a claimed sender
Telli 6abb971
fix(companion): follow the gateway's agent-execution answer, not the …
Telli 5c98db4
Merge branch 'fix/ws-live-role-and-companion-role-hint' into fix/stam…
Telli File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| namespace OpenClaw.Gateway.A2A; | ||
|
|
||
| /// <summary> | ||
| /// The signed-in account behind the current A2A request. The A2A middleware sets it before the SDK runs the | ||
| /// handler; unlike the HTTP context, an async-local value still flows into work the SDK detaches from the request. | ||
| /// </summary> | ||
| internal static class A2ACallerContext | ||
| { | ||
| private static readonly AsyncLocal<string?> Current = new(); | ||
|
|
||
| public static string? AccountId | ||
| { | ||
| get => Current.Value; | ||
| set => Current.Value = value; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🔒 Security & Privacy | 🟠 Major | ⚡ Quick win
🔎 Supported by static analysis
🏁 Script executed:
Repository: clawdotnet/openclaw.net
Length of output: 4454
Hold the Apps session lock through agent execution.
Two authenticated
/apps/chatrequests can provide the samesessionIdand receive the sameSession. The Apps endpoint assignsAuthenticatedUserIdwithout acquiring the existing session lock, then startsRunStreamingAsync. MCP and capability tools readsession.AuthenticatedUserIdduring the turn. If the second request overwrites the property before the first request invokes a tool, the first turn can use the second account's identity.Acquire the lock before the assignment and retain it through
RunStreamingAsync, as the stable OpenAI session paths already do.Suggested fix
var sessionId = string.IsNullOrWhiteSpace(requestedSessionId) ? $"apps-{Guid.NewGuid():N}" : requestedSessionId!; var session = await runtime.SessionManager.GetOrCreateByIdAsync(sessionId, "apps", sessionId, ct); + await using var sessionLock = await runtime.SessionManager.AcquireSessionLockAsync(session.Id, ct); session.AuthenticatedUserId = EndpointHelpers.ResolveAuthenticatedAccountId(ctx, startup);🤖 Prompt for AI Agents