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] Close the conformance gaps in the modern lifecycle (#447)

Browse source 
* [Server] Let the client gateway see modern-era capabilities

The six supports*() probes read session state only InitializeHandler wrote,
so every request served statelessly reported no client capabilities at all —
a tool guarding on them took the unsupported branch without a signal.
StatelessProtocol now writes the request's declaration under the same keys.

* [Server] Reject the RPCs 2026-07-28 removed

resources/subscribe and resources/unsubscribe were still dispatched and
answered 200 OK, recording subscriptions the modern era never reads. They
join initialize, ping and logging/setLevel in the era guard; the handlers
stay registered because the handshake era still serves them.

* [Server] Decode a wrapped Mcp-Name before comparing it

The Base64 sentinel was only unwrapped for Mcp-Param-*, so any resource URI
or tool name outside the header-safe ASCII set — which the spec explicitly
tells clients to wrap — was compared encoded and refused with -32020.

* [Server] Require the MCP-Protocol-Version header

It was only checked for contradicting the body, so omitting it entirely
passed — leaving the value intermediaries route on unenforced. Tied to the
header validator's presence, since that is what a header-bearing transport
installs and stdio carries its metadata inline.

* [Server] Read the modern-era request body whole

A single read() takes whatever the stream cares to give — 64 bytes from a
chunked transfer is legal — so an oversized-but-valid POST came back as a
parse error. Shares the legacy transport's incremental read as a trait.

* [Schema][Server] Answer a notification with a status, not a response

A body with no id was dispatched as a request and came back as a JSON-RPC
error carrying "id": "" — an id nobody issued, and on a path a client uses
to tell a modern server from a legacy one. Notifications now get 202 and no
body, and Error omits an id it could not read instead of emptying it.

* [Server] Stop emitting the error codes 2026-07-28 reserved

resources/read answered -32002, which this revision forbids; prompts/get
and completion/complete answered it for an unknown *name*, which it never
meant; tools/call answered -32601, which belongs to an unknown method.
Only the resources/read code is revision-gated — older peers expect -32002
there, and nowhere else. Also routes the -32021 capability exception out of
the prompt and resource handlers, which were swallowing it into -32603.
This commit is contained in:
Christopher Hertel 2026-08-18 23:09:34 +02:00 • committed by GitHub
commit 5e73683079
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 855 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

46
tests/Unit/Server/Stateless/StandardHeaderValidatorTest.php
View file

@ -101,6 +101,52 @@ class StandardHeaderValidatorTest extends TestCase
));
}
#[TestDox('a Base64-wrapped Mcp-Name is decoded before it is compared')]
#[DataProvider('wrappedNames')]
public function testWrappedNameHeaderIsDecoded(string $method, string $member, string $subject): void
{
$this->assertNull($this->validator->validate(
$method,
[$member => $subject],
[
'Mcp-Method' => $method,
'Mcp-Name' => '=?base64?'.base64_encode($subject).'?=',
],
));
}
/**
* @return iterable<string, array{string, string, string}>
*/
public static function wrappedNames(): iterable
{
yield 'non-ASCII tool name' => ['tools/call', 'name', 'grüße_welt'];
yield 'CJK prompt name' => ['prompts/get', 'name', '天気予報'];
yield 'resource URI with a non-ASCII path' => ['resources/read', 'uri', 'file:///projects/münchen/config.json'];
yield 'value padded with spaces' => ['tools/call', 'name', ' padded '];
yield 'value matching the sentinel pattern' => ['tools/call', 'name', '=?base64?literal?='];
}
#[TestDox('a wrapped Mcp-Name that disagrees with the body is still rejected')]
public function testWrappedNameHeaderStillHasToMatch(): void
{
$this->assertStringContainsString('does not match', (string) $this->validator->validate(
'tools/call',
['name' => 'grüße_welt'],
['Mcp-Method' => 'tools/call', 'Mcp-Name' => '=?base64?'.base64_encode('etwas_anderes').'?='],
));
}
#[TestDox('a malformed Base64 wrapper on Mcp-Name is refused, not compared raw')]
public function testMalformedWrappedNameHeaderIsRefused(): void
{
$this->assertStringContainsString('well-formed Base64', (string) $this->validator->validate(
'tools/call',
['name' => 'do_thing'],
['Mcp-Method' => 'tools/call', 'Mcp-Name' => '=?base64?SGVsbG8!?='],
));
}
#[TestDox('a method that carries no name does not require the header')]
public function testNamelessMethodNeedsNoNameHeader(): void
{