mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-08-01 19:06:01 +00:00
* feat(lark): sidecar credential broker for sandbox lark-cli (Pattern B) Removes the plaintext Lark credential mounts (appSecret + OAuth tokens) from the sandbox container. A long-running broker sidecar owns lark-cli and the per-user config/data dirs and serves the command surface over Pod loopback; the sandbox gets only a forwarding shim on PATH, so the raw credential files never exist in the sandbox filesystem. - lark_broker.py: stdlib-only loopback broker (argv passthrough with shell=False, server-injected credential env, bounded I/O) + shim script constant + install-shim mode. - docker/lark-cli-broker: init(install-shim) + serve image. - provisioner: LARK_CLI_BROKER_IMAGE + provision_lark_cli_broker → shim init container + lark-cli-broker sidecar (config/data mounted sidecar-only); credentials dropped from the sandbox container; /api/capabilities reports lark_cli_broker_image. Broker supersedes the Pattern A init-container binary when both are configured. - gateway: lark_cli_env_overlay(broker=True) omits config/data env; sandbox_lark_broker_active() TTL-cached mode resolver; broker added to sandbox_runtime_mode / readiness and the settings UI. Opt-in and off by default (empty LARK_CLI_BROKER_IMAGE ⇒ no change). Closes #4338 * fix(lark): address Pattern B broker review findings (#4501) Follow-up to the sidecar credential broker addressing the PR #4501 review: - shim: split the on-PATH lark-cli into a /bin/sh launcher + Python shim body so broker mode fails loudly (exit 127, actionable message) instead of ENOEXEC when the sandbox image ships no python3; interpreter pinnable via DEERFLOW_LARK_BROKER_PYTHON. Launcher bakes in the shim's absolute path since $0 is the bare command name when run off PATH. - broker: drop the dead cwd payload field (broker can't see the sandbox FS) and document the command-surface-only / no-file-IO limitation. - broker: return a structured 500 JSON on unexpected exec errors so the shim gets a meaningful message, not an opaque transport failure; set a handler socket timeout to bound slow/stuck connections. - broker: add an opt-in DEERFLOW_LARK_BROKER_DENY_SUBCOMMANDS denylist that refuses secret-dumping subcommands before spawning the binary, forwarded from the provisioner sidecar. - gateway: tighten the per-bash-call broker probe timeout (1.5s) and cache negatives longer (300s) so non-broker remote-provisioner users don't pay a latency hit; guard the mode cache with a lock; drop the dead _probe_provisioner_lark_cli_init_image wrapper. - docs: remove the broken design-doc link from the broker README. Adds tests for launcher python resolution, cwd omission, denylist enforcement, 500-on-error, hot-path probe timeout + negative caching, and provisioner denylist-env wiring.
190 lines
6.7 KiB
Python
190 lines
6.7 KiB
Python
"""Abstract base class for sandbox provisioning backends."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import ipaddress
|
|
import logging
|
|
import time
|
|
from abc import ABC, abstractmethod
|
|
from urllib.parse import urlparse
|
|
|
|
import httpx
|
|
import requests
|
|
|
|
from .sandbox_info import SandboxInfo
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
def sandbox_http_trust_env(sandbox_url: str) -> bool:
|
|
"""Whether HTTP clients for *sandbox_url* should inherit proxy settings.
|
|
|
|
Local Docker, DooD, and Kubernetes sandbox endpoints are control-plane
|
|
connections, not internet traffic. Sending them through ``HTTP_PROXY`` can
|
|
produce a misleading proxy-generated 502 even though the sandbox container
|
|
is healthy (#3441). External fully-qualified hosts retain normal environment
|
|
proxy behavior.
|
|
"""
|
|
try:
|
|
hostname = (urlparse(sandbox_url).hostname or "").rstrip(".").lower()
|
|
except ValueError:
|
|
return True
|
|
if not hostname:
|
|
return True
|
|
if hostname == "localhost" or hostname.endswith(".localhost") or hostname.endswith(".docker.internal") or hostname.endswith(".containers.internal"):
|
|
return False
|
|
try:
|
|
address = ipaddress.ip_address(hostname)
|
|
except ValueError:
|
|
return "." in hostname
|
|
return not (address.is_loopback or address.is_private or address.is_link_local)
|
|
|
|
|
|
def wait_for_sandbox_ready(sandbox_url: str, timeout: int = 30) -> bool:
|
|
"""Poll sandbox health endpoint until ready or timeout.
|
|
|
|
Args:
|
|
sandbox_url: URL of the sandbox (e.g. http://k3s:30001).
|
|
timeout: Maximum time to wait in seconds.
|
|
|
|
Returns:
|
|
True if sandbox is ready, False otherwise.
|
|
"""
|
|
start_time = time.time()
|
|
with requests.Session() as session:
|
|
session.trust_env = sandbox_http_trust_env(sandbox_url)
|
|
while time.time() - start_time < timeout:
|
|
try:
|
|
response = session.get(f"{sandbox_url}/v1/sandbox", timeout=5)
|
|
if response.status_code == 200:
|
|
return True
|
|
except requests.exceptions.RequestException:
|
|
pass
|
|
time.sleep(1)
|
|
return False
|
|
|
|
|
|
async def wait_for_sandbox_ready_async(sandbox_url: str, timeout: int = 30, poll_interval: float = 1.0) -> bool:
|
|
"""Async variant of sandbox readiness polling.
|
|
|
|
Use this from async runtime paths so sandbox startup waits do not block the
|
|
event loop. The synchronous ``wait_for_sandbox_ready`` function remains for
|
|
existing synchronous backend/provider call sites.
|
|
"""
|
|
loop = asyncio.get_running_loop()
|
|
deadline = loop.time() + timeout
|
|
|
|
async with httpx.AsyncClient(timeout=5, trust_env=sandbox_http_trust_env(sandbox_url)) as client:
|
|
while True:
|
|
remaining = deadline - loop.time()
|
|
if remaining <= 0:
|
|
break
|
|
try:
|
|
response = await client.get(f"{sandbox_url}/v1/sandbox", timeout=min(5.0, remaining))
|
|
if response.status_code == 200:
|
|
return True
|
|
except httpx.RequestError:
|
|
pass
|
|
remaining = deadline - loop.time()
|
|
if remaining <= 0:
|
|
break
|
|
await asyncio.sleep(min(poll_interval, remaining))
|
|
return False
|
|
|
|
|
|
class SandboxBackend(ABC):
|
|
"""Abstract base for sandbox provisioning backends.
|
|
|
|
Two implementations:
|
|
- LocalContainerBackend: starts Docker/Apple Container locally, manages ports
|
|
- RemoteSandboxBackend: connects to a pre-existing URL (K8s service, external)
|
|
"""
|
|
|
|
@abstractmethod
|
|
def create(
|
|
self,
|
|
thread_id: str | None,
|
|
sandbox_id: str,
|
|
extra_mounts: list[tuple[str, str, bool]] | None = None,
|
|
*,
|
|
user_id: str | None = None,
|
|
provision_lark_cli_runtime: bool = False,
|
|
provision_lark_cli_broker: bool = False,
|
|
) -> SandboxInfo:
|
|
"""Create/provision a new sandbox.
|
|
|
|
Args:
|
|
thread_id: Thread ID for which the sandbox is being created. Useful for backends that want to organize sandboxes by thread.
|
|
sandbox_id: Deterministic sandbox identifier.
|
|
extra_mounts: Additional volume mounts as (host_path, container_path, read_only) tuples.
|
|
Ignored by backends that don't manage containers (e.g., remote).
|
|
user_id: User bucket that the sandbox should mount or provision for.
|
|
provision_lark_cli_runtime: Ask the backend to provision the sandbox
|
|
lark-cli runtime via its native mechanism (e.g. the provisioner's
|
|
init container + emptyDir). Backends that can't do this ignore it.
|
|
provision_lark_cli_broker: Ask the backend to provision a lark-cli
|
|
broker sidecar (Pattern B, issue #4338) so credentials stay out of
|
|
the sandbox. Supersedes ``provision_lark_cli_runtime`` when the
|
|
backend supports it; backends that can't do this ignore it.
|
|
|
|
Returns:
|
|
SandboxInfo with connection details.
|
|
"""
|
|
...
|
|
|
|
@abstractmethod
|
|
def destroy(self, info: SandboxInfo) -> None:
|
|
"""Destroy/cleanup a sandbox and release its resources.
|
|
|
|
Args:
|
|
info: The sandbox metadata to destroy.
|
|
"""
|
|
...
|
|
|
|
@abstractmethod
|
|
def is_alive(self, info: SandboxInfo) -> bool:
|
|
"""Quick check whether a sandbox is still alive.
|
|
|
|
This should be a lightweight check (e.g., container inspect)
|
|
rather than a full health check.
|
|
|
|
Args:
|
|
info: The sandbox metadata to check.
|
|
|
|
Returns:
|
|
True if the sandbox appears to be alive.
|
|
"""
|
|
...
|
|
|
|
@abstractmethod
|
|
def discover(self, sandbox_id: str) -> SandboxInfo | None:
|
|
"""Try to discover an existing sandbox by its deterministic ID.
|
|
|
|
Used for cross-process recovery: when another process started a sandbox,
|
|
this process can discover it by the deterministic container name or URL.
|
|
|
|
Args:
|
|
sandbox_id: The deterministic sandbox ID to look for.
|
|
|
|
Returns:
|
|
SandboxInfo if found and healthy, None otherwise.
|
|
"""
|
|
...
|
|
|
|
def list_running(self) -> list[SandboxInfo]:
|
|
"""Enumerate all running sandboxes managed by this backend.
|
|
|
|
Used for startup reconciliation: when the process restarts, it needs
|
|
to discover containers started by previous processes so they can be
|
|
adopted into the warm pool or destroyed if idle too long.
|
|
|
|
The default implementation returns an empty list, which is correct
|
|
for backends that don't manage local containers (e.g., RemoteSandboxBackend
|
|
delegates lifecycle to the provisioner which handles its own cleanup).
|
|
|
|
Returns:
|
|
A list of SandboxInfo for all currently running sandboxes.
|
|
"""
|
|
return []
|