Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions src/mcp/server/mcpserver/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@
from starlette.middleware.authentication import AuthenticationMiddleware
from starlette.requests import Request
from starlette.responses import Response
from starlette.routing import Mount, Route
from starlette.types import Receive, Scope, Send
from starlette.routing import Mount, Route, request_response

from mcp.server.auth.middleware.auth_context import AuthContextMiddleware
from mcp.server.auth.middleware.bearer_auth import BearerAuthBackend, RequireAuthMiddleware
Expand Down Expand Up @@ -1172,14 +1171,23 @@ def sse_app(
message_path, security_settings=transport_security, max_request_body_size=max_request_body_size
)

async def handle_sse(scope: Scope, receive: Receive, send: Send): # pragma: no cover
# Add client ID from auth context into request context if available

async with sse.connect_sse(scope, receive, send) as streams:
async def sse_endpoint(request: Request) -> Response:
if request.method == "HEAD":
Comment thread
claude[bot] marked this conversation as resolved.
Resolved
# GET's headers without its never-ending stream; a Content-Length would claim an empty one.
response = Response(
Comment thread
Kludex marked this conversation as resolved.
Resolved
media_type="text/event-stream", headers={"Cache-Control": "no-store", "X-Accel-Buffering": "no"}
Comment thread
Kludex marked this conversation as resolved.
Resolved
)
del response.headers["content-length"]
return response
Comment thread
claude[bot] marked this conversation as resolved.
Resolved
async with sse.connect_sse( # pragma: no cover
request.scope,
request.receive,
request._send, # type: ignore[reportPrivateUsage]
) as streams:
await self._lowlevel_server.run(
streams[0], streams[1], self._lowlevel_server.create_initialization_options()
)
return Response()
return Response() # pragma: no cover
Comment thread
Kludex marked this conversation as resolved.
Resolved

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2: connect_sse() already sends the SSE response, so returning Response() makes request_response send a second response when a GET stream closes. Keep the GET handler as a raw ASGI endpoint and return a Response only for HEAD.

Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. When an issue isn't valid or won't be fixed in this PR, reply in its thread with the reason and then resolve the thread. At src/mcp/server/mcpserver/server.py, line 1198:

<comment>`connect_sse()` already sends the SSE response, so returning `Response()` makes `request_response` send a second response when a GET stream closes. Keep the GET handler as a raw ASGI endpoint and return a `Response` only for HEAD.</comment>

<file context>
@@ -1178,21 +1177,25 @@ def sse_app(
                 await self._lowlevel_server.run(
                     streams[0], streams[1], self._lowlevel_server.create_initialization_options()
                 )
+            return Response()  # pragma: no cover
 
         # Create routes
</file context>


# Create routes
routes: list[Route | Mount] = []
Expand Down Expand Up @@ -1237,7 +1245,9 @@ async def handle_sse(scope: Scope, receive: Receive, send: Send): # pragma: no
routes.append(
Route(
sse_path,
endpoint=RequireAuthMiddleware(handle_sse, required_scopes, resource_metadata_url),
endpoint=RequireAuthMiddleware(
request_response(sse_endpoint), required_scopes, resource_metadata_url
),
Comment thread
claude[bot] marked this conversation as resolved.
Resolved
methods=["GET"],
)
)
Expand All @@ -1249,11 +1259,6 @@ async def handle_sse(scope: Scope, receive: Receive, send: Send): # pragma: no
)
else:
# Auth is disabled, no need for RequireAuthMiddleware
# Since handle_sse is an ASGI app, we need to create a compatible endpoint
async def sse_endpoint(request: Request) -> Response: # pragma: no cover
# Convert the Starlette request to ASGI parameters
return await handle_sse(request.scope, request.receive, request._send) # type: ignore[reportPrivateUsage]

routes.append(
Route(
sse_path,
Expand Down
5 changes: 5 additions & 0 deletions src/mcp/server/sse.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@

# Define handler functions
async def handle_sse(request):
# Starlette also routes HEAD here: answer with GET's headers, not its never-ending stream
if request.method == "HEAD":
response = Response(media_type="text/event-stream", headers={"Cache-Control": "no-store"})
Comment thread
Kludex marked this conversation as resolved.
Resolved
del response.headers["content-length"]
return response
async with sse.connect_sse(
request.scope, request.receive, request._send
) as streams:
Expand Down
9 changes: 9 additions & 0 deletions tests/interaction/_requirements.py
Original file line number Diff line number Diff line change
Expand Up @@ -2705,6 +2705,15 @@ def __post_init__(self) -> None:
transports=("sse",),
note="Only observable over the legacy SSE transport.",
),
"transport:sse:head": Requirement(
source="issue:#3736",
behavior=(
"A HEAD request to the SSE endpoint of `MCPServer.sse_app()` is answered at once with the "
"headers a GET would get and no body or Content-Length, without opening a session or a stream."
),
transports=("sse",),
note="Only observable over the legacy SSE transport.",
),
"transport:stdio": Requirement(
source=f"{SPEC_BASE_URL}/basic/transports#stdio",
behavior=(
Expand Down
23 changes: 23 additions & 0 deletions tests/interaction/transports/test_sse.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
from mcp.client.client import Client
from mcp.client.sse import sse_client
from mcp.server import Server
from mcp.server.mcpserver import MCPServer
from mcp.server.transport_security import TransportSecuritySettings
from tests.interaction._connect import BASE_URL, build_sse_app
from tests.interaction._requirements import requirement
from tests.interaction.transports._bridge import StreamingASGITransport
Expand Down Expand Up @@ -88,3 +90,24 @@ async def test_post_for_an_unknown_session_is_rejected() -> None:
"/messages/", params={"session_id": uuid4().hex}, json={"jsonrpc": "2.0", "method": "ping", "id": 1}
)
assert (response.status_code, response.text) == snapshot((404, "Could not find session"))


@requirement("transport:sse:head")
async def test_head_on_the_sse_endpoint_is_answered_with_headers_only() -> None:
"""`MCPServer.sse_app()` answers HEAD at once instead of streaming forever."""
app = MCPServer("legacy").sse_app(
transport_security=TransportSecuritySettings(enable_dns_rebinding_protection=False)
)
async with httpx2.AsyncClient(transport=StreamingASGITransport(app), base_url=BASE_URL) as http:
with anyio.fail_after(5):
response = await http.head("/sse")
assert (response.status_code, dict(response.headers)) == snapshot(
(
200,
{
"cache-control": "no-store",
"x-accel-buffering": "no",
"content-type": "text/event-stream; charset=utf-8",
},
)
)
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
Resolved
Loading