fix(opencode): secure manual MCP OAuth callback#33725
Open
rekram1-node wants to merge 2 commits into
Open
Conversation
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
Security rationale
The split API previously accepted an authorization code without binding it to the state returned by
mcp.auth.start, allowing an uncorrelated callback and replay. It also started a local browser callback listener that the manual API never consumed and retained pending OAuth material after failures. This change binds each callback to one atomically consumed state value, rejects invalid/replayed callbacks before token exchange, preserves the expected state after a mismatched request, avoids exposing the unused listener in manual mode, and closes/clears pending credentials at completion.Related issues
Tests
bun test test/server/httpapi-mcp.test.ts test/server/httpapi-mcp-oauth.test.ts test/mcp/oauth-browser.test.ts test/mcp/oauth-auto-connect.test.ts test/mcp/auth.test.ts --timeout 30000(16 passed)bun typecheckfrompackages/opencode./packages/sdk/js/script/build.tsThe HTTP integration tests use production Effect routes and a real local OAuth/MCP HTTP server without mocks or sleeps. They cover missing, wrong, correct, and replayed state, prove wrong state does not exchange a token or invalidate the expected state, and verify manual start leaves the configured callback port unbound.