mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-06-18 13:46:02 +00:00
68ba4198b8
* fix(channels): make channel connect flow deterministic * make format * fix(channels): apply connect-code before allowed_users on telegram and wechat The bind-bootstrap reorder shipped for slack/dingtalk only. Telegram and WeChat still gate _check_user/allowed_users before connect-code dispatch, so a newly allowlisted-but-unbound user is silently rejected when binding via the browser deep-link / connect-code flow — the same deadlock the PR fixes. - telegram: consume the /start deep-link token before the allowed_users gate. - wechat: handle the /connect code before the allowed_users gate, and defer inbound file extraction + context-token tracking past the gate so blocked senders no longer trigger CDN downloads or token bookkeeping. Adds regression tests for both adapters mirroring the slack/dingtalk coverage. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * fix(channels): enforce single-active-owner invariant at the DB layer _revoke_other_active_owners did a SELECT-then-UPDATE in app code with no row lock or constraint covering active rows. Under READ COMMITTED, two concurrent connect-code consumes for the same (provider, external_account_id, workspace_id) from different owners could each observe "no other active owner" and both commit a connected row, leaving find_connection_by_external_identity nondeterministic. - Add a partial unique index on (provider, external_account_id, workspace_id) WHERE status != 'revoked' (portable to SQLite >= 3.8.0 and PostgreSQL) so the database guarantees at most one non-revoked row per external identity. - Reorder upsert_connection to revoke other owners' active rows before the new connected row is flushed (so the index is satisfied at commit), wrapped in a bounded rollback-and-retry loop. A losing concurrent writer now retries against the now-visible state instead of committing a duplicate. Adds DB-constraint, revoked-slot-reuse, and concurrent-upsert regression tests. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * fix(channels): harden connect-status polling primitive pollChannelConnectionUntilResolved was a free-floating recursive setTimeout started from onSuccess with no cancellation, no per-provider dedup, a redundant second endpoint per tick, and an unbounded loop on a non-finite expires_in. - Extract a framework-agnostic, cancellable poller (connect-poll.ts) that polls only listChannelConnections() and invalidates the providers query once when the bind resolves, instead of fetching both endpoints every tick. - Guard expires_in with a finite check + default window so undefined/NaN can no longer produce a poll loop that runs until the page closes. - Track one active poll handle per provider in useConnectChannelProvider via a ref Map: a new connect cancels the prior poll for that provider, and a useEffect cleanup cancels all polls on unmount. Adds unit tests for resolve-and-stop, cancellation, and non-finite-expiry. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * fix(channels): stop leaking blocked-sender content in DingTalk INFO log; document bind semantics Moving the allowed_users gate past _extract_text meant the parsed-message INFO log (text=%r, first 100 chars) fired for senders that allowed_users would have rejected, defeating the filter's noise/privacy role. Move that log to after the allowed_users gate so blocked senders' message text never reaches INFO logs. Also document the two operator-relevant semantic changes in backend/CLAUDE.md: connect-code dispatch runs before allowed_users (so allowed_users is no longer a bind-time defense; the model relies on code confidentiality + 600s TTL + one-time consumption), and the single-active-owner-per-external-identity transfer semantics now backed by the partial unique index. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * docs(channels): note connect-code-vs-allowlist and ownership transfer in operator guide Mirror the backend/CLAUDE.md notes in the operator-facing IM_CHANNEL_CONNECTIONS.md: connect codes are consumed before allowed_users (so a not-yet-allowlisted user can still complete a first bind, and allowed_users is not a bind-time defense), and an external identity has at most one active owner with last-bind-wins transfer enforced at the DB layer. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * refactor(channels): lift connect-code dispatch into Channel base class Each adapter duplicated the ordering-sensitive boilerplate of extracting a /connect code and guarding on the connection repo before its allowed_users gate. The duplication is what let telegram/wechat drift and keep the gate ahead of the bind. Centralize it: - Move `_connection_repo` onto Channel.__init__ (removing 7 duplicate assignments). - Add Channel._pending_connect_code(text), which guards on the repo and extracts the code, documenting that adapters MUST consult it before authorization so a browser-initiated bind can bootstrap a not-yet-authorized identity. - Route slack, discord, feishu, dingtalk, wechat, and wecom through the helper. This also fixes a latent inconsistency where slack dispatched a bind even when no connection repo was configured. Pure refactor — the full channel suite stays green; adds a direct unit test for the base helper's contract. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * make format * fix(channels): redact DingTalk parsed-message INFO log content Log text_len instead of the first 100 chars of message text, so message content never reaches INFO logs (the after-gate move already keeps blocked senders out entirely). This takes over the redaction from #3584 so only this PR touches dingtalk.py, letting the two PRs merge in any order conflict-free. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
133 lines
4.6 KiB
Python
133 lines
4.6 KiB
Python
"""Tests for Telegram deep-link channel connections."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from datetime import UTC, datetime, timedelta
|
|
from pathlib import Path
|
|
from unittest.mock import AsyncMock, MagicMock
|
|
|
|
import pytest
|
|
|
|
from app.channels.message_bus import MessageBus
|
|
from app.channels.telegram import TelegramChannel
|
|
|
|
|
|
@pytest.fixture
|
|
async def repo(tmp_path: Path):
|
|
from deerflow.persistence.channel_connections import ChannelConnectionRepository, ChannelCredentialCipher
|
|
from deerflow.persistence.engine import close_engine, get_session_factory, init_engine
|
|
|
|
await init_engine("sqlite", url=f"sqlite+aiosqlite:///{tmp_path / 'telegram.db'}", sqlite_dir=str(tmp_path))
|
|
try:
|
|
yield ChannelConnectionRepository(
|
|
get_session_factory(),
|
|
cipher=ChannelCredentialCipher.from_key("telegram-secret"),
|
|
)
|
|
finally:
|
|
await close_engine()
|
|
|
|
|
|
def _telegram_update(*, text: str = "/start", user_id: int = 42, chat_id: int = 100, chat_type: str = "private"):
|
|
update = MagicMock()
|
|
update.effective_user.id = user_id
|
|
update.effective_user.username = "alice"
|
|
update.effective_user.full_name = "Alice Example"
|
|
update.effective_chat.id = chat_id
|
|
update.effective_chat.type = chat_type
|
|
update.message.text = text
|
|
update.message.message_id = 55
|
|
update.message.reply_to_message = None
|
|
update.message.reply_text = AsyncMock()
|
|
return update
|
|
|
|
|
|
@pytest.mark.anyio
|
|
async def test_start_with_deep_link_state_binds_telegram_chat(repo):
|
|
state = "telegram-bind-state"
|
|
await repo.create_oauth_state(
|
|
owner_user_id="deerflow-user-1",
|
|
provider="telegram",
|
|
state=state,
|
|
expires_at=datetime.now(UTC) + timedelta(minutes=5),
|
|
)
|
|
channel = TelegramChannel(
|
|
bus=MessageBus(),
|
|
config={"bot_token": "test-token", "connection_repo": repo},
|
|
)
|
|
update = _telegram_update(text=f"/start {state}")
|
|
context = MagicMock()
|
|
context.args = [state]
|
|
|
|
await channel._cmd_start(update, context)
|
|
|
|
connections = await repo.list_connections("deerflow-user-1")
|
|
assert len(connections) == 1
|
|
assert connections[0]["provider"] == "telegram"
|
|
assert connections[0]["external_account_id"] == "42"
|
|
assert connections[0]["external_account_name"] == "Alice Example"
|
|
assert connections[0]["workspace_id"] == "100"
|
|
assert connections[0]["metadata"]["chat_type"] == "private"
|
|
update.message.reply_text.assert_awaited_once()
|
|
assert "connected" in update.message.reply_text.await_args.args[0].lower()
|
|
|
|
|
|
@pytest.mark.anyio
|
|
async def test_start_token_bypasses_allowed_users_filter(repo):
|
|
# A newly allowlisted-but-unbound user must be able to bootstrap their first
|
|
# bind via the deep-link start token even though their Telegram id is not yet
|
|
# in allowed_users. The allowed_users gate must run after token handling.
|
|
state = "telegram-bind-state"
|
|
await repo.create_oauth_state(
|
|
owner_user_id="deerflow-user-1",
|
|
provider="telegram",
|
|
state=state,
|
|
expires_at=datetime.now(UTC) + timedelta(minutes=5),
|
|
)
|
|
channel = TelegramChannel(
|
|
bus=MessageBus(),
|
|
config={
|
|
"bot_token": "test-token",
|
|
"connection_repo": repo,
|
|
"allowed_users": [999], # newcomer (42) is not whitelisted
|
|
},
|
|
)
|
|
update = _telegram_update(text=f"/start {state}", user_id=42)
|
|
context = MagicMock()
|
|
context.args = [state]
|
|
|
|
await channel._cmd_start(update, context)
|
|
|
|
connections = await repo.list_connections("deerflow-user-1")
|
|
assert len(connections) == 1
|
|
assert connections[0]["external_account_id"] == "42"
|
|
assert "connected" in update.message.reply_text.await_args.args[0].lower()
|
|
|
|
|
|
@pytest.mark.anyio
|
|
async def test_bound_telegram_message_publishes_connection_identity(repo):
|
|
connection = await repo.upsert_connection(
|
|
owner_user_id="deerflow-user-1",
|
|
provider="telegram",
|
|
external_account_id="42",
|
|
external_account_name="Alice Example",
|
|
workspace_id="100",
|
|
metadata={"chat_type": "private"},
|
|
)
|
|
bus = MessageBus()
|
|
channel = TelegramChannel(
|
|
bus=bus,
|
|
config={"bot_token": "test-token", "connection_repo": repo},
|
|
)
|
|
channel._main_loop = __import__("asyncio").get_event_loop()
|
|
channel._send_running_reply = AsyncMock()
|
|
|
|
await channel._on_text(_telegram_update(text="hello"), None)
|
|
inbound = await bus.get_inbound()
|
|
|
|
assert inbound.connection_id == connection["id"]
|
|
assert inbound.owner_user_id == "deerflow-user-1"
|
|
assert inbound.workspace_id == "100"
|
|
assert inbound.user_id == "42"
|
|
assert inbound.chat_id == "100"
|
|
assert inbound.text == "hello"
|