flake.lock: update inputs

Co-authored-by: Floweynt <50057682+Floweynt@users.noreply.github.com>
Co-authored-by: Autumn Liu <al63244@my.utexas.edu>
Reviewed-on: #3
Co-authored-by: autumn <aut.tea7@gmail.com>

.github/workflows/vulnix.yml

@@ -5,10 +5,6 @@ on:
     - cron: "0 6 * * 1"
   workflow_dispatch:
 
-permissions:
-  contents: read
-  issues: write
-
 jobs:
   scan:
     runs-on: nix
@@ -25,7 +21,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,10 +1,17 @@
 { 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

@@ -18,7 +18,8 @@ def run(*args, **kw):
 
 
 def nix(*args):
-    return subprocess_tee.run(("nix", "--extra-experimental-features", "nix-command flakes", "-L", *args), check=True, text=True).stdout
+    # 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
 
 
 def git(*args, check=True):
@@ -32,13 +33,16 @@ 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&labels={label}")
+    issues = gitea("GET", f"/issues?state=open&type=issues&labels={label}")
     return issues[0] if issues else None
 
 
@@ -235,7 +239,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, "")
+            desc = v.get("description", {}).get(cve, "").replace("\n", " ").replace("|", "∣")
             if len(desc) > 120:
                 desc = desc[:117] + "..."
             rows.append((v["pname"], v["version"], cve, score, desc))

containers/server-n0/git.nix

@@ -163,10 +163,9 @@ in
             trusted-public-keys = [ "microvm.cachix.org-1:oXnBc6hRE3eX5rSYdRyMYXnfzcCxC7yKPTbZXALsqys=" ];
           };
 
-          nix.gc = {
+          nix.settings = {
-            automatic = true;
+            min-free = 5 * 1024 * 1024 * 1024;
-            dates = "daily";
+            max-free = 10 * 1024 * 1024 * 1024;
-            options = "--delete-older-than 14d";
           };
           # nix.optimise.automatic = true; - doesn't work with microvm.writableStoreOverlay
 

containers/server-n0/ssh.nix

@@ -61,12 +61,16 @@ let
       net ? { },
       resources ? { },
       traits ? [ ],
+      isolation ? { },
     }:
     mkContainer {
       inherit name;
       inherit net resources;
       svc.autoStart = true;
-      isolation.nixDaemon = nixDaemon;
+      isolation = {
+        inherit nixDaemon;
+      }
+      // isolation;
       traits = [ sshTrait ] ++ traits;
       packages = with pkgs; [ tmux ] ++ packages;
       miscProperties = self._sshpiperRegister routingInfo;
@@ -113,14 +117,28 @@ 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 = [
+      {
+        containerConfig =
+          { config, ... }:
+          {
+            users.groups.kvm.gid = config.ids.gids.kvm;
+            users.users.runner.extraGroups = [ "kvm" ];
+          };
+      }
+    ];
     routingInfo = [
       {
         username = "autumn";

dsl.nix

@@ -221,6 +221,15 @@ rec {
     `resources.fs`
     : Bind mounts, keyed by mount point.
 
+    `resources.devices`
+    : Host device nodes to expose, as paths, added to the unit's
+      `DeviceAllow=`. nspawn populates a handful of privileged devices
+      (`/dev/kvm`, `/dev/net/tun`, ...) into the container's own `/dev` once
+      the cgroup allows it, and silently skips ones the host doesn't have -
+      no `resources.fs` bind mount needed. 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.
 
@@ -270,6 +279,7 @@ 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";
 
@@ -277,7 +287,7 @@ rec {
       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 != "no";
+      useIdmap = privateUsers == "pick" || (builtins.isInt privateUsers && privateUsers > 0);
       bindMountExtraFlags = lib.mapAttrsToList (
         mountPoint: bm:
         (if bm.isReadOnly then "--bind-ro=" else "--bind=")
@@ -363,6 +373,7 @@ rec {
         hostAddr
         bindMountHostPaths
         includedInTests
+        devices
         ;
       bindMounts = allBindMounts;
       kind = "nspawn";
@@ -503,6 +514,7 @@ rec {
         ;
       inherit needsGateway;
       bindMountHostPaths = map (s: s.source) shares;
+      devices = [ ];
       kind = "vm";
       miscProperties = flattenMiscProp self miscProperties;
       microvmConfig = {
@@ -939,6 +951,7 @@ 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
@@ -1298,6 +1311,7 @@ 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.lock

@@ -26,11 +26,11 @@
         "spectrum": "spectrum"
       },
       "locked": {
-        "lastModified": 1786300091,
+        "lastModified": 1789252264,
-        "narHash": "sha256-4UFJOVGpaYtHW5yasSv80MaJxTBYdk2zyf3jhKtt0wA=",
+        "narHash": "sha256-IyOsrL64VjSHJKdzvQQcgNJtrSd4/jDa7vhlFa9libM=",
         "owner": "microvm-nix",
         "repo": "microvm.nix",
-        "rev": "71beea0076cd46dafcee97a5a2e7d00cbba5bd2f",
+        "rev": "e7e1c7aba5cb04644cfd6afe7e98cb87d76ac64f",
         "type": "github"
       },
       "original": {
@@ -63,11 +63,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1786384358,
+        "lastModified": 1789149629,
-        "narHash": "sha256-RzPPiWeUtuvymnpuEWsdtzli5w4kjZs49FqEs3/1u+I=",
+        "narHash": "sha256-H6GwaZzZf+4npqv0tph94w9tZddSjFjmQrVsW0z78uk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2fcb964de67fcf60b43471c55d5d99e61a9ccb5a",
+        "rev": "eaad089433ca2bb662274377d33df3d0e51ef28b",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
     "spectrum": {
       "flake": false,
       "locked": {
-        "lastModified": 1785761586,
+        "lastModified": 1786032750,
-        "narHash": "sha256-MWOMVqJJERwjQGgRIv8d6rlEBqbLM3VZWxHkNKIIZNw=",
+        "narHash": "sha256-+Ba/kIn5BjvV7PN8bWOo7RoqgTY/Yv2M7qeMf3wS2Ag=",
         "ref": "refs/heads/main",
-        "rev": "a7762d6f54b40560dd5255ce902e6e6a5d980fe9",
+        "rev": "77d2389874bb092b8dbf05ecc5b1030372e80e98",
-        "revCount": 1416,
+        "revCount": 1417,
         "type": "git",
         "url": "https://spectrum-os.org/git/spectrum"
       },

tests/server-n0/integration.py

@@ -27,6 +27,7 @@ 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 = ""
@@ -55,6 +56,11 @@ 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}"
@@ -323,3 +329,21 @@ 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:
+            server.succeed(ct_cmd(name, f"exec 3<> {dev}"))
+
+
+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"