c011c66889
Picks up the recent in-image deps (``pip install caido-sdk-client`` for ``python_action`` + Caido CLI bumped to v0.56.0). 0.2.0 is the new minor since this is the first SDK-migration-era image; users pulling the new strix should pull the matching new image. Updated: - ``strix/config/settings.py:64`` — ``RuntimeSettings.image`` default - ``strix/runtime/session_manager.py`` + ``strix/orchestration/scan.py`` — docstring example - ``HARNESS_WIKI.md`` — three references in the runtime + config docs - ``MIGRATION_EVALUATION.md`` — the SDK-bridging note The historical changelog row (``HARNESS_WIKI.md:744`` — "bump to 0.1.13") stays untouched on purpose; it records what commit ``640bd67`` did, not the current pin. 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
|
|
|
|
from agents.sandbox.entries import LocalDir
|
|
from agents.sandbox.manifest import Environment, Manifest
|
|
|
|
from strix.config import load_settings
|
|
from strix.runtime.backends import get_backend
|
|
from strix.runtime.caido_bootstrap import bootstrap_caido
|
|
|
|
|
|
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.2.0"``).
|
|
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. ``NO_PROXY`` keeps the
|
|
# agent-browser CDP daemon's localhost traffic from looping back
|
|
# through Caido.
|
|
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,
|
|
"NO_PROXY": "localhost,127.0.0.1",
|
|
},
|
|
),
|
|
)
|
|
|
|
backend_name = load_settings().runtime.backend
|
|
backend = get_backend(backend_name)
|
|
|
|
logger.info(
|
|
"Creating sandbox session for scan %s (backend=%s, image=%s)",
|
|
scan_id,
|
|
backend_name,
|
|
image,
|
|
)
|
|
client, session = await backend(
|
|
image=image,
|
|
manifest=manifest,
|
|
exposed_ports=(_CONTAINER_CAIDO_PORT,),
|
|
)
|
|
|
|
caido_endpoint = await session.resolve_exposed_port(_CONTAINER_CAIDO_PORT)
|
|
host_caido_url = f"http://{caido_endpoint.host}:{caido_endpoint.port}"
|
|
logger.debug("Caido host endpoint resolved: %s", host_caido_url)
|
|
|
|
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
|
|
logger.info("Sandbox session for scan %s ready and cached", scan_id)
|
|
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,
|
|
)
|