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

Keep following a relative redirect when the endpoint URL carries userinfo (#3450)

Browse source
This commit is contained in:
Max 2026-09-05 01:24:29 +01:00 • committed by GitHub
commit 9771e6b59c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/mcp/shared/_httpx_utils.py
View file

@ -90,8 +90,10 @@ def next_request_within_origin(response: httpx2.Response) -> httpx2.Request | No
GET: httpx2 turns a POST into a body-less GET for 301/302/303, which would GET: httpx2 turns a POST into a body-less GET for 301/302/303, which would
drop the message), its URL stays within the origin of the request just sent drop the message), its URL stays within the origin of the request just sent
(same scheme, host and port, or http to https on the same host with default (same scheme, host and port, or http to https on the same host with default
ports), and the Location carries no userinfo (which httpx2 would otherwise ports), and the Location does not bring userinfo of its own (which httpx2
send as Basic auth). None for anything else, including a non-redirect. would otherwise send as Basic auth; userinfo the configured URL already had
is kept by a relative Location and is fine). None for anything else,
including a non-redirect.
""" """
next_request = response.next_request next_request = response.next_request
if next_request is None: if next_request is None:
@ -99,7 +101,7 @@ def next_request_within_origin(response: httpx2.Response) -> httpx2.Request | No
sent = response.request sent = response.request
if ( if (
next_request.method != sent.method next_request.method != sent.method
or next_request.url.userinfo or (next_request.url.userinfo and next_request.url.userinfo != sent.url.userinfo)
or not _within_origin(sent.url, next_request.url) or not _within_origin(sent.url, next_request.url)
): ):
return None return None

14
tests/shared/test_httpx_utils.py
View file

@ -208,6 +208,20 @@ async def test_redirect_location_with_userinfo_is_not_followed():
assert received == [f"POST {url}"] assert received == [f"POST {url}"]
async def test_userinfo_of_the_configured_url_kept_by_a_relative_location_is_followed():
"""Userinfo the caller put in the endpoint URL is carried over by a relative Location (URL join
keeps the authority); that is the caller's own credential for the same origin, so the redirect
is followed as httpx2 itself would (SDK-defined)."""
url = "http://user:secret@mcp.example/mcp"
client, received, _ = _recording_client({url: (307, "/mcp/")})
async with client, stream_within_origin(client, "POST", url, content=b"payload") as response:
await response.aread()
assert response.status_code == 200
assert received == [f"POST {url}", "POST http://user:secret@mcp.example/mcp/"]
async def test_request_within_origin_returns_a_read_response(): async def test_request_within_origin_returns_a_read_response():
"""The non-streaming form hands back a response whose body is already read.""" """The non-streaming form hands back a response whose body is already read."""
url = "http://mcp.example/mcp" url = "http://mcp.example/mcp"