Xinmin Zeng f2e832330e
fix(sandbox): enforce disabled skills in filesystem views (#4178)
* fix(sandbox): project enabled skills into sandbox views

* fix(skills): keep projection mutations consistent

* fix(skills): fail closed on projection errors

* fix(skills): isolate per-scope failures during boot projection rebuild

rebuild_all_skill_projections() propagated any exception from the public
rebuild or from a single user's rebuild straight out of the gateway
lifespan startup, uncaught. A single broken user directory (bad
permissions, corrupted _skill_states.json, unreadable content) would
therefore abort gateway boot for every user, not just that one -
_rebuild_*_locked already fails closed internally (clears the view and
re-raises), so the boot loop only needed to stop treating that re-raise
as fatal.

Each scope's rebuild now fails closed independently and boot continues;
a scope left empty by a boot failure self-heals on the next sandbox
acquire via ensure_skill_projections().

Also patches deerflow.skills.projection.rebuild_all_skill_projections in
the memory-flush lifespan test fixture, matching the two sibling
fixtures in the same file — this call is now on the lifespan startup
path and the fixture's minimal SimpleNamespace config predates it.

* test(skills): update authz test for the projection-aware public toggle

_persist_shared_skill_state (introduced earlier in this branch) reads
the shared extensions_config.json fresh from disk under the projection
lock instead of through the cached get_extensions_config() singleton -
that's the whole point of the fix (stale worker caches must not clobber
another worker's concurrent update). The name no longer exists on the
skills router module, so the test's monkeypatch of it started raising
AttributeError instead of exercising the endpoint.

The mock storage in this test isn't a real LocalSkillStorage instance,
so _persist_shared_skill_state's projection-mutation branch is already
skipped (nullcontext) and it falls back to a fresh ExtensionsConfig()
for the nonexistent tmp config_path - no replacement monkeypatch needed.

* fix(sandbox): make skill projection ensure best-effort in acquire

acquire() called _ensure_skills_projection() directly, outside any
try/except, in both LocalSandboxProvider and AioSandboxProvider. Every
other skill-mount setup path in these providers has always caught
exceptions and logged a warning rather than failing sandbox acquire
outright (e.g. when config.yaml can't be resolved) - these two new call
sites broke that contract, so any projection failure (including simply
not having a config.yaml, as in CI's test environment) now failed
acquire() itself instead of just leaving skill mounts off.

_ensure_skills_projection now catches its own exceptions and returns
None; both providers' callers already tolerate that (a None projection
skips the skill-specific mounts, matching the existing degrade path)
after making _append_public_skill_mapping and the custom/legacy mount
block in LocalSandboxProvider explicitly None-safe.

Caught by running the full suite with config.yaml removed, matching
CI's environment - not caught locally because a real config.yaml was
present, masking the failure.

* fix(sandbox): make E2B skill projection mounts best-effort

_skill_projection_mounts called ensure_skill_projections with no guard,
unlike Local/AIO's _ensure_skills_projection. A raise propagated out of
_apply_mounts before the configured-mounts loop ran, so a skills
projection failure dropped the operator's own configured mounts too -
only caught by create()'s outer warning, with nothing applied at all.

Swallow here and return an empty mount list on failure, matching the
Local/AIO pattern: still fail-closed for skills, but no longer widens
the blast radius to unrelated configured mounts.

Review feedback from PR #4178.

* docs(skills): document projection trade-offs flagged in review

- _update_tree_digest: note the metadata-only (not content) hashing
  trade-off and why runtime writes through this codebase are still
  covered regardless (rebuild-under-lock + rename always changes inode).
- LocalSandboxProvider.acquire: note the acquire-time self-heal cost
  (cheap on a fresh manifest, ~400ms rebuild under lock on stale/drift).
- skill_projection_mutation: drop the no-op except-Exception-then-raise;
  a raise from the mutation already propagates past the yield with the
  view left cleared, no explicit re-raise needed.
- provisioner README: spell out that hostPath skills volumes require
  the gateway and K8s node to share DEER_FLOW_HOST_BASE_DIR (single-node
  or shared storage), and that the custom/legacy volumes' hostPath type
  Directory (not DirectoryOrCreate) makes a violation of that assumption
  a visible Pod-creation failure instead of a silent empty mount.

Review feedback from PR #4178.

* fix(skills): lazily repair user projections

* fix(skills): close projection review gaps

* fix(skills): refresh user projection enable state

* fix(skills): close projection review follow-ups

* fix(skills): preserve state across projection writes

---------

Co-authored-by: Willem Jiang <willem.jiang@gmail.com>
2026-07-31 17:55:24 +08:00

553 lines
22 KiB
Python

"""Materialize enabled-only skill trees for sandbox filesystem exposure."""
from __future__ import annotations
import errno
import hashlib
import json
import logging
import os
import shutil
import tempfile
import threading
from collections.abc import Iterator
from contextlib import contextmanager
from dataclasses import dataclass
from pathlib import Path
from typing import TYPE_CHECKING
from deerflow.skills.parser import parse_skill_file
from deerflow.skills.types import SKILL_MD_FILE, Skill, SkillCategory
if TYPE_CHECKING:
from deerflow.skills.storage.skill_storage import SkillStorage
logger = logging.getLogger(__name__)
try:
import fcntl
except ImportError: # pragma: no cover - Windows
fcntl = None # type: ignore[assignment]
import msvcrt
_locks_guard = threading.Lock()
_process_locks: dict[Path, threading.RLock] = {}
_MANIFEST_VERSION = 1
_MAX_REBUILD_ATTEMPTS = 2
@dataclass(frozen=True)
class SkillProjectionPaths:
"""Stable category roots mounted or uploaded by sandbox providers."""
public: Path
custom: Path
legacy: Path
integrations: Path
def get_skill_projection_paths(storage: SkillStorage) -> SkillProjectionPaths:
from deerflow.config.paths import get_paths
paths = getattr(storage, "_paths", None) or get_paths()
user_id = getattr(storage, "user_id", None)
if user_id is None:
return SkillProjectionPaths(
public=paths.public_skills_view_dir,
custom=paths.skills_view_dir / "custom",
legacy=paths.skills_view_dir / "legacy",
integrations=paths.skills_view_dir / "integrations",
)
return SkillProjectionPaths(
public=paths.public_skills_view_dir,
custom=paths.user_custom_skills_view_dir(user_id),
legacy=paths.user_legacy_skills_view_dir(user_id),
integrations=paths.user_integration_skills_view_dir(user_id),
)
def _lock_for(path: Path) -> threading.RLock:
resolved = path.resolve()
with _locks_guard:
return _process_locks.setdefault(resolved, threading.RLock())
@contextmanager
def _projection_lock(root: Path) -> Iterator[None]:
"""Serialize projection replacement in-process and across POSIX workers."""
lock_path = root.parent / f".{root.name}.projection.lock"
lock_path.parent.mkdir(parents=True, exist_ok=True)
process_lock = _lock_for(lock_path)
with process_lock, lock_path.open("a", encoding="utf-8") as lock_file:
if fcntl is not None:
fcntl.flock(lock_file, fcntl.LOCK_EX)
else: # pragma: no cover - Windows
lock_file.seek(0)
msvcrt.locking(lock_file.fileno(), msvcrt.LK_LOCK, 1)
try:
yield
finally:
if fcntl is not None:
fcntl.flock(lock_file, fcntl.LOCK_UN)
else: # pragma: no cover - Windows
lock_file.seek(0)
msvcrt.locking(lock_file.fileno(), msvcrt.LK_UNLCK, 1)
def _link_or_copy(source: str, target: str, *, follow_symlinks: bool = True) -> str:
# Hardlinks share the source inode and provide no write isolation. Any
# read-only guarantee must come from the consuming sandbox or mount.
try:
os.link(source, target, follow_symlinks=follow_symlinks)
except OSError as exc:
if exc.errno not in {errno.EXDEV, errno.EPERM, errno.EACCES, errno.ENOTSUP}:
raise
shutil.copy2(source, target, follow_symlinks=follow_symlinks)
return target
def _stage_skill(source: Path, target: Path, nested_skill_roots: set[Path]) -> None:
def _exclude_nested_skills(current: str, names: list[str]) -> list[str]:
relative_root = Path(current).relative_to(source)
return [name for name in names if relative_root / name in nested_skill_roots]
shutil.copytree(
source,
target,
copy_function=_link_or_copy,
symlinks=True,
ignore=_exclude_nested_skills,
dirs_exist_ok=True,
)
def _path_kind(path: Path) -> str:
if path.is_symlink():
return "symlink"
if path.is_dir():
return "directory"
return "file"
def _tree_entries(root: Path) -> dict[Path, str]:
entries: dict[Path, str] = {}
for current_root, dir_names, file_names in os.walk(root, followlinks=False):
current = Path(current_root)
for name in dir_names:
path = current / name
entries[path.relative_to(root)] = _path_kind(path)
dir_names[:] = [name for name in dir_names if not (current / name).is_symlink()]
for name in file_names:
path = current / name
entries[path.relative_to(root)] = _path_kind(path)
return entries
def _remove_projection_entry(path: Path) -> None:
if path.is_dir() and not path.is_symlink():
shutil.rmtree(path)
else:
path.unlink(missing_ok=True)
def _validate_projection_relative_path(relative_path: Path) -> None:
if relative_path.is_absolute() or not relative_path.parts or any(part in {"", ".", ".."} for part in relative_path.parts):
raise ValueError("Projection removal path must identify a package within its category root")
def _remove_projection_relative(root: Path, relative_path: Path) -> None:
"""Remove a projected package without following a drifted namespace symlink."""
current = root
for part in relative_path.parts:
current /= part
if current.is_symlink():
current.unlink()
return
_remove_projection_entry(current)
def _sync_staged_category(root: Path, staging: Path) -> None:
desired = _tree_entries(staging)
live = _tree_entries(root)
for relative_path, live_kind in sorted(live.items(), key=lambda item: len(item[0].parts), reverse=True):
if desired.get(relative_path) != live_kind:
_remove_projection_entry(root / relative_path)
for relative_path, kind in sorted(desired.items(), key=lambda item: len(item[0].parts)):
if kind == "directory":
(root / relative_path).mkdir(parents=True, exist_ok=True)
for relative_path, kind in desired.items():
if kind == "directory":
continue
target = root / relative_path
target.parent.mkdir(parents=True, exist_ok=True)
(staging / relative_path).replace(target)
def _replace_category(root: Path, desired: dict[Path, Skill], skill_boundaries: set[Path]) -> None:
"""Reconcile entries beneath a stable category root without blanking it."""
root.mkdir(parents=True, exist_ok=True)
with tempfile.TemporaryDirectory(prefix=f".{root.name}.projection-", dir=root.parent) as staging_dir:
staging = Path(staging_dir)
for relative_path, skill in desired.items():
nested_roots = {boundary.relative_to(relative_path) for boundary in skill_boundaries if boundary != relative_path and boundary.is_relative_to(relative_path)}
_stage_skill(skill.skill_dir, staging / relative_path, nested_roots)
_sync_staged_category(root, staging)
def _clear_category(root: Path) -> None:
root.mkdir(parents=True, exist_ok=True)
for path in root.iterdir():
if path.is_dir() and not path.is_symlink():
shutil.rmtree(path)
else:
path.unlink()
def _clear_projection_scope(scope_root: Path, *category_roots: Path) -> None:
for category_root in category_roots:
_clear_category(category_root)
_manifest_path(scope_root).unlink(missing_ok=True)
def _update_tree_digest(digest, root: Path, label: str) -> None:
"""Hash directory metadata (inode/mode/size/mtime), not file contents.
Trade-off: fast enough to run on every sandbox acquire (O(files), no
reads), but an external edit that preserves inode+size+mtime — unlikely,
not zero-probability — is invisible to this signature and leaves the
projection stale until the next explicit rebuild. Runtime writes through
this codebase are covered regardless: the mutation path rebuilds under
lock, and atomic-rename always changes the inode.
"""
digest.update(f"root:{label}\0".encode())
if not root.exists():
digest.update(b"absent\0")
return
stack = [(root, Path("."))]
while stack:
current, relative_root = stack.pop()
with os.scandir(current) as entries:
ordered = sorted(entries, key=lambda entry: entry.name)
child_dirs: list[tuple[Path, Path]] = []
for entry in ordered:
relative = relative_root / entry.name
metadata = entry.stat(follow_symlinks=False)
if entry.is_symlink():
kind = "link"
elif entry.is_dir(follow_symlinks=False):
kind = "dir"
child_dirs.append((Path(entry.path), relative))
else:
kind = "file"
digest.update((f"{label}:{relative.as_posix()}:{kind}:{metadata.st_ino}:{metadata.st_mode}:{metadata.st_size}:{metadata.st_mtime_ns}\0").encode())
stack.extend(reversed(child_dirs))
def _extensions_state() -> dict:
from deerflow.config.extensions_config import ExtensionsConfig
config = ExtensionsConfig.from_file()
return {name: state.model_dump(mode="json") for name, state in config.skills.items()}
def _source_signature(storage: SkillStorage, scope: str) -> str:
digest = hashlib.sha256()
host_root = storage.get_skills_root_path()
if scope == "public":
_update_tree_digest(digest, host_root / SkillCategory.PUBLIC.value, "public")
state = {"extensions": _extensions_state()}
elif scope == "user":
user_custom_root = storage.get_user_custom_root()
integration_root = storage.get_user_integrations_root()
_update_tree_digest(digest, user_custom_root, "custom")
_update_tree_digest(digest, host_root / SkillCategory.CUSTOM.value, "legacy")
_update_tree_digest(digest, integration_root, "integrations")
# CUSTOM/LEGACY/INTEGRATION visibility is the intersection of the
# per-user state and the global extensions default, so both belong in
# this signature.
state = {
"extensions": _extensions_state(),
"user": storage._read_skill_states(),
}
else: # pragma: no cover - internal invariant
raise ValueError(f"Unknown skill projection scope: {scope}")
digest.update(json.dumps(state, sort_keys=True, separators=(",", ":")).encode())
return digest.hexdigest()
def _manifest_path(scope_root: Path) -> Path:
return scope_root / ".projection-manifest.json"
def _read_manifest(scope_root: Path) -> dict | None:
try:
value = json.loads(_manifest_path(scope_root).read_text(encoding="utf-8"))
except (OSError, json.JSONDecodeError):
return None
return value if isinstance(value, dict) else None
def _write_manifest(scope_root: Path, source_signature: str) -> None:
scope_root.mkdir(parents=True, exist_ok=True)
target = _manifest_path(scope_root)
fd, temporary_name = tempfile.mkstemp(prefix=".projection-manifest-", suffix=".tmp", dir=scope_root)
temporary = Path(temporary_name)
try:
with os.fdopen(fd, "w", encoding="utf-8") as stream:
json.dump({"version": _MANIFEST_VERSION, "source_signature": source_signature}, stream, sort_keys=True)
temporary.replace(target)
except Exception:
temporary.unlink(missing_ok=True)
raise
def _load_public_skills(storage: SkillStorage, *, enabled_only: bool) -> list[Skill]:
from deerflow.config.extensions_config import ExtensionsConfig
public_root = storage.get_skills_root_path() / SkillCategory.PUBLIC.value
if not public_root.is_dir():
return []
extensions = ExtensionsConfig.from_file()
skills: list[Skill] = []
for current_root, dir_names, file_names in os.walk(public_root, followlinks=True):
dir_names[:] = sorted(name for name in dir_names if not name.startswith("."))
if SKILL_MD_FILE not in file_names:
continue
# Match the runtime loader: nested SKILL.md files inside a package are
# support data, not independently configurable skills.
dir_names.clear()
skill_file = Path(current_root) / SKILL_MD_FILE
skill = parse_skill_file(
skill_file,
category=SkillCategory.PUBLIC,
relative_path=skill_file.parent.relative_to(public_root),
)
if skill is None:
continue
enabled = extensions.is_skill_enabled(skill.name, SkillCategory.PUBLIC.value)
if not enabled_only or enabled:
skills.append(skill)
return skills
def _by_relative_path(skills: list[Skill], category: SkillCategory) -> dict[Path, Skill]:
return {skill.relative_path: skill for skill in skills if skill.category == category}
def _category_boundaries(skills: list[Skill], category: SkillCategory) -> set[Path]:
return {skill.relative_path for skill in skills if skill.category == category}
def _rebuild_public_locked(storage: SkillStorage, paths: SkillProjectionPaths) -> None:
scope_root = paths.public.parent
try:
for _attempt in range(_MAX_REBUILD_ATTEMPTS):
before = _source_signature(storage, "public")
all_public_skills = _load_public_skills(storage, enabled_only=False)
enabled_public_skills = _load_public_skills(storage, enabled_only=True)
_replace_category(
paths.public,
_by_relative_path(enabled_public_skills, SkillCategory.PUBLIC),
_category_boundaries(all_public_skills, SkillCategory.PUBLIC),
)
after = _source_signature(storage, "public")
if before == after:
_write_manifest(scope_root, after)
return
raise RuntimeError("Public skills changed repeatedly while rebuilding the sandbox projection")
except Exception:
_clear_projection_scope(scope_root, paths.public)
raise
def _rebuild_user_locked(storage: SkillStorage, paths: SkillProjectionPaths) -> None:
scope_root = paths.custom.parent
try:
for _attempt in range(_MAX_REBUILD_ATTEMPTS):
before = _source_signature(storage, "user")
all_user_skills = storage.load_skills(enabled_only=False)
enabled_user_skills = [skill for skill in all_user_skills if skill.enabled]
_replace_category(
paths.custom,
_by_relative_path(enabled_user_skills, SkillCategory.CUSTOM),
_category_boundaries(all_user_skills, SkillCategory.CUSTOM),
)
_replace_category(
paths.legacy,
_by_relative_path(enabled_user_skills, SkillCategory.LEGACY),
_category_boundaries(all_user_skills, SkillCategory.LEGACY),
)
_replace_category(
paths.integrations,
_by_relative_path(enabled_user_skills, SkillCategory.INTEGRATION),
_category_boundaries(all_user_skills, SkillCategory.INTEGRATION),
)
after = _source_signature(storage, "user")
if before == after:
_write_manifest(scope_root, after)
return
raise RuntimeError("User skills changed repeatedly while rebuilding the sandbox projection")
except Exception:
_clear_projection_scope(scope_root, paths.custom, paths.legacy, paths.integrations)
raise
def rebuild_skill_projections(
storage: SkillStorage,
*,
include_public: bool = True,
include_user: bool = True,
) -> SkillProjectionPaths:
"""Rebuild enabled-only projection scopes visible through ``storage``."""
paths = get_skill_projection_paths(storage)
user_id = getattr(storage, "user_id", None)
if include_public:
with _projection_lock(paths.public.parent):
_rebuild_public_locked(storage, paths)
if include_user and user_id is not None:
with _projection_lock(paths.custom.parent):
_rebuild_user_locked(storage, paths)
return paths
def _public_projection_is_fresh(storage: SkillStorage, paths: SkillProjectionPaths) -> bool:
if not paths.public.is_dir():
return False
manifest_before = _read_manifest(paths.public.parent)
if manifest_before is None or manifest_before.get("version") != _MANIFEST_VERSION:
return False
signature = _source_signature(storage, "public")
manifest_after = _read_manifest(paths.public.parent)
return manifest_before == manifest_after and manifest_before.get("source_signature") == signature
def ensure_skill_projections(storage: SkillStorage) -> SkillProjectionPaths:
"""Repair stale projection scopes, otherwise leave their inodes untouched."""
paths = get_skill_projection_paths(storage)
try:
public_is_fresh = _public_projection_is_fresh(storage, paths)
except Exception:
# Re-check under the mutation lock before failing closed. A concurrent
# writer may have exposed a transient source/manifest state.
public_is_fresh = False
if not public_is_fresh:
with _projection_lock(paths.public.parent):
try:
if not _public_projection_is_fresh(storage, paths):
_rebuild_public_locked(storage, paths)
except Exception:
_clear_projection_scope(paths.public.parent, paths.public)
raise
if getattr(storage, "user_id", None) is not None:
with _projection_lock(paths.custom.parent):
try:
manifest = _read_manifest(paths.custom.parent)
signature = _source_signature(storage, "user")
if not paths.custom.is_dir() or not paths.legacy.is_dir() or not paths.integrations.is_dir() or manifest is None or manifest.get("version") != _MANIFEST_VERSION or manifest.get("source_signature") != signature:
_rebuild_user_locked(storage, paths)
except Exception:
_clear_projection_scope(paths.custom.parent, paths.custom, paths.legacy, paths.integrations)
raise
return paths
@contextmanager
def skill_projection_mutation(
storage: SkillStorage,
scope: str,
*,
remove: tuple[tuple[SkillCategory, Path], ...] = (),
remove_names: tuple[str, ...] = (),
) -> Iterator[None]:
"""Hold a projection scope lock across a source/state mutation."""
if not isinstance(storage.get_skills_root_path(), Path):
# Lightweight unit-test doubles sometimes return MagicMock here. The
# SkillStorage contract requires a Path; real storage implementations
# therefore never take this compatibility branch.
yield
return
paths = get_skill_projection_paths(storage)
if scope == "public":
scope_root = paths.public.parent
category_roots = {SkillCategory.PUBLIC: paths.public}
def rebuild() -> None:
_rebuild_public_locked(storage, paths)
elif scope == "user":
scope_root = paths.custom.parent
category_roots = {
SkillCategory.CUSTOM: paths.custom,
SkillCategory.LEGACY: paths.legacy,
SkillCategory.INTEGRATION: paths.integrations,
}
def rebuild() -> None:
_rebuild_user_locked(storage, paths)
else:
raise ValueError(f"Unknown skill projection scope: {scope}")
removals: set[tuple[Path, Path]] = set()
for category, relative_path in remove:
root = category_roots.get(category)
if root is None:
raise ValueError(f"Skill category {category.value!r} does not belong to projection scope {scope!r}")
_validate_projection_relative_path(relative_path)
removals.add((root, relative_path))
with _projection_lock(scope_root):
if remove_names:
names = set(remove_names)
skills = _load_public_skills(storage, enabled_only=False) if scope == "public" else storage.load_skills(enabled_only=False)
for skill in skills:
root = category_roots.get(skill.category)
if skill.name not in names or root is None:
continue
_validate_projection_relative_path(skill.relative_path)
removals.add((root, skill.relative_path))
try:
_manifest_path(scope_root).unlink(missing_ok=True)
for root, relative_path in removals:
_remove_projection_relative(root, relative_path)
yield
rebuild()
except Exception:
_clear_projection_scope(scope_root, *category_roots.values())
raise
def ensure_public_skill_projection(*, app_config=None) -> bool:
"""Ensure the global public view during boot without scanning user data.
User projections are repaired lazily by sandbox acquire. Eagerly rebuilding
every historical user would make gateway readiness scale with tenant count,
while providing no additional safety before that user's next acquire.
"""
from deerflow.config import get_app_config
from deerflow.config.paths import get_paths
from deerflow.skills.storage import get_or_new_skill_storage
try:
config = app_config or get_app_config()
public_storage = get_or_new_skill_storage(app_config=config)
ensure_skill_projections(public_storage)
except Exception:
logger.warning("Failed to ensure the public skill projection during boot; clearing it until a sandbox acquire self-heals it", exc_info=True)
try:
paths = get_paths()
with _projection_lock(paths.public_skills_view_dir.parent):
_clear_projection_scope(paths.public_skills_view_dir.parent, paths.public_skills_view_dir)
except Exception:
logger.error("Failed to clear the public skill projection after a boot-time error", exc_info=True)
return False
return True