feat(swarm-mgmt): agent enrollment bundle flow + admin swarm endpoints

decnet/web/router/swarm_mgmt/__init__.py

@@ -0,0 +1,24 @@
+"""Swarm management endpoints for the React dashboard.
+
+These are *not* the unauthenticated /swarm routes mounted on the separate
+swarm-controller process (decnet/web/swarm_api.py on port 8770). These
+live on the main web API, go through ``require_admin``, and are the
+interface the dashboard uses to list hosts, decommission them, list
+deckies across the fleet, and generate one-shot agent-enrollment
+bundles.
+
+Mounted under ``/api/v1/swarm`` by the main api router.
+"""
+from fastapi import APIRouter
+
+from .api_list_hosts import router as list_hosts_router
+from .api_decommission_host import router as decommission_host_router
+from .api_list_deckies import router as list_deckies_router
+from .api_enroll_bundle import router as enroll_bundle_router
+
+swarm_mgmt_router = APIRouter(prefix="/swarm")
+
+swarm_mgmt_router.include_router(list_hosts_router)
+swarm_mgmt_router.include_router(decommission_host_router)
+swarm_mgmt_router.include_router(list_deckies_router)
+swarm_mgmt_router.include_router(enroll_bundle_router)

decnet/web/router/swarm_mgmt/api_decommission_host.py

@@ -0,0 +1,41 @@
+"""DELETE /swarm/hosts/{uuid} — decommission a worker from the dashboard."""
+from __future__ import annotations
+
+import pathlib
+
+from fastapi import APIRouter, Depends, HTTPException, status
+
+from decnet.web.db.repository import BaseRepository
+from decnet.web.dependencies import get_repo, require_admin
+
+router = APIRouter()
+
+
+@router.delete(
+    "/hosts/{uuid}",
+    status_code=status.HTTP_204_NO_CONTENT,
+    tags=["Swarm Management"],
+)
+async def decommission_host(
+    uuid: str,
+    admin: dict = Depends(require_admin),
+    repo: BaseRepository = Depends(get_repo),
+) -> None:
+    row = await repo.get_swarm_host_by_uuid(uuid)
+    if row is None:
+        raise HTTPException(status_code=404, detail="host not found")
+
+    await repo.delete_decky_shards_for_host(uuid)
+    await repo.delete_swarm_host(uuid)
+
+    bundle_dir = pathlib.Path(row.get("cert_bundle_path") or "")
+    if bundle_dir.is_dir():
+        for child in bundle_dir.iterdir():
+            try:
+                child.unlink()
+            except OSError:
+                pass
+        try:
+            bundle_dir.rmdir()
+        except OSError:
+            pass

decnet/web/router/swarm_mgmt/api_enroll_bundle.py

@@ -0,0 +1,354 @@
+"""Agent-enrollment bundles — the Wazuh-style one-liner flow.
+
+Three endpoints:
+  POST /swarm/enroll-bundle          — admin issues certs + builds payload
+  GET  /swarm/enroll-bundle/{t}.sh   — bootstrap script (idempotent until .tgz)
+  GET  /swarm/enroll-bundle/{t}.tgz  — tarball payload (one-shot; trips served)
+
+The operator's paste is a single pipe ``curl -fsSL <.sh> | sudo bash``.
+Under the hood the bootstrap curls the ``.tgz`` from the same token.
+Both files are rendered + persisted on POST; the ``.tgz`` GET atomically
+marks the token served, reads the bytes under the lock, and unlinks both
+files so a sweeper cannot race it. Unclaimed tokens expire after 5 min.
+
+We avoid the single-self-extracting-script pattern because ``bash`` run
+via pipe has ``$0 == "bash"`` — there is no file on disk to ``tail`` for
+the embedded payload. Two URLs, one paste.
+"""
+from __future__ import annotations
+
+import asyncio
+import fnmatch
+import io
+import os
+import pathlib
+import secrets
+import tarfile
+from dataclasses import dataclass
+from datetime import datetime, timedelta, timezone
+from typing import Optional
+
+from fastapi import APIRouter, Depends, HTTPException, Request, Response, status
+from pydantic import BaseModel, Field
+
+from decnet.logging import get_logger
+from decnet.swarm import pki
+from decnet.web.db.repository import BaseRepository
+from decnet.web.dependencies import get_repo, require_admin
+
+log = get_logger("swarm_mgmt.enroll_bundle")
+
+router = APIRouter()
+
+BUNDLE_TTL = timedelta(minutes=5)
+BUNDLE_DIR = pathlib.Path(os.environ.get("DECNET_ENROLL_BUNDLE_DIR", "/tmp/decnet-enroll"))  # nosec B108 - short-lived 0600 bundle cache, env-overridable
+SWEEP_INTERVAL_SECS = 30
+
+# Paths excluded from the bundled tarball. Matches the intent of
+# decnet.swarm.tar_tree.DEFAULT_EXCLUDES but narrower — we never want
+# tests, dev scaffolding, the master's DB, or the frontend source tree
+# shipped to an agent.
+_EXCLUDES: tuple[str, ...] = (
+    ".venv", ".venv/*", "**/.venv/*",
+    "__pycache__", "**/__pycache__", "**/__pycache__/*",
+    ".git", ".git/*",
+    ".pytest_cache", ".pytest_cache/*",
+    ".mypy_cache", ".mypy_cache/*",
+    "*.egg-info", "*.egg-info/*",
+    "*.pyc", "*.pyo",
+    "*.db", "*.db-wal", "*.db-shm", "decnet.db*",
+    "*.log",
+    "tests", "tests/*",
+    "development", "development/*",
+    "wiki-checkout", "wiki-checkout/*",
+    "decnet_web/node_modules", "decnet_web/node_modules/*",
+    "decnet_web/src", "decnet_web/src/*",
+    "decnet-state.json",
+    "master.log", "master.json",
+    "decnet.tar",
+)
+
+
+# ---------------------------------------------------------------------------
+# DTOs
+# ---------------------------------------------------------------------------
+
+class EnrollBundleRequest(BaseModel):
+    master_host: str = Field(..., min_length=1, max_length=253,
+                             description="IP/host the agent will reach back to")
+    agent_name: str = Field(..., pattern=r"^[a-z0-9][a-z0-9-]{0,62}$",
+                            description="Worker name (DNS-label safe)")
+    services_ini: Optional[str] = Field(
+        default=None,
+        description="Optional INI text shipped to the agent as /etc/decnet/services.ini",
+    )
+
+
+class EnrollBundleResponse(BaseModel):
+    token: str
+    command: str
+    expires_at: datetime
+    host_uuid: str
+
+
+# ---------------------------------------------------------------------------
+# In-memory registry
+# ---------------------------------------------------------------------------
+
+@dataclass
+class _Bundle:
+    sh_path: pathlib.Path
+    tgz_path: pathlib.Path
+    expires_at: datetime
+    served: bool = False
+
+
+_BUNDLES: dict[str, _Bundle] = {}
+_LOCK = asyncio.Lock()
+_SWEEPER_TASK: Optional[asyncio.Task] = None
+
+
+async def _sweep_loop() -> None:
+    while True:
+        try:
+            await asyncio.sleep(SWEEP_INTERVAL_SECS)
+            now = datetime.now(timezone.utc)
+            async with _LOCK:
+                dead = [t for t, b in _BUNDLES.items() if b.served or b.expires_at <= now]
+                for t in dead:
+                    b = _BUNDLES.pop(t)
+                    for p in (b.sh_path, b.tgz_path):
+                        try:
+                            p.unlink()
+                        except FileNotFoundError:
+                            pass
+                        except OSError as exc:
+                            log.warning("enroll-bundle sweep unlink failed path=%s err=%s", p, exc)
+        except asyncio.CancelledError:
+            raise
+        except Exception:  # noqa: BLE001
+            log.exception("enroll-bundle sweeper iteration failed")
+
+
+def _ensure_sweeper() -> None:
+    global _SWEEPER_TASK
+    if _SWEEPER_TASK is None or _SWEEPER_TASK.done():
+        _SWEEPER_TASK = asyncio.create_task(_sweep_loop())
+
+
+# ---------------------------------------------------------------------------
+# Tarball construction
+# ---------------------------------------------------------------------------
+
+def _repo_root() -> pathlib.Path:
+    # decnet/web/router/swarm_mgmt/api_enroll_bundle.py -> 4 parents = repo root.
+    return pathlib.Path(__file__).resolve().parents[4]
+
+
+def _is_excluded(rel: str) -> bool:
+    parts = pathlib.PurePosixPath(rel).parts
+    for pat in _EXCLUDES:
+        if fnmatch.fnmatch(rel, pat):
+            return True
+        for i in range(1, len(parts) + 1):
+            if fnmatch.fnmatch("/".join(parts[:i]), pat):
+                return True
+    return False
+
+
+def _render_decnet_ini(master_host: str) -> bytes:
+    return (
+        "; Generated by DECNET agent-enrollment bundle.\n"
+        "[decnet]\n"
+        "mode = agent\n"
+        "disallow-master = true\n"
+        "log-file-path = /var/log/decnet/decnet.log\n"
+        "\n"
+        "[agent]\n"
+        f"master-host = {master_host}\n"
+        "swarm-syslog-port = 6514\n"
+        "agent-port = 8765\n"
+        "agent-dir = /root/.decnet/agent\n"
+        "updater-dir = /root/.decnet/updater\n"
+    ).encode()
+
+
+def _add_bytes(tar: tarfile.TarFile, name: str, data: bytes, mode: int = 0o644) -> None:
+    info = tarfile.TarInfo(name)
+    info.size = len(data)
+    info.mode = mode
+    info.mtime = int(datetime.now(timezone.utc).timestamp())
+    tar.addfile(info, io.BytesIO(data))
+
+
+def _build_tarball(
+    master_host: str,
+    issued: pki.IssuedCert,
+    services_ini: Optional[str],
+) -> bytes:
+    """Gzipped tarball with:
+      - full repo source (minus excludes)
+      - etc/decnet/decnet.ini (pre-baked for mode=agent)
+      - home/.decnet/agent/{ca.crt,worker.crt,worker.key}
+      - services.ini at root if provided
+    """
+    root = _repo_root()
+    buf = io.BytesIO()
+    with tarfile.open(fileobj=buf, mode="w:gz") as tar:
+        for path in sorted(root.rglob("*")):
+            rel = path.relative_to(root).as_posix()
+            if _is_excluded(rel):
+                continue
+            if path.is_symlink() or path.is_dir():
+                continue
+            tar.add(path, arcname=rel, recursive=False)
+
+        _add_bytes(tar, "etc/decnet/decnet.ini", _render_decnet_ini(master_host))
+        _add_bytes(tar, "home/.decnet/agent/ca.crt", issued.ca_cert_pem)
+        _add_bytes(tar, "home/.decnet/agent/worker.crt", issued.cert_pem)
+        _add_bytes(tar, "home/.decnet/agent/worker.key", issued.key_pem, mode=0o600)
+
+        if services_ini:
+            _add_bytes(tar, "services.ini", services_ini.encode())
+
+    return buf.getvalue()
+
+
+def _render_bootstrap(
+    agent_name: str,
+    master_host: str,
+    tarball_url: str,
+    expires_at: datetime,
+) -> bytes:
+    tpl_path = pathlib.Path(__file__).resolve().parents[1].parent / "templates" / "enroll_bootstrap.sh.j2"
+    tpl = tpl_path.read_text()
+    now = datetime.now(timezone.utc).replace(microsecond=0).isoformat()
+    rendered = (
+        tpl.replace("{{ agent_name }}", agent_name)
+           .replace("{{ master_host }}", master_host)
+           .replace("{{ tarball_url }}", tarball_url)
+           .replace("{{ generated_at }}", now)
+           .replace("{{ expires_at }}", expires_at.replace(microsecond=0).isoformat())
+    )
+    return rendered.encode()
+
+
+# ---------------------------------------------------------------------------
+# Endpoints
+# ---------------------------------------------------------------------------
+
+@router.post(
+    "/enroll-bundle",
+    response_model=EnrollBundleResponse,
+    status_code=status.HTTP_201_CREATED,
+    tags=["Swarm Management"],
+)
+async def create_enroll_bundle(
+    req: EnrollBundleRequest,
+    request: Request,
+    admin: dict = Depends(require_admin),
+    repo: BaseRepository = Depends(get_repo),
+) -> EnrollBundleResponse:
+    import uuid as _uuid
+
+    existing = await repo.get_swarm_host_by_name(req.agent_name)
+    if existing is not None:
+        raise HTTPException(status_code=409, detail=f"Worker '{req.agent_name}' is already enrolled")
+
+    # 1. Issue certs (reuses the same code as /swarm/enroll).
+    ca = pki.ensure_ca()
+    sans = list({req.agent_name, req.master_host})
+    issued = pki.issue_worker_cert(ca, req.agent_name, sans)
+    bundle_dir = pki.DEFAULT_CA_DIR / "workers" / req.agent_name
+    pki.write_worker_bundle(issued, bundle_dir)
+
+    # 2. Register the host row so it shows up in SwarmHosts immediately.
+    host_uuid = str(_uuid.uuid4())
+    await repo.add_swarm_host(
+        {
+            "uuid": host_uuid,
+            "name": req.agent_name,
+            "address": req.master_host,  # placeholder; agent overwrites on first heartbeat
+            "agent_port": 8765,
+            "status": "enrolled",
+            "client_cert_fingerprint": issued.fingerprint_sha256,
+            "updater_cert_fingerprint": None,
+            "cert_bundle_path": str(bundle_dir),
+            "enrolled_at": datetime.now(timezone.utc),
+            "notes": "enrolled via UI bundle",
+        }
+    )
+
+    # 3. Render payload + bootstrap.
+    tarball = _build_tarball(req.master_host, issued, req.services_ini)
+    token = secrets.token_urlsafe(24)
+    expires_at = datetime.now(timezone.utc) + BUNDLE_TTL
+
+    BUNDLE_DIR.mkdir(parents=True, exist_ok=True, mode=0o700)
+    sh_path = BUNDLE_DIR / f"{token}.sh"
+    tgz_path = BUNDLE_DIR / f"{token}.tgz"
+
+    base = str(request.base_url).rstrip("/")
+    tarball_url = f"{base}/api/v1/swarm/enroll-bundle/{token}.tgz"
+    bootstrap_url = f"{base}/api/v1/swarm/enroll-bundle/{token}.sh"
+    script = _render_bootstrap(req.agent_name, req.master_host, tarball_url, expires_at)
+
+    tgz_path.write_bytes(tarball)
+    sh_path.write_bytes(script)
+    os.chmod(tgz_path, 0o600)
+    os.chmod(sh_path, 0o600)
+
+    async with _LOCK:
+        _BUNDLES[token] = _Bundle(sh_path=sh_path, tgz_path=tgz_path, expires_at=expires_at)
+    _ensure_sweeper()
+
+    log.info("enroll-bundle created agent=%s master=%s token=%s...", req.agent_name, req.master_host, token[:8])
+
+    return EnrollBundleResponse(
+        token=token,
+        command=f"curl -fsSL {bootstrap_url} | sudo bash",
+        expires_at=expires_at,
+        host_uuid=host_uuid,
+    )
+
+
+def _now() -> datetime:
+    # Indirection so tests can monkeypatch.
+    return datetime.now(timezone.utc)
+
+
+async def _lookup_live(token: str) -> _Bundle:
+    b = _BUNDLES.get(token)
+    if b is None or b.served or b.expires_at <= _now():
+        raise HTTPException(status_code=404, detail="bundle not found or expired")
+    return b
+
+
+@router.get(
+    "/enroll-bundle/{token}.sh",
+    tags=["Swarm Management"],
+    include_in_schema=False,
+)
+async def get_bootstrap(token: str) -> Response:
+    async with _LOCK:
+        b = await _lookup_live(token)
+        data = b.sh_path.read_bytes()
+    return Response(content=data, media_type="text/x-shellscript")
+
+
+@router.get(
+    "/enroll-bundle/{token}.tgz",
+    tags=["Swarm Management"],
+    include_in_schema=False,
+)
+async def get_payload(token: str) -> Response:
+    async with _LOCK:
+        b = await _lookup_live(token)
+        b.served = True
+        data = b.tgz_path.read_bytes()
+        for p in (b.sh_path, b.tgz_path):
+            try:
+                p.unlink()
+            except FileNotFoundError:
+                pass
+    return Response(content=data, media_type="application/gzip")

decnet/web/router/swarm_mgmt/api_list_deckies.py

@@ -0,0 +1,42 @@
+"""GET /swarm/deckies — admin-gated list of decky shards across the fleet."""
+from __future__ import annotations
+
+from typing import Optional
+
+from fastapi import APIRouter, Depends
+
+from decnet.web.db.models import DeckyShardView
+from decnet.web.db.repository import BaseRepository
+from decnet.web.dependencies import get_repo, require_admin
+
+router = APIRouter()
+
+
+@router.get("/deckies", response_model=list[DeckyShardView], tags=["Swarm Management"])
+async def list_deckies(
+    host_uuid: Optional[str] = None,
+    state: Optional[str] = None,
+    admin: dict = Depends(require_admin),
+    repo: BaseRepository = Depends(get_repo),
+) -> list[DeckyShardView]:
+    shards = await repo.list_decky_shards(host_uuid)
+    hosts = {h["uuid"]: h for h in await repo.list_swarm_hosts()}
+
+    out: list[DeckyShardView] = []
+    for s in shards:
+        if state and s.get("state") != state:
+            continue
+        host = hosts.get(s["host_uuid"], {})
+        out.append(DeckyShardView(
+            decky_name=s["decky_name"],
+            host_uuid=s["host_uuid"],
+            host_name=host.get("name") or "<unknown>",
+            host_address=host.get("address") or "",
+            host_status=host.get("status") or "unknown",
+            services=s.get("services") or [],
+            state=s.get("state") or "pending",
+            last_error=s.get("last_error"),
+            compose_hash=s.get("compose_hash"),
+            updated_at=s["updated_at"],
+        ))
+    return out

decnet/web/router/swarm_mgmt/api_list_hosts.py

@@ -0,0 +1,26 @@
+"""GET /swarm/hosts — admin-gated list of enrolled workers for the dashboard.
+
+Thin wrapper over ``repo.list_swarm_hosts()`` — same shape as the
+unauth'd controller route, but behind ``require_admin``.
+"""
+from __future__ import annotations
+
+from typing import Optional
+
+from fastapi import APIRouter, Depends
+
+from decnet.web.db.models import SwarmHostView
+from decnet.web.db.repository import BaseRepository
+from decnet.web.dependencies import get_repo, require_admin
+
+router = APIRouter()
+
+
+@router.get("/hosts", response_model=list[SwarmHostView], tags=["Swarm Management"])
+async def list_hosts(
+    host_status: Optional[str] = None,
+    admin: dict = Depends(require_admin),
+    repo: BaseRepository = Depends(get_repo),
+) -> list[SwarmHostView]:
+    rows = await repo.list_swarm_hosts(host_status)
+    return [SwarmHostView(**r) for r in rows]