Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
12 changes: 12 additions & 0 deletions src/mcp/server/streamable_http.py
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,18 @@ async def _handle_get_request(self, request: Request, send: Send) -> None:
if writer is None: # pragma: no cover
raise ValueError("No read stream writer available. Ensure connect() is called first.")

if not self.mcp_session_id:
response = self._create_error_response(
"Method Not Allowed: SSE stream not supported",
HTTPStatus.METHOD_NOT_ALLOWED,
headers={
"Content-Type": CONTENT_TYPE_JSON,
"Allow": "POST",
},
)
await response(request.scope, request.receive, send)
return

# Validate Accept header - must include text/event-stream
_, has_sse = self._check_accept_headers(request)

Expand Down
49 changes: 48 additions & 1 deletion tests/shared/test_streamable_http.py
Original file line number Diff line number Diff line change
Expand Up @@ -397,13 +397,15 @@ def create_app(
is_json_response_enabled: bool = False,
event_store: EventStore | None = None,
retry_interval: int | None = None,
stateless: bool = False,
) -> Starlette: # pragma: no cover
"""Create a Starlette application for testing using the session manager.

Args:
is_json_response_enabled: If True, use JSON responses instead of SSE streams.
event_store: Optional event store for testing resumability.
retry_interval: Retry interval in milliseconds for SSE polling.
stateless: If True, create a stateless Streamable HTTP server.
"""
# Create server instance
server = _create_server()
Expand All @@ -416,6 +418,7 @@ def create_app(
app=server,
event_store=event_store,
json_response=is_json_response_enabled,
stateless=stateless,
security_settings=security_settings,
retry_interval=retry_interval,
)
Expand All @@ -437,6 +440,7 @@ def run_server(
is_json_response_enabled: bool = False,
event_store: EventStore | None = None,
retry_interval: int | None = None,
stateless: bool = False,
) -> None: # pragma: no cover
"""Run the test server.

Expand All @@ -445,9 +449,10 @@ def run_server(
is_json_response_enabled: If True, use JSON responses instead of SSE streams.
event_store: Optional event store for testing resumability.
retry_interval: Retry interval in milliseconds for SSE polling.
stateless: If True, run the server in stateless mode.
"""

app = create_app(is_json_response_enabled, event_store, retry_interval)
app = create_app(is_json_response_enabled, event_store, retry_interval, stateless)
# Configure server
config = uvicorn.Config(
app=app,
Expand Down Expand Up @@ -570,6 +575,34 @@ def json_server_url(json_server_port: int) -> str:
return f"http://127.0.0.1:{json_server_port}"


@pytest.fixture
def stateless_server_port() -> int:
"""Find an available port for the stateless server."""
with socket.socket() as s:
s.bind(("127.0.0.1", 0))
return s.getsockname()[1]


@pytest.fixture
def stateless_server(stateless_server_port: int) -> Generator[None, None, None]:
"""Start a server in stateless mode."""
proc = multiprocessing.Process(target=run_server, kwargs={"port": stateless_server_port, "stateless": True}, daemon=True)
proc.start()

wait_for_server(stateless_server_port)

yield

proc.kill()
proc.join(timeout=2)


@pytest.fixture
def stateless_server_url(stateless_server_port: int) -> str:
"""Get the URL for the stateless test server."""
return f"http://127.0.0.1:{stateless_server_port}"


# Basic request validation tests
def test_accept_header_validation(basic_server: None, basic_server_url: str):
"""Test that Accept header is properly validated."""
Expand Down Expand Up @@ -1043,6 +1076,20 @@ def test_get_validation(basic_server: None, basic_server_url: str):
assert "Not Acceptable" in response.text


def test_get_method_not_allowed_in_stateless_mode(stateless_server: None, stateless_server_url: str):
"""Test that stateless servers reject standalone GET SSE requests."""
response = requests.get(
f"{stateless_server_url}/mcp",
headers={
"Accept": "text/event-stream",
},
)

assert response.status_code == 405
assert response.headers.get("Allow") == "POST"
assert "Method Not Allowed" in response.text


# Client-specific fixtures
@pytest.fixture
async def http_client(basic_server: None, basic_server_url: str): # pragma: no cover
Expand Down
Loading