DATA
6de0bf9f5b
Vendored deer-flow upstream (bytedance/deer-flow) plus prompt-injection hardening: - New deerflow.security package: content_delimiter, html_cleaner, sanitizer (8 layers — invisible chars, control chars, symbols, NFC, PUA, tag chars, horizontal whitespace collapse with newline/tab preservation, length cap) - New deerflow.community.searx package: web_search, web_fetch, image_search backed by a private SearX instance, every external string sanitized and wrapped in <<<EXTERNAL_UNTRUSTED_CONTENT>>> delimiters - All native community web providers (ddg_search, tavily, exa, firecrawl, jina_ai, infoquest, image_search) replaced with hard-fail stubs that raise NativeWebToolDisabledError at import time, so a misconfigured tool.use path fails loud rather than silently falling back to unsanitized output - Native client back-doors (jina_client.py, infoquest_client.py) stubbed too - Native-tool tests quarantined under tests/_disabled_native/ (collect_ignore_glob via local conftest.py) - Sanitizer Layer 7 fix: only collapse horizontal whitespace, preserve newlines and tabs so list/table structure survives - Hardened runtime config.yaml references only the searx-backed tools - Factory overlay (backend/) kept in sync with deer-flow tree as a reference / source See HARDENING.md for the full audit trail and verification steps.
88 lines
3.2 KiB
Python
88 lines
3.2 KiB
Python
from types import SimpleNamespace
|
|
|
|
from deerflow.sandbox.security import is_host_bash_allowed
|
|
from deerflow.tools.tools import get_available_tools
|
|
|
|
|
|
def _make_config(*, allow_host_bash: bool, sandbox_use: str = "deerflow.sandbox.local:LocalSandboxProvider", extra_tools: list[SimpleNamespace] | None = None):
|
|
return SimpleNamespace(
|
|
tools=[
|
|
SimpleNamespace(name="bash", group="bash", use="deerflow.sandbox.tools:bash_tool"),
|
|
SimpleNamespace(name="ls", group="file:read", use="tests:ls_tool"),
|
|
*(extra_tools or []),
|
|
],
|
|
models=[],
|
|
sandbox=SimpleNamespace(
|
|
use=sandbox_use,
|
|
allow_host_bash=allow_host_bash,
|
|
),
|
|
tool_search=SimpleNamespace(enabled=False),
|
|
get_model_config=lambda name: None,
|
|
)
|
|
|
|
|
|
def test_get_available_tools_hides_bash_for_default_local_sandbox(monkeypatch):
|
|
monkeypatch.setattr("deerflow.tools.tools.get_app_config", lambda: _make_config(allow_host_bash=False))
|
|
monkeypatch.setattr(
|
|
"deerflow.tools.tools.resolve_variable",
|
|
lambda use, _: SimpleNamespace(name="bash" if "bash" in use else "ls"),
|
|
)
|
|
|
|
names = [tool.name for tool in get_available_tools(include_mcp=False, subagent_enabled=False)]
|
|
|
|
assert "bash" not in names
|
|
assert "ls" in names
|
|
|
|
|
|
def test_get_available_tools_keeps_bash_when_explicitly_enabled(monkeypatch):
|
|
monkeypatch.setattr("deerflow.tools.tools.get_app_config", lambda: _make_config(allow_host_bash=True))
|
|
monkeypatch.setattr(
|
|
"deerflow.tools.tools.resolve_variable",
|
|
lambda use, _: SimpleNamespace(name="bash" if "bash" in use else "ls"),
|
|
)
|
|
|
|
names = [tool.name for tool in get_available_tools(include_mcp=False, subagent_enabled=False)]
|
|
|
|
assert "bash" in names
|
|
assert "ls" in names
|
|
|
|
|
|
def test_get_available_tools_hides_renamed_host_bash_alias(monkeypatch):
|
|
config = _make_config(
|
|
allow_host_bash=False,
|
|
extra_tools=[SimpleNamespace(name="shell", group="bash", use="deerflow.sandbox.tools:bash_tool")],
|
|
)
|
|
monkeypatch.setattr("deerflow.tools.tools.get_app_config", lambda: config)
|
|
monkeypatch.setattr(
|
|
"deerflow.tools.tools.resolve_variable",
|
|
lambda use, _: SimpleNamespace(name="bash" if "bash_tool" in use else "ls"),
|
|
)
|
|
|
|
names = [tool.name for tool in get_available_tools(include_mcp=False, subagent_enabled=False)]
|
|
|
|
assert "bash" not in names
|
|
assert "shell" not in names
|
|
assert "ls" in names
|
|
|
|
|
|
def test_get_available_tools_keeps_bash_for_aio_sandbox(monkeypatch):
|
|
config = _make_config(
|
|
allow_host_bash=False,
|
|
sandbox_use="deerflow.community.aio_sandbox:AioSandboxProvider",
|
|
)
|
|
monkeypatch.setattr("deerflow.tools.tools.get_app_config", lambda: config)
|
|
monkeypatch.setattr(
|
|
"deerflow.tools.tools.resolve_variable",
|
|
lambda use, _: SimpleNamespace(name="bash" if "bash_tool" in use else "ls"),
|
|
)
|
|
|
|
names = [tool.name for tool in get_available_tools(include_mcp=False, subagent_enabled=False)]
|
|
|
|
assert "bash" in names
|
|
assert "ls" in names
|
|
|
|
|
|
def test_is_host_bash_allowed_defaults_false_when_sandbox_missing():
|
|
assert is_host_bash_allowed(SimpleNamespace()) is False
|
|
assert is_host_bash_allowed(SimpleNamespace(sandbox=None)) is False
|