mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-06-13 10:55:59 +00:00
aa015462a7
* Add user-owned IM channel connections * Fix dev startup and channel connect popup * Use async channel connect flow * Harden dev service daemon startup * Support local IM channel connections * Align IM connections with local channels * Fix safe user id digest algorithm * Address Copilot IM channel feedback * Address IM channel review comments * Support all integrated IM channel connections * Format additional channel connection tests * Keep unavailable channel connect buttons clickable * Fix IM channel provider icons * Add runtime setup for enabled IM channels * Guard global shortcut key handling * Keep configured IM channels editable * Avoid password autofill for channel secrets * Make channel threads visible to connection owners * Persist IM runtime config locally * Allow disconnecting runtime IM channels * Route no-auth channel sessions to local user * Use default user for auth-disabled local mode * Show IM channel source on threads * Prefill IM channel runtime config * Reflect IM channel runtime health * Ignore Feishu message read events * Ignore Feishu non-content message events * Let setup wizard enable IM channels * Fix frontend formatting after merge * Stabilize backend tests without local config * Isolate channel runtime config tests * Address channel connection review comments * Use sha256 user buckets with legacy migration * Ensure runtime IM channels are ready after restart * Persist disconnected IM channel state * Address channel connection review comments * Address channel connection review findings Frontend connect flow: - Open the runtime-config dialog only when a provider still needs credentials; configured providers go straight to the connect flow, so the binding-code/deep-link path is reachable from the UI again. - After saving credentials, continue into the connect flow when a user binding is still required (multi-user mode) instead of stopping at a "Connected" toast. - Extract shared provider-state helpers to core/channels/provider-state and add unit + e2e coverage for the direct-connect and configure-then-connect paths. Provider status semantics: - Report connection_status from the user's newest connection row; with no binding it is not_connected, except in auth-disabled local mode where a configured running channel is effectively connected. Concurrency and event-loop correctness: - Offload ChannelRuntimeConfigStore construction and writes, channel service construction, and Slack connection replies to threads; add a tests/blocking_io/ anchor for the runtime-config handlers. - Consume binding codes with a conditional UPDATE so a code can only be used once under concurrent workers; retry upsert_connection as an update when a concurrent insert wins the unique constraint. - Serialize ensure_channel_ready per channel so concurrent provider polls cannot double-start a channel worker. Config and migration hardening: - Stop mutating the get_app_config()-cached Telegram provider config; the runtime store now owns the UI-entered bot username. - Register channel_connections in STARTUP_ONLY_FIELDS with the standardized startup-only Field description. - Match the legacy unsafe-id bucket by recomputing its exact SHA-1 name so another user's same-prefix bucket can never be migrated. - Remove the unused Telegram process_webhook_update path and document src/core/channels in the frontend docs. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Address PR review comments on authz scoping and channel runtime Security (review feedback from ShenAC-SAC): - Scope internal-token callers to the connection owner carried in X-DeerFlow-Owner-User-Id instead of bypassing owner checks outright, in both require_permission(owner_check=True) and the stateless run endpoints. Internal callers keep access to their own and shared/legacy threads, and may claim a default-owned channel thread for its real owner, but a leaked internal token no longer grants cross-user thread access. - Require admin privileges for POST/DELETE /api/channels/{provider}/ runtime-config: runtime credentials and channel workers are instance-wide shared state (same model as the MCP config API). Read-only provider listing stays available to all users. Performance (review feedback from willem-bd): - Skip the redundant thread channel-metadata PATCH after the first successful backfill per thread. - Reuse the per-connection Slack WebClient until its token changes instead of constructing one per outbound message. - Reconcile channel readiness for all providers concurrently in GET /api/channels/providers. Also resolve the code-quality unused-import flag in the blocking-io anchor by pre-importing the channel service via importlib. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Fix prettier formatting in provider-state test Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Reconcile UI runtime channel config with config reload on restart Main now reloads a channel's config.yaml entry on restart_channel() (#3514, issue #3497). Adapt the user-owned connection flow to coexist: - configure_channel() restarts with reload_config=False — the caller just supplied the authoritative config (browser-entered credentials that are never written to config.yaml), so a file reload must not clobber it with the stale on-disk entry. - _load_channel_config() re-applies the UI runtime-store overlay used at startup, so an operator-triggered restart keeps browser-entered credentials for channels without a config.yaml entry and does not resurrect a channel disconnected from the UI. - Offload the reload's disk IO (config.yaml + runtime store) with asyncio.to_thread, matching the blocking-IO policy on this branch. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
206 lines
8.2 KiB
Python
206 lines
8.2 KiB
Python
"""Cross-user isolation for the stateless ``POST /api/runs/stream`` and ``/wait`` endpoints.
|
|
|
|
These endpoints receive ``thread_id`` in the request body, so the
|
|
``@require_permission(owner_check=True)`` decorator — which reads the
|
|
``thread_id`` *path* parameter — cannot protect them. The owner check
|
|
lives inside ``services.start_run()`` instead; this suite pins it at the
|
|
HTTP layer so the gap cannot silently reopen.
|
|
|
|
Strategy
|
|
--------
|
|
``app.state.run_manager.create_or_reject`` raises ``ConflictError``, so a
|
|
request that *passes* the owner check deterministically short-circuits
|
|
with 409 before any agent code runs. The two outcomes:
|
|
|
|
- 404 + ``create_or_reject`` never awaited -> blocked by the owner check
|
|
- 409 + ``create_or_reject`` awaited -> passed the owner check
|
|
|
|
The thread store is a real ``MemoryThreadMetaStore`` (not a mock) so the
|
|
``check_access`` semantics under test — missing row allows, ``user_id``
|
|
NULL allows, foreign owner denies — are exercised through real code.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
from contextlib import contextmanager
|
|
from types import SimpleNamespace
|
|
from unittest.mock import AsyncMock, MagicMock
|
|
from uuid import uuid4
|
|
|
|
import pytest
|
|
from _router_auth_helpers import make_authed_test_app
|
|
from fastapi.testclient import TestClient
|
|
from langgraph.store.memory import InMemoryStore
|
|
|
|
from app.gateway.auth.models import User
|
|
from app.gateway.routers import runs
|
|
from deerflow.config.app_config import AppConfig, reset_app_config, set_app_config
|
|
from deerflow.persistence.thread_meta.memory import MemoryThreadMetaStore
|
|
from deerflow.runtime import ConflictError
|
|
|
|
USER_A = User(email="owner-a@example.com", password_hash="x", system_role="user", id=uuid4())
|
|
USER_B = User(email="intruder-b@example.com", password_hash="x", system_role="user", id=uuid4())
|
|
INTERNAL_USER = SimpleNamespace(id="default", system_role="internal")
|
|
|
|
THREAD_A = "thread-owned-by-a"
|
|
THREAD_SHARED = "thread-shared-null-owner"
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _stub_app_config():
|
|
"""Inject a minimal AppConfig so the allowed path (which builds a
|
|
RunContext via ``get_config()``) never reads config.yaml from disk."""
|
|
set_app_config(AppConfig.model_validate({"sandbox": {"use": "deerflow.sandbox.local:LocalSandboxProvider"}}))
|
|
yield
|
|
reset_app_config()
|
|
|
|
|
|
def _make_thread_store() -> MemoryThreadMetaStore:
|
|
store = MemoryThreadMetaStore(InMemoryStore())
|
|
|
|
async def _seed():
|
|
await store.create(THREAD_A, user_id=str(USER_A.id))
|
|
await store.create(THREAD_SHARED, user_id=None)
|
|
|
|
asyncio.run(_seed())
|
|
return store
|
|
|
|
|
|
@contextmanager
|
|
def _client(user):
|
|
"""Yield a ``TestClient`` authenticated as ``user`` plus the stubbed
|
|
``create_or_reject`` mock, closing the client (and its anyio portal /
|
|
background threads) on exit.
|
|
|
|
``create_or_reject`` raises ``ConflictError`` so a request that passes the
|
|
owner check short-circuits to 409 before any agent code runs.
|
|
"""
|
|
app = make_authed_test_app(user_factory=lambda: user)
|
|
app.include_router(runs.router)
|
|
app.state.thread_store = _make_thread_store()
|
|
app.state.stream_bridge = MagicMock()
|
|
app.state.checkpointer = MagicMock()
|
|
app.state.store = MagicMock()
|
|
app.state.run_events_config = None
|
|
app.state.run_event_store = MagicMock()
|
|
run_manager = MagicMock()
|
|
run_manager.create_or_reject = AsyncMock(side_effect=ConflictError("sentinel: owner check passed"))
|
|
app.state.run_manager = run_manager
|
|
with TestClient(app) as client:
|
|
yield client, run_manager.create_or_reject
|
|
|
|
|
|
def _body(thread_id: str | None = None) -> dict:
|
|
if thread_id is None:
|
|
return {}
|
|
return {"config": {"configurable": {"thread_id": thread_id}}}
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Denied: another user's thread
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_stream_cross_user_returns_404():
|
|
"""User B cannot start a run on user A's thread via /api/runs/stream."""
|
|
with _client(USER_B) as (client, create_or_reject):
|
|
response = client.post("/api/runs/stream", json=_body(THREAD_A))
|
|
assert response.status_code == 404
|
|
assert response.json()["detail"] == f"Thread {THREAD_A} not found"
|
|
create_or_reject.assert_not_awaited()
|
|
|
|
|
|
def test_wait_cross_user_returns_404_without_channel_values():
|
|
"""User B cannot read user A's checkpoint state via /api/runs/wait."""
|
|
with _client(USER_B) as (client, create_or_reject):
|
|
response = client.post("/api/runs/wait", json=_body(THREAD_A))
|
|
assert response.status_code == 404
|
|
assert response.json() == {"detail": f"Thread {THREAD_A} not found"}
|
|
create_or_reject.assert_not_awaited()
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Allowed: owner, fresh/untracked/shared threads, internal role
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_stream_owner_passes_owner_check():
|
|
"""User A reaches run creation on their own thread (409 sentinel)."""
|
|
with _client(USER_A) as (client, create_or_reject):
|
|
response = client.post("/api/runs/stream", json=_body(THREAD_A))
|
|
assert response.status_code == 409
|
|
create_or_reject.assert_awaited()
|
|
|
|
|
|
def test_wait_owner_passes_owner_check():
|
|
with _client(USER_A) as (client, create_or_reject):
|
|
response = client.post("/api/runs/wait", json=_body(THREAD_A))
|
|
assert response.status_code == 409
|
|
create_or_reject.assert_awaited()
|
|
|
|
|
|
def test_stream_without_thread_id_passes_owner_check():
|
|
"""Stateless run with no thread_id auto-creates a thread — never blocked."""
|
|
with _client(USER_B) as (client, create_or_reject):
|
|
response = client.post("/api/runs/stream", json=_body())
|
|
assert response.status_code == 409
|
|
create_or_reject.assert_awaited()
|
|
|
|
|
|
def test_stream_untracked_thread_passes_owner_check():
|
|
"""A thread_id with no thread_meta row (untracked legacy) stays accessible."""
|
|
with _client(USER_B) as (client, create_or_reject):
|
|
response = client.post("/api/runs/stream", json=_body("never-created-thread"))
|
|
assert response.status_code == 409
|
|
create_or_reject.assert_awaited()
|
|
|
|
|
|
def test_stream_shared_thread_passes_owner_check():
|
|
"""A thread_meta row with user_id NULL (shared / pre-auth data) stays accessible."""
|
|
with _client(USER_B) as (client, create_or_reject):
|
|
response = client.post("/api/runs/stream", json=_body(THREAD_SHARED))
|
|
assert response.status_code == 409
|
|
create_or_reject.assert_awaited()
|
|
|
|
|
|
def test_stream_internal_role_scoped_by_owner_header():
|
|
"""IM channels run with the internal system role on behalf of the
|
|
connection owner named in X-DeerFlow-Owner-User-Id — the owner check is
|
|
scoped to that owner rather than bypassed."""
|
|
from app.gateway.internal_auth import INTERNAL_OWNER_USER_ID_HEADER_NAME
|
|
|
|
with _client(INTERNAL_USER) as (client, create_or_reject):
|
|
response = client.post(
|
|
"/api/runs/stream",
|
|
json=_body(THREAD_A),
|
|
headers={INTERNAL_OWNER_USER_ID_HEADER_NAME: str(USER_A.id)},
|
|
)
|
|
assert response.status_code == 409
|
|
create_or_reject.assert_awaited()
|
|
|
|
|
|
def test_stream_internal_role_with_foreign_owner_header_returns_404():
|
|
"""The internal token alone must not grant access to another user's thread."""
|
|
from app.gateway.internal_auth import INTERNAL_OWNER_USER_ID_HEADER_NAME
|
|
|
|
with _client(INTERNAL_USER) as (client, create_or_reject):
|
|
response = client.post(
|
|
"/api/runs/stream",
|
|
json=_body(THREAD_A),
|
|
headers={INTERNAL_OWNER_USER_ID_HEADER_NAME: str(USER_B.id)},
|
|
)
|
|
assert response.status_code == 404
|
|
create_or_reject.assert_not_awaited()
|
|
|
|
|
|
def test_stream_internal_role_without_owner_header_is_scoped_to_internal_user():
|
|
"""Without an owner header internal callers keep access to their own and
|
|
shared/untracked threads, but not to user-owned threads."""
|
|
with _client(INTERNAL_USER) as (client, create_or_reject):
|
|
denied = client.post("/api/runs/stream", json=_body(THREAD_A))
|
|
allowed = client.post("/api/runs/stream", json=_body(THREAD_SHARED))
|
|
assert denied.status_code == 404
|
|
assert allowed.status_code == 409
|
|
create_or_reject.assert_awaited()
|