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.
154 lines
5.3 KiB
Python
154 lines
5.3 KiB
Python
"""ChannelStore — persists IM chat-to-DeerFlow thread mappings."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import logging
|
|
import tempfile
|
|
import threading
|
|
import time
|
|
from pathlib import Path
|
|
from typing import Any
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class ChannelStore:
|
|
"""JSON-file-backed store that maps IM conversations to DeerFlow threads.
|
|
|
|
Data layout (on disk)::
|
|
|
|
{
|
|
"<channel_name>:<chat_id>": {
|
|
"thread_id": "<uuid>",
|
|
"user_id": "<platform_user>",
|
|
"created_at": 1700000000.0,
|
|
"updated_at": 1700000000.0
|
|
},
|
|
...
|
|
}
|
|
|
|
The store is intentionally simple — a single JSON file that is atomically
|
|
rewritten on every mutation. For production workloads with high concurrency,
|
|
this can be swapped for a proper database backend.
|
|
"""
|
|
|
|
def __init__(self, path: str | Path | None = None) -> None:
|
|
if path is None:
|
|
from deerflow.config.paths import get_paths
|
|
|
|
path = Path(get_paths().base_dir) / "channels" / "store.json"
|
|
self._path = Path(path)
|
|
self._path.parent.mkdir(parents=True, exist_ok=True)
|
|
self._data: dict[str, dict[str, Any]] = self._load()
|
|
self._lock = threading.Lock()
|
|
|
|
# -- persistence -------------------------------------------------------
|
|
|
|
def _load(self) -> dict[str, dict[str, Any]]:
|
|
if self._path.exists():
|
|
try:
|
|
return json.loads(self._path.read_text(encoding="utf-8"))
|
|
except (json.JSONDecodeError, OSError):
|
|
logger.warning("Corrupt channel store at %s, starting fresh", self._path)
|
|
return {}
|
|
|
|
def _save(self) -> None:
|
|
fd = tempfile.NamedTemporaryFile(
|
|
mode="w",
|
|
dir=self._path.parent,
|
|
suffix=".tmp",
|
|
delete=False,
|
|
)
|
|
try:
|
|
json.dump(self._data, fd, indent=2)
|
|
fd.close()
|
|
Path(fd.name).replace(self._path)
|
|
except BaseException:
|
|
fd.close()
|
|
Path(fd.name).unlink(missing_ok=True)
|
|
raise
|
|
|
|
# -- key helpers -------------------------------------------------------
|
|
|
|
@staticmethod
|
|
def _key(channel_name: str, chat_id: str, topic_id: str | None = None) -> str:
|
|
if topic_id:
|
|
return f"{channel_name}:{chat_id}:{topic_id}"
|
|
return f"{channel_name}:{chat_id}"
|
|
|
|
# -- public API --------------------------------------------------------
|
|
|
|
def get_thread_id(self, channel_name: str, chat_id: str, topic_id: str | None = None) -> str | None:
|
|
"""Look up the DeerFlow thread_id for a given IM conversation/topic."""
|
|
entry = self._data.get(self._key(channel_name, chat_id, topic_id))
|
|
return entry["thread_id"] if entry else None
|
|
|
|
def set_thread_id(
|
|
self,
|
|
channel_name: str,
|
|
chat_id: str,
|
|
thread_id: str,
|
|
*,
|
|
topic_id: str | None = None,
|
|
user_id: str = "",
|
|
) -> None:
|
|
"""Create or update the mapping for an IM conversation/topic."""
|
|
with self._lock:
|
|
key = self._key(channel_name, chat_id, topic_id)
|
|
now = time.time()
|
|
existing = self._data.get(key)
|
|
self._data[key] = {
|
|
"thread_id": thread_id,
|
|
"user_id": user_id,
|
|
"created_at": existing["created_at"] if existing else now,
|
|
"updated_at": now,
|
|
}
|
|
self._save()
|
|
|
|
def remove(self, channel_name: str, chat_id: str, topic_id: str | None = None) -> bool:
|
|
"""Remove a mapping.
|
|
|
|
If ``topic_id`` is provided, only that specific conversation/topic mapping is removed.
|
|
If ``topic_id`` is omitted, all mappings whose key starts with
|
|
``"<channel_name>:<chat_id>"`` (including topic-specific ones) are removed.
|
|
|
|
Returns True if at least one mapping was removed.
|
|
"""
|
|
with self._lock:
|
|
# Remove a specific conversation/topic mapping.
|
|
if topic_id is not None:
|
|
key = self._key(channel_name, chat_id, topic_id)
|
|
if key in self._data:
|
|
del self._data[key]
|
|
self._save()
|
|
return True
|
|
return False
|
|
|
|
# Remove all mappings for this channel/chat_id (base and any topic-specific keys).
|
|
prefix = self._key(channel_name, chat_id)
|
|
keys_to_delete = [k for k in self._data if k == prefix or k.startswith(prefix + ":")]
|
|
if not keys_to_delete:
|
|
return False
|
|
|
|
for k in keys_to_delete:
|
|
del self._data[k]
|
|
self._save()
|
|
return True
|
|
|
|
def list_entries(self, channel_name: str | None = None) -> list[dict[str, Any]]:
|
|
"""List all stored mappings, optionally filtered by channel."""
|
|
results = []
|
|
for key, entry in self._data.items():
|
|
parts = key.split(":", 2)
|
|
ch = parts[0]
|
|
chat = parts[1] if len(parts) > 1 else ""
|
|
topic = parts[2] if len(parts) > 2 else None
|
|
if channel_name and ch != channel_name:
|
|
continue
|
|
item: dict[str, Any] = {"channel_name": ch, "chat_id": chat, **entry}
|
|
if topic is not None:
|
|
item["topic_id"] = topic
|
|
results.append(item)
|
|
return results
|