mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-07-09 16:08:31 +00:00
Some checks are pending
Backend Blocking IO / backend-blocking-io (push) Waiting to run
Unit Tests / backend-unit-tests (push) Waiting to run
E2E Tests / e2e-tests (push) Waiting to run
Frontend Unit Tests / frontend-unit-tests (push) Waiting to run
Lint Check / lint-backend (push) Waiting to run
Lint Check / lint-frontend (push) Waiting to run
Replay E2E (front-back contract) / Layer 1 — backend golden (no API key) (push) Waiting to run
Replay E2E (front-back contract) / Layer 2 — full-stack render (no API key) (push) Waiting to run
* feat(channels): expose channel_user_id to sandbox commands as DEERFLOW_CHANNEL_USER_ID IM-channel skills need the sender's platform identity (Feishu open_id, Slack Uxxx, ...). The channel manager already writes channel_user_id into body.context, but the Gateway whitelist dropped it. Forward it into the runtime context only (never configurable, which is checkpointed), and have bash_tool export it as a fixed env var through a shell-quoted command prefix. The identity deliberately does not ride execute_command(env=...): that channel is reserved for request-scoped secrets, and a non-empty env switches AioSandbox onto the bash.exec path (fresh session per call, image >= 1.9.3 required), which would have broken every IM bash command on older sandbox images and abandoned persistent-shell semantics on new ones. A command-string export keeps the legacy path, stays visible in audit logs (it is an identifier, not a secret), and gives per-call correctness in group chats where one thread and sandbox are shared by senders with different platform ids. Skipped on the Windows local sandbox, whose PowerShell/cmd.exe fallback has no POSIX export. Part of #3914 * feat(channels): propagate channel_user_id to subagents; cap value length Review findings from the pre-PR verification pass: - Subagent delegation dropped the sender identity: task_tool now captures channel_user_id from the parent runtime context and the executor forwards it into the subagent's context, mirroring the guardrail attribution fields (user_role/oauth_*/run_id). Without this, bash commands delegated via task lost the group-chat sender's id. - body.context is client-writable on web requests, so values over 256 chars are ignored instead of bloating every command string sent to the sandbox. * fix(channels): set-or-unset channel_user_id so identity is per-call regardless of AIO session persistence Review (willem-bd): the identity export could leak across senders in a shared group-chat AIO sandbox. The AIO no-env path reuses a persistent shell session (the class-lock reason, #1433), and the 256-char/type guard made some commands carry no prefix — so a dropped-id command could resolve the id a previous sender exported. Make per-call correctness independent of session semantics: an IM-channel command (channel_user_id present in context) now always carries an explicit prefix — export VAR=<quoted> for a valid id, or unset VAR for an unusable one (empty / non-str / over the cap). Non-IM runs (no key) are untouched. A prefix unset has none of the '& ; unset' suffix hazard raised earlier. Verified on a real AIO 1.11.0 container: the no-id shell path auto-creates a session per call (does not persist today), but an explicit shared session DOES persist (export stale-A -> readback [stale-A]); the unset prefix clears it (-> []). So the fix holds even on an image whose no-id path persists. Regression tests cover the dropped-id group-chat window and the non-IM passthrough. Part of #3914 * test(channels): align channel_user_id task test with new Command return shape The merge from main changed task_tool to return a Command(update=...) instead of a plain string; update the assertion to extract the tool message via the existing _task_tool_message helper, matching the sibling tests. Fixes the CI backend-unit-tests failure introduced by the merge.
200 lines
9.6 KiB
Python
200 lines
9.6 KiB
Python
"""Tests for exposing the IM-channel platform user id to sandbox commands (#3914).
|
|
|
|
Two halves:
|
|
- Gateway: ``merge_run_context_overrides`` forwards ``channel_user_id`` from
|
|
``body.context`` into ``config['context']`` (runtime context) only — never
|
|
into ``configurable`` (which is checkpointed).
|
|
- Sandbox: ``bash_tool`` exposes the id as the fixed env var
|
|
``DEERFLOW_CHANNEL_USER_ID`` via an ``export`` prefix on the command string.
|
|
It must NOT ride the ``env=`` parameter: on ``AioSandbox`` a non-empty env
|
|
switches execution to the ``bash.exec`` API, which requires image >= 1.9.3
|
|
and abandons the persistent shell session — that channel is reserved for
|
|
request-scoped secrets.
|
|
"""
|
|
|
|
from types import SimpleNamespace
|
|
|
|
from deerflow.sandbox.tools import (
|
|
CHANNEL_USER_ID_ENV,
|
|
_channel_identity_prefix,
|
|
bash_tool,
|
|
)
|
|
|
|
_THREAD_DATA = {
|
|
"workspace_path": "/tmp/deer-flow/threads/t1/user-data/workspace",
|
|
"uploads_path": "/tmp/deer-flow/threads/t1/user-data/uploads",
|
|
"outputs_path": "/tmp/deer-flow/threads/t1/user-data/outputs",
|
|
}
|
|
|
|
|
|
def _aio_runtime(context: dict) -> SimpleNamespace:
|
|
return SimpleNamespace(
|
|
state={"sandbox": {"sandbox_id": "aio-sandbox-1"}, "thread_data": _THREAD_DATA.copy()},
|
|
context=context,
|
|
)
|
|
|
|
|
|
class _CapturingSandbox:
|
|
def __init__(self, output: str = "ok"):
|
|
self.calls: list[dict] = []
|
|
self._output = output
|
|
|
|
def execute_command(self, command: str, env=None, timeout=None) -> str:
|
|
self.calls.append({"command": command, "env": env})
|
|
return self._output
|
|
|
|
|
|
def _run_bash(monkeypatch, runtime, command: str = "echo hi") -> _CapturingSandbox:
|
|
sandbox = _CapturingSandbox()
|
|
monkeypatch.setattr("deerflow.sandbox.tools.ensure_sandbox_initialized", lambda runtime: sandbox)
|
|
monkeypatch.setattr("deerflow.sandbox.tools.ensure_thread_directories_exist", lambda runtime: None)
|
|
bash_tool.func(runtime=runtime, description="test", command=command)
|
|
return sandbox
|
|
|
|
|
|
class TestMergeRunContextOverridesChannelUserId:
|
|
def test_channel_user_id_propagates_to_runtime_context_only(self):
|
|
from app.gateway.services import build_run_config, merge_run_context_overrides
|
|
|
|
config = build_run_config("thread-1", None, None)
|
|
merge_run_context_overrides(config, {"channel_user_id": "ou_feishu_123"})
|
|
|
|
assert config["context"]["channel_user_id"] == "ou_feishu_123"
|
|
# Never into configurable: that mapping is checkpointed with the thread.
|
|
assert "channel_user_id" not in config["configurable"]
|
|
|
|
def test_existing_runtime_context_value_wins(self):
|
|
"""setdefault semantics: a server-side value stamped earlier must not be
|
|
overridden by the client-supplied body.context."""
|
|
from app.gateway.services import build_run_config, merge_run_context_overrides
|
|
|
|
config = build_run_config("thread-1", None, None)
|
|
config.setdefault("context", {})["channel_user_id"] = "server-stamped"
|
|
merge_run_context_overrides(config, {"channel_user_id": "client-supplied"})
|
|
|
|
assert config["context"]["channel_user_id"] == "server-stamped"
|
|
|
|
def test_absent_channel_user_id_adds_nothing(self):
|
|
from app.gateway.services import build_run_config, merge_run_context_overrides
|
|
|
|
config = build_run_config("thread-1", None, None)
|
|
merge_run_context_overrides(config, {"model_name": "gpt"})
|
|
|
|
assert "channel_user_id" not in config.get("context", {})
|
|
|
|
|
|
class TestBashToolChannelIdentityPrefix:
|
|
def test_identity_exported_and_env_stays_none(self, monkeypatch):
|
|
"""The id rides the command string; env must stay None so AioSandbox
|
|
keeps the legacy persistent-shell path (regression guard for the
|
|
#3921/#3922 bash.exec capability gap)."""
|
|
sandbox = _run_bash(monkeypatch, _aio_runtime({"channel_user_id": "ou_feishu_123"}))
|
|
|
|
assert len(sandbox.calls) == 1
|
|
assert sandbox.calls[0]["command"] == f"export {CHANNEL_USER_ID_ENV}=ou_feishu_123; echo hi"
|
|
assert sandbox.calls[0]["env"] is None
|
|
|
|
def test_no_channel_user_id_leaves_command_unchanged(self, monkeypatch):
|
|
sandbox = _run_bash(monkeypatch, _aio_runtime({"thread_id": "t1"}))
|
|
|
|
assert sandbox.calls[0]["command"] == "echo hi"
|
|
assert sandbox.calls[0]["env"] is None
|
|
|
|
def test_per_call_identity_follows_current_context(self, monkeypatch):
|
|
"""Group chats share one thread/sandbox: each message's run carries that
|
|
sender's id, so consecutive commands must each export their own value."""
|
|
first = _run_bash(monkeypatch, _aio_runtime({"channel_user_id": "sender-a"}))
|
|
second = _run_bash(monkeypatch, _aio_runtime({"channel_user_id": "sender-b"}))
|
|
|
|
assert "sender-a" in first.calls[0]["command"]
|
|
assert "sender-b" in second.calls[0]["command"]
|
|
|
|
def test_value_is_shell_quoted(self, monkeypatch):
|
|
"""A hostile platform id must not be able to inject shell syntax."""
|
|
sandbox = _run_bash(monkeypatch, _aio_runtime({"channel_user_id": "x'; rm -rf /tmp/y; '"}))
|
|
|
|
command = sandbox.calls[0]["command"]
|
|
assert command.endswith("; echo hi")
|
|
# shlex.quote wraps the value; the raw injection payload must not appear
|
|
# as executable syntax outside the quoted region.
|
|
assert "export " + CHANNEL_USER_ID_ENV + "='x'\"'\"'; rm -rf /tmp/y; '\"'\"''; echo hi" == command
|
|
|
|
def test_secrets_and_identity_compose(self, monkeypatch):
|
|
"""Active skill secrets keep the env= channel; the identity keeps the
|
|
command-string channel. They must not mix."""
|
|
runtime = _aio_runtime(
|
|
{
|
|
"channel_user_id": "ou_1",
|
|
"__active_skill_secrets": {"ERP_TOKEN": "secret-value"},
|
|
}
|
|
)
|
|
sandbox = _run_bash(monkeypatch, runtime)
|
|
|
|
call = sandbox.calls[0]
|
|
assert call["env"] == {"ERP_TOKEN": "secret-value"}
|
|
assert call["command"].startswith(f"export {CHANNEL_USER_ID_ENV}=ou_1; ")
|
|
assert "secret-value" not in call["command"]
|
|
|
|
def test_non_im_run_leaves_command_untouched(self):
|
|
"""No channel_user_id key at all → non-IM run → prefix is None so the
|
|
command (the vast majority: Web/API/subagent) is unchanged."""
|
|
assert _channel_identity_prefix(SimpleNamespace(context={"thread_id": "t1"})) is None
|
|
assert _channel_identity_prefix(SimpleNamespace(context={})) is None
|
|
assert _channel_identity_prefix(SimpleNamespace(context=None)) is None
|
|
|
|
def test_unusable_value_emits_unset_not_none(self, monkeypatch):
|
|
"""An IM run whose id is unusable (empty / non-str / over the cap) must
|
|
emit ``unset`` — not skip the prefix. Skipping would let a bare command
|
|
resolve a stale value left in the AIO persistent shell by an earlier
|
|
sender (willem-bd's group-chat leak window)."""
|
|
for bad in ("", 123, "x" * 5000, None):
|
|
prefix = _channel_identity_prefix(SimpleNamespace(context={"channel_user_id": bad}))
|
|
assert prefix == f"unset {CHANNEL_USER_ID_ENV}; ", f"value={bad!r}"
|
|
|
|
def test_group_chat_dropped_id_clears_previous_sender(self, monkeypatch):
|
|
"""Sender A (valid) then sender B (over-cap id, dropped): B's command must
|
|
carry ``unset`` so it cannot inherit A's exported id in a shared
|
|
persistent-shell sandbox — per-call correctness independent of session
|
|
persistence."""
|
|
a = _run_bash(monkeypatch, _aio_runtime({"channel_user_id": "sender-a"}))
|
|
b = _run_bash(monkeypatch, _aio_runtime({"channel_user_id": "b" * 5000}))
|
|
|
|
assert a.calls[0]["command"] == f"export {CHANNEL_USER_ID_ENV}=sender-a; echo hi"
|
|
assert b.calls[0]["command"] == f"unset {CHANNEL_USER_ID_ENV}; echo hi"
|
|
assert b.calls[0]["env"] is None
|
|
|
|
def test_windows_local_sandbox_skips_prefix(self, monkeypatch):
|
|
"""On Windows the local sandbox may execute via PowerShell/cmd.exe where
|
|
POSIX ``export`` is not valid syntax — skip injection rather than break
|
|
every IM-channel command."""
|
|
runtime = SimpleNamespace(
|
|
state={"sandbox": {"sandbox_id": "local"}, "thread_data": _THREAD_DATA.copy()},
|
|
context={"channel_user_id": "ou_1", "thread_id": "t1"},
|
|
)
|
|
sandbox = _CapturingSandbox()
|
|
monkeypatch.setattr("deerflow.sandbox.tools.ensure_sandbox_initialized", lambda runtime: sandbox)
|
|
monkeypatch.setattr("deerflow.sandbox.tools.ensure_thread_directories_exist", lambda runtime: None)
|
|
monkeypatch.setattr("deerflow.sandbox.tools.is_host_bash_allowed", lambda: True)
|
|
monkeypatch.setattr("deerflow.sandbox.tools._is_windows", lambda: True)
|
|
|
|
bash_tool.func(runtime=runtime, description="test", command="echo hi")
|
|
|
|
assert len(sandbox.calls) == 1
|
|
assert "export" not in sandbox.calls[0]["command"]
|
|
|
|
def test_posix_local_sandbox_gets_prefix(self, monkeypatch):
|
|
runtime = SimpleNamespace(
|
|
state={"sandbox": {"sandbox_id": "local"}, "thread_data": _THREAD_DATA.copy()},
|
|
context={"channel_user_id": "ou_1", "thread_id": "t1"},
|
|
)
|
|
sandbox = _CapturingSandbox()
|
|
monkeypatch.setattr("deerflow.sandbox.tools.ensure_sandbox_initialized", lambda runtime: sandbox)
|
|
monkeypatch.setattr("deerflow.sandbox.tools.ensure_thread_directories_exist", lambda runtime: None)
|
|
monkeypatch.setattr("deerflow.sandbox.tools.is_host_bash_allowed", lambda: True)
|
|
|
|
bash_tool.func(runtime=runtime, description="test", command="echo hi")
|
|
|
|
assert len(sandbox.calls) == 1
|
|
command = sandbox.calls[0]["command"]
|
|
assert command.startswith(f"export {CHANNEL_USER_ID_ENV}=ou_1; ")
|
|
assert command.endswith("echo hi")
|