mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-09-14 16:08:41 +00:00
* feat(extensions): add gateway services and routers * feat(extensions): add standalone reference extension * fix(extensions): harden contributed gateway routes * docs(extensions): document gateway contribution points * feat(extensions): add operator CLI for packaged extension management Add `deerflow extensions install/list/enable/disable/remove` plus the root `make extension-*` wrappers, backed by an `ExtensionManager` that owns one transaction over backend/pyproject.toml, backend/uv.lock, the managed source snapshot, the uv environment, and the `plugins:` block in config.yaml. Install accepts a package requirement, a public HTTPS Git URL, or a local directory. Local directories are copied to backend/extensions/sources/ as deployable snapshots rather than editable installs, and the root .dockerignore re-includes that tree so snapshots reach the backend builder. Remote sources are HTTPS-only; SSH Git, file:// and local wheels are rejected because the stock Docker builder cannot reproduce them. Because environment configuration can still resolve a plain package name to a local wheel (a UV_FIND_LINKS wheelhouse, say), every uv add/remove is followed by an audit of the new lock: any local reference the stock image build cannot reproduce rolls back the whole transaction. A config carrying duplicate top-level `plugins:` keys is rejected outright rather than managed against one block while the Gateway reads another. Dependency synchronization now has one lock authority. The `extensions` dependency group joins [tool.uv].default-groups, every startup path syncs the same lock with --locked and launches with --no-sync, and the Docker images move to uv 0.11.1 for the --no-workspace boundary the manager needs. Loader gains `enabled`, `name` and `package` fields so a disabled extension is skipped before resolution and import. Co-authored-by: Codex <codex@openai.com> * fix(extensions): stop the managed plugins rewrite from destroying config Two data-safety defects in the managed `plugins:` block writer. The "next top-level key" boundary was a regex matching only `[A-Za-z_][A-Za-z0-9_-]*` or a quoted key. `AppConfig` is `extra="allow"`, so a config may legally carry any top-level key, and a key the pattern cannot recognize did not fail loudly — it read as "no next section", and the rewrite replaced that neighbour and its entire subtree with the managed block. `my.key`, `2fa`, `$schema`, `my key` and non-ASCII keys were all silently deleted by a plain `extension-enable`/`disable`. Both boundaries now come from the YAML parser's node marks, so key shape is irrelevant. The file-final branch never consulted the trailing-comment scan the has-next-key branch used, so any comment below the block was dropped. Since the manager appends `plugins:` at end of file, that is the steady-state shape for most installs: an operator note below the block was destroyed on the next toggle. Separately, every managed install wrote `required: true` while the loader defaults to false. That turned any later load failure — broken wheel, missing native library, deleted snapshot — into a Gateway startup abort recoverable only with shell access. New records are now written `required: false`, with an explicit `install --required` opt-in; adopting an existing hand-written record still preserves the operator's own choice. * fix(extensions): harden the manager transaction and correct its docs Follow-up hardening on the extension package manager. Security posture, which the docs already claimed: - Scrub `UV_PYTHON`, `UV_INSECURE_HOST`, `UV_CONSTRAINT` and `UV_NO_BUILD_ISOLATION` from the controlled uv environment. `UV_PYTHON` swaps the interpreter that the entry-point probe then imports and calls, and every later `uv run --no-sync` startup uses; `UV_INSECURE_HOST` removes the TLS validation the HTTPS-only source rule depends on. Neither is an index, proxy, cache or credential-provider setting, so neither was covered by the carve-out. - Recognize run-together and all-caps secret query parameters (`accesstoken`, `ACCESSTOKEN`, `key`, `pw`, `sas`, `code`). The camel-case splitter only fires on case transitions, so only the separated spellings were caught. Short generic words stay boundary-anchored, so `?keyword=` remains installable. - Validate the config before running any uv command. `uv add`/`uv sync` execute the package's build backend, so a config the manager could never write to must fail before that code runs rather than afterwards through rollback. Transaction integrity: - Run the second dependency-file restore from a `finally`. The recovery sync runs without `--locked` when the checkout had no lock, so uv writes one while resolving; if that sync then failed, the restore was skipped and the operator kept a lock file they never had. A failing recovery sync now also reports the original failure instead of replacing it. - Skip the recovery sync on cancellation. Answering Ctrl-C with a full dependency resolve invites a second interrupt that escapes the handler and strands the checkout mid-transaction; the declarations are already restored and the next locked startup sync reconciles the environment. - Retry a non-blocking lock on Windows instead of using `msvcrt.LK_LOCK`, which gives up after ~10s — far shorter than a real `uv add` plus `uv sync`, so contention surfaced as `Permission denied` rather than serializing. - Locate the entry-point probe's JSON payload instead of parsing stdout's first line, so a `sitecustomize`/`.pth` banner cannot roll back a good install. - Warn when the lock records a loopback source. `127.0.0.1` inside the image builder is a different machine, but unlike an environment-driven wheelhouse resolution this is a source the operator typed deliberately, so it is reported rather than rolled back. Private-network indexes are untouched: a builder on that network can reach them. Docs: the blanket claim that failed operations restore the config file was wrong — the conflict branches deliberately preserve a concurrent external edit and leave `remove` deactivated. Document that, the `required: false` default, the config preflight, the interrupt behaviour, and where the plugins-block boundaries come from. * test(gateway): pin the request-path projection agreement `get_request_route_path()` imports the private `starlette._utils.get_route_path` so the auth and CSRF predicates classify the exact string Starlette's router matches on. Its requirement is not "strip root_path correctly" but "return what the dispatcher is matching", so delegating to the router's own implementation keeps the two in lockstep by construction. Keep the private import rather than vendoring a copy: an import that disappears fails loudly at startup, while a stale copy diverges silently at a security boundary. Cover the property directly instead of the mechanism, so the tests survive a future reimplementation: - projection edge cases, including the segment-boundary guard that keeps root_path="/api" from slicing "/apifoo/models" into a string the router would never match - agreement with the router under nested mounts - the two bypasses these predicates exist to prevent: a protected route mounted under the "/health" public prefix must still 401, and a POST mounted under "/api/webhooks" must still require a CSRF token Both are verified to fail when the projection is reverted to `request.url.path` (9/13 red) and when a plausible vendored copy omits the boundary guard (the 2 boundary cases red). Declare starlette as a bounded direct dependency so a bump — which is security-relevant here — shows up in review rather than arriving silently through FastAPI. * ci: pin uv to the version production ships ExtensionManager is not a consumer of uv the build tool -- it is a program whose whole job is driving `uv` as a subprocess, depending on its CLI behavior (`--no-workspace`, `--no-sync`, what `uv add` writes into `[dependency-groups] extensions`) and on the `uv.lock` serialization format. uv is closer to a runtime dependency with a contract than to incidental tooling. backend/Dockerfile pins that binary to 0.11.1, but all eight astral-sh/setup-uv steps installed whatever was latest at run time, so CI exercised the manager against a uv that is not the uv production runs. The sharpest failure that allows: a newer uv bumps uv.lock's `revision`, CI stays green because the same uv reads back what it wrote, and the pinned uv in the production image cannot read the committed lock. `uv lock --check` is version-sensitive for the same reason -- it verifies the lock is what *this* uv would produce, and two versions can emit equivalent but non-identical output. Pin every step to 0.11.1 and lift the one lingering setup-uv@v3 to v7 so the steps share input and caching behavior. Pinning alone drifts apart again on the next bump, so add a constraint test in the style of test_compose_default_bind_host.py: the Dockerfile's UV_IMAGE tag is the single source of truth, and both compose defaults plus every setup-uv step must match it. Verified to fail when a pin drifts, when a step omits `version`, and -- the real scenario -- when the Dockerfile is bumped alone, which lights up the workflows and both compose files at once. * fix(gateway): state the extension route auth limit and abort a failed dev sync Two scoped review follow-ups. README: contributed routers cannot enter the host's reserved public prefixes, which makes every extension endpoint session-authenticated -- there is no way to expose an unauthenticated route. The rejection rule was documented but its consequence was not, so inbound provider webhooks and public status endpoints read as merely undocumented rather than out of scope for this release. docker/dev-entrypoint.sh: the self-heal retry reuses `--locked`, so it repairs a corrupt .venv but never a lock that disagrees with pyproject.toml. `set -e` already stopped the script there -- uvicorn was not being started against a stale environment -- but it exited on a bare uv exit code with no indication of what to do. Abort explicitly with the cause and the fix. Tests slice the sync block out of the real script and run it against a stub uv, so they exercise the shipped code rather than a copy of it (/app/backend only exists inside the container). They cover the success path, the retry that recovers, the abort, and the guidance. Verified against the pre-fix script: only the guidance case goes red, confirming the abort itself was already correct. * fix(extensions): point Git SSH shorthand at the HTTPS correction Git's SCP-like shorthand carries no URL scheme, so `git+git@host:org/repo.git` reached the scheme rules looking like a bare path and was rejected with "local path references are not deployable; pass a local directory so DeerFlow can snapshot it". The operator asked for a remote source, so that guidance points at the wrong fix. Detect the shorthand ahead of the scheme rules and report the public-HTTPS correction instead. The bare `git@host:org/repo.git` spelling took a different wrong turn: packaging parses it as a direct reference named `git`, leaving `host:org/repo.git`, whose `host` reads as a URL scheme and produced the generic HTTPS message. Both spellings now share one message, as does the PEP 508 named form. * docs: keep the root extension summary within its new budget #4799 split the depth out of the module guides and added a size gate; the root file's job is now orientation, and this branch had pushed it 192 bytes past the soft limit. The manager transaction, source rules, and lock discipline are already stated in full in the extensions guide, so the root keeps the one-line orientation and points there instead of restating them. --------- Co-authored-by: Codex <codex@openai.com>
188 lines
8.2 KiB
Python
188 lines
8.2 KiB
Python
"""Regression for #3459 / #3454 — dev gateway reload-exclude must not crash.
|
|
|
|
#3426 switched the dev gateway's ``--reload-exclude`` patterns from relative
|
|
(``sandbox/``) to absolute (``$REPO_ROOT/backend/sandbox``). uvicorn only
|
|
excludes such a path directly when it already exists as a directory; otherwise
|
|
it falls back to ``Path.cwd().glob(pattern)``, and on **Python 3.12**
|
|
``pathlib.Path.glob()`` raises ``NotImplementedError: Non-relative patterns are
|
|
unsupported`` for an absolute pattern. ``serve.sh`` created the ``.deer-flow``
|
|
excludes but not ``backend/sandbox``, so a fresh checkout crashed ``make dev``
|
|
on startup.
|
|
|
|
Two layers of coverage:
|
|
|
|
* ``test_*_resolve_*`` exercises uvicorn's real ``resolve_reload_patterns`` to
|
|
pin the failure mode and the fix's mechanism.
|
|
* ``test_launcher_precreates_every_absolute_reload_exclude`` enforces the actual
|
|
invariant on every dev launcher: every absolute exclude dir is ``mkdir -p``'d
|
|
before uvicorn starts. This encodes the root cause, so any future absolute
|
|
exclude that forgets its ``mkdir`` fails here.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import re
|
|
import shlex
|
|
import subprocess
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
from uvicorn.config import resolve_reload_patterns
|
|
|
|
REPO_ROOT = Path(__file__).resolve().parents[2]
|
|
|
|
LAUNCHERS = {
|
|
"scripts/serve.sh": REPO_ROOT / "scripts" / "serve.sh",
|
|
"docker/dev-entrypoint.sh": REPO_ROOT / "docker" / "dev-entrypoint.sh",
|
|
"backend/Makefile": REPO_ROOT / "backend" / "Makefile",
|
|
}
|
|
|
|
# Shell terminators / redirects that end a simple command's argument list.
|
|
_CMD_BOUNDARY = re.compile(r"[;&|<>]")
|
|
|
|
|
|
def _logical_lines(script: str) -> list[str]:
|
|
"""Fold ``\\``-continuations and drop comment lines, yielding logical lines.
|
|
|
|
A ``mkdir`` or ``--reload-exclude`` list split across lines with a trailing
|
|
backslash becomes one line here, so an argument on a continuation line can't
|
|
be silently dropped by per-line scanning.
|
|
"""
|
|
folded = script.replace("\\\n", " ")
|
|
return [line for line in folded.splitlines() if not line.lstrip().startswith("#")]
|
|
|
|
|
|
def _shlex(fragment: str) -> list[str]:
|
|
"""Tokenize a shell fragment (quotes stripped, ``$VAR`` kept literal,
|
|
trailing ``# comment`` honored); tolerate pathological quoting."""
|
|
try:
|
|
return shlex.split(fragment, comments=True)
|
|
except ValueError:
|
|
return fragment.split()
|
|
|
|
|
|
# ``--reload-exclude`` followed by ``=`` or whitespace, then a value that is a
|
|
# single-quoted group, a double-quoted group, or a bare token. The quoted
|
|
# alternatives match a *balanced* pair first, so serve.sh's surrounding
|
|
# ``GATEWAY_EXTRA_FLAGS="..."`` closing quote is never swallowed into the value.
|
|
_RELOAD_EXCLUDE = re.compile(r"""--reload-exclude[=\s]+('[^']*'|"[^"]*"|[^\s'"]+)""")
|
|
|
|
|
|
def _reload_exclude_values(script: str) -> list[str]:
|
|
"""Every ``--reload-exclude`` value, with surrounding quotes removed.
|
|
|
|
Handles both CLI forms (``--reload-exclude=<value>`` and the space form
|
|
``--reload-exclude <value>``) and both shell quotings the launchers use:
|
|
|
|
* ``docker/dev-entrypoint.sh`` puts each flag on its own line.
|
|
* ``scripts/serve.sh`` packs every flag into a single double-quoted
|
|
``GATEWAY_EXTRA_FLAGS="... --reload-exclude='$X' ..."`` assignment. A
|
|
whole-line ``shlex`` would collapse that assignment into one token and
|
|
find no flags (this is what regressed serve.sh in CI); matching balanced
|
|
inner quotes here keeps the assignment's closing ``"`` out of the value,
|
|
so every exclude — including the last ``$BACKEND_RUNTIME_HOME`` — is seen.
|
|
"""
|
|
values: list[str] = []
|
|
for line in _logical_lines(script):
|
|
for raw in _RELOAD_EXCLUDE.findall(line):
|
|
values.append(raw.strip("\"'"))
|
|
return values
|
|
|
|
|
|
def _mkdir_dirs(script: str) -> set[str]:
|
|
"""Exact set of directories created by every ``mkdir`` command.
|
|
|
|
Tokenizes each ``mkdir`` argument list rather than substring-matching, so
|
|
``/app/backend/sandbox`` is not falsely considered created by, say,
|
|
``mkdir -p /app/backend/sandbox-other``.
|
|
"""
|
|
dirs: set[str] = set()
|
|
for line in _logical_lines(script):
|
|
match = re.search(r"\bmkdir\b(.*)", line)
|
|
if not match:
|
|
continue
|
|
args = _CMD_BOUNDARY.split(match.group(1), maxsplit=1)[0]
|
|
for token in _shlex(args):
|
|
if token.startswith("-"): # skip flags such as -p
|
|
continue
|
|
dirs.add(token)
|
|
return dirs
|
|
|
|
|
|
@pytest.mark.skipif(
|
|
sys.version_info >= (3, 13),
|
|
reason="pathlib accepts absolute glob patterns on 3.13+, so the crash is 3.12-only",
|
|
)
|
|
def test_resolve_reload_patterns_crashes_on_missing_absolute_dir(tmp_path):
|
|
"""The exact #3454 failure: absolute exclude + missing dir on Python 3.12."""
|
|
missing = tmp_path / "sandbox" # absolute path that does not exist yet
|
|
assert not missing.exists()
|
|
with pytest.raises(NotImplementedError):
|
|
resolve_reload_patterns([str(missing)], [])
|
|
|
|
|
|
def test_resolve_reload_patterns_is_safe_once_dir_exists(tmp_path):
|
|
"""The fix's mechanism: a pre-created dir takes uvicorn's is_dir() path."""
|
|
sandbox = tmp_path / "sandbox"
|
|
sandbox.mkdir()
|
|
_patterns, directories = resolve_reload_patterns([str(sandbox)], [])
|
|
resolved = {d.resolve() for d in directories}
|
|
assert sandbox.resolve() in resolved
|
|
|
|
|
|
@pytest.mark.parametrize("name", list(LAUNCHERS))
|
|
def test_launcher_precreates_every_absolute_reload_exclude(name):
|
|
"""Every absolute ``--reload-exclude`` dir must be created by ``mkdir`` first.
|
|
|
|
Relative glob patterns (``*.pyc``, ``__pycache__``) are safe and skipped;
|
|
anything anchored at ``/`` or a shell variable is an absolute path that
|
|
uvicorn would glob — and crash on — unless it already exists. Membership is
|
|
an exact match against the parsed ``mkdir`` argument set (not a substring
|
|
test), so a path-prefix can't produce a false pass.
|
|
"""
|
|
script = LAUNCHERS[name].read_text(encoding="utf-8")
|
|
created = _mkdir_dirs(script)
|
|
|
|
absolute_excludes = [v for v in _reload_exclude_values(script) if v.startswith(("/", "$"))]
|
|
assert absolute_excludes, f"{name}: expected at least one absolute reload-exclude"
|
|
|
|
for value in absolute_excludes:
|
|
assert value in created, f"{name}: absolute reload-exclude {value!r} is never created via mkdir (created dirs: {sorted(created)})"
|
|
|
|
|
|
@pytest.mark.parametrize("name", list(LAUNCHERS))
|
|
def test_sandbox_mkdir_precedes_uvicorn_launch(name):
|
|
"""The sandbox mkdir must come before the uvicorn launch, not just exist.
|
|
|
|
``_mkdir_dirs`` only proves the mkdir is present somewhere; this pins script
|
|
order so a future edit can't move (or guard) the mkdir below the launch and
|
|
silently reintroduce the #3454 crash on a fresh checkout. The ``uv run``
|
|
matcher allows runtime-only flags while still excluding serve.sh's
|
|
``stop_all`` kill line.
|
|
"""
|
|
lines = LAUNCHERS[name].read_text(encoding="utf-8").splitlines()
|
|
launch_idx = next((i for i, ln in enumerate(lines) if re.search(r"\buv run(?: --(?:no-sync|locked))? uvicorn\b", ln)), None)
|
|
mkdir_idx = next((i for i, ln in enumerate(lines) if re.search(r"\bmkdir\b", ln) and "sandbox" in ln.lower()), None)
|
|
|
|
assert launch_idx is not None, f"{name}: could not locate the uvicorn launch line"
|
|
assert mkdir_idx is not None, f"{name}: could not locate the sandbox mkdir line"
|
|
assert mkdir_idx < launch_idx, f"{name}: sandbox mkdir (line {mkdir_idx + 1}) must precede uvicorn launch (line {launch_idx + 1})"
|
|
|
|
|
|
def test_precreated_sandbox_artifacts_are_gitignored():
|
|
"""backend/sandbox is runtime state — its contents must stay out of git so
|
|
sandbox artifacts can't be accidentally committed (matches the reload-exclude
|
|
intent). A content path is existence-independent, unlike the bare dir path.
|
|
|
|
Guards against the inaccurate "gitignored" claim by making it verifiable.
|
|
"""
|
|
probe = "backend/sandbox/__artifact_probe__"
|
|
result = subprocess.run(
|
|
["git", "-C", str(REPO_ROOT), "check-ignore", "-q", probe],
|
|
capture_output=True,
|
|
)
|
|
if result.returncode == 128: # not a git checkout (e.g. packaged install)
|
|
pytest.skip("not inside a git working tree")
|
|
assert result.returncode == 0, "backend/sandbox/* should be gitignored (see backend/.gitignore '/sandbox/')"
|