fix(mcp): register OAuth callback before opening browser#9646
Merged
Conversation
Fix race condition where the OAuth callback arrives before the state is registered in pendingAuths map. This happens when the IdP has an active SSO session and redirects immediately back to the callback URL. The fix moves waitForCallback() to BEFORE opening the browser, ensuring the callback handler is ready to receive the authorization code even if the redirect happens instantly. Symptoms before fix: - CSRF error 'No pending authentication for state: ...' - Only occurs with active SSO sessions (fast redirects) - Works fine when user has to manually authenticate (slow redirects) Fixes anomalyco#9645
Contributor
|
The following comment was made by an LLM, it may be inaccurate: No duplicate PRs found |
Collaborator
|
/review |
Contributor
|
lgtm |
3 tasks
xywsxp
pushed a commit
to xywsxp/opencode
that referenced
this pull request
Apr 24, 2026
Rwanbt
pushed a commit
to Rwanbt/opencode
that referenced
this pull request
May 5, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Fix race condition where the OAuth callback arrives before the state is registered in
pendingAuthsmap.Fixes #9645
Problem
When using MCP servers with OAuth authentication (e.g., Keycloak), the OAuth flow fails with a CSRF error if the Identity Provider has an active SSO session:
Root Cause
The current code flow is:
open(authorizationUrl)- Opens browserMcpOAuthCallback.waitForCallback(oauthState)- Registers callback handlerWhen the IdP has an active SSO session, the redirect back to the callback URL happens before step 2 completes. The callback handler receives the authorization code but can't find the state in
pendingAuths, triggering the CSRF protection error.Solution
Move
waitForCallback()to before opening the browser:Testing