Skip to content

Commit c57a3a6

Browse files
committed
fix(mcp): sanitize headers in McpTool for consistency with McpToolset
1 parent 34aadc4 commit c57a3a6

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

src/google/adk/tools/mcp_tool/mcp_tool.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
from .mcp_session_manager import MCPSessionManager
5959
from .mcp_session_manager import retry_on_errors
6060
from .session_context import SessionContext
61+
from ._internal import sanitize_header_value
6162
from .types import HeaderProvider
6263

6364
logger = logging.getLogger("google_adk." + __name__)
@@ -396,6 +397,11 @@ async def _run_async_impl(
396397
headers.update(auth_headers)
397398
if dynamic_headers:
398399
headers.update(dynamic_headers)
400+
401+
# Sanitize all header values to prevent injection attacks.
402+
if headers:
403+
headers = {k: sanitize_header_value(v) for k, v in headers.items()}
404+
399405
final_headers = headers if headers else None
400406

401407
# Propagate trace context in the _meta field as sprcified by MCP protocol.

0 commit comments

Comments
 (0)