Skip to content

πŸš€ The fast, Pythonic way to build MCP servers and clients.

Let configured proxy headers replace forwarded ones regardless of case (#5972)

leopranzl12aefc84f642
diff --git a/fastmcp_slim/fastmcp/client/dependencies.py b/fastmcp_slim/fastmcp/client/dependencies.py
index 7a8f9f046..164e4ffbf 100644
--- a/fastmcp_slim/fastmcp/client/dependencies.py
+++ b/fastmcp_slim/fastmcp/client/dependencies.py
@@ -1,5 +1,23 @@
"""Client-side dependency helpers."""
+from collections.abc import Mapping
+
+
+def _merge_forwardable_http_headers(configured: Mapping[str, str]) -> dict[str, str]:
+ """Combine forwardable ambient headers with a transport's configured headers.
+
+ Configured headers take precedence. Header names are case-insensitive, so a
+ configured `Authorization` replaces the forwarded `authorization` instead of
+ being sent alongside it.
+ """
+ configured_names = {name.lower() for name in configured}
+ forwarded = {
+ name: value
+ for name, value in _get_forwardable_http_headers().items()
+ if name.lower() not in configured_names
+ }
+ return forwarded | dict(configured)
+
def _get_forwardable_http_headers() -> dict[str, str]:
"""Return ambient headers safe to copy onto a new MCP connection.
diff --git a/fastmcp_slim/fastmcp/client/transports/http.py b/fastmcp_slim/fastmcp/client/transports/http.py
index 11703623d..ece831005 100644
--- a/fastmcp_slim/fastmcp/client/transports/http.py
+++ b/fastmcp_slim/fastmcp/client/transports/http.py
@@ -20,7 +20,7 @@ from fastmcp.client.auth.client_credentials import (
PrivateKeyJWTOAuthProvider,
)
from fastmcp.client.auth.oauth import OAuth
-from fastmcp.client.dependencies import _get_forwardable_http_headers
+from fastmcp.client.dependencies import _merge_forwardable_http_headers
from fastmcp.client.transports.base import (
ClientTransport,
SessionKwargs,
@@ -166,7 +166,7 @@ class StreamableHttpTransport(ClientTransport):
# This is off by default so a plain Client used inside a server tool
# handler cannot leak caller headers to an unrelated remote server.
if options.forward_incoming_headers:
- headers = _get_forwardable_http_headers() | self.headers
+ headers = _merge_forwardable_http_headers(self.headers)
else:
headers = dict(self.headers)
diff --git a/fastmcp_slim/fastmcp/client/transports/sse.py b/fastmcp_slim/fastmcp/client/transports/sse.py
index 86f997b72..780d8a85c 100644
--- a/fastmcp_slim/fastmcp/client/transports/sse.py
+++ b/fastmcp_slim/fastmcp/client/transports/sse.py
@@ -21,7 +21,7 @@ from fastmcp.client.auth.client_credentials import (
PrivateKeyJWTOAuthProvider,
)
from fastmcp.client.auth.oauth import OAuth
-from fastmcp.client.dependencies import _get_forwardable_http_headers
+from fastmcp.client.dependencies import _merge_forwardable_http_headers
from fastmcp.client.transports.base import (
ClientTransport,
SessionKwargs,
@@ -143,7 +143,7 @@ class SSETransport(ClientTransport):
# This is off by default so a plain Client used inside a server tool
# handler cannot leak caller headers to an unrelated remote server.
if options.forward_incoming_headers:
- client_kwargs["headers"] = _get_forwardable_http_headers() | self.headers
+ client_kwargs["headers"] = _merge_forwardable_http_headers(self.headers)
else:
client_kwargs["headers"] = dict(self.headers)
diff --git a/tests/server/providers/proxy/test_header_options.py b/tests/server/providers/proxy/test_header_options.py
index af5e9da08..15fcb1dc3 100644
--- a/tests/server/providers/proxy/test_header_options.py
+++ b/tests/server/providers/proxy/test_header_options.py
@@ -9,7 +9,7 @@ from fastmcp.client.transports import (
StreamableHttpTransport,
)
from fastmcp.server import create_proxy
-from fastmcp.server.dependencies import get_http_headers
+from fastmcp.server.dependencies import get_http_headers, get_http_request
from fastmcp.server.providers.proxy import ProxyClient
from fastmcp.utilities.tests import run_server_async
@@ -97,6 +97,50 @@ async def test_proxy_header_forwarding_can_be_selected(kind: str, forward: bool
assert "x-caller" not in received
[email protected]("kind", ["http", "sse"])
+async def test_configured_headers_replace_forwarded_headers_regardless_of_case(
+ kind: str,
+):
+ backend = FastMCP("Backend")
+
+ @backend.tool
+ def raw_headers() -> dict[str, list[str]]:
+ # Header names are case-insensitive, so every line the backend received
+ # for a name is listed rather than the single value a dict would keep.
+ headers = get_http_request().headers
+ return {
+ name: headers.getlist(name)
+ for name in ("authorization", "x-api-key", "x-caller")
+ }
+
+ backend_transport = "sse" if kind == "sse" else "http"
+ async with run_server_async(backend, transport=backend_transport) as url:
+ configured = {"Authorization": "Bearer backend", "X-API-Key": "backend"}
+ target = (
+ SSETransport(url, headers=configured)
+ if kind == "sse"
+ else StreamableHttpTransport(url, headers=configured)
+ )
+ proxy = create_proxy(ProxyClient[ClientTransport](target))
+ async with run_server_async(proxy) as proxy_url:
+ transport = StreamableHttpTransport(
+ proxy_url,
+ headers={
+ "Authorization": "Bearer caller",
+ "X-API-Key": "caller",
+ "X-Caller": "inbound",
+ },
+ )
+ async with Client(transport, mode="legacy") as client:
+ result = await client.call_tool("raw_headers", {})
+
+ assert result.data == {
+ "authorization": ["Bearer backend"],
+ "x-api-key": ["backend"],
+ "x-caller": ["inbound"],
+ }
+
+
def test_proxy_copies_keep_independent_forwarding_options():
transport = StreamableHttpTransport("http://backend/mcp")
forwarding = ProxyClient(transport)