fix(oauth): subpath-aware metadata discovery with RFC 9728 fallback#1327
Open
Educg550 wants to merge 3 commits into
Open
fix(oauth): subpath-aware metadata discovery with RFC 9728 fallback#1327Educg550 wants to merge 3 commits into
Educg550 wants to merge 3 commits into
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
This PR addresses #1168, that is, the metadata discovery step on OAuth Flow now considers subpaths for mounted MCP servers.
Type of Change
Changes Made
client/src/lib/oauth-state-machine.ts—metadata_discoverytransitionauthServerUrlwas constructed asnew URL("/", context.serverUrl), which stripped the path and broke RFC 8414 path-scoped discovery for sub-path mounted servers (e.g.http://host/api/mcp/github/mcp). It is now constructed asnew URL(context.serverUrl)so the full path is preserved.resourceMetadataUrlof{serverUrl}/.well-known/oauth-protected-resource(trailing slash stripped). Root-mounted servers (pathname === "/") skip this fallback.resourceMetadata?.authorization_serversis now evaluated after both discovery attempts, so the auth server URL is correctly resolved from resource metadata when the fallback succeeds.client/src/lib/__tests__/oauth-state-machine.test.ts— new test fileCovers the
metadata_discoverytransition with five unit tests:discoverAuthorizationServerMetadata(RFC 8414 §3).For reference:
Related Issues
Fixes #1168
Testing
Checklist
npm run prettier-fix)