modelcontextprotocol/php-sdk
Watch
1
0
Fork
You've already forked php-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Server] Handle malformed JSON-RPC input graceful (#412)

Browse source 
* Never let a throwable escape Protocol::processInput()

* Validate payload types in the schema hydration methods

* Stop leaking handler exception messages to the client
This commit is contained in:
Christopher Hertel 2026-08-14 22:34:01 +02:00 • committed by GitHub
commit c8ed07bba2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 858 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/Schema/Result/CallToolResult.php
View file

@ -95,15 +95,30 @@ class CallToolResult implements ResultInterface
$contents = [];
foreach ($data['content'] as $item) {
$contents[] = match ($item['type'] ?? null) {
$type = \is_array($item) ? $item['type'] ?? null : null;
if (!\is_string($type)) {
throw new InvalidArgumentException('Missing or invalid content "type" in CallToolResult data.');
}
$contents[] = match ($type) {
'text' => TextContent::fromArray($item),
'image' => ImageContent::fromArray($item),
'audio' => AudioContent::fromArray($item),
'resource' => EmbeddedResource::fromArray($item),
default => throw new InvalidArgumentException(\sprintf('Invalid content type in CallToolResult data: "%s".', $item['type'] ?? null)),
default => throw new InvalidArgumentException(\sprintf('Invalid content type in CallToolResult data: "%s".', $type)),
};
}
if (isset($data['isError']) && !\is_bool($data['isError'])) {
throw new InvalidArgumentException('Invalid "isError" in CallToolResult data.');
}
if (isset($data['structuredContent']) && !\is_array($data['structuredContent'])) {
throw new InvalidArgumentException('Invalid "structuredContent" in CallToolResult data.');
}
if (isset($data['_meta']) && !\is_array($data['_meta'])) {
throw new InvalidArgumentException('Invalid "_meta" in CallToolResult data.');
}
return new self(
$contents,
$data['isError'] ?? false,