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 156

Update MCPServerManager to raise HTTPException with status code 400 for extra headers in OpenAPI-backed servers. Adjust tests to verify the correct status code and exception message.

Browse source
This commit is contained in:
Noah Nistler 2026-03-17 16:07:06 -05:00
parent 4af352aac8
commit 9f443a31aa
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2235,6 +2235,21 @@ class MCPServerManager:
if "arguments" in hook_result:
arguments = hook_result["arguments"]
# OpenAPI-backed servers cannot forward hook-injected headers — reject early
# before scheduling any background tasks to avoid orphaned asyncio.Tasks.
if mcp_server.spec_path and hook_result.get("extra_headers"):
raise HTTPException(
status_code=400,
detail={
"error": (
"pre_mcp_call hook returned extra_headers for an "
"OpenAPI-backed MCP server, which does not support "
"hook header injection. Use a regular MCP server "
"(SSE/HTTP transport) for hook header support."
)
},
)
# Prepare tasks for during hooks
tasks = []
if proxy_logging_obj:
@ -2251,20 +2266,8 @@ class MCPServerManager:
# For OpenAPI servers, call the tool handler directly instead of via MCP client
if mcp_server.spec_path:
verbose_logger.debug(
"Calling OpenAPI tool %s directly via HTTP handler", name
f"Calling OpenAPI tool {name} directly via HTTP handler"
)
if hook_result.get("extra_headers"):
raise HTTPException(
status_code=500,
detail={
"error": (
"pre_mcp_call hook returned extra_headers for an "
"OpenAPI-backed MCP server, which does not support "
"hook header injection. Use a regular MCP server "
"(SSE/HTTP transport) for hook header support."
)
},
)
tasks.append(
asyncio.create_task(
self._call_openapi_tool_handler(mcp_server, name, arguments)

2
tests/test_litellm/proxy/_experimental/mcp_server/test_mcp_hook_extra_headers.py
View file

@ -459,7 +459,7 @@ class TestCallToolFlowsHookHeaders:
proxy_logging_obj=proxy_logging,
)
assert exc_info.value.status_code == 500
assert exc_info.value.status_code == 400
assert "does not support hook header injection" in str(
exc_info.value.detail
)