scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-09-14 23:21:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 102

fix(mcp): forward hook-injected extra_headers for OpenAPI servers

Browse source 
Addresses Greptile P1 review: pre_mcp_call guardrail hooks (e.g.
MCPJWTSigner) can inject headers via hook_result["extra_headers"].
These were silently dropped for OpenAPI-backed servers. Now merged
into the ContextVar alongside client request headers.

Made-with: Cursor
This commit is contained in:
Raj Nagulapalle 2026-04-29 17:17:56 -07:00
parent 22000ffecc
commit 9dac38e952
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
View file

@ -2038,6 +2038,7 @@ class MCPServerManager:
tool_name: str,
arguments: Dict[str, Any],
raw_headers: Optional[Dict[str, str]] = None,
hook_extra_headers: Optional[Dict[str, str]] = None,
) -> CallToolResult:
"""
Call an OpenAPI tool handler directly.
@ -2052,6 +2053,8 @@ class MCPServerManager:
arguments: Tool arguments to pass to the handler
raw_headers: Optional raw headers from the inbound request, used to
extract headers listed in ``server.extra_headers``.
hook_extra_headers: Optional headers injected by ``pre_mcp_call``
guardrail hooks (e.g. ``MCPJWTSigner``).
Returns:
CallToolResult with the response from the API
@ -2093,6 +2096,13 @@ class MCPServerManager:
if val is not None:
extra_headers_dict[header] = val
# Merge hook-injected headers (e.g. from pre_mcp_call guardrails
# like MCPJWTSigner) so they also reach the upstream API.
if hook_extra_headers:
if extra_headers_dict is None:
extra_headers_dict = {}
extra_headers_dict.update(hook_extra_headers)
_extra_token = _request_extra_headers.set(extra_headers_dict)
try:
handler_result = await tool.handler(**arguments)
@ -2533,7 +2543,11 @@ class MCPServerManager:
tasks.append(
asyncio.create_task(
self._call_openapi_tool_handler(
mcp_server, name, arguments, raw_headers=raw_headers
mcp_server,
name,
arguments,
raw_headers=raw_headers,
hook_extra_headers=hook_result.get("extra_headers"),
)
)
)