Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a12c18386d | ||
|
|
e8cc76844d | ||
|
|
f9d92fc62d | ||
|
|
060863f72f | ||
|
|
8190b0080d | ||
|
|
af5d7493af |
@@ -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
|
||||||
|
|||||||
@@ -33,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")
|
||||||
|
try:
|
||||||
with urllib.request.urlopen(req) as resp:
|
with urllib.request.urlopen(req) as resp:
|
||||||
raw = resp.read()
|
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
|
||||||
|
|
||||||
|
|
||||||
@@ -236,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))
|
||||||
|
|||||||
@@ -75,7 +75,6 @@ let
|
|||||||
packages = with pkgs; [ tmux ] ++ packages;
|
packages = with pkgs; [ tmux ] ++ packages;
|
||||||
miscProperties = self._sshpiperRegister routingInfo;
|
miscProperties = self._sshpiperRegister routingInfo;
|
||||||
};
|
};
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
ssh-admin = mkSsh {
|
ssh-admin = mkSsh {
|
||||||
|
|||||||
@@ -222,13 +222,15 @@ rec {
|
|||||||
: Bind mounts, keyed by mount point.
|
: Bind mounts, keyed by mount point.
|
||||||
|
|
||||||
`resources.devices`
|
`resources.devices`
|
||||||
: Host device nodes to expose, as paths, added to the unit's
|
: Host device nodes to expose, as paths. Bound into the container at the
|
||||||
`DeviceAllow=`. nspawn populates a handful of privileged devices
|
same path and added to the unit's `DeviceAllow=` - the cgroup
|
||||||
(`/dev/kvm`, `/dev/net/tun`, ...) into the container's own `/dev` once
|
permission alone doesn't get you a working node (nothing can `mknod` a
|
||||||
the cgroup allows it, and silently skips ones the host doesn't have -
|
device inside a user namespace), and the bind alone leaves the cgroup
|
||||||
no `resources.fs` bind mount needed. Nodes keep their host ownership,
|
denying `open()`, so both are needed. The bind is unconditional, so
|
||||||
so a consumer inside needs `isolation.privateUsers = "identity"` for
|
the device must actually exist on whatever host runs the container.
|
||||||
the owning gid to mean anything.
|
Nodes keep their host ownership, so a consumer inside needs
|
||||||
|
`isolation.privateUsers = "identity"` for the owning gid to mean
|
||||||
|
anything.
|
||||||
|
|
||||||
`isolation.nixDaemon`
|
`isolation.nixDaemon`
|
||||||
: Whether the Nix daemon and CLI are available inside the container.
|
: Whether the Nix daemon and CLI are available inside the container.
|
||||||
@@ -287,7 +289,7 @@ rec {
|
|||||||
allBindMounts = builtins.foldl' (acc: t: acc // (t.resources.fs or { })) { } traits // bindMounts;
|
allBindMounts = builtins.foldl' (acc: t: acc // (t.resources.fs or { })) { } traits // bindMounts;
|
||||||
userModules = map mkUser (lib.concatMap (t: t.users or [ ]) traits ++ users);
|
userModules = map mkUser (lib.concatMap (t: t.users or [ ]) traits ++ users);
|
||||||
allPorts = ports ++ map (p: (normalizePort p).container) hostPorts;
|
allPorts = ports ++ map (p: (normalizePort p).container) hostPorts;
|
||||||
useIdmap = privateUsers != "no";
|
useIdmap = privateUsers == "pick" || (builtins.isInt privateUsers && privateUsers > 0);
|
||||||
bindMountExtraFlags = lib.mapAttrsToList (
|
bindMountExtraFlags = lib.mapAttrsToList (
|
||||||
mountPoint: bm:
|
mountPoint: bm:
|
||||||
(if bm.isReadOnly then "--bind-ro=" else "--bind=")
|
(if bm.isReadOnly then "--bind-ro=" else "--bind=")
|
||||||
@@ -295,6 +297,10 @@ rec {
|
|||||||
+ lib.optionalString useIdmap ":idmap"
|
+ lib.optionalString useIdmap ":idmap"
|
||||||
) allBindMounts;
|
) allBindMounts;
|
||||||
bindMountHostPaths = map (bm: bm.hostPath) (lib.attrValues 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)
|
inherit (deriveIdentity ifPrefix.nspawn name)
|
||||||
iface
|
iface
|
||||||
mac
|
mac
|
||||||
@@ -381,7 +387,7 @@ rec {
|
|||||||
nixosContainer = {
|
nixosContainer = {
|
||||||
inherit autoStart privateUsers;
|
inherit autoStart privateUsers;
|
||||||
bindMounts = { };
|
bindMounts = { };
|
||||||
extraFlags = bindMountExtraFlags;
|
extraFlags = bindMountExtraFlags ++ deviceFlags;
|
||||||
privateNetwork = true;
|
privateNetwork = true;
|
||||||
extraVeths = linkVeths;
|
extraVeths = linkVeths;
|
||||||
config =
|
config =
|
||||||
|
|||||||
@@ -333,15 +333,28 @@ with subtest("(functional): published ports follow the container's lifetime"):
|
|||||||
with subtest("(functional): declared devices are usable in-container"):
|
with subtest("(functional): declared devices are usable in-container"):
|
||||||
for name, devices in DEVICES.items():
|
for name, devices in DEVICES.items():
|
||||||
for dev in devices:
|
for dev in devices:
|
||||||
if server.execute(f"test -e {dev}")[0] != 0:
|
|
||||||
# host lacks the device (e.g. /dev/kvm without nested
|
|
||||||
# virtualization, as in this test's own VM) - nspawn skips
|
|
||||||
# populating it in-container, so there's nothing to check.
|
|
||||||
continue
|
|
||||||
# opened, not stat'd: without DeviceAllow= the node is still visible
|
# opened, not stat'd: without DeviceAllow= the node is still visible
|
||||||
server.succeed(ct_cmd(name, f"exec 3<> {dev}"))
|
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"):
|
with subtest("(isolation): devices reach only the container that declared them"):
|
||||||
for name in enterable:
|
for name in enterable:
|
||||||
for dev in {d for ds in DEVICES.values() for d in ds} - set(DEVICES.get(name, [])):
|
for dev in {d for ds in DEVICES.values() for d in ds} - set(DEVICES.get(name, [])):
|
||||||
|
|||||||
Reference in New Issue
Block a user