🚀 The fast, Pythonic way to build MCP servers and clients.
fix: prevent MCP transport auth header from leaking to downstream OpenAPI APIs (#3260) (#3262)
不做了睡大觉0d4580fef32a
diff --git a/src/fastmcp/client/transports/http.py b/src/fastmcp/client/transports/http.pyindex 83dbb7cc8..f7e74ca60 100644--- a/src/fastmcp/client/transports/http.py+++ b/src/fastmcp/client/transports/http.py@@ -95,7 +95,7 @@ class StreamableHttpTransport(ClientTransport):# Load headers from an active HTTP request, if available. This will only be true# if the client is used in a FastMCP Proxy, in which case the MCP client headers# need to be forwarded to the remote server.- headers = get_http_headers() | self.headers+ headers = get_http_headers(include={"authorization"}) | self.headers# Configure timeout if provided, preserving MCP's 30s connect defaulttimeout: httpx.Timeout | None = Nonediff --git a/src/fastmcp/client/transports/sse.py b/src/fastmcp/client/transports/sse.pyindex 45db01bee..36fa0ebc0 100644--- a/src/fastmcp/client/transports/sse.py+++ b/src/fastmcp/client/transports/sse.py@@ -69,7 +69,9 @@ class SSETransport(ClientTransport):# load headers from an active HTTP request, if available. This will only be true# if the client is used in a FastMCP Proxy, in which case the MCP client headers# need to be forwarded to the remote server.- client_kwargs["headers"] = get_http_headers() | self.headers+ client_kwargs["headers"] = (+ get_http_headers(include={"authorization"}) | self.headers+ )# sse_read_timeout has a default value set, so we can't pass None without overriding it# instead we simply leave the kwarg out if it's not provideddiff --git a/src/fastmcp/server/dependencies.py b/src/fastmcp/server/dependencies.pyindex 15c8c3124..3e72d9f84 100644--- a/src/fastmcp/server/dependencies.py+++ b/src/fastmcp/server/dependencies.py@@ -434,14 +434,22 @@ def get_http_request() -> Request:return request-def get_http_headers(include_all: bool = False) -> dict[str, str]:+def get_http_headers(+ include_all: bool = False,+ include: set[str] | None = None,+) -> dict[str, str]:"""Extract headers from the current HTTP request if available.Never raises an exception, even if there is no active HTTP request (in which casean empty dict is returned).- By default, strips problematic headers like `content-length` that cause issues- if forwarded to downstream clients. If `include_all` is True, all headers are returned.+ By default, strips problematic headers like `content-length` and `authorization`+ that cause issues if forwarded to downstream services. If `include_all` is True,+ all headers are returned.++ The `include` parameter allows specific headers to be included even if they would+ normally be excluded. This is useful for proxy transports that need to forward+ authorization headers to upstream MCP servers."""if include_all:exclude_headers: set[str] = set()@@ -457,6 +465,7 @@ def get_http_headers(include_all: bool = False) -> dict[str, str]:"keep-alive","expect","accept",+ "authorization",# Proxy-related headers"proxy-authenticate","proxy-authorization",@@ -464,6 +473,8 @@ def get_http_headers(include_all: bool = False) -> dict[str, str]:# MCP-related headers"mcp-session-id",}+ if include:+ exclude_headers -= {h.lower() for h in include}# (just in case)if not all(h.lower() == h for h in exclude_headers):raise ValueError("Excluded headers must be lowercase")@@ -1037,7 +1048,7 @@ class _CurrentHeaders(Dependency): # type: ignore[misc]"""Async context manager for HTTP Headers dependency."""async def __aenter__(self) -> dict[str, str]:- return get_http_headers()+ return get_http_headers(include={"authorization"})async def __aexit__(self, *args: object) -> None:pass@@ -1046,9 +1057,10 @@ class _CurrentHeaders(Dependency): # type: ignore[misc]def CurrentHeaders() -> dict[str, str]:"""Get the current HTTP request headers.- This dependency provides access to the HTTP headers for the current request.- Returns an empty dictionary when no HTTP request is available, making it- safe to use in code that might run over any transport.+ This dependency provides access to the HTTP headers for the current request,+ including the authorization header. Returns an empty dictionary when no HTTP+ request is available, making it safe to use in code that might run over any+ transport.Returns:A dependency that resolves to a dictionary of header name -> valuediff --git a/src/fastmcp/server/providers/openapi/components.py b/src/fastmcp/server/providers/openapi/components.pyindex 6b942d22e..1f52033fa 100644--- a/src/fastmcp/server/providers/openapi/components.py+++ b/src/fastmcp/server/providers/openapi/components.py@@ -172,7 +172,9 @@ class OpenAPITool(Tool):mcp_headers = get_http_headers()if mcp_headers:- request.headers.update(mcp_headers)+ for key, value in mcp_headers.items():+ if key not in request.headers:+ request.headers[key] = valueexcept Exception as e:raise ValueError(f"Error building request for {self._route.method.upper()} "