Skip to content

fix: validate transport type in custom MCP server config to prevent command injection #4910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jackieya wants to merge 1 commit into
base: v2
Choose a base branch
from
+6 −2
Open

fix: validate transport type in custom MCP server config to prevent command injection #4910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/application/chat_pipeline/step/chat_step/impl/base_chat_step.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,8 @@ def _handle_mcp_request(self, mcp_source, mcp_servers, mcp_tool_ids, tool_ids,
# 兼容老数据
if not mcp_tool_ids:
mcp_tool_ids = []
if mcp_source == 'custom' and mcp_servers and '"stdio"' not in mcp_servers:
if mcp_source == 'custom' and mcp_servers:
ToolExecutor().validate_mcp_transport(mcp_servers)
mcp_servers_config = json.loads(mcp_servers)
elif mcp_tool_ids:
mcp_tools = QuerySet(Tool).filter(id__in=mcp_tool_ids).values()
Expand Down
3 changes: 2 additions & 1 deletion apps/application/flow/step_node/ai_chat_step_node/impl/base_chat_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,8 @@ def _handle_mcp_request(self, mcp_source, mcp_servers, mcp_tool_id, mcp_tool_ids
mcp_tool_ids = []
if mcp_tool_id:
mcp_tool_ids = list(set(mcp_tool_ids + [mcp_tool_id]))
if mcp_source == 'custom' and mcp_servers and '"stdio"' not in mcp_servers:
if mcp_source == 'custom' and mcp_servers:
ToolExecutor().validate_mcp_transport(mcp_servers)
mcp_servers_config = json.loads(mcp_servers)
mcp_servers_config = self.handle_variables(mcp_servers_config)
elif mcp_tool_ids:
Expand Down
2 changes: 2 additions & 0 deletions apps/application/flow/step_node/mcp_node/impl/base_mcp_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from application.flow.i_step_node import NodeResult
from application.flow.step_node.mcp_node.i_mcp_node import IMcpNode
from tools.models import Tool
from common.utils.tool_code import ToolExecutor


class BaseMcpNode(IMcpNode):
Expand All @@ -34,6 +35,7 @@ def execute(self, mcp_servers, mcp_server, mcp_tool, mcp_tool_id, mcp_source, to
else:
servers = json.loads(mcp_servers)
servers = self.handle_variables(servers) # 处理servers中的变量
ToolExecutor().validate_mcp_transport(json.dumps(servers))
params = json.loads(json.dumps(tool_params))
params = self.handle_variables(params)

Expand Down