fix(desktop): harden remote MCP OAuth after landing - #582
Merged
Merged
Conversation
Force HTTPS on authorization-server endpoints (loopback excepted), reuse DCR clients only when RFC 8252 portless or exact redirect matches, and consume loopback callbacks only after a matching state. Pass the listed server record through to onAuthorized so a project-level MCP can handshake after login, and unsubscribe the settings OAuth listener on unmount. Refs #556.
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.
Follow-up to #556. Lands the review hardening without changing the OAuth feature shape.
Fixes
authorization_endpoint,token_endpoint,registration_endpoint,authorization_servers,resource_metadata) must be HTTPS. Loopback HTTP remains allowed; the MCP resource URL may still behttp://(ADR 0142).http://127.0.0.1/callbackplus the current exact URI; reuse a stored client only when that portless URI is on file or the exact redirect matches. Rebind the previous loopback port when possible.statebeforeerror/code. Mismatchedstatedoes not abort the login. A matching callback is consumed once (replay → 409).mcp/oauth/startpasses the listedMcpServerRecordthrough toonAuthorized.invalid_grantdeletes the stored secret; 5xx keeps the existing access token. Token-endpoint error bodies stay in main-process logs.Tests
apps/desktop/test/mcp-oauth.test.mjs— 18/18 passing (TLS, CSRF/replay, DCR reuse vs re-register, refresh 400/5xx,onAuthorizedrecord).Refs #556.