mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-06-18 05:25:57 +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>
126 lines
6.0 KiB
Python
126 lines
6.0 KiB
Python
"""ORM models for user-owned IM channel connections."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from datetime import UTC, datetime
|
|
|
|
from sqlalchemy import JSON, DateTime, ForeignKey, Index, Integer, String, Text, UniqueConstraint, text
|
|
from sqlalchemy.orm import Mapped, mapped_column
|
|
|
|
from deerflow.persistence.base import Base
|
|
|
|
|
|
def _utc_now() -> datetime:
|
|
return datetime.now(UTC)
|
|
|
|
|
|
class ChannelConnectionRow(Base):
|
|
__tablename__ = "channel_connections"
|
|
|
|
id: Mapped[str] = mapped_column(String(64), primary_key=True)
|
|
owner_user_id: Mapped[str] = mapped_column(String(64), nullable=False, index=True)
|
|
provider: Mapped[str] = mapped_column(String(32), nullable=False, index=True)
|
|
status: Mapped[str] = mapped_column(String(32), nullable=False, default="connected")
|
|
|
|
external_account_id: Mapped[str] = mapped_column(String(128), nullable=False, default="")
|
|
external_account_name: Mapped[str | None] = mapped_column(String(256), nullable=True)
|
|
workspace_id: Mapped[str] = mapped_column(String(128), nullable=False, default="")
|
|
workspace_name: Mapped[str | None] = mapped_column(String(256), nullable=True)
|
|
bot_user_id: Mapped[str | None] = mapped_column(String(128), nullable=True)
|
|
|
|
scopes_json: Mapped[list] = mapped_column(JSON, default=list)
|
|
capabilities_json: Mapped[dict] = mapped_column(JSON, default=dict)
|
|
metadata_json: Mapped[dict] = mapped_column(JSON, default=dict)
|
|
|
|
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False, default=_utc_now)
|
|
updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False, default=_utc_now, onupdate=_utc_now)
|
|
last_seen_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
|
|
last_error_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
|
|
|
|
__table_args__ = (
|
|
UniqueConstraint(
|
|
"owner_user_id",
|
|
"provider",
|
|
"external_account_id",
|
|
"workspace_id",
|
|
name="uq_channel_connection_owner_provider_identity",
|
|
),
|
|
Index("idx_channel_connections_event_lookup", "provider", "workspace_id", "bot_user_id"),
|
|
# Enforce the single-active-owner invariant at the database layer: at most
|
|
# one non-revoked row may exist per external identity. This makes ownership
|
|
# transfer race-safe (concurrent connects from different owners can no
|
|
# longer both commit a connected row). Partial unique indexes are
|
|
# supported by both SQLite (>= 3.8.0) and PostgreSQL.
|
|
Index(
|
|
"uq_channel_connection_active_identity",
|
|
"provider",
|
|
"external_account_id",
|
|
"workspace_id",
|
|
unique=True,
|
|
sqlite_where=text("status != 'revoked'"),
|
|
postgresql_where=text("status != 'revoked'"),
|
|
),
|
|
)
|
|
|
|
|
|
class ChannelCredentialRow(Base):
|
|
__tablename__ = "channel_credentials"
|
|
|
|
connection_id: Mapped[str] = mapped_column(
|
|
String(64),
|
|
ForeignKey("channel_connections.id", ondelete="CASCADE"),
|
|
primary_key=True,
|
|
)
|
|
encrypted_access_token: Mapped[str | None] = mapped_column(Text, nullable=True)
|
|
encrypted_refresh_token: Mapped[str | None] = mapped_column(Text, nullable=True)
|
|
token_type: Mapped[str | None] = mapped_column(String(32), nullable=True)
|
|
expires_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
|
|
refresh_expires_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
|
|
encrypted_extra_json: Mapped[str | None] = mapped_column(Text, nullable=True)
|
|
version: Mapped[int] = mapped_column(Integer, nullable=False, default=1)
|
|
updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False, default=_utc_now, onupdate=_utc_now)
|
|
|
|
|
|
class ChannelOAuthStateRow(Base):
|
|
__tablename__ = "channel_oauth_states"
|
|
|
|
state_hash: Mapped[str] = mapped_column(String(128), primary_key=True)
|
|
owner_user_id: Mapped[str] = mapped_column(String(64), nullable=False, index=True)
|
|
provider: Mapped[str] = mapped_column(String(32), nullable=False, index=True)
|
|
code_verifier_encrypted: Mapped[str | None] = mapped_column(Text, nullable=True)
|
|
nonce_hash: Mapped[str | None] = mapped_column(String(128), nullable=True)
|
|
redirect_after: Mapped[str | None] = mapped_column(Text, nullable=True)
|
|
requested_scopes_json: Mapped[list] = mapped_column(JSON, default=list)
|
|
metadata_json: Mapped[dict] = mapped_column(JSON, default=dict)
|
|
expires_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
|
|
consumed_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
|
|
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False, default=_utc_now)
|
|
|
|
|
|
class ChannelConversationRow(Base):
|
|
__tablename__ = "channel_conversations"
|
|
|
|
id: Mapped[str] = mapped_column(String(64), primary_key=True)
|
|
connection_id: Mapped[str] = mapped_column(
|
|
String(64),
|
|
ForeignKey("channel_connections.id", ondelete="CASCADE"),
|
|
nullable=False,
|
|
index=True,
|
|
)
|
|
owner_user_id: Mapped[str] = mapped_column(String(64), nullable=False, index=True)
|
|
provider: Mapped[str] = mapped_column(String(32), nullable=False, index=True)
|
|
external_conversation_id: Mapped[str] = mapped_column(String(128), nullable=False)
|
|
external_topic_id: Mapped[str] = mapped_column(String(128), nullable=False, default="")
|
|
thread_id: Mapped[str] = mapped_column(String(64), nullable=False, index=True)
|
|
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False, default=_utc_now)
|
|
updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False, default=_utc_now, onupdate=_utc_now)
|
|
|
|
__table_args__ = (
|
|
UniqueConstraint(
|
|
"connection_id",
|
|
"external_conversation_id",
|
|
"external_topic_id",
|
|
name="uq_channel_conversation_connection_external",
|
|
),
|
|
)
|