mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-07-21 02:05:45 +00:00
* fix: V-001 security vulnerability Automated security fix generated by OrbisAI Security * fix(sandbox): wire provisioner API key through backend client and config RemoteSandboxBackend now accepts an api_key parameter and sends it as X-API-Key on all five provisioner HTTP calls (list, create, destroy, is_alive, discover). AioSandboxProvider reads provisioner_api_key from SandboxConfig and forwards it at construction time. SandboxConfig formally declares the field; config.example.yaml documents it under Option 4; docker-compose-dev.yaml threads PROVISIONER_API_KEY into both the provisioner and gateway containers so a single .env entry covers both sides. Tests: monkeypatch PROVISIONER_API_KEY and send X-API-Key headers in the five parametrized threading tests (previously 401-failing); new test_auth_middleware asserts /health is open, /api/* rejects no-header and wrong-key with 401, and accepts the correct key. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(provisioner): correct fail-closed auth docs and fix test mock signatures The first round of PR #4116 fixes left four blocking issues: - Mock signatures in test_remote_sandbox_backend.py (17) and test_aio_sandbox_provider.py (2) didn't accept the new headers= kwarg, causing TypeError on every provisioner HTTP call test. - sandbox_config.py and config.example.yaml described the auth as optional ("leave unset to disable") but the middleware is fail-closed: an unset PROVISIONER_API_KEY causes 401 on every /api/* request. - .env.example had no PROVISIONER_API_KEY entry, leaving users with an empty value and silent 401s. - No test covered the PROVISIONER_API_KEY="" fail-closed path. Fix all four: add headers=None to all mock signatures, correct the field description and example comment to state that both sides must have the same key set, add PROVISIONER_API_KEY to .env.example with generation guidance, add test_auth_middleware_unset_key, and add a logger.warning on auth rejection for observability. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
233 lines
9.7 KiB
Python
233 lines
9.7 KiB
Python
"""Remote sandbox backend — delegates Pod lifecycle to the provisioner service.
|
|
|
|
The provisioner dynamically creates per-sandbox-id Pods + NodePort Services
|
|
in k3s. The backend accesses sandbox pods directly via ``k3s:{NodePort}``.
|
|
|
|
Architecture:
|
|
┌────────────┐ HTTP ┌─────────────┐ K8s API ┌──────────┐
|
|
│ this file │ ──────▸ │ provisioner │ ────────▸ │ k3s │
|
|
│ (backend) │ │ :8002 │ │ :6443 │
|
|
└────────────┘ └─────────────┘ └─────┬────┘
|
|
│ creates
|
|
┌─────────────┐ ┌─────▼──────┐
|
|
│ backend │ ────────▸ │ sandbox │
|
|
│ │ direct │ Pod(s) │
|
|
└─────────────┘ k3s:NPort └────────────┘
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
|
|
import requests
|
|
|
|
from deerflow.runtime.user_context import get_effective_user_id
|
|
from deerflow.skills.storage import user_should_see_legacy_skills
|
|
|
|
from .backend import SandboxBackend
|
|
from .sandbox_info import SandboxInfo
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class RemoteSandboxBackend(SandboxBackend):
|
|
"""Backend that delegates sandbox lifecycle to the provisioner service.
|
|
|
|
All Pod creation, destruction, and discovery are handled by the
|
|
provisioner. This backend is a thin HTTP client.
|
|
|
|
Typical config.yaml::
|
|
|
|
sandbox:
|
|
use: deerflow.community.aio_sandbox:AioSandboxProvider
|
|
provisioner_url: http://provisioner:8002
|
|
provisioner_api_key: $PROVISIONER_API_KEY
|
|
"""
|
|
|
|
def __init__(self, provisioner_url: str, api_key: str = ""):
|
|
"""Initialize with the provisioner service URL and optional API key.
|
|
|
|
Args:
|
|
provisioner_url: URL of the provisioner service
|
|
(e.g., ``http://provisioner:8002``).
|
|
api_key: Value sent as ``X-API-Key`` header on every request.
|
|
Leave empty to send no authentication header.
|
|
"""
|
|
self._provisioner_url = provisioner_url.rstrip("/")
|
|
self._api_key = api_key
|
|
|
|
@property
|
|
def provisioner_url(self) -> str:
|
|
return self._provisioner_url
|
|
|
|
def _auth_headers(self) -> dict[str, str]:
|
|
return {"X-API-Key": self._api_key} if self._api_key else {}
|
|
|
|
# ── SandboxBackend interface ──────────────────────────────────────────
|
|
|
|
def create(
|
|
self,
|
|
thread_id: str | None,
|
|
sandbox_id: str,
|
|
extra_mounts: list[tuple[str, str, bool]] | None = None,
|
|
*,
|
|
user_id: str | None = None,
|
|
) -> SandboxInfo:
|
|
"""Create a sandbox Pod + Service via the provisioner.
|
|
|
|
Calls ``POST /api/sandboxes`` which creates a dedicated Pod +
|
|
NodePort Service in k3s.
|
|
"""
|
|
return self._provisioner_create(thread_id, sandbox_id, extra_mounts, user_id=user_id)
|
|
|
|
def destroy(self, info: SandboxInfo) -> None:
|
|
"""Destroy a sandbox Pod + Service via the provisioner."""
|
|
self._provisioner_destroy(info.sandbox_id)
|
|
|
|
def is_alive(self, info: SandboxInfo) -> bool:
|
|
"""Check whether the sandbox Pod is running."""
|
|
return self._provisioner_is_alive(info.sandbox_id)
|
|
|
|
def discover(self, sandbox_id: str) -> SandboxInfo | None:
|
|
"""Discover an existing sandbox via the provisioner.
|
|
|
|
Calls ``GET /api/sandboxes/{sandbox_id}`` and returns info if
|
|
the Pod exists.
|
|
"""
|
|
return self._provisioner_discover(sandbox_id)
|
|
|
|
def list_running(self) -> list[SandboxInfo]:
|
|
"""Return all sandboxes currently managed by the provisioner.
|
|
|
|
Calls ``GET /api/sandboxes`` so that ``AioSandboxProvider._reconcile_orphans()``
|
|
can adopt pods that were created by a previous process and were never
|
|
explicitly destroyed.
|
|
Without this, a process restart silently orphans all existing k8s Pods —
|
|
they stay running forever because the idle checker only
|
|
tracks in-process state.
|
|
"""
|
|
return self._provisioner_list()
|
|
|
|
# ── Provisioner API calls ─────────────────────────────────────────────
|
|
|
|
def _provisioner_list(self) -> list[SandboxInfo]:
|
|
"""GET /api/sandboxes → list all running sandboxes."""
|
|
try:
|
|
resp = requests.get(f"{self._provisioner_url}/api/sandboxes", headers=self._auth_headers(), timeout=10)
|
|
resp.raise_for_status()
|
|
data = resp.json()
|
|
if not isinstance(data, dict):
|
|
logger.warning("Provisioner list_running returned non-dict payload: %r", type(data))
|
|
return []
|
|
|
|
sandboxes = data.get("sandboxes", [])
|
|
if not isinstance(sandboxes, list):
|
|
logger.warning("Provisioner list_running returned non-list sandboxes: %r", type(sandboxes))
|
|
return []
|
|
|
|
infos: list[SandboxInfo] = []
|
|
for sandbox in sandboxes:
|
|
if not isinstance(sandbox, dict):
|
|
logger.warning("Provisioner list_running entry is not a dict: %r", type(sandbox))
|
|
continue
|
|
|
|
sandbox_id = sandbox.get("sandbox_id")
|
|
sandbox_url = sandbox.get("sandbox_url")
|
|
if isinstance(sandbox_id, str) and sandbox_id and isinstance(sandbox_url, str) and sandbox_url:
|
|
infos.append(SandboxInfo(sandbox_id=sandbox_id, sandbox_url=sandbox_url))
|
|
|
|
logger.info("Provisioner list_running: %d sandbox(es) found", len(infos))
|
|
return infos
|
|
except requests.RequestException as exc:
|
|
logger.warning("Provisioner list_running failed: %s", exc)
|
|
return []
|
|
|
|
def _provisioner_create(
|
|
self,
|
|
thread_id: str | None,
|
|
sandbox_id: str,
|
|
extra_mounts: list[tuple[str, str, bool]] | None = None,
|
|
*,
|
|
user_id: str | None = None,
|
|
) -> SandboxInfo:
|
|
"""POST /api/sandboxes → create Pod + Service."""
|
|
del extra_mounts
|
|
effective_user_id = user_id or get_effective_user_id()
|
|
include_legacy_skills = user_should_see_legacy_skills(effective_user_id)
|
|
try:
|
|
resp = requests.post(
|
|
f"{self._provisioner_url}/api/sandboxes",
|
|
json={
|
|
"sandbox_id": sandbox_id,
|
|
"thread_id": thread_id,
|
|
"user_id": effective_user_id,
|
|
"include_legacy_skills": include_legacy_skills,
|
|
},
|
|
headers=self._auth_headers(),
|
|
timeout=30,
|
|
)
|
|
resp.raise_for_status()
|
|
data = resp.json()
|
|
logger.info(f"Provisioner created sandbox {sandbox_id}: sandbox_url={data['sandbox_url']}")
|
|
return SandboxInfo(
|
|
sandbox_id=sandbox_id,
|
|
sandbox_url=data["sandbox_url"],
|
|
)
|
|
except requests.RequestException as exc:
|
|
logger.error(f"Provisioner create failed for {sandbox_id}: {exc}")
|
|
raise RuntimeError(f"Provisioner create failed: {exc}") from exc
|
|
|
|
def _provisioner_destroy(self, sandbox_id: str) -> None:
|
|
"""DELETE /api/sandboxes/{sandbox_id} → destroy Pod + Service."""
|
|
try:
|
|
resp = requests.delete(
|
|
f"{self._provisioner_url}/api/sandboxes/{sandbox_id}",
|
|
headers=self._auth_headers(),
|
|
timeout=15,
|
|
)
|
|
if resp.ok:
|
|
logger.info(f"Provisioner destroyed sandbox {sandbox_id}")
|
|
else:
|
|
logger.warning(f"Provisioner destroy returned {resp.status_code}: {resp.text}")
|
|
except requests.RequestException as exc:
|
|
logger.warning(f"Provisioner destroy failed for {sandbox_id}: {exc}")
|
|
|
|
def _provisioner_is_alive(self, sandbox_id: str) -> bool:
|
|
"""GET /api/sandboxes/{sandbox_id} → check Pod phase."""
|
|
try:
|
|
resp = requests.get(
|
|
f"{self._provisioner_url}/api/sandboxes/{sandbox_id}",
|
|
headers=self._auth_headers(),
|
|
timeout=10,
|
|
)
|
|
except requests.RequestException as exc:
|
|
raise RuntimeError(f"Provisioner health check failed for {sandbox_id}: {exc}") from exc
|
|
|
|
if resp.status_code == 404:
|
|
return False
|
|
if not resp.ok:
|
|
raise RuntimeError(f"Provisioner health check failed for {sandbox_id}: HTTP {resp.status_code} {resp.text}")
|
|
|
|
data = resp.json()
|
|
return data.get("status") == "Running"
|
|
|
|
def _provisioner_discover(self, sandbox_id: str) -> SandboxInfo | None:
|
|
"""GET /api/sandboxes/{sandbox_id} → discover existing sandbox."""
|
|
try:
|
|
resp = requests.get(
|
|
f"{self._provisioner_url}/api/sandboxes/{sandbox_id}",
|
|
headers=self._auth_headers(),
|
|
timeout=10,
|
|
)
|
|
if resp.status_code == 404:
|
|
return None
|
|
resp.raise_for_status()
|
|
data = resp.json()
|
|
return SandboxInfo(
|
|
sandbox_id=sandbox_id,
|
|
sandbox_url=data["sandbox_url"],
|
|
)
|
|
except requests.RequestException as exc:
|
|
logger.debug(f"Provisioner discover failed for {sandbox_id}: {exc}")
|
|
return None
|