Merge branch 'master' into frcc-kvm

.github/workflows/lint.yml

@@ -19,18 +19,18 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: pick reporter
+        run: |
+          if [ "${{ github.event_name }}" = pull_request ]; then
+            echo "REPORTER=gitea-pr-review" >> "$GITHUB_ENV"
+          else
+            echo "REPORTER=local" >> "$GITHUB_ENV"
+          fi
+
       - name: run linters
         run: nix run -L .#ci -- lint . "$RUNNER_TEMP/findings"
 
       - name: report findings
-        if: always()
         env:
-          REVIEWDOG_GITEA_API_TOKEN: ${{ secrets.GITEA_TOKEN }}
-          GITEA_ADDRESS: ${{ github.server_url }}
-        run: |
-          if [ "${{ github.event_name }}" = pull_request ]; then
-            nix run -L .#ci -- lint-report gitea-pr-review "$RUNNER_TEMP/findings"
-          else
-            nix run -L .#ci -- lint-summary "$RUNNER_TEMP/findings" \
-              | tee -a "$GITHUB_STEP_SUMMARY"
-          fi
+          REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: nix run -L .#ci -- lint-report "$REPORTER" "$RUNNER_TEMP/findings"

.github/workflows/vulnix.yml

@@ -5,6 +5,10 @@ on:
     - cron: "0 6 * * 1"
   workflow_dispatch:
 
+permissions:
+  contents: read
+  issues: write
+
 jobs:
   scan:
     runs-on: nix
@@ -21,7 +25,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           API: ${{ github.api_url }}
           REPO: ${{ github.repository }}
-        run: 'nix run -L .#ci -- upsert-issue vulnix "vulnix: known vulnerabilities in system closure" "$RUNNER_TEMP/issue.md"'
+        run: nix run -L .#ci -- upsert-issue vulnix "vulnix: known vulnerabilities in system closure" "$RUNNER_TEMP/issue.md"
 
       - name: close resolved issue
         if: steps.scan.outputs.count == '0'

ci.nix

@@ -1,17 +1,9 @@
 { lib, pkgs }:
-let
-  # vulnix's bundled nix-2.34 broke its own --experimental-features detection
-  nixConf = pkgs.writeText "ci-nix.conf" "experimental-features = nix-command flakes";
-in
 # tools must track ci.py's subprocess calls; nix stays ambient (uses the
 # runner's own nix, not a pinned one).
 pkgs.writers.writePython3Bin "ci" {
   flakeIgnore = [ "E501" ];
-  libraries = [ pkgs.python3Packages.subprocess-tee ];
   makeWrapperArgs = [
-    "--set-default"
-    "NIX_USER_CONF_FILES"
-    (toString nixConf)
     "--prefix"
     "PATH"
     ":"

ci.py

@@ -6,7 +6,6 @@ import json
 import os
 import re
 import subprocess
-import subprocess_tee
 import sys
 import urllib.request
 from collections import Counter
@@ -18,8 +17,7 @@ def run(*args, **kw):
 
 
 def nix(*args):
-    # tee to stderr - stdout leaks into GITHUB_OUTPUT $() captures
-    return subprocess_tee.run(("nix", "--extra-experimental-features", "nix-command flakes", "-L", *args), check=True, text=True, stdout=sys.stderr).stdout
+    return run("nix", "--extra-experimental-features", "nix-command flakes", "-L", *args, check=True, stdout=subprocess.PIPE).stdout
 
 
 def git(*args, check=True):
@@ -33,16 +31,13 @@ def gitea(method, path, body=None):
     req.add_header("Authorization", f'token {os.environ["GH_TOKEN"]}')
     if data is not None:
         req.add_header("Content-Type", "application/json")
-    try:
     with urllib.request.urlopen(req) as resp:
         raw = resp.read()
-    except urllib.error.HTTPError as e:
-        sys.exit(f"gitea {method} {path}: {e.code} {e.reason}\n{e.read().decode()}")
     return json.loads(raw) if raw else None
 
 
 def find_open_issue(label):
-    issues = gitea("GET", f"/issues?state=open&type=issues&labels={label}")
+    issues = gitea("GET", f"/issues?state=open&labels={label}")
     return issues[0] if issues else None
 
 
@@ -239,7 +234,7 @@ def format_vulnix(vulns):
     for v in vulns:
         for cve in v["affected_by"]:
             score = v.get("cvssv3_basescore", {}).get(cve)
-            desc = v.get("description", {}).get(cve, "").replace("\n", " ").replace("|", "∣")
+            desc = v.get("description", {}).get(cve, "")
             if len(desc) > 120:
                 desc = desc[:117] + "..."
             rows.append((v["pname"], v["version"], cve, score, desc))
@@ -367,63 +362,10 @@ def lint_report(args):
 
     codes = [reviewdog(f"{args.dir}/{name}", flags)
              for name, flags in LINTERS
-             if os.path.isfile(f"{args.dir}/{name}") and os.path.getsize(f"{args.dir}/{name}") > 0]
+             if os.path.getsize(f"{args.dir}/{name}") > 0]
     sys.exit(1 if any(codes) else 0)
 
 
-def has_findings(path):
-    return os.path.isfile(path) and os.path.getsize(path) > 0
-
-
-def fmt_rdjsonl(path):
-    lines = []
-    with open(path) as f:
-        for raw in f:
-            rec = json.loads(raw)
-            loc = rec["location"]
-            r = loc.get("range", {}).get("start")
-            pos = f"{loc['path']}:{r['line']}:{r['column']}" if r else loc["path"]
-            lines.append(f"- `{pos}`: {rec['message']}")
-    return "\n".join(lines)
-
-
-def fmt_errfmt(path):
-    lines = []
-    with open(path) as f:
-        for raw in f:
-            parts = raw.strip().split(">", 1)
-            if len(parts) == 2:
-                lines.append(f"- `{parts[0]}:{parts[1].split(':', 3)[-1].strip()}`" if ":" in parts[1] else f"- `{raw.strip()}`")
-            elif raw.strip():
-                lines.append(f"- `{raw.strip()}`")
-    return "\n".join(lines)
-
-
-def lint_summary(args):
-    sections = []
-    d = args.dir
-
-    if has_findings(f"{d}/nixfmt.diff"):
-        with open(f"{d}/nixfmt.diff") as f:
-            sections.append(f"## nixfmt\n\n```diff\n{f.read().rstrip()}\n```")
-
-    if has_findings(f"{d}/statix.errfmt"):
-        sections.append(f"## statix\n\n{fmt_errfmt(f'{d}/statix.errfmt')}")
-
-    if has_findings(f"{d}/deadnix.rdjsonl"):
-        sections.append(f"## deadnix\n\n{fmt_rdjsonl(f'{d}/deadnix.rdjsonl')}")
-
-    if has_findings(f"{d}/cycles.rdjsonl"):
-        sections.append(f"## systemd ordering cycles\n\n{fmt_rdjsonl(f'{d}/cycles.rdjsonl')}")
-
-    if sections:
-        print("\n\n".join(["# Lint findings"] + sections))
-        sys.exit(1)
-    else:
-        print("No lint findings.")
-        sys.exit(0)
-
-
 def post_comment(args):
     body = args.marker + "\n" + Path(args.body_file).read_text()
     pr = os.environ["PR"]
@@ -496,7 +438,6 @@ def main():
     command("vulnix", vulnix, "ref", "body_out")
     command("lint", lint, "target", "out")
     command("lint-report", lint_report, "reporter", "dir")
-    command("lint-summary", lint_summary, "dir")
     command("post-comment", post_comment, "marker", "body_file")
     command("upsert-issue", upsert_issue, "label", "title", "body_file")
     command("close-issue", close_issue, "label")

configuration.nix

@@ -4,26 +4,12 @@
   lib,
   hostInfo,
   customPkgs,
-  flakeRev,
   ...
 }:
 let
   inherit (hostInfo) paths;
 in
 {
-  imports = [ ./modules/autodeploy.nix ];
-
-  services.server-autodeploy = {
-    enable = true;
-    giteaUrl = "https://git.floweytf.com/";
-    giteaRepo = "server/server-config";
-    tokenFile = "${hostInfo.paths.secrets}/gitea-autodeploy-token";
-    allowedSigners = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPaGpTX3EzfezVc2nl3MgsKVamYYP2h2VJaRny8pZkvi flowey@arch"
-    ];
-    stateDir = hostInfo.paths.config;
-  };
-
   assertions =
     let
       isMounted =
@@ -61,14 +47,6 @@ in
 
   time.timeZone = "UTC";
   system.stateVersion = "26.05";
-  system.nixos.label =
-    let
-      labelFile = ./.nixos-label;
-    in
-    if builtins.pathExists labelFile then
-      lib.removeSuffix "\n" (builtins.readFile labelFile)
-    else
-      flakeRev;
 
   nix = {
     settings = {

containers/common/overseer.nix

@@ -381,6 +381,6 @@ let
         };
       };
     };
-  inherit (c) hostAddr;
+  hostAddr = c.hostAddr;
 in
 c

containers/server-n0/git.nix

@@ -55,8 +55,7 @@ in
     net.expose.tcp = [ 3000 ];
   };
 
-  ci-runner =
-    mkVm {
+  ci-runner = mkVm {
     name = "ci-runner";
     includedInTests = false;
     net.access = [
@@ -76,12 +75,6 @@ in
         source = "${ciRunnerData}/nix-rw-store";
         mountPoint = "/nix/.rw-store";
       }
-        {
-          proto = "virtiofs";
-          tag = "nix-db";
-          source = "${ciRunnerData}/nix-db";
-          mountPoint = "/nix/var/nix/db";
-        }
       {
         proto = "virtiofs";
         tag = "docker-data";
@@ -159,33 +152,22 @@ in
             "flakes"
           ];
           max-jobs = "auto";
-            substituters = [ "https://microvm.cachix.org" ];
-            trusted-public-keys = [ "microvm.cachix.org-1:oXnBc6hRE3eX5rSYdRyMYXnfzcCxC7yKPTbZXALsqys=" ];
         };
 
-          nix.settings = {
-            min-free = 5 * 1024 * 1024 * 1024;
-            max-free = 10 * 1024 * 1024 * 1024;
+        nix.gc = {
+          automatic = true;
+          dates = "daily";
+          options = "--delete-older-than 14d";
         };
         # nix.optimise.automatic = true; - doesn't work with microvm.writableStoreOverlay
 
-          services.openssh = {
-            enable = true;
-            settings = {
-              PermitRootLogin = "yes";
-              PermitEmptyPasswords = "yes";
-            };
-          };
-          users.users.root.initialHashedPassword = "";
         services.journald.extraConfig = "ForwardToConsole=yes";
 
         virtualisation.containerd.enable = true;
-          virtualisation.containerd.settings.plugins."io.containerd.snapshotter.v1.overlayfs".mount_options =
-            [ "userxattr" ];
+        virtualisation.containerd.settings.plugins."io.containerd.snapshotter.v1.overlayfs".mount_options = [ "userxattr" ];
 
         virtualisation.docker.enable = true;
         virtualisation.docker.extraOptions = "--containerd /run/containerd/containerd.sock";
-          virtualisation.docker.daemon.settings.exec-opts = [ "native.cgroupdriver=cgroupfs" ];
         systemd.services.docker.wants = [ "containerd.service" ];
         systemd.services.docker.after = [ "containerd.service" ];
 
@@ -219,15 +201,5 @@ in
           };
         };
       };
-    }
-    // {
-      hostConfig = {
-        systemd.tmpfiles.rules = [
-          "d ${ciRunnerData}/nix-rw-store 0755 server server -"
-          "d ${ciRunnerData}/nix-db 0755 server server -"
-          "d ${ciRunnerData}/docker 0755 server server -"
-          "d ${ciRunnerData}/runner-state 0755 server server -"
-        ];
-      };
   };
 }

containers/server-n0/mail.nix

@@ -146,8 +146,6 @@ let
 in
 mkContainer {
   inherit name;
-  includedInTests = false; # TODO: fixme, clearly mail is flakey
-
   net.access = [ { to = "@internet"; } ];
   svc.autoStart = true;
   net.forward.tcp = [

containers/server-n0/nginx.nix

@@ -210,6 +210,6 @@ let
     };
     inherit (setup) containerConfig;
   };
-  inherit (c) hostAddr;
+  hostAddr = c.hostAddr;
 in
 c

containers/server-n0/ssh.nix

@@ -67,14 +67,21 @@ let
       inherit name;
       inherit net resources;
       svc.autoStart = true;
-      isolation = {
-        inherit nixDaemon;
-      }
-      // isolation;
+      isolation = { nixDaemon = nixDaemon; } // isolation;
       traits = [ sshTrait ] ++ traits;
       packages = with pkgs; [ tmux ] ++ packages;
       miscProperties = self._sshpiperRegister routingInfo;
     };
+
+  kvmTrait = {
+    containerConfig =
+      { pkgs, ... }:
+      {
+        users.users.runner.extraGroups = [ "wheel" ];
+        security.sudo.wheelNeedsPassword = false;
+        environment.systemPackages = [ pkgs.qemu_kvm ];
+      };
+  };
 in
 {
   ssh-admin = mkSsh {
@@ -117,27 +124,32 @@ in
   ssh-generic = mkSsh {
     name = "ssh-generic";
     net.access = [ { to = "@internet"; } ];
-    # /dev/kvm keeps its host ownership, so the kvm gid must not be shifted.
-    isolation.privateUsers = "identity";
     resources = {
       fs."/home/runner/data" = {
         hostPath = "${data}/ssh/generic";
         isReadOnly = false;
       };
-      devices = [ "/dev/kvm" ];
       mem = "16G";
       cpu = 65;
     };
-    packages = with pkgs; [ qemu_kvm ];
-    traits = [
+    traits = [ kvmTrait ];
+    isolation.allowedDevices = [
       {
-        containerConfig =
-          { config, ... }:
-          {
-            users.groups.kvm.gid = config.ids.gids.kvm;
-            users.users.runner.extraGroups = [ "kvm" ];
-          };
+        node = "/dev/kvm";
+        modifier = "rw";
       }
+      {
+        node = "/dev/vhost-net";
+        modifier = "rw";
+      }
+      {
+        node = "/dev/net/tun";
+        modifier = "rwm";
+      }
+    ];
+    isolation.additionalCapabilities = [
+      "CAP_NET_ADMIN"
+      "CAP_MKNOD"
     ];
     routingInfo = [
       {

dsl.nix

@@ -221,17 +221,6 @@ rec {
     `resources.fs`
     : Bind mounts, keyed by mount point.
 
-    `resources.devices`
-    : Host device nodes to expose, as paths. Bound into the container at the
-      same path and added to the unit's `DeviceAllow=` - the cgroup
-      permission alone doesn't get you a working node (nothing can `mknod` a
-      device inside a user namespace), and the bind alone leaves the cgroup
-      denying `open()`, so both are needed. The bind is unconditional, so
-      the device must actually exist on whatever host runs the container.
-      Nodes keep their host ownership, so a consumer inside needs
-      `isolation.privateUsers = "identity"` for the owning gid to mean
-      anything.
-
     `isolation.nixDaemon`
     : Whether the Nix daemon and CLI are available inside the container.
 
@@ -239,6 +228,17 @@ rec {
     : systemd-nspawn user namespacing; see `--private-users=` in
       systemd-nspawn(1). Bind mounts always go through idmapped `--bind`.
 
+    `isolation.allowedDevices`
+    : List of `{ node; modifier; }` host devices to grant the container's
+      cgroup access to; see `containers.<name>.allowedDevices` in the NixOS
+      manual. nspawn bind-mounts a handful of devices (`/dev/kvm`,
+      `/dev/net/tun`, ...) into the container itself once the cgroup allows it -
+      this doesn't need a matching `resources.fs` bind mount.
+
+    `isolation.additionalCapabilities`
+    : Extra Linux capabilities granted to the container; see
+      `containers.<name>.additionalCapabilities` in the NixOS manual.
+
     `miscProperties`
     : Arbitrary data attached to the result. Used for cross-container discovery
       via `collectContainers`.
@@ -281,15 +281,16 @@ rec {
       cpuQuota = "${toString (cpu * 100)}%";
       memoryMax = resources.mem or "512M";
       bindMounts = resources.fs or { };
-      devices = resources.devices or [ ];
       allowsNixDaemon = isolation.nixDaemon or false;
       privateUsers = isolation.privateUsers or "pick";
+      allowedDevices = isolation.allowedDevices or [ ];
+      additionalCapabilities = isolation.additionalCapabilities or [ ];
 
       allowInternet = hasInternetAccess access;
       allBindMounts = builtins.foldl' (acc: t: acc // (t.resources.fs or { })) { } traits // bindMounts;
       userModules = map mkUser (lib.concatMap (t: t.users or [ ]) traits ++ users);
       allPorts = ports ++ map (p: (normalizePort p).container) hostPorts;
-      useIdmap = privateUsers == "pick" || (builtins.isInt privateUsers && privateUsers > 0);
+      useIdmap = privateUsers != "no";
       bindMountExtraFlags = lib.mapAttrsToList (
         mountPoint: bm:
         (if bm.isReadOnly then "--bind-ro=" else "--bind=")
@@ -297,10 +298,6 @@ rec {
         + lib.optionalString useIdmap ":idmap"
       ) allBindMounts;
       bindMountHostPaths = map (bm: bm.hostPath) (lib.attrValues allBindMounts);
-      # DeviceAllow= alone only grants cgroup permission - nspawn can't
-      # mknod a device node inside a user namespace, so the node still
-      # needs an explicit bind from the host.
-      deviceFlags = map (d: "--bind=${d}") devices;
       inherit (deriveIdentity ifPrefix.nspawn name)
         iface
         mac
@@ -379,15 +376,19 @@ rec {
         hostAddr
         bindMountHostPaths
         includedInTests
-        devices
         ;
       bindMounts = allBindMounts;
       kind = "nspawn";
       miscProperties = flattenMiscProp self miscProperties;
       nixosContainer = {
-        inherit autoStart privateUsers;
+        inherit
+          autoStart
+          privateUsers
+          allowedDevices
+          additionalCapabilities
+          ;
         bindMounts = { };
-        extraFlags = bindMountExtraFlags ++ deviceFlags;
+        extraFlags = bindMountExtraFlags;
         privateNetwork = true;
         extraVeths = linkVeths;
         config =
@@ -520,7 +521,6 @@ rec {
         ;
       inherit needsGateway;
       bindMountHostPaths = map (s: s.source) shares;
-      devices = [ ];
       kind = "vm";
       miscProperties = flattenMiscProp self miscProperties;
       microvmConfig = {
@@ -572,10 +572,7 @@ rec {
               Gateway = hostAddr;
             };
             networkConfig.DNS = [ hostAddr ];
-            networkConfig.Domains = [
-              "~."
-              "containers"
-            ];
+            networkConfig.Domains = [ "~." "containers" ];
             linkConfig.RequiredForOnline = if allowInternet then "routable" else "degraded";
           };
           networking.enableIPv6 = false;
@@ -957,7 +954,6 @@ rec {
           startLimitBurst = 5;
           startLimitIntervalSec = 120;
           unitConfig.RequiresMountsFor = c.bindMountHostPaths;
-          serviceConfig.DeviceAllow = map (d: "${d} rw") c.devices;
         };
 
       # the host end of a link, for both kinds. nixos-containers only configures
@@ -1317,7 +1313,6 @@ rec {
         HOST_ADDR = ${pyDict pyStr (lib.mapAttrs (_: c: c.hostAddr) autoStartTestContainers)}
         IFACE = ${pyDict pyStr (lib.mapAttrs (_: c: c.iface) autoStartTestContainers)}
         KIND = ${pyDict pyStr (lib.mapAttrs (_: c: c.kind) autoStartTestContainers)}
-        DEVICES = ${pyDict pyList (lib.mapAttrs (_: c: c.devices) autoStartTestContainers)}
         # only nspawn guests can be entered with nsenter; a vm has no host-side
         # netns, so every probe that runs *inside* a guest is limited to these
         enterable = [c for c in included if KIND[c] == "nspawn"]

flake.nix

@@ -11,7 +11,6 @@
 
   outputs =
     {
-      self,
       nixpkgs,
       mtce,
       microvm,
@@ -22,8 +21,6 @@
       inherit (nixpkgs) lib;
       pkgs = import nixpkgs { inherit system; };
 
-      flakeRev = self.shortRev or self.dirtyShortRev or "unknown";
-
       customPkgs = {
         hopper-rs = pkgs.callPackage ./packages/hopper-rs.nix { };
         sshpiper = pkgs.callPackage ./packages/sshpiper.nix { };
@@ -32,7 +29,6 @@
         server-rebuild = pkgs.callPackage ./packages/server-rebuild.nix { };
         server-status = pkgs.callPackage ./packages/server-status.nix { };
         server-kexec = pkgs.callPackage ./packages/server-kexec.nix { };
-        server-autodeploy = pkgs.callPackage ./packages/server-autodeploy.nix { };
       };
 
       ci = import ./ci.nix { inherit lib pkgs; };
@@ -50,13 +46,12 @@
           server = "/persist/@containers";
           data = "/persist/@containers/data";
           secrets = "/persist/@secrets/";
-          config = "/persist/@config/";
         };
       };
 
       specialArgsFor = hostName: {
         hostInfo = hostInfoFor hostName;
-        inherit inputs customPkgs flakeRev;
+        inherit inputs customPkgs;
       };
 
       hostDefFor =
@@ -134,10 +129,11 @@
     {
       nixosConfigurations = lib.mapAttrs (_: host: host.hostCfg) allHosts;
 
-      inspect = lib.mapAttrs (
-        name: host:
-        pkgs.writeText "inspect-${name}.json" (builtins.toJSON (introspect.hostReport { inherit host; }))
-      ) allHosts;
+      inspect = lib.mapAttrs
+        (name: host:
+          pkgs.writeText "inspect-${name}.json"
+            (builtins.toJSON (introspect.hostReport { inherit host; })))
+        allHosts;
 
       packages.${system} = customPkgs // {
         inherit ci;
@@ -152,7 +148,6 @@
           server-rebuild
           server-status
           server-kexec
-          server-autodeploy
           ;
       };
     };

modules/autodeploy.nix

@@ -1,84 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  customPkgs,
-  ...
-}:
-let
-  cfg = config.services.server-autodeploy;
-in
-{
-  options.services.server-autodeploy = {
-    enable = lib.mkEnableOption "automatic deployment from signed git tags";
-
-    interval = lib.mkOption {
-      type = lib.types.str;
-      default = "15min";
-    };
-
-    branch = lib.mkOption {
-      type = lib.types.str;
-      default = "master";
-    };
-
-    giteaUrl = lib.mkOption {
-      type = lib.types.str;
-    };
-
-    giteaRepo = lib.mkOption {
-      type = lib.types.str;
-    };
-
-    tokenFile = lib.mkOption {
-      type = lib.types.str;
-    };
-
-    allowedSigners = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
-      default = [ ];
-    };
-
-    stateDir = lib.mkOption {
-      type = lib.types.str;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    systemd.services.server-autodeploy = {
-      description = "Deploy latest signed tag";
-      after = [ "network-online.target" ];
-      wants = [ "network-online.target" ];
-
-      environment = {
-        GITEA_URL = cfg.giteaUrl;
-        GITEA_REPO = cfg.giteaRepo;
-        TOKEN_FILE = cfg.tokenFile;
-        ALLOWED_SIGNERS = builtins.toFile "signers" (lib.join "\n" cfg.allowedSigners);
-        DEPLOY_BRANCH = cfg.branch;
-        STATE_DIR = cfg.stateDir;
-        REPO_DIR = "/persist/@configuration";
-      };
-
-      serviceConfig = {
-        Type = "oneshot";
-        ExecStart = lib.getExe customPkgs.server-autodeploy;
-        TimeoutStartSec = "30min";
-      };
-
-      path = [
-        config.nix.package
-        pkgs.nixos-rebuild
-      ];
-    };
-
-    systemd.timers.server-autodeploy = {
-      wantedBy = [ "timers.target" ];
-      timerConfig = {
-        OnBootSec = "2min";
-        OnUnitActiveSec = cfg.interval;
-        RandomizedDelaySec = "2min";
-      };
-    };
-  };
-}

packages/server-autodeploy.nix

@@ -1,14 +0,0 @@
-{
-  writeShellApplication,
-  git,
-  curl,
-  jq,
-}:
-import ./mk-script.nix { inherit writeShellApplication; } {
-  name = "server-autodeploy";
-  runtimeInputs = [
-    git
-    curl
-    jq
-  ];
-}

scripts/server-autodeploy.sh

@@ -1,58 +0,0 @@
-REPO_DIR="${REPO_DIR:-/persist/@configuration}"
-STATE_DIR="${STATE_DIR:-/persist/@autodeploy}"
-BRANCH="origin/${DEPLOY_BRANCH:-master}"
-
-mkdir -p "$STATE_DIR"
-exec 9>"$STATE_DIR/lock"
-flock -n 9 || { echo "another deploy running"; exit 0; }
-
-report_status() {
-  [[ -f "$TOKEN_FILE" ]] || return 0
-  curl -sf -X POST \
-    -H "Authorization: token $(<"$TOKEN_FILE")" \
-    -H "Content-Type: application/json" \
-    -d "$(jq -n --arg s "$1" --arg d "$2" --arg c "deploy/$(hostname)" \
-      '{state:$s,description:$d,context:$c}')" \
-    "$GITEA_URL/api/v1/repos/$GITEA_REPO/statuses/$3" >/dev/null
-}
-
-cd "$REPO_DIR"
-
-export GIT_CONFIG_COUNT=2
-export GIT_CONFIG_KEY_0=gpg.format
-export GIT_CONFIG_VALUE_0=ssh
-export GIT_CONFIG_KEY_1=gpg.ssh.allowedSignersFile
-export GIT_CONFIG_VALUE_1="$ALLOWED_SIGNERS"
-
-git fetch origin --tags --prune-tags
-
-latest=$(git describe --abbrev=0 "$BRANCH" 2>/dev/null) || {
-  echo "no tags on $BRANCH"
-  exit 0
-}
-
-current=$(cat "$STATE_DIR/tag" 2>/dev/null) || true
-[[ "$latest" != "$current" ]] || { echo "already at $latest"; exit 0; }
-
-echo "new tag: $latest (current: ${current:-none})"
-
-git tag -v "$latest" || {
-  sha=$(git rev-list -1 "$latest")
-  report_status "failure" "tag signature verification failed" "$sha"
-  exit 1
-}
-
-sha=$(git rev-list -1 "$latest")
-report_status "pending" "deploying $latest" "$sha"
-
-# build from remote, pinned to the verified rev - no local checkout needed
-flake_url="git+${GITEA_URL}/${GITEA_REPO}?ref=refs/tags/${latest}&rev=${sha}#$(hostname)"
-
-if nixos-rebuild switch --flake "$flake_url"; then
-  echo "$latest" > "$STATE_DIR/tag"
-  report_status "success" "deployed $latest" "$sha"
-  echo "deployed $latest"
-else
-  report_status "failure" "nixos-rebuild failed" "$sha"
-  exit 1
-fi

tests/server-n0/integration.py

@@ -27,7 +27,6 @@ if TYPE_CHECKING:
     HOST_ADDR: dict[str, str] = {}
     IFACE: dict[str, str] = {}
     KIND: dict[str, str] = {}
-    DEVICES: dict[str, list[str]] = {}
     EDGES: list[tuple[str, str, list[int], list[int]]] = []
     SSH_KEY: str = ""
     SSH_OPTS: str = ""
@@ -56,11 +55,6 @@ def container_pid(name):
     return server.succeed(f"machinectl show {name} -p Leader --value").strip()
 
 
-def ct_cmd(name, cmd):
-    pid = container_pid(name)
-    return f"{NSENTER} --mount=/proc/{pid}/ns/mnt --root=/proc/{pid}/root -- {SH} -c '{cmd}'"
-
-
 def net_cmd(name, cmd):
     pid = container_pid(name)
     return f"{NSENTER} --net=/proc/{pid}/ns/net -- {cmd}"
@@ -153,8 +147,6 @@ with subtest("(functional): web services respond"):
     for name, port in [("devenv", 8080), ("maven", 8080), ("git", 3000)]:
         server.succeed(net_cmd(name, f"{CURL} -sf --max-time 5 -o /dev/null http://{ADDR[name]}:{port}/ >&2"))
 
-# TODO: re-enable mail
-"""
 with subtest("(functional): mail accepts connections"):
     smtp_probe = net_cmd("mail", f"{SH} -c 'exec 3<>/dev/tcp/{ADDR['mail']}/25 && head -1 <&3'")
     server.wait_until_succeeds(f"{smtp_probe} | grep -q '^220'", timeout=60)
@@ -169,7 +161,6 @@ with subtest("(functional): mail accepts connections"):
         return greeting.strip().startswith("* OK")
 
     retry(imap_ready, timeout_seconds=60)
-"""
 
 with subtest("(functional): nginx proxies to backend containers"):
     server.succeed(
@@ -200,7 +191,7 @@ with subtest("(isolation): undeclared container edges are refused"):
         ("devenv", "git", 3000),
         ("git", "devenv", 8080),
         ("maven", "git", 3000),
-        # ("nginx", "mail", 25),
+        ("nginx", "mail", 25),
         ("ssh-botm", "ssh-admin", 22),
         ("overseer", "git", 3000),
     ]:
@@ -214,7 +205,12 @@ with subtest("(isolation): edges are one-way"):
     server.fail(ct_connect("git", ADDR["nginx"], 443, timeout=2))
 
 with subtest("(isolation): host access allowlist"):
-    server.succeed(ct_connect("overseer", HOST_ADDR["overseer"], HOST_EXPORTER_PORT))
+    server.succeed(
+        net_cmd(
+            "overseer",
+            f"{CURL} -sf --max-time 5 http://{HOST_ADDR['overseer']}:{HOST_EXPORTER_PORT}/metrics >&2",
+        )
+    )
     for port in (HOST_EXPORTER_PORT, HOST_CADVISOR_PORT):
         server.fail(ct_connect("git", HOST_ADDR["git"], port, timeout=2))
         server.fail(ct_connect("git", HOST_ADDR["overseer"], port, timeout=2))
@@ -253,7 +249,7 @@ with subtest("(isolation): renaming the interface changes nothing"):
     rename(iface, "evil0")
     try:
         server.succeed(ct_connect("nginx", ADDR["git"], 3000))
-        # server.fail(ct_connect("nginx", ADDR["mail"], 25, timeout=2))
+        server.fail(ct_connect("nginx", ADDR["mail"], 25, timeout=2))
     finally:
         rename("evil0", iface)
 
@@ -332,40 +328,3 @@ with subtest("(functional): published ports follow the container's lifetime"):
     server.succeed("systemctl start container@nginx")
     server.wait_for_unit("container@nginx.service")
     internet.wait_until_succeeds(ext_connect(80), timeout=30)
-
-with subtest("(functional): declared devices are usable in-container"):
-    for name, devices in DEVICES.items():
-        for dev in devices:
-            # opened, not stat'd: without DeviceAllow= the node is still visible
-            server.succeed(ct_cmd(name, f"exec 3<> {dev}"))
-
-
-with subtest("(functional): /dev/kvm actually initializes, not just opens"):
-    # a wrong-gid or unmapped node still opens but fails the ioctls qemu
-    # needs, so boot with no disk (never completes) and kill it - the
-    # failure mode this catches is qemu refusing to start at all.
-    for name, devices in DEVICES.items():
-        if "/dev/kvm" not in devices:
-            continue
-        out = server.succeed(
-            ct_cmd(
-                name,
-                f"{TIMEOUT} 3 qemu-system-x86_64 -enable-kvm -m 256 -nographic -no-reboot "
-                ">/tmp/qemu.out 2>&1; cat /tmp/qemu.out",
-            )
-        )
-        assert "Permission denied" not in out, f"{name}: qemu couldn't use /dev/kvm:\n{out}"
-        assert "Could not access KVM" not in out, f"{name}: qemu couldn't use /dev/kvm:\n{out}"
-
-
-with subtest("(isolation): devices reach only the container that declared them"):
-    for name in enterable:
-        for dev in {d for ds in DEVICES.values() for d in ds} - set(DEVICES.get(name, [])):
-            server.fail(ct_cmd(name, f"test -e {dev}"))
-
-
-with subtest("(isolation): identity uid mapping keeps the user namespace"):
-    for name in (n for n, ds in DEVICES.items() if ds):
-        host_ns = server.succeed("readlink /proc/1/ns/user").strip()
-        ct_ns = server.succeed(f"readlink /proc/{container_pid(name)}/ns/user").strip()
-        assert host_ns != ct_ns, f"{name} shares the host user namespace"