Author SHA1 Message Date
Floweynt b7f57b57e8 ci: exclude PRs from issue search, sanitize vulnix descriptions for markdown tables
diff-pr / dix (pull_request) Successful in 6m17s
flake-check / flake-check (pull_request) Successful in 51s
lint / lint (pull_request) Successful in 1m48s
2026-09-11 19:23:55 -05:00
Floweynt 4e8a8666b7 ci: drop explicit permissions block from vulnix workflow
diff-pr / dix (pull_request) Successful in 6m16s
flake-check / flake-check (pull_request) Successful in 52s
lint / lint (pull_request) Successful in 1m51s
2026-09-11 16:25:43 -05:00
Floweynt feae577108 ci: log gitea API error responses 2026-09-11 16:25:36 -05:00
Floweynt ba23f719ab ci: fix vulnix GITHUB_OUTPUT format error
diff-pr / dix (pull_request) Successful in 6m30s
flake-check / flake-check (pull_request) Successful in 52s
lint / lint (pull_request) Successful in 1m50s
2026-09-11 15:25:03 -05:00
1447febbaf frcc experiments (#1)
flake-check / flake-check (push) Successful in 57s
lint / lint (push) Successful in 2m13s
diff-tag / dix (push) Successful in 6m13s
Co-authored-by: Autumn Liu <al63244@my.utexas.edu>
Co-authored-by: Floweynt <50057682+Floweynt@users.noreply.github.com>
Reviewed-on: #1
Co-authored-by: autumn <aut.tea7@gmail.com>
2026-09-11 07:31:32 +00:00
Floweynt 6b21be0088 ci: try to fix vulnix v2
diff-tag / dix (push) Successful in 6m9s
flake-check / flake-check (push) Successful in 51s
lint / lint (push) Successful in 1m49s
2026-09-10 23:09:49 -05:00
floweyandFloweynt 0279df6b11 cI: improve cache management (#2)
diff-tag / dix (push) Successful in 6m10s
flake-check / flake-check (push) Successful in 51s
lint / lint (push) Successful in 1m49s
Co-authored-by: Floweynt <50057682+Floweynt@users.noreply.github.com>
Reviewed-on: #2
2026-09-11 02:06:39 +00:00
Floweynt 3a87891486 ci: try to fix vulnix
flake-check / flake-check (push) Canceled after 0s
lint / lint (push) Canceled after 0s
diff-tag / dix (push) Successful in 6m7s
2026-09-10 20:18:03 -05:00
6 changed files with 72 additions and 16 deletions
+1 -5
View File
@@ -5,10 +5,6 @@ on:
- cron: "0 6 * * 1" - cron: "0 6 * * 1"
workflow_dispatch: workflow_dispatch:
permissions:
contents: read
issues: write
jobs: jobs:
scan: scan:
runs-on: nix runs-on: nix
@@ -25,7 +21,7 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
API: ${{ github.api_url }} API: ${{ github.api_url }}
REPO: ${{ github.repository }} 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 - name: close resolved issue
if: steps.scan.outputs.count == '0' if: steps.scan.outputs.count == '0'
+7
View File
@@ -1,10 +1,17 @@
{ lib, pkgs }: { 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 # tools must track ci.py's subprocess calls; nix stays ambient (uses the
# runner's own nix, not a pinned one). # runner's own nix, not a pinned one).
pkgs.writers.writePython3Bin "ci" { pkgs.writers.writePython3Bin "ci" {
flakeIgnore = [ "E501" ]; flakeIgnore = [ "E501" ];
libraries = [ pkgs.python3Packages.subprocess-tee ]; libraries = [ pkgs.python3Packages.subprocess-tee ];
makeWrapperArgs = [ makeWrapperArgs = [
"--set-default"
"NIX_USER_CONF_FILES"
(toString nixConf)
"--prefix" "--prefix"
"PATH" "PATH"
":" ":"
+9 -5
View File
@@ -18,7 +18,8 @@ def run(*args, **kw):
def nix(*args): 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): 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"]}') req.add_header("Authorization", f'token {os.environ["GH_TOKEN"]}')
if data is not None: if data is not None:
req.add_header("Content-Type", "application/json") req.add_header("Content-Type", "application/json")
with urllib.request.urlopen(req) as resp: try:
raw = resp.read() 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 return json.loads(raw) if raw else None
def find_open_issue(label): 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 return issues[0] if issues else None
@@ -235,7 +239,7 @@ def format_vulnix(vulns):
for v in vulns: for v in vulns:
for cve in v["affected_by"]: for cve in v["affected_by"]:
score = v.get("cvssv3_basescore", {}).get(cve) 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: if len(desc) > 120:
desc = desc[:117] + "..." desc = desc[:117] + "..."
rows.append((v["pname"], v["version"], cve, score, desc)) rows.append((v["pname"], v["version"], cve, score, desc))
+3 -4
View File
@@ -163,10 +163,9 @@ in
trusted-public-keys = [ "microvm.cachix.org-1:oXnBc6hRE3eX5rSYdRyMYXnfzcCxC7yKPTbZXALsqys=" ]; 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 # nix.optimise.automatic = true; - doesn't work with microvm.writableStoreOverlay
+33 -1
View File
@@ -61,16 +61,29 @@ let
net ? { }, net ? { },
resources ? { }, resources ? { },
traits ? [ ], traits ? [ ],
isolation ? { },
}: }:
mkContainer { mkContainer {
inherit name; inherit name;
inherit net resources; inherit net resources;
svc.autoStart = true; svc.autoStart = true;
isolation.nixDaemon = nixDaemon; isolation = {
inherit nixDaemon;
}
// isolation;
traits = [ sshTrait ] ++ traits; traits = [ sshTrait ] ++ traits;
packages = with pkgs; [ tmux ] ++ packages; packages = with pkgs; [ tmux ] ++ packages;
miscProperties = self._sshpiperRegister routingInfo; miscProperties = self._sshpiperRegister routingInfo;
}; };
kvmTrait = {
containerConfig =
{ pkgs, ... }:
{
users.users.runner.extraGroups = [ "kvm" ];
environment.systemPackages = [ pkgs.qemu_kvm ];
};
};
in in
{ {
ssh-admin = mkSsh { ssh-admin = mkSsh {
@@ -121,6 +134,25 @@ in
mem = "16G"; mem = "16G";
cpu = 65; cpu = 65;
}; };
traits = [ kvmTrait ];
isolation.allowedDevices = [
{
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 = [ routingInfo = [
{ {
username = "autumn"; username = "autumn";
+19 -1
View File
@@ -228,6 +228,17 @@ rec {
: systemd-nspawn user namespacing; see `--private-users=` in : systemd-nspawn user namespacing; see `--private-users=` in
systemd-nspawn(1). Bind mounts always go through idmapped `--bind`. 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` `miscProperties`
: Arbitrary data attached to the result. Used for cross-container discovery : Arbitrary data attached to the result. Used for cross-container discovery
via `collectContainers`. via `collectContainers`.
@@ -272,6 +283,8 @@ rec {
bindMounts = resources.fs or { }; bindMounts = resources.fs or { };
allowsNixDaemon = isolation.nixDaemon or false; allowsNixDaemon = isolation.nixDaemon or false;
privateUsers = isolation.privateUsers or "pick"; privateUsers = isolation.privateUsers or "pick";
allowedDevices = isolation.allowedDevices or [ ];
additionalCapabilities = isolation.additionalCapabilities or [ ];
allowInternet = hasInternetAccess access; allowInternet = hasInternetAccess access;
allBindMounts = builtins.foldl' (acc: t: acc // (t.resources.fs or { })) { } traits // bindMounts; allBindMounts = builtins.foldl' (acc: t: acc // (t.resources.fs or { })) { } traits // bindMounts;
@@ -368,7 +381,12 @@ rec {
kind = "nspawn"; kind = "nspawn";
miscProperties = flattenMiscProp self miscProperties; miscProperties = flattenMiscProp self miscProperties;
nixosContainer = { nixosContainer = {
inherit autoStart privateUsers; inherit
autoStart
privateUsers
allowedDevices
additionalCapabilities
;
bindMounts = { }; bindMounts = { };
extraFlags = bindMountExtraFlags; extraFlags = bindMountExtraFlags;
privateNetwork = true; privateNetwork = true;