69db629e16
Rewire DockerBottleBackend.launch to the consolidated model, replacing the
per-bottle sidecar bundle. VALIDATED END-TO-END on real docker:
test_sandbox_escape passes all 5 attacks (egress DLP + git-gate gitleaks)
through the shared gateway.
launch now:
- mints git-gate dynamic keys (if any), then launch_consolidated() to
register the bottle + provision its git-gate state into the gateway and
get the agent's attach context (pinned source IP, gateway address);
- installs the SHARED gateway CA (gateway.ca_cert_pem) into the agent;
- renders the agent-only consolidated compose on the gateway network at the
pinned IP, proxied through the gateway;
- points the agent's git-gate insteadOf (http://<gw>:9420) and supervise
MCP (http://<gw>:9100) at the gateway (DockerBottlePlan.agent_git_gate_url
/ agent_supervise_url);
- teardown = compose down + teardown_consolidated (dereg + deprovision).
Dropped the per-bottle networks, per-bottle egress CA, and bundle service.
Fixes surfaced by the real e2e (couldn't be caught by unit mocks):
- provision_git_gate installs the bottle-agnostic pre-receive/access hooks
into the gateway (were cp'd per-bundle before);
- source-IP allocation reads the *actual* container IPs on the network
(gateway + orchestrator + agents), not just gateway + registry — the
orchestrator container sits on the network and was colliding.
Unit tests for the old bundle launch rewritten against the new collaborators.
NOTE for reviewers: the gateway/bundle image (bot-bottle-sidecars) must be
rebuilt when its flat sources change — `ensure_built` only builds-if-missing,
so a stale image silently runs the OLD single-tenant daemons. A content-hash
/ --rebuild path is a follow-up.
pyright 0 errors; pylint 9.83/10; unit suite green (1760 tests; the 13
test_sidecar_init /bin/sleep errors are pre-existing NixOS-local noise);
test_sandbox_escape green on real docker.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01WBMWTEtQdJ4W5UrWuLHCck
144 lines
5.8 KiB
Python
144 lines
5.8 KiB
Python
"""Unit: Docker launch step uses committed image when available (consolidated)."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import contextlib
|
|
import io
|
|
import tempfile
|
|
import unittest
|
|
from collections.abc import Callable, Generator
|
|
from pathlib import Path
|
|
from typing import Any
|
|
from unittest import mock
|
|
|
|
from bot_bottle.agent_provider import AgentProvisionPlan
|
|
from bot_bottle.backend import BottleSpec
|
|
from bot_bottle.backend.docker import launch as launch_mod
|
|
from bot_bottle.backend.docker.bottle_plan import DockerBottlePlan
|
|
from bot_bottle.backend.docker.consolidated_launch import LaunchContext
|
|
from bot_bottle.egress import EgressPlan
|
|
from bot_bottle.git_gate import GitGatePlan
|
|
from bot_bottle.manifest import ManifestIndex
|
|
from tests.unit import use_bottle_root
|
|
|
|
|
|
_SLUG = "dev-abc12"
|
|
_COMMITTED_TAG = f"bot-bottle-committed-{_SLUG}:latest"
|
|
_DEFAULT_IMAGE = "bot-bottle-claude:latest"
|
|
|
|
_IDX = ManifestIndex.from_json_obj({
|
|
"bottles": {"dev": {}},
|
|
"agents": {"demo": {"skills": [], "prompt": "", "bottle": "dev"}},
|
|
})
|
|
|
|
_CTX = LaunchContext(
|
|
bottle_id="b1", identity_token="t", source_ip="172.20.0.4",
|
|
network="bot-bottle-gateway", gateway_ip="172.20.0.2",
|
|
orchestrator_url="http://orch:8099",
|
|
)
|
|
|
|
|
|
def _plan(tmp: str) -> DockerBottlePlan:
|
|
stage = Path(tmp)
|
|
spec = BottleSpec(
|
|
manifest=_IDX, agent_name="demo", copy_cwd=False, user_cwd=tmp, identity=_SLUG,
|
|
)
|
|
return DockerBottlePlan(
|
|
spec=spec,
|
|
manifest=_IDX.load_for_agent("demo"),
|
|
stage_dir=stage,
|
|
git_gate_plan=GitGatePlan(
|
|
slug=_SLUG, entrypoint_script=stage / "e.sh", hook_script=stage / "h.sh",
|
|
access_hook_script=stage / "a.sh", upstreams=(),
|
|
),
|
|
egress_plan=EgressPlan(
|
|
slug=_SLUG, routes_path=stage / "egress.yaml", routes=(), token_env_map={},
|
|
),
|
|
supervise_plan=None,
|
|
agent_provision=AgentProvisionPlan(
|
|
template="claude", command="claude", prompt_mode="append_file",
|
|
image=_DEFAULT_IMAGE, dockerfile="", guest_home="/home/node",
|
|
instance_name=f"bot-bottle-{_SLUG}", prompt_file=stage / "prompt.txt",
|
|
guest_env={},
|
|
),
|
|
slug=_SLUG, forwarded_env={}, use_runsc=False,
|
|
)
|
|
|
|
|
|
class TestLaunchCommittedImage(unittest.TestCase):
|
|
def setUp(self) -> None:
|
|
self._tmp = tempfile.mkdtemp(prefix="launch-committed-test.")
|
|
self.addCleanup(lambda: __import__("shutil").rmtree(self._tmp, ignore_errors=True))
|
|
# The launch writes the gateway CA under the bottle root — sandbox it.
|
|
self.addCleanup(use_bottle_root(Path(self._tmp)))
|
|
|
|
@contextlib.contextmanager
|
|
def _patched(
|
|
self,
|
|
*,
|
|
committed_tag: str | None,
|
|
image_present: bool,
|
|
compose: Callable[..., dict[str, Any]],
|
|
) -> Generator[list[str], None, None]:
|
|
built: list[str] = []
|
|
gw = mock.Mock()
|
|
gw.ca_cert_pem.return_value = "-----BEGIN CERTIFICATE-----\nx\n-----END CERTIFICATE-----\n"
|
|
|
|
def _build(image: str, ctx: str, *, dockerfile: str = "") -> None:
|
|
del ctx, dockerfile
|
|
built.append(image)
|
|
|
|
with mock.patch.object(launch_mod, "read_committed_image", return_value=committed_tag), \
|
|
mock.patch.object(launch_mod.docker_mod, "image_exists", return_value=image_present), \
|
|
mock.patch.object(launch_mod.docker_mod, "build_image", side_effect=_build), \
|
|
mock.patch.object(launch_mod, "launch_consolidated", return_value=_CTX), \
|
|
mock.patch.object(launch_mod, "teardown_consolidated"), \
|
|
mock.patch.object(launch_mod, "DockerGateway", return_value=gw), \
|
|
mock.patch.object(launch_mod, "consolidated_agent_compose", side_effect=compose), \
|
|
mock.patch.object(launch_mod, "write_compose_file", return_value=Path("/tmp/c.yml")), \
|
|
mock.patch.object(launch_mod, "compose_up"), \
|
|
mock.patch.object(launch_mod, "compose_dump_logs"), \
|
|
mock.patch.object(launch_mod, "compose_down"), \
|
|
contextlib.redirect_stderr(io.StringIO()):
|
|
yield built
|
|
|
|
def _run_launch(
|
|
self, plan: DockerBottlePlan, *,
|
|
committed_tag: str | None = None, image_present: bool = True,
|
|
) -> list[str]:
|
|
def compose(_p: DockerBottlePlan, **_kw: Any) -> dict[str, Any]:
|
|
return {"services": {"agent": {}}}
|
|
with self._patched(
|
|
committed_tag=committed_tag, image_present=image_present, compose=compose,
|
|
) as built:
|
|
with launch_mod.launch(plan, provision=mock.Mock(return_value=None)):
|
|
pass
|
|
return built
|
|
|
|
def test_skips_build_when_committed_image_present(self) -> None:
|
|
built = self._run_launch(_plan(self._tmp), committed_tag=_COMMITTED_TAG, image_present=True)
|
|
self.assertEqual([], built) # committed image reused, no build
|
|
|
|
def test_uses_committed_image_in_compose_spec(self) -> None:
|
|
captured: list[DockerBottlePlan] = []
|
|
|
|
def compose(p: DockerBottlePlan, **_kw: Any) -> dict[str, Any]:
|
|
captured.append(p)
|
|
return {"services": {"agent": {}}}
|
|
|
|
with self._patched(committed_tag=_COMMITTED_TAG, image_present=True, compose=compose):
|
|
with launch_mod.launch(_plan(self._tmp), provision=mock.Mock(return_value=None)):
|
|
pass
|
|
self.assertEqual(_COMMITTED_TAG, captured[0].image)
|
|
|
|
def test_falls_back_to_build_when_no_committed_image(self) -> None:
|
|
self.assertEqual([_DEFAULT_IMAGE], self._run_launch(_plan(self._tmp), committed_tag=None))
|
|
|
|
def test_falls_back_to_build_when_committed_image_missing_from_daemon(self) -> None:
|
|
built = self._run_launch(_plan(self._tmp), committed_tag=_COMMITTED_TAG, image_present=False)
|
|
self.assertEqual([_DEFAULT_IMAGE], built)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|