mirror of
https://github.com/usestrix/strix.git
synced 2026-08-20 10:33:34 +02:00
The split between ``strix/sandbox/`` and ``strix/runtime/`` was artificial — both were managing the same backend. ``strix/sandbox/`` also collided uncomfortably with the SDK's ``agents.sandbox.*`` namespace. ``runtime/`` (which matches ``STRIX_RUNTIME_BACKEND``) is the canonical home for everything Docker / Daytona / K8s lifecycle. While merging, also rip out two pieces of Docker-specific coupling: - ``caido_bootstrap`` was POSTing ``loginAsGuest`` from the host via ``aiohttp`` to ``http://127.0.0.1:{forwarded_port}``. That assumed Docker port forwarding; Daytona / K8s expose ports differently. Now we ``session.exec`` curl from *inside* the container — the SDK's runtime-agnostic exec primitive — so any backend works as long as it implements ``exec``. The host-side Caido ``Client`` still uses the runtime's exposed-port URL for post-bootstrap calls, but that goes through the SDK's own ``resolve_exposed_port`` abstraction (also runtime-agnostic). - The bootstrap retry loop now doubles as the readiness probe, so ``healthcheck.wait_for_tcp_ready`` (and the entire ``healthcheck.py`` module) goes away. Drive-by simplification: drop ``caido_host_port`` plumbing entirely. It was only piped through ``make_agent_context`` → child contexts without ever being read; only ``caido_client`` is consumed. Drops ``aiohttp`` runtime dep (it stays only as a transitive of the Caido SDK). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
152 lines
5.0 KiB
Python
152 lines
5.0 KiB
Python
"""Per-scan sandbox session lifecycle.
|
|
|
|
One session per scan, reused across every agent in that scan's tree.
|
|
|
|
The bundle returned by :func:`create_or_reuse` carries the SDK
|
|
``client`` + ``session`` plus a ready-to-use Caido client (already
|
|
authenticated and pointing at a temporary sandbox project).
|
|
|
|
Cache strategy: a module-level dict keyed by ``scan_id``. The same scan
|
|
issuing multiple ``create_or_reuse`` calls (e.g., resume after a crash
|
|
on the host side) gets the same bundle back. ``cleanup`` is best-effort
|
|
— a leaked container is preferable to a stuck cleanup that prevents the
|
|
next scan from starting.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
from typing import TYPE_CHECKING, Any
|
|
|
|
import docker
|
|
from agents.sandbox.entries import LocalDir
|
|
from agents.sandbox.manifest import Environment, Manifest
|
|
from agents.sandbox.sandboxes.docker import DockerSandboxClientOptions
|
|
|
|
from strix.runtime.caido_bootstrap import bootstrap_caido
|
|
from strix.runtime.strix_docker_client import StrixDockerSandboxClient
|
|
|
|
|
|
if TYPE_CHECKING:
|
|
from pathlib import Path
|
|
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
# In-container Caido sidecar port (matches the image's caido-cli bind).
|
|
_CONTAINER_CAIDO_PORT = 48080
|
|
|
|
|
|
# Per-scan session cache. Module-level so a scan that bounces through
|
|
# multiple host-side processes (e.g., re-imports the module) doesn't
|
|
# spin up a second container — though in practice we expect one
|
|
# Strix process per scan.
|
|
_SESSION_CACHE: dict[str, dict[str, Any]] = {}
|
|
|
|
|
|
async def create_or_reuse(
|
|
scan_id: str,
|
|
*,
|
|
image: str,
|
|
sources_path: Path,
|
|
) -> dict[str, Any]:
|
|
"""Return the existing bundle for ``scan_id`` or create a new one.
|
|
|
|
Args:
|
|
scan_id: Caller-provided scan identifier (used as cache key).
|
|
image: Docker image tag (e.g. ``"strix-sandbox:0.1.13"``).
|
|
sources_path: Host directory mounted into the container's
|
|
``/workspace/sources`` so the agent can read user code.
|
|
|
|
Returns the bundle dict containing ``client``, ``session``, and
|
|
``caido_client``.
|
|
"""
|
|
cached = _SESSION_CACHE.get(scan_id)
|
|
if cached is not None:
|
|
logger.info("Reusing existing sandbox session for scan %s", scan_id)
|
|
return cached
|
|
|
|
# Caido runs as an in-container sidecar; HTTP(S) traffic from any
|
|
# process started via ``session.exec`` (the SDK's Shell tool, etc.)
|
|
# picks up these env vars automatically.
|
|
container_caido_url = f"http://127.0.0.1:{_CONTAINER_CAIDO_PORT}"
|
|
manifest = Manifest(
|
|
entries={"sources": LocalDir(src=sources_path)},
|
|
environment=Environment(
|
|
value={
|
|
"PYTHONUNBUFFERED": "1",
|
|
"HOST_GATEWAY": "host.docker.internal",
|
|
"http_proxy": container_caido_url,
|
|
"https_proxy": container_caido_url,
|
|
"ALL_PROXY": container_caido_url,
|
|
},
|
|
),
|
|
)
|
|
|
|
client = StrixDockerSandboxClient(docker.from_env())
|
|
options = DockerSandboxClientOptions(
|
|
image=image,
|
|
exposed_ports=(_CONTAINER_CAIDO_PORT,),
|
|
)
|
|
|
|
logger.info("Creating sandbox session for scan %s (image=%s)", scan_id, image)
|
|
session = await client.create(options=options, manifest=manifest)
|
|
|
|
caido_endpoint = await session.resolve_exposed_port(_CONTAINER_CAIDO_PORT)
|
|
host_caido_url = f"http://{caido_endpoint.host}:{caido_endpoint.port}"
|
|
|
|
caido_client = await bootstrap_caido(
|
|
session,
|
|
host_url=host_caido_url,
|
|
container_url=container_caido_url,
|
|
)
|
|
|
|
bundle = {
|
|
"client": client,
|
|
"session": session,
|
|
"caido_client": caido_client,
|
|
}
|
|
_SESSION_CACHE[scan_id] = bundle
|
|
return bundle
|
|
|
|
|
|
async def cleanup(scan_id: str) -> None:
|
|
"""Tear down ``scan_id``'s container and drop its cache entry.
|
|
|
|
Best-effort: any error during ``client.delete`` is logged and
|
|
swallowed. We never want a cleanup failure to prevent the next
|
|
scan from starting; the worst case is a stranded container that
|
|
Docker's normal reaping will catch on next ``docker prune``.
|
|
"""
|
|
bundle = _SESSION_CACHE.pop(scan_id, None)
|
|
if bundle is None:
|
|
logger.debug("cleanup(%s): no cached session", scan_id)
|
|
return
|
|
|
|
caido_client = bundle.get("caido_client")
|
|
if caido_client is not None:
|
|
try:
|
|
await caido_client.aclose()
|
|
except Exception: # noqa: BLE001
|
|
logger.debug("cleanup(%s): caido_client.aclose() raised", scan_id, exc_info=True)
|
|
|
|
try:
|
|
await bundle["client"].delete(bundle["session"])
|
|
logger.info("Cleaned up sandbox session for scan %s", scan_id)
|
|
except Exception:
|
|
logger.exception(
|
|
"cleanup(%s): client.delete raised; container may need manual reaping",
|
|
scan_id,
|
|
)
|
|
|
|
|
|
def cached_scan_ids() -> list[str]:
|
|
"""Snapshot of currently-cached scan ids. Used by the TUI / CLI."""
|
|
return list(_SESSION_CACHE.keys())
|
|
|
|
|
|
def _reset_cache_for_tests() -> None:
|
|
"""Test helper — clears the module cache between unit tests."""
|
|
_SESSION_CACHE.clear()
|