8d7e5956e1
The single infra VM now runs BOTH the orchestrator control plane and the gateway data plane (egress / supervise / git-http), multi-tenant against the local control plane — the single-VM shape from the Stage B design. - Dockerfile.infra: the firecracker infra image = the gateway image + the baked control-plane source (FROM bot-bottle-gateway, COPY bot_bottle). Reuses the gateway payload rather than copying mitmproxy/ gitleaks into a third image; the docker backend keeps its two separate images. - infra_vm: build from source (gateway then infra image), and the PID-1 init now also launches `gateway_init` with BOT_BOTTLE_ORCHESTRATOR_URL=http://127.0.0.1:8099. Adds `gateway_ca_pem` (fetch the mitmproxy CA over SSH) and the agent-facing port constants. - init exports PATH — a bare-init shell resolves its own execs via a built-in default path, but that isn't in the environment, so gateway_init's `python3 ...` daemons would otherwise fail to spawn. Verified on a KVM host: infra VM boots, control plane /health -> 200, and egress:9099 / supervise:9100 / git-http:9420 all listen and are reachable from the host over the TAP link; the gateway CA is retrievable. (git-gate stays down until a bottle provisions its per-bottle entrypoint/creds, same as a fresh docker gateway — non-fatal, the supervisor keeps the rest up.) Next: agent->gateway VM-to-VM routing so bbfc* VMs reach these ports at the infra VM and nowhere else. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01WBMWTEtQdJ4W5UrWuLHCck
203 lines
8.1 KiB
Python
203 lines
8.1 KiB
Python
"""The per-host infra VM for the Firecracker backend (PRD 0070 Stage B).
|
|
|
|
A single persistent microVM that runs the orchestrator **control plane** (and,
|
|
in a following step, the gateway **data plane**) — the trusted per-host service
|
|
the docker backend runs as containers. It boots on the NAT'd orchestrator link
|
|
(`netpool.orch_slot()`): the host CLI reaches its control plane over HTTP at the
|
|
guest IP, and agent VMs reach its gateway ports over VM-to-VM routing.
|
|
|
|
Build-from-source (the default while the design churns): the rootfs is exported
|
|
from the locally built orchestrator image, which bakes the stdlib-only
|
|
control-plane source. A pull-from-registry mode (Gitea's OCI registry) becomes
|
|
the default later.
|
|
|
|
SSH is left enabled for debugging; the control plane is the load-bearing
|
|
surface.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import subprocess
|
|
import time
|
|
import urllib.error
|
|
import urllib.request
|
|
from dataclasses import dataclass
|
|
from pathlib import Path
|
|
|
|
from ...log import die, info
|
|
from ..docker import util as docker_mod
|
|
from . import firecracker_vm, netpool, util
|
|
|
|
# The single infra-VM image: gateway data plane + baked control-plane source
|
|
# (Dockerfile.infra FROM the gateway image). Built from source by default;
|
|
# a pull-from-registry mode lands later.
|
|
_INFRA_IMAGE = "bot-bottle-infra:latest"
|
|
_GATEWAY_IMAGE = "bot-bottle-gateway:latest"
|
|
_REPO_ROOT = Path(__file__).resolve().parents[3]
|
|
|
|
CONTROL_PLANE_PORT = 8099
|
|
# Gateway data-plane ports (agent-facing): egress proxy, supervise MCP,
|
|
# git-http. Reached by agent VMs over VM-to-VM routing (added next).
|
|
EGRESS_PORT = 9099
|
|
SUPERVISE_PORT = 9100
|
|
GIT_HTTP_PORT = 9420
|
|
# mitmproxy writes its CA here a beat after start; agents install it to trust
|
|
# the gateway's TLS interception.
|
|
_GATEWAY_CA_PATH = "/home/mitmproxy/.mitmproxy/mitmproxy-ca-cert.pem"
|
|
|
|
# The infra VM makes direct upstream connections (gateway egress, and buildah
|
|
# during builds), and the kernel `ip=` cmdline sets no resolver. Public for
|
|
# now; routing DNS through a filtered path is a later refinement.
|
|
_INFRA_RESOLVER = "1.1.1.1"
|
|
|
|
_HEALTH_TIMEOUT_SECONDS = 45.0
|
|
_HEALTH_POLL_SECONDS = 0.5
|
|
_CA_TIMEOUT_SECONDS = 30.0
|
|
|
|
|
|
@dataclass
|
|
class InfraVm:
|
|
"""A booted infra VM: its VMM handle, guest IP, and debug SSH key."""
|
|
|
|
vm: firecracker_vm.VmHandle
|
|
guest_ip: str
|
|
private_key: Path
|
|
|
|
@property
|
|
def control_plane_url(self) -> str:
|
|
return f"http://{self.guest_ip}:{CONTROL_PLANE_PORT}"
|
|
|
|
def terminate(self) -> None:
|
|
self.vm.terminate()
|
|
|
|
def gateway_ca_pem(self, *, timeout: float = _CA_TIMEOUT_SECONDS) -> str:
|
|
"""The gateway's mitmproxy CA (PEM) that agents install to trust its
|
|
TLS interception. Generated a moment after boot, so this polls over
|
|
SSH until it appears (mirrors DockerGateway.ca_cert_pem)."""
|
|
deadline = time.monotonic() + timeout
|
|
while True:
|
|
proc = subprocess.run(
|
|
util.ssh_base_argv(self.private_key, self.guest_ip)
|
|
+ [f"cat {_GATEWAY_CA_PATH}"],
|
|
capture_output=True, text=True, timeout=15, check=False,
|
|
)
|
|
if proc.returncode == 0 and "BEGIN CERTIFICATE" in proc.stdout:
|
|
return proc.stdout
|
|
if time.monotonic() >= deadline:
|
|
die(f"gateway CA not available after {timeout:g}s: "
|
|
f"{proc.stderr.strip() or 'empty'}")
|
|
time.sleep(_HEALTH_POLL_SECONDS)
|
|
|
|
|
|
def ensure_built() -> None:
|
|
"""Build the infra image from source (bootstrap via host docker): the
|
|
gateway data-plane image, then the infra image that layers the
|
|
control-plane source onto it. A pull-from-registry mode replaces this
|
|
later."""
|
|
docker_mod.build_image(
|
|
_GATEWAY_IMAGE, str(_REPO_ROOT), dockerfile="Dockerfile.gateway")
|
|
docker_mod.build_image(
|
|
_INFRA_IMAGE, str(_REPO_ROOT), dockerfile="Dockerfile.infra")
|
|
|
|
|
|
def build_infra_rootfs_dir() -> Path:
|
|
"""The infra VM's base rootfs: the infra image prepared with the
|
|
control-plane + gateway init as PID 1."""
|
|
return util.build_base_rootfs_dir(
|
|
_INFRA_IMAGE, variant="-infra", init_script=_infra_init(),
|
|
)
|
|
|
|
|
|
def boot() -> InfraVm:
|
|
"""Boot the infra VM on the orchestrator link. Caller waits for health
|
|
(`wait_for_health`) and tears it down."""
|
|
slot = netpool.orch_slot()
|
|
if not netpool.tap_present(slot.iface):
|
|
die(f"orchestrator link {slot.iface} not present.\n"
|
|
f" ./cli.py backend setup --backend=firecracker")
|
|
|
|
base = build_infra_rootfs_dir()
|
|
run_dir = util.cache_dir() / "run" / "infra"
|
|
run_dir.mkdir(parents=True, exist_ok=True)
|
|
rootfs = run_dir / "rootfs.ext4"
|
|
util.build_rootfs_ext4(base, rootfs, slack_mib=8192)
|
|
private_key, pubkey = util.generate_keypair(run_dir)
|
|
|
|
info(f"booting infra VM on {slot.iface} (guest {slot.guest_ip})")
|
|
vm = firecracker_vm.boot(
|
|
name="bot-bottle-infra", rootfs=rootfs, tap=slot.iface,
|
|
guest_ip=slot.guest_ip, host_ip=slot.host_ip, pubkey=pubkey,
|
|
run_dir=run_dir, mem_mib=4096,
|
|
)
|
|
return InfraVm(vm=vm, guest_ip=slot.guest_ip, private_key=private_key)
|
|
|
|
|
|
def wait_for_health(
|
|
infra: InfraVm, *, timeout: float = _HEALTH_TIMEOUT_SECONDS,
|
|
) -> None:
|
|
"""Poll the control plane's /health until it answers 200 or the deadline
|
|
passes. Dies (with the console tail) if the VMM exits early."""
|
|
url = f"{infra.control_plane_url}/health"
|
|
deadline = time.monotonic() + timeout
|
|
while time.monotonic() < deadline:
|
|
if not infra.vm.is_alive():
|
|
die(f"infra VM exited during boot (rc={infra.vm.process.returncode}).\n"
|
|
f"{firecracker_vm._console_tail(infra.vm.console_log)}")
|
|
try:
|
|
with urllib.request.urlopen(url, timeout=1.0) as resp:
|
|
if resp.status == 200:
|
|
info(f"infra control plane healthy at {infra.control_plane_url}")
|
|
return
|
|
except (urllib.error.URLError, TimeoutError, OSError):
|
|
pass
|
|
time.sleep(_HEALTH_POLL_SECONDS)
|
|
die(f"infra control plane at {url} did not become healthy within "
|
|
f"{timeout:.0f}s.\n{firecracker_vm._console_tail(infra.vm.console_log)}")
|
|
|
|
|
|
def _infra_init() -> str:
|
|
"""PID-1 init for the infra VM: mount the pseudo-filesystems, wire a
|
|
resolver, start dropbear (debug SSH), then launch the control plane and
|
|
the gateway data plane (multi-tenant against the local control plane)."""
|
|
return f"""#!/bin/sh
|
|
# bot-bottle Firecracker infra VM init (PID 1).
|
|
mount -t proc proc /proc 2>/dev/null
|
|
mount -t sysfs sys /sys 2>/dev/null
|
|
mount -t devtmpfs dev /dev 2>/dev/null
|
|
mkdir -p /dev/pts && mount -t devpts devpts /dev/pts 2>/dev/null
|
|
mount -o remount,rw / 2>/dev/null
|
|
|
|
# Export a real PATH: a bare-init shell resolves its own execs via a
|
|
# built-in default path, but that isn't in the *environment*, so
|
|
# gateway_init's subprocess daemons (spawned as `python3 ...`) would
|
|
# inherit no PATH and fail to find python3. Export it for all children.
|
|
export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
|
|
|
# Direct upstream resolver (control-plane / gateway egress + buildah).
|
|
printf 'nameserver {_INFRA_RESOLVER}\\n' > /etc/resolv.conf 2>/dev/null
|
|
|
|
# Debug SSH: install the per-boot pubkey from the kernel cmdline.
|
|
KEY=$(sed -n 's/.*bb_pubkey=\\([^ ]*\\).*/\\1/p' /proc/cmdline | base64 -d 2>/dev/null)
|
|
if [ -n "$KEY" ]; then
|
|
mkdir -p /root/.ssh
|
|
printf '%s\\n' "$KEY" > /root/.ssh/authorized_keys
|
|
chmod 700 /root/.ssh && chmod 600 /root/.ssh/authorized_keys
|
|
fi
|
|
chown -R 0:0 /root 2>/dev/null || true
|
|
mkdir -p /etc/dropbear /run /var/lib/bot-bottle
|
|
/bb-dropbear -R -E -p 22 &
|
|
|
|
# Control plane. Source is baked at /app; the package is stdlib-only.
|
|
cd /app
|
|
BOT_BOTTLE_ROOT=/var/lib/bot-bottle python3 -m bot_bottle.orchestrator \\
|
|
--host 0.0.0.0 --port {CONTROL_PLANE_PORT} --broker stub &
|
|
|
|
# Gateway data plane (egress / git-gate / supervise), multi-tenant: each
|
|
# request resolves source-IP -> policy against the local control plane.
|
|
BOT_BOTTLE_ORCHESTRATOR_URL=http://127.0.0.1:{CONTROL_PLANE_PORT} \\
|
|
python3 /app/gateway_init.py &
|
|
|
|
# Reap as PID 1; children are backgrounded, so `wait` blocks.
|
|
while : ; do wait ; done
|
|
"""
|