fix: sanitize internal error details in tool error responses#1651
Open
Bortlesboat wants to merge 2 commits intomodelcontextprotocol:mainfrom
Open
fix: sanitize internal error details in tool error responses#1651Bortlesboat wants to merge 2 commits intomodelcontextprotocol:mainfrom
Bortlesboat wants to merge 2 commits intomodelcontextprotocol:mainfrom
Conversation
Unhandled exceptions thrown from tool handlers were previously exposed to MCP clients with their full error message, potentially leaking sensitive internal details (stack traces, hostnames, connection strings, etc.). Now only intentional errors are returned to clients: - ToolError: new exported class for user-visible error messages - ProtocolError: SDK validation errors (already safe) - All other errors: sanitized to generic "Internal error" Fixes modelcontextprotocol#1429
@modelcontextprotocol/client
@modelcontextprotocol/server
@modelcontextprotocol/express
@modelcontextprotocol/hono
@modelcontextprotocol/node
commit: |
🦋 Changeset detectedLatest commit: 25907cc The changes in this PR will be included in the next version bump. This PR includes changesets to release 4 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 |
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
Fixes #1429
Unhandled exceptions thrown from tool handlers were previously exposed to MCP clients with their full error message, potentially leaking sensitive internal details (stack traces, hostnames, connection strings, etc.).
This PR:
ToolErrorclass that tool authors can throw when they intentionally want an error message returned to the client"Internal error"messageProtocolErrormessages (SDK-generated validation errors that are already safe)UrlElicitationRequiredErroras beforeUsage
Test plan
Errorto expect"Internal error"instead of the raw messageToolErrormessages are passed through to the client