fix(server): sanitize internal error details in tool error responses#1830
Open
claygeo wants to merge 1 commit intomodelcontextprotocol:mainfrom
Open
fix(server): sanitize internal error details in tool error responses#1830claygeo wants to merge 1 commit intomodelcontextprotocol:mainfrom
claygeo wants to merge 1 commit intomodelcontextprotocol:mainfrom
Conversation
When a tool handler throws an unexpected error, the full error message was sent to the MCP client, potentially leaking sensitive server internals (hostnames, connection strings, stack traces). Adds a ToolError class that tool authors can throw when they want a specific message shown to the client. All other unhandled errors are now sanitized to "Internal error". ProtocolErrors from SDK validation are still passed through since they contain safe, structured messages. Closes modelcontextprotocol#1429
|
@modelcontextprotocol/client
@modelcontextprotocol/server
@modelcontextprotocol/express
@modelcontextprotocol/fastify
@modelcontextprotocol/hono
@modelcontextprotocol/node
commit: |
|
@claude review |
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
Closes #1429
When a tool handler throws an unexpected error, the full error message is sent to the MCP client, potentially leaking sensitive server internals (hostnames, connection strings, stack traces).
This PR:
ToolErrorclass that tool authors can throw when they want a specific message shown to the client"Internal error"ProtocolErrormessages (SDK-generated validation errors are safe to expose)Usage
Error handling behavior
ToolErrorProtocolErrorError"Internal error""Internal error"Test plan
Erroris sanitized to"Internal error"ToolErrormessage passes through to client"Internal error"ProtocolErrorvalidation tests still pass (129/129)