Skip to content

The agent engineering platform.

fix(openai): redact MCP `authorization` (#39155)

John Kennedy725489f13545
diff --git a/libs/partners/openai/langchain_openai/chat_models/base.py b/libs/partners/openai/langchain_openai/chat_models/base.py
index 0702b6d55d..e7d7690a1a 100644
--- a/libs/partners/openai/langchain_openai/chat_models/base.py
+++ b/libs/partners/openai/langchain_openai/chat_models/base.py
@@ -2045,10 +2045,18 @@ class BaseChatOpenAI(BaseChatModel):
**self._default_params,
**kwargs,
}
- # Redact headers from built-in remote MCP tool invocations
+ # Redact credentials from built-in remote MCP tool invocations
if (tools := params.get("tools")) and isinstance(tools, list):
+ sensitive_fields = ("headers", "authorization")
params["tools"] = [
- ({**tool, "headers": "**REDACTED**"} if "headers" in tool else tool)
+ {
+ **tool,
+ **{
+ field: "**REDACTED**"
+ for field in sensitive_fields
+ if field in tool
+ },
+ }
if isinstance(tool, dict) and tool.get("type") == "mcp"
else tool
for tool in tools
diff --git a/libs/partners/openai/tests/unit_tests/chat_models/test_base.py b/libs/partners/openai/tests/unit_tests/chat_models/test_base.py
index 4a4233d6da..cabea65350 100644
--- a/libs/partners/openai/tests/unit_tests/chat_models/test_base.py
+++ b/libs/partners/openai/tests/unit_tests/chat_models/test_base.py
@@ -3447,25 +3447,31 @@ def test_mcp_tracing() -> None:
"server_label": "deepwiki",
"server_url": "https://mcp.deepwiki.com/mcp",
"require_approval": "always",
- "headers": {"Authorization": "Bearer PLACEHOLDER"},
+ "headers": {"Authorization": "Bearer HEADER_SECRET"},
+ "authorization": "Bearer AUTHORIZATION_SECRET",
}
]
with patch.object(llm, "root_client", mock_client):
llm_with_tools = llm.bind_tools(tools)
_ = llm_with_tools.invoke([input_message], config={"callbacks": [tracer]})
- # Test headers are not traced
+ # Test credentials are not traced
assert len(tracer.chat_model_start_inputs) == 1
invocation_params = tracer.chat_model_start_inputs[0]["kwargs"]["invocation_params"]
- for tool in invocation_params["tools"]:
- if "headers" in tool:
- assert tool["headers"] == "**REDACTED**"
- for substring in ["Authorization", "Bearer", "PLACEHOLDER"]:
+ assert invocation_params["tools"][0]["headers"] == "**REDACTED**"
+ assert invocation_params["tools"][0]["authorization"] == "**REDACTED**"
+ for substring in [
+ "Authorization",
+ "Bearer",
+ "HEADER_SECRET",
+ "AUTHORIZATION_SECRET",
+ ]:
assert substring not in str(tracer.chat_model_start_inputs)
- # Test headers are correctly propagated to request
+ # Test credentials are correctly propagated to request
payload = llm_with_tools._get_request_payload([input_message], tools=tools) # type: ignore[attr-defined]
- assert payload["tools"][0]["headers"]["Authorization"] == "Bearer PLACEHOLDER"
+ assert payload["tools"][0]["headers"]["Authorization"] == "Bearer HEADER_SECRET"
+ assert payload["tools"][0]["authorization"] == "Bearer AUTHORIZATION_SECRET"
def test_compat_responses_v03() -> None: