Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9721112d67 | ||
|
|
3605fc36ef | ||
|
|
bb79660386 | ||
|
|
a54cbc14bd | ||
|
|
06ed76e5ab | ||
|
|
096908ac39 | ||
|
|
33ccab9ad4 |
@@ -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'
|
||||
|
||||
@@ -1,17 +1,10 @@
|
||||
{ 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"
|
||||
":"
|
||||
|
||||
@@ -18,8 +18,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 subprocess_tee.run(("nix", "--extra-experimental-features", "nix-command flakes", "-L", *args), check=True, text=True).stdout
|
||||
|
||||
|
||||
def git(*args, check=True):
|
||||
@@ -33,16 +32,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()}")
|
||||
with urllib.request.urlopen(req) as resp:
|
||||
raw = resp.read()
|
||||
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 +235,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))
|
||||
|
||||
@@ -163,9 +163,10 @@ in
|
||||
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
|
||||
|
||||
|
||||
@@ -75,6 +75,7 @@ let
|
||||
packages = with pkgs; [ tmux ] ++ packages;
|
||||
miscProperties = self._sshpiperRegister routingInfo;
|
||||
};
|
||||
|
||||
in
|
||||
{
|
||||
ssh-admin = mkSsh {
|
||||
|
||||
@@ -222,14 +222,10 @@ rec {
|
||||
: 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
|
||||
: Host device nodes to expose, as paths. Bound into the container's `/dev`
|
||||
and added to the unit's `DeviceAllow=` - the bind alone leaves the cgroup
|
||||
denying `open()`. Nodes keep their host ownership, so a consumer inside
|
||||
needs `isolation.privateUsers = "identity"` for the owning gid to mean
|
||||
anything.
|
||||
|
||||
`isolation.nixDaemon`
|
||||
@@ -289,7 +285,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 == "pick" || (builtins.isInt privateUsers && privateUsers > 0);
|
||||
useIdmap = privateUsers != "no";
|
||||
bindMountExtraFlags = lib.mapAttrsToList (
|
||||
mountPoint: bm:
|
||||
(if bm.isReadOnly then "--bind-ro=" else "--bind=")
|
||||
@@ -297,9 +293,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
|
||||
|
||||
@@ -337,24 +337,6 @@ with subtest("(functional): declared devices are usable in-container"):
|
||||
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, [])):
|
||||
|
||||
Reference in New Issue
Block a user