MCP: mcp 2.3 (MCPServer, transport arguments on streamable_http_app, bearer read in middleware); tests for the 2026-07-28 revision and the resource check

This commit is contained in:
2026-10-28 09:21:01 +01:00
parent c04d6b83c6
commit c04e4883c2
8 changed files with 224 additions and 55 deletions
+68 -6
View File
@@ -51,9 +51,6 @@ def over_mcp(monkeypatch: pytest.MonkeyPatch):
from fluksio.mcp import http as mcp_http
from fluksio.mcp import server as mcp_server
# A FastMCP instance enters its session manager once, and another test in
# the run may have built one already.
monkeypatch.setattr(mcp_server.mcp, "_session_manager", None, raising=False)
mcp_app = mcp_http.build_http_app(app)
def run(block: Callable[[httpx.AsyncClient], Awaitable[Any]]) -> Any:
@@ -194,6 +191,34 @@ def test_an_agent_can_list_and_call_tools(
assert called.json()["result"]["isError"] is False
def test_a_token_for_another_resource_is_refused(
over_mcp,
client: TestClient,
superuser_token_headers: dict[str, str],
agent: uuid.UUID,
monkeypatch: pytest.MonkeyPatch,
) -> None:
"""The SDK compares the resource the verifier reports with its own URL."""
from fluksio.mcp import http as mcp_http
verify = mcp_http._JWTVerifier.verify_token
async def for_elsewhere(self: Any, token: str) -> Any:
accepted = await verify(self, token)
return accepted.model_copy(update={"resource": "https://other.example/mcp"})
monkeypatch.setattr(mcp_http._JWTVerifier, "verify_token", for_elsewhere)
me = client.get(
f"{settings.API_V1_STR}/users/me", headers=superuser_token_headers
).json()
token = mcp_token(uuid.UUID(me["id"]), agent)
async def block(http: httpx.AsyncClient) -> httpx.Response:
return await http.post("/mcp", **rpc(token, "tools/list"))
assert over_mcp(block).status_code == 401
def test_revoking_an_agent_stops_the_token_it_already_holds(
over_mcp,
client: TestClient,
@@ -278,7 +303,7 @@ def test_a_real_client_can_connect_and_call_a_tool(
) as http_client:
async with streamable_http_client(
f"{settings.oauth_issuer}/mcp", http_client=http_client
) as (read, write, _):
) as (read, write):
async with ClientSession(read, write) as session:
initialized = await session.initialize()
tools = await session.list_tools()
@@ -286,9 +311,13 @@ def test_a_real_client_can_connect_and_call_a_tool(
return initialized, tools, called
initialized, tools, called = over_mcp(block)
assert initialized.serverInfo.name == "fluksio"
assert initialized.server_info.name == "fluksio"
assert {"list_flows", "run_flow"} <= {tool.name for tool in tools.tools}
assert called.isError is False
assert called.is_error is False
# The tool reached the API as the agent's person: refused calls come back
# as an error object in the text, not as a failed call.
answer = json.loads(called.content[0].text)
assert not (isinstance(answer, dict) and "error" in answer), answer
@pytest.mark.parametrize("revision", ["2025-03-26", "2025-06-18", "2025-11-25"])
@@ -326,3 +355,36 @@ def test_clients_of_older_protocol_revisions_still_connect(
assert initialized.json()["result"]["protocolVersion"] == revision
assert listed.status_code == 200
assert "list_flows" in {tool["name"] for tool in listed.json()["result"]["tools"]}
def test_a_request_of_the_2026_07_28_revision_is_served(
over_mcp,
client: TestClient,
superuser_token_headers: dict[str, str],
agent: uuid.UUID,
) -> None:
"""Its requests carry their own protocol envelope and no handshake."""
me = client.get(
f"{settings.API_V1_STR}/users/me", headers=superuser_token_headers
).json()
token = mcp_token(uuid.UUID(me["id"]), agent)
meta = {
"io.modelcontextprotocol/protocolVersion": "2026-07-28",
"io.modelcontextprotocol/clientCapabilities": {},
}
call = rpc(token, "tools/call", _meta=meta, name="list_flows", arguments={})
call["headers"] |= {
"MCP-Protocol-Version": "2026-07-28",
"Mcp-Method": "tools/call",
"Mcp-Name": "list_flows",
}
async def block(http: httpx.AsyncClient) -> httpx.Response:
return await http.post("/mcp", **call)
answer = over_mcp(block)
assert answer.status_code == 200
result = answer.json()["result"]
assert result["isError"] is False
# Carrying the agent's token on to the API, or the call is refused there.
assert "error" not in json.loads(result["content"][0]["text"])