fix(core-internal): percent-encode multi-variable URI template expansions - #2633
Open
nyxst4ck wants to merge 1 commit into
Open
fix(core-internal): percent-encode multi-variable URI template expansions#2633nyxst4ck wants to merge 1 commit into
nyxst4ck wants to merge 1 commit into
Conversation
…ions
UriTemplate.expandPart() interpolated the values of a multi-variable
expression raw, never calling encodeValue(). A template such as {x,y}
therefore emitted spaces and reserved characters verbatim, producing a
malformed URI, while the single-variable path encoded correctly.
Encode each value with the same operator-aware helper the single-variable
branch uses, so {x,y} percent-encodes reserved characters and {+x,y} /
{#x,y} keep them.
🦋 Changeset detectedLatest commit: cd1322c 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
1 participant
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.
Problem
UriTemplate.expand()encoded single-variable expressions but interpolated multi-variable expressions such as{x,y}without calling the encoder. For example:returned
value with spaces,a/b?c&d, which contains raw spaces and reserved characters where a simple expansion must percent-encode them.Change
Route every value in the multi-variable branch through the same operator-aware
encodeValue()helper used by single-variable expansions. This keeps reserved characters for reserved (+) expansions while encoding them for simple expansions.The change is internal and focused, with no new public API. A patch changeset is included for the affected v2 packages.
Verification
pnpm --filter @modelcontextprotocol/core-internal test -- uriTemplate— 40 passed.pnpm --filter @modelcontextprotocol/core-internal lint— passed, including Prettier check.pnpm --filter @modelcontextprotocol/core-internal typecheck— passed.The new tests cover both
{x,y}and{+path,name}; they fail against the unpatched multi-variable branch and pass with this change.