scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-09-12 23:01:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 88

fix(mcp): normalize default ports in preview origins

Browse source
This commit is contained in:
Joshua Valluru 2026-09-09 18:11:20 -07:00
parent 3523f3731c
commit 493c98f9bf
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
litellm/proxy/_experimental/mcp_server/rest_endpoints.py
View file

@ -1261,8 +1261,11 @@ if MCP_AVAILABLE:
else None
)
saved_origin: Final = _redact_mcp_resource_url(saved_server.url) if saved_server else None
preview_origin: Final = _redact_mcp_resource_url(new_mcp_server_request.url)
may_inherit: Final = new_mcp_server_request.auth_type not in _STAGED_AUTH_VALUE_AUTH_TYPES or (
saved_origin is not None and saved_origin == _redact_mcp_resource_url(new_mcp_server_request.url)
saved_origin is not None
and preview_origin is not None
and httpx.URL(saved_origin) == httpx.URL(preview_origin)
)
request: Final = (
_inherit_credentials_from_existing_server(new_mcp_server_request) if may_inherit else new_mcp_server_request

17
tests/test_litellm/proxy/_experimental/mcp_server/test_rest_endpoints.py
View file

@ -154,11 +154,17 @@ class TestExecuteWithMcpClient:
assert saved.url == "https://stored.example/mcp"
@pytest.mark.parametrize(
"url", ("https://other.example/mcp", "http://stored.example/mcp", "https://stored.example:8443/mcp")
("url", "same_origin"),
(
("https://other.example/mcp", False),
("http://stored.example/mcp", False),
("https://stored.example:8443/mcp", False),
("https://stored.example:443/mcp", True),
),
)
@pytest.mark.parametrize("explicit_credential", (None, "preview:explicit"))
def test_static_preview_does_not_inherit_credentials_across_origins(
self, monkeypatch: pytest.MonkeyPatch, url: str, explicit_credential: str | None
def test_static_preview_respects_origin_when_inheriting_credentials(
self, monkeypatch: pytest.MonkeyPatch, url: str, same_origin: bool, explicit_credential: str | None
) -> None:
from starlette.datastructures import Headers
@ -185,8 +191,9 @@ class TestExecuteWithMcpClient:
credentials={"auth_value": explicit_credential} if explicit_credential else None,
)
staged: Final = rest_endpoints._stage_server_test(payload, Headers())
assert staged.mcp_auth_header == explicit_credential
assert staged.request.credentials == payload.credentials
expected: Final = explicit_credential or ("preview:stored" if same_origin else None)
assert staged.mcp_auth_header == expected
assert staged.request.credentials == ({"auth_value": expected} if expected else None)
@pytest.mark.asyncio
async def test_redacts_stack_trace(self, monkeypatch):