4a607ad098
Adopts the firecracker infra-VM pattern for macOS: the orchestrator control plane and the gateway data plane now run in a SINGLE Apple container instead of two. Apple Containers are lightweight VMs with separate kernels, so the prior two-container design had both guests writing one bot-bottle.db over virtiofs, where fcntl locks are not coherent across kernels — concurrent writes (the orchestrator's registry vs the gateway supervise daemon's queue) could corrupt it. One container = one kernel = coherent locking. The DB moves onto a container-only Apple volume (bot-bottle-mac-db), never bind-mounted from the host, so no host process opens the live file either. The host CLI already reaches registry + supervise state over the control-plane HTTP surface (cli/supervise.py uses OrchestratorClient), exactly as firecracker's VM-only DB requires. Two simplifications fall out of the single container: - No DNS dance: the control plane and gateway daemons reach each other over 127.0.0.1, so the orchestrator-before-gateway ordering (a workaround for Apple having no container DNS) is gone, along with the moved-IP recreate logic it needed. - Net -243 lines. Mechanics: the infra container runs from the gateway image with the control-plane source bind-mounted read-only (like the docker orchestrator, so a code change needs no rebuild) and a small sh -c init that starts both processes (mirrors firecracker's _infra_init). Also implements the macOS backend's ensure_orchestrator() and adds it to discover_orchestrator_url, so operator tools (supervise) can bring up / find the control plane on demand — previously the macOS backend died with "no orchestrator control plane". Verified end-to-end on real Apple Container 1.0.0: the single infra container comes up healthy (one address for control plane + gateway), both processes run, the DB is written on the container-only volume, host-side supervise works over HTTP, and a registered agent gets 200 for an allowed host / 403 for a denied one. 1824 unit tests pass with `container` absent (CI parity), pyright clean, pylint 9.89. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
213 lines
8.6 KiB
Python
213 lines
8.6 KiB
Python
"""Host-side control-plane client (PRD 0070).
|
|
|
|
The launch path talks to the orchestrator over its HTTP control plane to
|
|
register, re-policy, and tear down bottles — the counterpart to the
|
|
gateway-side `PolicyResolver` (which only reads `/resolve`). Where
|
|
`PolicyResolver` is fail-closed and lives in the untrusted data plane, this
|
|
is the trusted control-plane caller: a non-success response is an error the
|
|
launch path must surface, not silently swallow.
|
|
|
|
Stdlib-only, so the CLI can drive the orchestrator without any dependency.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import urllib.error
|
|
import urllib.request
|
|
from dataclasses import dataclass
|
|
|
|
DEFAULT_TIMEOUT_SECONDS = 5.0
|
|
|
|
|
|
class OrchestratorClientError(RuntimeError):
|
|
"""A control-plane call failed (unreachable, or an unexpected status)."""
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class RegisteredBottle:
|
|
"""What `POST /bottles` returns: the minted bottle id and the per-bottle
|
|
identity token the agent presents for app-layer attribution."""
|
|
|
|
bottle_id: str
|
|
identity_token: str
|
|
|
|
|
|
class OrchestratorClient:
|
|
"""Trusted host-side client for the orchestrator control plane."""
|
|
|
|
def __init__(self, base_url: str, *, timeout: float = DEFAULT_TIMEOUT_SECONDS) -> None:
|
|
self._base = base_url.rstrip("/")
|
|
self._timeout = timeout
|
|
|
|
def _request(
|
|
self, method: str, path: str, body: dict[str, object] | None = None,
|
|
) -> tuple[int, dict[str, object]]:
|
|
"""Send one request; return `(status, payload)`. Raises
|
|
`OrchestratorClientError` only when the orchestrator can't be reached
|
|
or returns malformed data — HTTP *status* codes are returned so
|
|
callers can treat 404 as a meaningful "no such bottle"."""
|
|
data = json.dumps(body).encode() if body is not None else None
|
|
headers = {"Content-Type": "application/json"} if data is not None else {}
|
|
req = urllib.request.Request(
|
|
f"{self._base}{path}", data=data, method=method, headers=headers,
|
|
)
|
|
try:
|
|
with urllib.request.urlopen(req, timeout=self._timeout) as resp:
|
|
raw = resp.read()
|
|
payload = json.loads(raw) if raw else {}
|
|
return resp.status, payload if isinstance(payload, dict) else {}
|
|
except urllib.error.HTTPError as e:
|
|
# A structured error response still carries a usable status.
|
|
try:
|
|
payload = json.loads(e.read() or b"{}")
|
|
except (ValueError, OSError):
|
|
payload = {}
|
|
return e.code, payload if isinstance(payload, dict) else {}
|
|
except (urllib.error.URLError, TimeoutError, OSError, ValueError) as e:
|
|
raise OrchestratorClientError(f"{method} {path}: {e}") from e
|
|
|
|
def _ok(self, method: str, path: str, body: dict[str, object] | None = None) -> dict[str, object]:
|
|
"""`_request` that requires a 2xx, raising otherwise."""
|
|
status, payload = self._request(method, path, body)
|
|
if not 200 <= status < 300:
|
|
detail = payload.get("error", "")
|
|
raise OrchestratorClientError(f"{method} {path}: HTTP {status} {detail}".rstrip())
|
|
return payload
|
|
|
|
def health(self) -> bool:
|
|
"""True iff the control plane answers `GET /health` with 200."""
|
|
try:
|
|
status, _ = self._request("GET", "/health")
|
|
except OrchestratorClientError:
|
|
return False
|
|
return status == 200
|
|
|
|
def register_bottle(
|
|
self,
|
|
source_ip: str,
|
|
*,
|
|
image_ref: str = "",
|
|
metadata: str = "",
|
|
policy: str = "",
|
|
tokens: dict[str, str] | None = None,
|
|
) -> RegisteredBottle:
|
|
"""Register a bottle and broker its launch (`POST /bottles`). `tokens`
|
|
are the per-bottle egress auth values (env_name -> value) the
|
|
orchestrator holds in memory for the gateway to inject. Returns the
|
|
minted id + identity token."""
|
|
payload = self._ok("POST", "/bottles", {
|
|
"source_ip": source_ip,
|
|
"image_ref": image_ref,
|
|
"metadata": metadata,
|
|
"policy": policy,
|
|
"tokens": tokens or {},
|
|
})
|
|
bottle_id = payload.get("bottle_id")
|
|
token = payload.get("identity_token")
|
|
if not isinstance(bottle_id, str) or not isinstance(token, str):
|
|
raise OrchestratorClientError("register: response missing bottle_id/identity_token")
|
|
return RegisteredBottle(bottle_id=bottle_id, identity_token=token)
|
|
|
|
def teardown_bottle(self, bottle_id: str) -> bool:
|
|
"""Tear a bottle down (`DELETE /bottles/<id>`). False if the
|
|
orchestrator didn't know it (404) — idempotent for cleanup paths."""
|
|
status, _ = self._request("DELETE", f"/bottles/{bottle_id}")
|
|
if status == 404:
|
|
return False
|
|
if not 200 <= status < 300:
|
|
raise OrchestratorClientError(f"teardown {bottle_id}: HTTP {status}")
|
|
return True
|
|
|
|
def set_policy(self, bottle_id: str, policy: str) -> bool:
|
|
"""Live-reload a bottle's policy (`PUT /bottles/<id>/policy`). False on
|
|
404 (unknown bottle)."""
|
|
status, _ = self._request("PUT", f"/bottles/{bottle_id}/policy", {"policy": policy})
|
|
if status == 404:
|
|
return False
|
|
if not 200 <= status < 300:
|
|
raise OrchestratorClientError(f"set_policy {bottle_id}: HTTP {status}")
|
|
return True
|
|
|
|
def list_bottles(self) -> list[dict[str, object]]:
|
|
"""Every registered bottle's redacted record (`GET /bottles`)."""
|
|
payload = self._ok("GET", "/bottles")
|
|
bottles = payload.get("bottles")
|
|
return bottles if isinstance(bottles, list) else []
|
|
|
|
# --- supervise queue (operator TUI) ------------------------------------
|
|
|
|
def supervise_pending(self) -> list[dict[str, object]]:
|
|
"""Pending supervise proposals across all bottles
|
|
(`GET /supervise/proposals`)."""
|
|
payload = self._ok("GET", "/supervise/proposals")
|
|
proposals = payload.get("proposals")
|
|
return proposals if isinstance(proposals, list) else []
|
|
|
|
def supervise_respond(
|
|
self,
|
|
proposal_id: str,
|
|
*,
|
|
bottle_slug: str,
|
|
decision: str,
|
|
notes: str = "",
|
|
final_file: str | None = None,
|
|
) -> None:
|
|
"""Record an operator decision (`POST /supervise/respond`). `decision`
|
|
is approve/modify/reject. Raises `OrchestratorClientError` if the
|
|
proposal is gone or the bottle can no longer be applied to (409)."""
|
|
body: dict[str, object] = {
|
|
"proposal_id": proposal_id,
|
|
"bottle_slug": bottle_slug,
|
|
"decision": decision,
|
|
"notes": notes,
|
|
}
|
|
if final_file is not None:
|
|
body["final_file"] = final_file
|
|
self._ok("POST", "/supervise/respond", body)
|
|
|
|
|
|
def discover_orchestrator_url(*, timeout: float = 2.0) -> str:
|
|
"""The URL of the one running per-host orchestrator control plane, probing
|
|
the backends' well-known control-plane addresses (both on port 8099):
|
|
docker publishes it on loopback; the firecracker infra VM serves it on the
|
|
orchestrator TAP. Returns the first that answers `/health`; raises if none
|
|
do (no orchestrator up — launch a bottle first)."""
|
|
candidates: list[str] = []
|
|
try: # docker: loopback-published control plane
|
|
from .lifecycle import DEFAULT_PORT as _DOCKER_PORT
|
|
candidates.append(f"http://127.0.0.1:{_DOCKER_PORT}")
|
|
except Exception: # noqa: BLE001 — backend optional
|
|
candidates.append("http://127.0.0.1:8099")
|
|
try: # firecracker: infra VM control plane on the orchestrator TAP
|
|
from ..backend.firecracker import netpool
|
|
from ..backend.firecracker.infra_vm import CONTROL_PLANE_PORT
|
|
candidates.append(
|
|
f"http://{netpool.orch_slot().guest_ip}:{CONTROL_PLANE_PORT}")
|
|
except Exception: # noqa: BLE001 — backend optional / not firecracker
|
|
pass
|
|
try: # macOS: infra container control plane on its host-only address
|
|
from ..backend.macos_container.infra import probe_control_plane_url
|
|
url = probe_control_plane_url()
|
|
if url:
|
|
candidates.append(url)
|
|
except Exception: # noqa: BLE001 — backend optional / not macOS
|
|
pass
|
|
for url in candidates:
|
|
if OrchestratorClient(url, timeout=timeout).health():
|
|
return url
|
|
raise OrchestratorClientError(
|
|
"no running orchestrator control plane found (tried "
|
|
+ ", ".join(candidates)
|
|
+ "); launch a bottle first"
|
|
)
|
|
|
|
|
|
__all__ = [
|
|
"OrchestratorClient",
|
|
"OrchestratorClientError",
|
|
"RegisteredBottle",
|
|
"DEFAULT_TIMEOUT_SECONDS",
|
|
"discover_orchestrator_url",
|
|
]
|