fix(client): don't match WWW-Authenticate field names inside longer param names#2503
Open
VihaanAgarwal wants to merge 1 commit into
Open
Conversation
extractFieldFromWwwAuth searched for `<field>=` anywhere in the header, so a parameter whose name ended with the requested field (e.g. `error_scope` when reading `scope`) shadowed the real value, and a parameter like `x_resource_metadata` could supply a decoy resource metadata URL. Anchor the parameter name to the header start or a separator. Add regression tests.
🦋 Changeset detectedLatest commit: 7d3a506 The changes in this PR will be included in the next version bump. This PR includes changesets to release 6 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
@modelcontextprotocol/client
@modelcontextprotocol/codemod
@modelcontextprotocol/core
@modelcontextprotocol/server
@modelcontextprotocol/server-legacy
@modelcontextprotocol/express
@modelcontextprotocol/fastify
@modelcontextprotocol/hono
@modelcontextprotocol/node
commit: |
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.
extractFieldFromWwwAuthbuilds its regex as${fieldName}=(?:...)with nothing anchoring the start of the param name. Asking forscopealso matcheserror_scope="...", so whichever param appears first shadows the real value. The worst case isresource_metadata: a header likeBearer x_resource_metadata="https://decoy.example.com"returns a URL from a param that isn'tresource_metadataat all, and that value is whatextractWWWAuthenticateParamsfeeds into protected-resource-metadata discovery.Repro on current main:
The fix anchors the param name to the header start or a whitespace/comma separator, so it only matches as a complete auth-param name. Two regression tests cover both shadowing shapes (
scopeinsideerror_scope, and a decoyx_resource_metadata); both fail without the one-line change. Changeset included.The same unanchored pattern exists on
v1.x(src/client/auth.ts). Happy to send the equivalent patch there too if useful.