Repository navigation
Check custom headers against the tool the tools_list_handler returns - #700
Open
koic wants to merge 1 commit into
Conversation
## Motivation and Context With a `tools_list_handler` (modelcontextprotocol#690), `tools/list` and `tools/call` resolve a tool through the block, but the custom header check of the streamable HTTP transport still looked the tool up among the registered ones, before dispatch. On a 2026-07-28 `tools/call` that gave three results: - A registered tool the block leaves out answered `-32020` naming its header parameter where an unknown tool answers `Tool not found`, so the two could be told apart by a caller the tool was not listed for. - A tool the block returns under the name of a registered one was checked against the registered schema, so a call made the way `tools/list` described it could be refused. - A tool only the block returns was not checked at all. The check now runs in the dispatcher, on the tool the call resolved to: the transport hands `Server#handle` a `tool_call_check`, and `call_tool` calls it once the tool is found and before its arguments are examined. A second lookup from the transport would have invoked the block in another context (no envelope, so no client capabilities) and could disagree with the dispatch. A tool that is not found answers the same whatever the request carries, and a tool the block returns is checked on the schema it was listed with. The block is still invoked once per `tools/call`. The refusal keeps its shape, a JSON 400 with `-32020`. It now comes after the errors the dispatcher raises before it looks the tool up (an invalid envelope, an unknown tool), and like those it reaches instrumentation and the exception reporter. ## How Has This Been Tested? `test/mcp/server/transports/streamable_http_mcp_param_test.rb`; seven of the eight new tests fail on the previous library, and the eighth holds that `Server#handle` without a transport checks no headers. ## Breaking Changes None for a request that was served. A `tools/call` that has both a header mismatch and an invalid envelope is now answered for the envelope.
This branch has not been deployed
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.
Motivation and Context
With a
tools_list_handler(#690),tools/listandtools/callresolve a tool through the block, but the custom header check of the streamable HTTP transport still looked the tool up among the registered ones, before dispatch. On a 2026-07-28tools/callthat gave three results:-32020naming its header parameter where an unknown tool answersTool not found, so the two could be told apart by a caller the tool was not listed for.tools/listdescribed it could be refused.The check now runs in the dispatcher, on the tool the call resolved to: the transport hands
Server#handleatool_call_check, andcall_toolcalls it once the tool is found and before its arguments are examined. A second lookup from the transport would have invoked the block in another context (no envelope, so no client capabilities) and could disagree with the dispatch. A tool that is not found answers the same whatever the request carries, and a tool the block returns is checked on the schema it was listed with. The block is still invoked once pertools/call.The refusal keeps its shape, a JSON 400 with
-32020. It now comes after the errors the dispatcher raises before it looks the tool up (an invalid envelope, an unknown tool), and like those it reaches instrumentation and the exception reporter.How Has This Been Tested?
test/mcp/server/transports/streamable_http_mcp_param_test.rb; seven of the eight new tests fail on the previous library, and the eighth holds thatServer#handlewithout a transport checks no headers.Breaking Changes
None for a request that was served. A
tools/callthat has both a header mismatch and an invalid envelope is now answered for the envelope.Types of changes
Checklist