diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-06-25 03:59:52 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-06-25 04:57:41 +0900 |
| commit | 87e008d56de974947ebb99c2cc40b25d3c2cf43e (patch) | |
| tree | 31791911e5226d6ec04e3fac7d91b0bf53e63aa5 /test | |
| parent | 399207321265307bb15f37d867f9370cd51c82a8 (diff) | |
treewide: rename to hakurei
Fortify makes little sense for a container tool.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'test')
| -rw-r--r-- | test/configuration.nix | 12 | ||||
| -rw-r--r-- | test/default.nix | 28 | ||||
| -rw-r--r-- | test/sandbox/case/default.nix | 6 | ||||
| -rw-r--r-- | test/sandbox/case/device.nix | 20 | ||||
| -rw-r--r-- | test/sandbox/case/mapuid.nix | 20 | ||||
| -rw-r--r-- | test/sandbox/case/preset.nix | 20 | ||||
| -rw-r--r-- | test/sandbox/case/tty.nix | 20 | ||||
| -rw-r--r-- | test/sandbox/configuration.nix | 8 | ||||
| -rw-r--r-- | test/sandbox/default.nix | 8 | ||||
| -rw-r--r-- | test/sandbox/fs_test.go | 24 | ||||
| -rw-r--r-- | test/sandbox/mount.go | 4 | ||||
| -rw-r--r-- | test/sandbox/mount_test.go | 2 | ||||
| -rw-r--r-- | test/sandbox/test.py | 28 | ||||
| -rw-r--r-- | test/sandbox/tool/main.go | 2 | ||||
| -rw-r--r-- | test/sandbox/tool/package.nix | 4 | ||||
| -rw-r--r-- | test/test.py | 74 |
16 files changed, 140 insertions, 140 deletions
diff --git a/test/configuration.nix b/test/configuration.nix index 4bd1ea55..18aaeda9 100644 --- a/test/configuration.nix +++ b/test/configuration.nix @@ -19,7 +19,7 @@ uid = 1001; # For deny unmapped uid test: - packages = [ config.environment.fortify.package ]; + packages = [ config.environment.hakurei.package ]; }; }; @@ -90,20 +90,20 @@ "-smp 8" ]; - environment.fortify = { + environment.hakurei = { enable = true; - stateDir = "/var/lib/fortify"; + stateDir = "/var/lib/hakurei"; users.alice = 0; extraHomeConfig = { config, ... }: { # To test merge deduplication: - options._fortify.stateVersion = lib.mkOption { type = lib.types.str; }; + options._hakurei.stateVersion = lib.mkOption { type = lib.types.str; }; config = { - home = { inherit (config._fortify) stateVersion; }; - _fortify.stateVersion = "23.05"; + home = { inherit (config._hakurei) stateVersion; }; + _hakurei.stateVersion = "23.05"; }; }; diff --git a/test/default.nix b/test/default.nix index 385b3433..44ec3d73 100644 --- a/test/default.nix +++ b/test/default.nix @@ -10,18 +10,18 @@ }: nixosTest { - name = "fortify" + (if withRace then "-race" else ""); + name = "hakurei" + (if withRace then "-race" else ""); nodes.machine = { options, pkgs, ... }: let fhs = let - fortify = options.environment.fortify.package.default; + hakurei = options.environment.hakurei.package.default; in buildFHSEnv { - pname = "fortify-fhs"; - inherit (fortify) version; - targetPkgs = _: fortify.targetPkgs; + pname = "hakurei-fhs"; + inherit (hakurei) version; + targetPkgs = _: hakurei.targetPkgs; extraOutputsToInstall = [ "dev" ]; profile = '' export PKG_CONFIG_PATH="/usr/share/pkgconfig:$PKG_CONFIG_PATH" @@ -31,29 +31,29 @@ nixosTest { { environment.systemPackages = [ # For go tests: - (writeShellScriptBin "fortify-test" '' - cd ${self.packages.${system}.fortify.src} - ${fhs}/bin/fortify-fhs -c \ + (writeShellScriptBin "hakurei-test" '' + cd ${self.packages.${system}.hakurei.src} + ${fhs}/bin/hakurei-fhs -c \ 'go test ${if withRace then "-race" else "-count 16"} ./...' \ - &> /tmp/fortify-test.log && \ - touch /tmp/fortify-test-ok - touch /tmp/fortify-test-done + &> /tmp/hakurei-test.log && \ + touch /tmp/hakurei-test-ok + touch /tmp/hakurei-test-done '') ]; # Run with Go race detector: - environment.fortify = lib.mkIf withRace rec { + environment.hakurei = lib.mkIf withRace rec { # race detector does not support static linking package = (pkgs.callPackage ../package.nix { }).overrideAttrs (previousAttrs: { GOFLAGS = previousAttrs.GOFLAGS ++ [ "-race" ]; }); - fsuPackage = options.environment.fortify.fsuPackage.default.override { fortify = package; }; + hsuPackage = options.environment.hakurei.hsuPackage.default.override { hakurei = package; }; }; imports = [ ./configuration.nix - self.nixosModules.fortify + self.nixosModules.hakurei self.inputs.home-manager.nixosModules.home-manager ]; }; diff --git a/test/sandbox/case/default.nix b/test/sandbox/case/default.nix index 21bdd4a0..05a13de1 100644 --- a/test/sandbox/case/default.nix +++ b/test/sandbox/case/default.nix @@ -46,14 +46,14 @@ let ; share = testProgram; packages = [ ]; - path = "${testProgram}/bin/fortify-test"; + path = "${testProgram}/bin/hakurei-test"; args = [ "test" - (toString (builtins.toFile "fortify-${tc.name}-want.json" (builtins.toJSON tc.want))) + (toString (builtins.toFile "hakurei-${tc.name}-want.json" (builtins.toJSON tc.want))) ]; }; - testCaseName = name: "cat.gensokyo.fortify.test." + name; + testCaseName = name: "cat.gensokyo.hakurei.test." + name; in { ${testCaseName "preset"} = callTestCase ./preset.nix 1; diff --git a/test/sandbox/case/device.nix b/test/sandbox/case/device.nix index ef3b5494..9765fd58 100644 --- a/test/sandbox/case/device.nix +++ b/test/sandbox/case/device.nix @@ -13,7 +13,7 @@ want = { env = [ "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/65534/bus" - "HOME=/var/lib/fortify/u0/a4" + "HOME=/var/lib/hakurei/u0/a4" "PULSE_SERVER=unix:/run/user/65534/pulse/native" "SHELL=/run/current-system/sw/bin/bash" "TERM=linux" @@ -25,7 +25,7 @@ ]; fs = fs "dead" { - ".fortify" = fs "800001ed" { } null; + ".hakurei" = fs "800001ed" { } null; bin = fs "800001ed" { sh = fs "80001ff" null null; } null; dev = fs "800001ed" null null; etc = fs "800001ed" { @@ -43,9 +43,9 @@ "dhcpcd.exit-hook" = fs "80001ff" null null; "fonts" = fs "80001ff" null null; "fstab" = fs "80001ff" null null; - "fsurc" = fs "80001ff" null null; + "hsurc" = fs "80001ff" null null; "fuse.conf" = fs "80001ff" null null; - "group" = fs "180" null "fortify:x:65534:\n"; + "group" = fs "180" null "hakurei:x:65534:\n"; "host.conf" = fs "80001ff" null null; "hostname" = fs "80001ff" null null; "hosts" = fs "80001ff" null null; @@ -70,7 +70,7 @@ "os-release" = fs "80001ff" null null; "pam" = fs "80001ff" null null; "pam.d" = fs "80001ff" null null; - "passwd" = fs "180" null "u0_a4:x:65534:65534:Fortify:/var/lib/fortify/u0/a4:/run/current-system/sw/bin/bash\n"; + "passwd" = fs "180" null "u0_a4:x:65534:65534:Hakurei:/var/lib/hakurei/u0/a4:/run/current-system/sw/bin/bash\n"; "pipewire" = fs "80001ff" null null; "pki" = fs "80001ff" null null; "polkit-1" = fs "80001ff" null null; @@ -138,7 +138,7 @@ usr = fs "800001c0" { bin = fs "800001ed" { env = fs "80001ff" null null; } null; } null; var = fs "800001c0" { lib = fs "800001c0" { - fortify = fs "800001c0" { + hakurei = fs "800001c0" { u0 = fs "800001c0" { a4 = fs "800001c0" { ".cache" = fs "800001ed" { ".keep" = fs "80001ff" null ""; } null; @@ -186,7 +186,7 @@ mount = [ (ent "/sysroot" "/" "rw,nosuid,nodev,relatime" "tmpfs" "rootfs" "rw,uid=1000004,gid=1000004") (ent "/" "/proc" "rw,nosuid,nodev,noexec,relatime" "proc" "proc" "rw") - (ent "/" "/.fortify" "rw,nosuid,nodev,relatime" "tmpfs" "tmpfs" "rw,size=4k,mode=755,uid=1000004,gid=1000004") + (ent "/" "/.hakurei" "rw,nosuid,nodev,relatime" "tmpfs" "tmpfs" "rw,size=4k,mode=755,uid=1000004,gid=1000004") (ent "/" "/dev" "rw,nosuid" "devtmpfs" "devtmpfs" ignore) (ent "/" "/dev/pts" "rw,nosuid,noexec,relatime" "devpts" "devpts" "rw,gid=3,mode=620,ptmxmode=666") (ent "/" "/dev/shm" "rw,nosuid,nodev" "tmpfs" "tmpfs" ignore) @@ -204,9 +204,9 @@ (ent "/var/cache" "/var/cache" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") (ent "/etc" ignore "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") (ent "/" "/run/user" "rw,nosuid,nodev,relatime" "tmpfs" "tmpfs" "rw,size=4k,mode=755,uid=1000004,gid=1000004") - (ent "/tmp/fortify.1000/runtime/4" "/run/user/65534" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") - (ent "/tmp/fortify.1000/tmpdir/4" "/tmp" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") - (ent "/var/lib/fortify/u0/a4" "/var/lib/fortify/u0/a4" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") + (ent "/tmp/hakurei.1000/runtime/4" "/run/user/65534" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") + (ent "/tmp/hakurei.1000/tmpdir/4" "/tmp" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") + (ent "/var/lib/hakurei/u0/a4" "/var/lib/hakurei/u0/a4" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") (ent ignore "/etc/passwd" "ro,nosuid,nodev,relatime" "tmpfs" "rootfs" "rw,uid=1000004,gid=1000004") (ent ignore "/etc/group" "ro,nosuid,nodev,relatime" "tmpfs" "rootfs" "rw,uid=1000004,gid=1000004") (ent ignore "/run/user/65534/wayland-0" "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") diff --git a/test/sandbox/case/mapuid.nix b/test/sandbox/case/mapuid.nix index 1f787086..af70cb30 100644 --- a/test/sandbox/case/mapuid.nix +++ b/test/sandbox/case/mapuid.nix @@ -13,7 +13,7 @@ want = { env = [ "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus" - "HOME=/var/lib/fortify/u0/a3" + "HOME=/var/lib/hakurei/u0/a3" "PULSE_SERVER=unix:/run/user/1000/pulse/native" "SHELL=/run/current-system/sw/bin/bash" "TERM=linux" @@ -25,7 +25,7 @@ ]; fs = fs "dead" { - ".fortify" = fs "800001ed" { } null; + ".hakurei" = fs "800001ed" { } null; bin = fs "800001ed" { sh = fs "80001ff" null null; } null; dev = fs "800001ed" { core = fs "80001ff" null null; @@ -67,9 +67,9 @@ "dhcpcd.exit-hook" = fs "80001ff" null null; "fonts" = fs "80001ff" null null; "fstab" = fs "80001ff" null null; - "fsurc" = fs "80001ff" null null; + "hsurc" = fs "80001ff" null null; "fuse.conf" = fs "80001ff" null null; - "group" = fs "180" null "fortify:x:100:\n"; + "group" = fs "180" null "hakurei:x:100:\n"; "host.conf" = fs "80001ff" null null; "hostname" = fs "80001ff" null null; "hosts" = fs "80001ff" null null; @@ -94,7 +94,7 @@ "os-release" = fs "80001ff" null null; "pam" = fs "80001ff" null null; "pam.d" = fs "80001ff" null null; - "passwd" = fs "180" null "u0_a3:x:1000:100:Fortify:/var/lib/fortify/u0/a3:/run/current-system/sw/bin/bash\n"; + "passwd" = fs "180" null "u0_a3:x:1000:100:Hakurei:/var/lib/hakurei/u0/a3:/run/current-system/sw/bin/bash\n"; "pipewire" = fs "80001ff" null null; "pki" = fs "80001ff" null null; "polkit-1" = fs "80001ff" null null; @@ -162,7 +162,7 @@ usr = fs "800001c0" { bin = fs "800001ed" { env = fs "80001ff" null null; } null; } null; var = fs "800001c0" { lib = fs "800001c0" { - fortify = fs "800001c0" { + hakurei = fs "800001c0" { u0 = fs "800001c0" { a3 = fs "800001c0" { ".cache" = fs "800001ed" { ".keep" = fs "80001ff" null ""; } null; @@ -210,7 +210,7 @@ mount = [ (ent "/sysroot" "/" "rw,nosuid,nodev,relatime" "tmpfs" "rootfs" "rw,uid=1000003,gid=1000003") (ent "/" "/proc" "rw,nosuid,nodev,noexec,relatime" "proc" "proc" "rw") - (ent "/" "/.fortify" "rw,nosuid,nodev,relatime" "tmpfs" "tmpfs" "rw,size=4k,mode=755,uid=1000003,gid=1000003") + (ent "/" "/.hakurei" "rw,nosuid,nodev,relatime" "tmpfs" "tmpfs" "rw,size=4k,mode=755,uid=1000003,gid=1000003") (ent "/" "/dev" "rw,nosuid,nodev,relatime" "tmpfs" "devtmpfs" "rw,mode=755,uid=1000003,gid=1000003") (ent "/null" "/dev/null" "rw,nosuid" "devtmpfs" "devtmpfs" ignore) (ent "/zero" "/dev/zero" "rw,nosuid" "devtmpfs" "devtmpfs" ignore) @@ -232,9 +232,9 @@ (ent "/var/cache" "/var/cache" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") (ent "/etc" ignore "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") (ent "/" "/run/user" "rw,nosuid,nodev,relatime" "tmpfs" "tmpfs" "rw,size=4k,mode=755,uid=1000003,gid=1000003") - (ent "/tmp/fortify.1000/runtime/3" "/run/user/1000" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") - (ent "/tmp/fortify.1000/tmpdir/3" "/tmp" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") - (ent "/var/lib/fortify/u0/a3" "/var/lib/fortify/u0/a3" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") + (ent "/tmp/hakurei.1000/runtime/3" "/run/user/1000" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") + (ent "/tmp/hakurei.1000/tmpdir/3" "/tmp" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") + (ent "/var/lib/hakurei/u0/a3" "/var/lib/hakurei/u0/a3" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") (ent ignore "/etc/passwd" "ro,nosuid,nodev,relatime" "tmpfs" "rootfs" "rw,uid=1000003,gid=1000003") (ent ignore "/etc/group" "ro,nosuid,nodev,relatime" "tmpfs" "rootfs" "rw,uid=1000003,gid=1000003") (ent ignore "/run/user/1000/wayland-0" "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") diff --git a/test/sandbox/case/preset.nix b/test/sandbox/case/preset.nix index f1c996d1..a2c2eb4f 100644 --- a/test/sandbox/case/preset.nix +++ b/test/sandbox/case/preset.nix @@ -13,7 +13,7 @@ want = { env = [ "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/65534/bus" - "HOME=/var/lib/fortify/u0/a1" + "HOME=/var/lib/hakurei/u0/a1" "PULSE_SERVER=unix:/run/user/65534/pulse/native" "SHELL=/run/current-system/sw/bin/bash" "TERM=linux" @@ -25,7 +25,7 @@ ]; fs = fs "dead" { - ".fortify" = fs "800001ed" { } null; + ".hakurei" = fs "800001ed" { } null; bin = fs "800001ed" { sh = fs "80001ff" null null; } null; dev = fs "800001ed" { core = fs "80001ff" null null; @@ -67,9 +67,9 @@ "dhcpcd.exit-hook" = fs "80001ff" null null; "fonts" = fs "80001ff" null null; "fstab" = fs "80001ff" null null; - "fsurc" = fs "80001ff" null null; + "hsurc" = fs "80001ff" null null; "fuse.conf" = fs "80001ff" null null; - "group" = fs "180" null "fortify:x:65534:\n"; + "group" = fs "180" null "hakurei:x:65534:\n"; "host.conf" = fs "80001ff" null null; "hostname" = fs "80001ff" null null; "hosts" = fs "80001ff" null null; @@ -94,7 +94,7 @@ "os-release" = fs "80001ff" null null; "pam" = fs "80001ff" null null; "pam.d" = fs "80001ff" null null; - "passwd" = fs "180" null "u0_a1:x:65534:65534:Fortify:/var/lib/fortify/u0/a1:/run/current-system/sw/bin/bash\n"; + "passwd" = fs "180" null "u0_a1:x:65534:65534:Hakurei:/var/lib/hakurei/u0/a1:/run/current-system/sw/bin/bash\n"; "pipewire" = fs "80001ff" null null; "pki" = fs "80001ff" null null; "polkit-1" = fs "80001ff" null null; @@ -162,7 +162,7 @@ usr = fs "800001c0" { bin = fs "800001ed" { env = fs "80001ff" null null; } null; } null; var = fs "800001c0" { lib = fs "800001c0" { - fortify = fs "800001c0" { + hakurei = fs "800001c0" { u0 = fs "800001c0" { a1 = fs "800001c0" { ".cache" = fs "800001ed" { ".keep" = fs "80001ff" null ""; } null; @@ -209,7 +209,7 @@ mount = [ (ent "/sysroot" "/" "rw,nosuid,nodev,relatime" "tmpfs" "rootfs" "rw,uid=1000001,gid=1000001") (ent "/" "/proc" "rw,nosuid,nodev,noexec,relatime" "proc" "proc" "rw") - (ent "/" "/.fortify" "rw,nosuid,nodev,relatime" "tmpfs" "tmpfs" "rw,size=4k,mode=755,uid=1000001,gid=1000001") + (ent "/" "/.hakurei" "rw,nosuid,nodev,relatime" "tmpfs" "tmpfs" "rw,size=4k,mode=755,uid=1000001,gid=1000001") (ent "/" "/dev" "rw,nosuid,nodev,relatime" "tmpfs" "devtmpfs" "rw,mode=755,uid=1000001,gid=1000001") (ent "/null" "/dev/null" "rw,nosuid" "devtmpfs" "devtmpfs" ignore) (ent "/zero" "/dev/zero" "rw,nosuid" "devtmpfs" "devtmpfs" ignore) @@ -230,9 +230,9 @@ (ent "/dri" "/dev/dri" "rw,nosuid" "devtmpfs" "devtmpfs" ignore) (ent "/etc" ignore "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") (ent "/" "/run/user" "rw,nosuid,nodev,relatime" "tmpfs" "tmpfs" "rw,size=4k,mode=755,uid=1000001,gid=1000001") - (ent "/tmp/fortify.1000/runtime/1" "/run/user/65534" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") - (ent "/tmp/fortify.1000/tmpdir/1" "/tmp" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") - (ent "/var/lib/fortify/u0/a1" "/var/lib/fortify/u0/a1" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") + (ent "/tmp/hakurei.1000/runtime/1" "/run/user/65534" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") + (ent "/tmp/hakurei.1000/tmpdir/1" "/tmp" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") + (ent "/var/lib/hakurei/u0/a1" "/var/lib/hakurei/u0/a1" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") (ent ignore "/etc/passwd" "ro,nosuid,nodev,relatime" "tmpfs" "rootfs" "rw,uid=1000001,gid=1000001") (ent ignore "/etc/group" "ro,nosuid,nodev,relatime" "tmpfs" "rootfs" "rw,uid=1000001,gid=1000001") (ent ignore "/run/user/65534/wayland-0" "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") diff --git a/test/sandbox/case/tty.nix b/test/sandbox/case/tty.nix index 8a549075..3132d257 100644 --- a/test/sandbox/case/tty.nix +++ b/test/sandbox/case/tty.nix @@ -13,7 +13,7 @@ want = { env = [ "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/65534/bus" - "HOME=/var/lib/fortify/u0/a2" + "HOME=/var/lib/hakurei/u0/a2" "PULSE_SERVER=unix:/run/user/65534/pulse/native" "SHELL=/run/current-system/sw/bin/bash" "TERM=linux" @@ -25,7 +25,7 @@ ]; fs = fs "dead" { - ".fortify" = fs "800001ed" { } null; + ".hakurei" = fs "800001ed" { } null; bin = fs "800001ed" { sh = fs "80001ff" null null; } null; dev = fs "800001ed" { console = fs "4200190" null null; @@ -68,9 +68,9 @@ "dhcpcd.exit-hook" = fs "80001ff" null null; "fonts" = fs "80001ff" null null; "fstab" = fs "80001ff" null null; - "fsurc" = fs "80001ff" null null; + "hsurc" = fs "80001ff" null null; "fuse.conf" = fs "80001ff" null null; - "group" = fs "180" null "fortify:x:65534:\n"; + "group" = fs "180" null "hakurei:x:65534:\n"; "host.conf" = fs "80001ff" null null; "hostname" = fs "80001ff" null null; "hosts" = fs "80001ff" null null; @@ -95,7 +95,7 @@ "os-release" = fs "80001ff" null null; "pam" = fs "80001ff" null null; "pam.d" = fs "80001ff" null null; - "passwd" = fs "180" null "u0_a2:x:65534:65534:Fortify:/var/lib/fortify/u0/a2:/run/current-system/sw/bin/bash\n"; + "passwd" = fs "180" null "u0_a2:x:65534:65534:Hakurei:/var/lib/hakurei/u0/a2:/run/current-system/sw/bin/bash\n"; "pipewire" = fs "80001ff" null null; "pki" = fs "80001ff" null null; "polkit-1" = fs "80001ff" null null; @@ -163,7 +163,7 @@ usr = fs "800001c0" { bin = fs "800001ed" { env = fs "80001ff" null null; } null; } null; var = fs "800001c0" { lib = fs "800001c0" { - fortify = fs "800001c0" { + hakurei = fs "800001c0" { u0 = fs "800001c0" { a2 = fs "800001c0" { ".cache" = fs "800001ed" { ".keep" = fs "80001ff" null ""; } null; @@ -211,7 +211,7 @@ mount = [ (ent "/sysroot" "/" "rw,nosuid,nodev,relatime" "tmpfs" "rootfs" "rw,uid=1000002,gid=1000002") (ent "/" "/proc" "rw,nosuid,nodev,noexec,relatime" "proc" "proc" "rw") - (ent "/" "/.fortify" "rw,nosuid,nodev,relatime" "tmpfs" "tmpfs" "rw,size=4k,mode=755,uid=1000002,gid=1000002") + (ent "/" "/.hakurei" "rw,nosuid,nodev,relatime" "tmpfs" "tmpfs" "rw,size=4k,mode=755,uid=1000002,gid=1000002") (ent "/" "/dev" "rw,nosuid,nodev,relatime" "tmpfs" "devtmpfs" "rw,mode=755,uid=1000002,gid=1000002") (ent "/null" "/dev/null" "rw,nosuid" "devtmpfs" "devtmpfs" ignore) (ent "/zero" "/dev/zero" "rw,nosuid" "devtmpfs" "devtmpfs" ignore) @@ -234,9 +234,9 @@ (ent "/var/cache" "/var/cache" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") (ent "/etc" ignore "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") (ent "/" "/run/user" "rw,nosuid,nodev,relatime" "tmpfs" "tmpfs" "rw,size=4k,mode=755,uid=1000002,gid=1000002") - (ent "/tmp/fortify.1000/runtime/2" "/run/user/65534" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") - (ent "/tmp/fortify.1000/tmpdir/2" "/tmp" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") - (ent "/var/lib/fortify/u0/a2" "/var/lib/fortify/u0/a2" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") + (ent "/tmp/hakurei.1000/runtime/2" "/run/user/65534" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") + (ent "/tmp/hakurei.1000/tmpdir/2" "/tmp" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") + (ent "/var/lib/hakurei/u0/a2" "/var/lib/hakurei/u0/a2" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") (ent ignore "/etc/passwd" "ro,nosuid,nodev,relatime" "tmpfs" "rootfs" "rw,uid=1000002,gid=1000002") (ent ignore "/etc/group" "ro,nosuid,nodev,relatime" "tmpfs" "rootfs" "rw,uid=1000002,gid=1000002") (ent ignore "/run/user/65534/wayland-0" "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") diff --git a/test/sandbox/configuration.nix b/test/sandbox/configuration.nix index 473e9d3c..c50363cc 100644 --- a/test/sandbox/configuration.nix +++ b/test/sandbox/configuration.nix @@ -5,7 +5,7 @@ ... }: let - testProgram = pkgs.callPackage ./tool/package.nix { inherit (config.environment.fortify.package) version; }; + testProgram = pkgs.callPackage ./tool/package.nix { inherit (config.environment.hakurei.package) version; }; in { users.users = { @@ -23,7 +23,7 @@ in services.getty.autologinUser = "alice"; environment = { - systemPackages = with pkgs; [ + systemPackages = [ # For checking seccomp outcome: testProgram ]; @@ -59,9 +59,9 @@ in "-smp 8" ]; - environment.fortify = { + environment.hakurei = { enable = true; - stateDir = "/var/lib/fortify"; + stateDir = "/var/lib/hakurei"; users.alice = 0; extraHomeConfig = { diff --git a/test/sandbox/default.nix b/test/sandbox/default.nix index 6ffc4fd5..8ea1bd53 100644 --- a/test/sandbox/default.nix +++ b/test/sandbox/default.nix @@ -7,23 +7,23 @@ }: nixosTest { - name = "fortify-sandbox" + (if withRace then "-race" else ""); + name = "hakurei-sandbox" + (if withRace then "-race" else ""); nodes.machine = { options, pkgs, ... }: { # Run with Go race detector: - environment.fortify = lib.mkIf withRace rec { + environment.hakurei = lib.mkIf withRace rec { # race detector does not support static linking package = (pkgs.callPackage ../../package.nix { }).overrideAttrs (previousAttrs: { GOFLAGS = previousAttrs.GOFLAGS ++ [ "-race" ]; }); - fsuPackage = options.environment.fortify.fsuPackage.default.override { fortify = package; }; + hsuPackage = options.environment.hakurei.hsuPackage.default.override { hakurei = package; }; }; imports = [ ./configuration.nix - self.nixosModules.fortify + self.nixosModules.hakurei self.inputs.home-manager.nixosModules.home-manager ]; }; diff --git a/test/sandbox/fs_test.go b/test/sandbox/fs_test.go index cac5a3f5..e7253af7 100644 --- a/test/sandbox/fs_test.go +++ b/test/sandbox/fs_test.go @@ -8,12 +8,12 @@ import ( "testing" "testing/fstest" - "git.gensokyo.uk/security/fortify/test/sandbox" + "git.gensokyo.uk/security/hakurei/test/sandbox" ) var ( - fsPasswdSample = "u0_a20:x:65534:65534:Fortify:/var/lib/persist/module/fortify/u0/a20:/run/current-system/sw/bin/zsh" - fsGroupSample = "fortify:x:65534:" + fsPasswdSample = "u0_a20:x:65534:65534:Hakurei:/var/lib/persist/module/hakurei/u0/a20:/run/current-system/sw/bin/zsh" + fsGroupSample = "hakurei:x:65534:" ) func TestCompare(t *testing.T) { @@ -26,15 +26,15 @@ func TestCompare(t *testing.T) { wantErr error }{ {"skip", fstest.MapFS{}, &sandbox.FS{}, "[ OK ] s .\x00", nil}, - {"simple pass", fstest.MapFS{".fortify": {Mode: 0x800001ed}}, - &sandbox.FS{Dir: map[string]*sandbox.FS{".fortify": {Mode: 0x800001ed}}}, - "[ OK ] s .fortify\x00[ OK ] d .\x00", nil}, - {"bad length", fstest.MapFS{".fortify": {Mode: 0x800001ed}}, + {"simple pass", fstest.MapFS{".hakurei": {Mode: 0x800001ed}}, + &sandbox.FS{Dir: map[string]*sandbox.FS{".hakurei": {Mode: 0x800001ed}}}, + "[ OK ] s .hakurei\x00[ OK ] d .\x00", nil}, + {"bad length", fstest.MapFS{".hakurei": {Mode: 0x800001ed}}, &sandbox.FS{Dir: make(map[string]*sandbox.FS)}, - "[FAIL] d .: \".fortify/\"\x00", sandbox.ErrFSBadLength}, - {"top level bad mode", fstest.MapFS{".fortify": {Mode: 0x800001ed}}, - &sandbox.FS{Dir: map[string]*sandbox.FS{".fortify": {Mode: 0xdeadbeef}}}, - "[FAIL] m .fortify: 800001ed, want deadbeef\x00", sandbox.ErrFSBadMode}, + "[FAIL] d .: \".hakurei/\"\x00", sandbox.ErrFSBadLength}, + {"top level bad mode", fstest.MapFS{".hakurei": {Mode: 0x800001ed}}, + &sandbox.FS{Dir: map[string]*sandbox.FS{".hakurei": {Mode: 0xdeadbeef}}}, + "[FAIL] m .hakurei: 800001ed, want deadbeef\x00", sandbox.ErrFSBadMode}, {"invalid entry condition", fstest.MapFS{"test": {Data: []byte{'0'}, Mode: 0644}}, &sandbox.FS{Dir: map[string]*sandbox.FS{"test": {Dir: make(map[string]*sandbox.FS)}}}, "[FAIL] d .: \"test\"\x00", sandbox.ErrFSInvalidEnt}, @@ -54,7 +54,7 @@ func TestCompare(t *testing.T) { }, &sandbox.FS{Dir: map[string]*sandbox.FS{"etc": {Mode: 0x800001c0, Dir: map[string]*sandbox.FS{ "passwd": {Mode: 0x1a4, Data: &fsGroupSample}, "group": {Mode: 0x1a4, Data: &fsGroupSample}, - }}}}, "[ OK ] f etc/group\x00[FAIL] f etc/passwd\x00got: u0_a20:x:65534:65534:Fortify:/var/lib/persist/module/fortify/u0/a20:/run/current-system/sw/bin/zsh\x00want: fortify:x:65534:\x00", sandbox.ErrFSBadData}, + }}}}, "[ OK ] f etc/group\x00[FAIL] f etc/passwd\x00got: u0_a20:x:65534:65534:Hakurei:/var/lib/persist/module/hakurei/u0/a20:/run/current-system/sw/bin/zsh\x00want: hakurei:x:65534:\x00", sandbox.ErrFSBadData}, } for _, tc := range testCases { diff --git a/test/sandbox/mount.go b/test/sandbox/mount.go index 27dc6bae..29405722 100644 --- a/test/sandbox/mount.go +++ b/test/sandbox/mount.go @@ -7,7 +7,7 @@ package sandbox #include <stdio.h> #include <libmount.h> -const char *F_MOUNTINFO_PATH = "/proc/self/mountinfo"; +const char *HAKUREI_MOUNTINFO_PATH = "/proc/self/mountinfo"; */ import "C" @@ -86,7 +86,7 @@ func (m *Mountinfo) Parse() error { } if m.p == "" { - m.tb = C.mnt_new_table_from_file(C.F_MOUNTINFO_PATH) + m.tb = C.mnt_new_table_from_file(C.HAKUREI_MOUNTINFO_PATH) } else { name := C.CString(m.p) m.tb = C.mnt_new_table_from_file(name) diff --git a/test/sandbox/mount_test.go b/test/sandbox/mount_test.go index 3591e5c3..6a8fc7a2 100644 --- a/test/sandbox/mount_test.go +++ b/test/sandbox/mount_test.go @@ -5,7 +5,7 @@ import ( "path" "testing" - "git.gensokyo.uk/security/fortify/test/sandbox" + "git.gensokyo.uk/security/hakurei/test/sandbox" ) func TestMountinfo(t *testing.T) { diff --git a/test/sandbox/test.py b/test/sandbox/test.py index 51a4c86f..93fb8247 100644 --- a/test/sandbox/test.py +++ b/test/sandbox/test.py @@ -28,27 +28,27 @@ def swaymsg(command: str = "", succeed=True, type="command"): start_all() machine.wait_for_unit("multi-user.target") -# To check fortify's version: -print(machine.succeed("sudo -u alice -i fortify version")) +# To check hakurei's version: +print(machine.succeed("sudo -u alice -i hakurei version")) # Wait for Sway to complete startup: machine.wait_for_file("/run/user/1000/wayland-1") machine.wait_for_file("/tmp/sway-ipc.sock") # Check seccomp outcome: -swaymsg("exec fortify run cat") +swaymsg("exec hakurei run cat") pid = int(machine.wait_until_succeeds("pgrep -U 1000000 -x cat", timeout=5)) -print(machine.succeed(f"fortify-test filter {pid} c698b081ff957afe17a6d94374537d37f2a63f6f9dd75da7546542407a9e32476ebda3312ba7785d7f618542bcfaf27ca27dcc2dddba852069d28bcfe8cad39a &>/dev/stdout", timeout=5)) +print(machine.succeed(f"hakurei-test filter {pid} c698b081ff957afe17a6d94374537d37f2a63f6f9dd75da7546542407a9e32476ebda3312ba7785d7f618542bcfaf27ca27dcc2dddba852069d28bcfe8cad39a &>/dev/stdout", timeout=5)) machine.succeed(f"kill -TERM {pid}") # Verify capabilities/securebits in user namespace: -print(machine.succeed("sudo -u alice -i fortify run capsh --print")) -print(machine.succeed("sudo -u alice -i fortify run capsh --has-no-new-privs")) -print(machine.fail("sudo -u alice -i fortify run capsh --has-a=CAP_SYS_ADMIN")) -print(machine.fail("sudo -u alice -i fortify run capsh --has-b=CAP_SYS_ADMIN")) -print(machine.fail("sudo -u alice -i fortify run capsh --has-i=CAP_SYS_ADMIN")) -print(machine.fail("sudo -u alice -i fortify run capsh --has-p=CAP_SYS_ADMIN")) -print(machine.fail("sudo -u alice -i fortify run umount -R /dev")) +print(machine.succeed("sudo -u alice -i hakurei run capsh --print")) +print(machine.succeed("sudo -u alice -i hakurei run capsh --has-no-new-privs")) +print(machine.fail("sudo -u alice -i hakurei run capsh --has-a=CAP_SYS_ADMIN")) +print(machine.fail("sudo -u alice -i hakurei run capsh --has-b=CAP_SYS_ADMIN")) +print(machine.fail("sudo -u alice -i hakurei run capsh --has-i=CAP_SYS_ADMIN")) +print(machine.fail("sudo -u alice -i hakurei run capsh --has-p=CAP_SYS_ADMIN")) +print(machine.fail("sudo -u alice -i hakurei run umount -R /dev")) # Check sandbox outcome: check_offset = 0 @@ -56,7 +56,7 @@ def check_sandbox(name): global check_offset check_offset += 1 swaymsg(f"exec script /dev/null -E always -qec check-sandbox-{name}") - machine.wait_for_file(f"/tmp/fortify.1000/tmpdir/{check_offset}/sandbox-ok", timeout=15) + machine.wait_for_file(f"/tmp/hakurei.1000/tmpdir/{check_offset}/sandbox-ok", timeout=15) check_sandbox("preset") @@ -68,5 +68,5 @@ check_sandbox("device") swaymsg("exit", succeed=False) machine.wait_for_file("/tmp/sway-exit-ok") -# Print fortify runDir contents: -print(machine.succeed("find /run/user/1000/fortify")) +# Print hakurei runDir contents: +print(machine.succeed("find /run/user/1000/hakurei")) diff --git a/test/sandbox/tool/main.go b/test/sandbox/tool/main.go index 4c639b28..a9a9ee04 100644 --- a/test/sandbox/tool/main.go +++ b/test/sandbox/tool/main.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "git.gensokyo.uk/security/fortify/test/sandbox" + "git.gensokyo.uk/security/hakurei/test/sandbox" ) func main() { diff --git a/test/sandbox/tool/package.nix b/test/sandbox/tool/package.nix index 7cc3472e..d003cfa8 100644 --- a/test/sandbox/tool/package.nix +++ b/test/sandbox/tool/package.nix @@ -21,10 +21,10 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; preBuild = '' - go mod init git.gensokyo.uk/security/fortify/test/sandbox >& /dev/null + go mod init git.gensokyo.uk/security/hakurei/test/sandbox >& /dev/null ''; postInstall = '' - mv $out/bin/tool $out/bin/fortify-test + mv $out/bin/tool $out/bin/hakurei-test ''; } diff --git a/test/test.py b/test/test.py index 4b67b6fd..1636164b 100644 --- a/test/test.py +++ b/test/test.py @@ -47,15 +47,15 @@ def wait_for_window(pattern): def collect_state_ui(name): - swaymsg(f"exec fortify ps > '/tmp/{name}.ps'") + swaymsg(f"exec hakurei ps > '/tmp/{name}.ps'") machine.copy_from_vm(f"/tmp/{name}.ps", "") - swaymsg(f"exec fortify --json ps > '/tmp/{name}.json'") + swaymsg(f"exec hakurei --json ps > '/tmp/{name}.json'") machine.copy_from_vm(f"/tmp/{name}.json", "") machine.screenshot(name) def check_state(name, enablements): - instances = json.loads(machine.succeed("sudo -u alice -i XDG_RUNTIME_DIR=/run/user/1000 fortify --json ps")) + instances = json.loads(machine.succeed("sudo -u alice -i XDG_RUNTIME_DIR=/run/user/1000 hakurei --json ps")) if len(instances) != 1: raise Exception(f"unexpected state length {len(instances)}") instance = next(iter(instances.values())) @@ -73,36 +73,36 @@ def check_state(name, enablements): raise Exception(f"unexpected enablements {instance['config']['enablements']}") -def fortify(command): - swaymsg(f"exec fortify {command}") +def hakurei(command): + swaymsg(f"exec hakurei {command}") start_all() machine.wait_for_unit("multi-user.target") -# To check fortify's version: -print(machine.succeed("sudo -u alice -i fortify version")) +# To check hakurei's version: +print(machine.succeed("sudo -u alice -i hakurei version")) # Wait for Sway to complete startup: machine.wait_for_file("/run/user/1000/wayland-1") machine.wait_for_file("/tmp/sway-ipc.sock") -# Run fortify Go tests outside of nix build in the background: -swaymsg("exec fortify-test") +# Run hakurei Go tests outside of nix build in the background: +swaymsg("exec hakurei-test") # Deny unmapped uid: -denyOutput = machine.fail("sudo -u untrusted -i fortify run &>/dev/stdout") +denyOutput = machine.fail("sudo -u untrusted -i hakurei run &>/dev/stdout") print(denyOutput) -denyOutputVerbose = machine.fail("sudo -u untrusted -i fortify -v run &>/dev/stdout") +denyOutputVerbose = machine.fail("sudo -u untrusted -i hakurei -v run &>/dev/stdout") print(denyOutputVerbose) -# Fail direct fsu call: -print(machine.fail("sudo -u alice -i fsu")) +# Fail direct hsu call: +print(machine.fail("sudo -u alice -i hsu")) # Verify PrintBaseError behaviour: -if denyOutput != "fsu: uid 1001 is not in the fsurc file\n": +if denyOutput != "hsu: uid 1001 is not in the hsurc file\n": raise Exception(f"unexpected deny output:\n{denyOutput}") -if denyOutputVerbose != "fsu: uid 1001 is not in the fsurc file\nfortify: *cannot obtain uid from fsu: permission denied\n": +if denyOutputVerbose != "hsu: uid 1001 is not in the hsurc file\nhakurei: *cannot obtain uid from setuid wrapper: permission denied\n": raise Exception(f"unexpected deny verbose output:\n{denyOutputVerbose}") check_offset = 0 @@ -113,15 +113,15 @@ def aid(offset): def tmpdir_path(offset, name): - return f"/tmp/fortify.1000/tmpdir/{aid(offset)}/{name}" + return f"/tmp/hakurei.1000/tmpdir/{aid(offset)}/{name}" -# Start fortify permissive defaults outside Wayland session: -print(machine.succeed("sudo -u alice -i fortify -v run -a 0 touch /tmp/pd-bare-ok")) -machine.wait_for_file("/tmp/fortify.1000/tmpdir/0/pd-bare-ok", timeout=5) +# Start hakurei permissive defaults outside Wayland session: +print(machine.succeed("sudo -u alice -i hakurei -v run -a 0 touch /tmp/pd-bare-ok")) +machine.wait_for_file("/tmp/hakurei.1000/tmpdir/0/pd-bare-ok", timeout=5) # Verify silent output permissive defaults: -output = machine.succeed("sudo -u alice -i fortify run -a 0 true &>/dev/stdout") +output = machine.succeed("sudo -u alice -i hakurei run -a 0 true &>/dev/stdout") if output != "": raise Exception(f"unexpected output\n{output}") @@ -130,12 +130,12 @@ def silent_output_interrupt(flags): swaymsg("exec foot") wait_for_window("alice@machine") # aid 0 does not have home-manager - machine.send_chars(f"exec fortify run {flags}-a 0 sh -c 'export PATH=/run/current-system/sw/bin:$PATH && touch /tmp/pd-silent-ready && sleep infinity' &>/tmp/pd-silent\n") - machine.wait_for_file("/tmp/fortify.1000/tmpdir/0/pd-silent-ready", timeout=15) - machine.succeed("rm /tmp/fortify.1000/tmpdir/0/pd-silent-ready") + machine.send_chars(f"exec hakurei run {flags}-a 0 sh -c 'export PATH=/run/current-system/sw/bin:$PATH && touch /tmp/pd-silent-ready && sleep infinity' &>/tmp/pd-silent\n") + machine.wait_for_file("/tmp/hakurei.1000/tmpdir/0/pd-silent-ready", timeout=15) + machine.succeed("rm /tmp/hakurei.1000/tmpdir/0/pd-silent-ready") machine.send_key("ctrl-c") machine.wait_until_fails("pgrep foot", timeout=5) - machine.wait_until_fails(f"pgrep -u alice -f 'fortify run {flags}-a 0 '", timeout=5) + machine.wait_until_fails(f"pgrep -u alice -f 'hakurei run {flags}-a 0 '", timeout=5) output = machine.succeed("cat /tmp/pd-silent && rm /tmp/pd-silent") if output != "": raise Exception(f"unexpected output\n{output}") @@ -146,10 +146,10 @@ silent_output_interrupt("--dbus ") # this one is especially painful as it mainta silent_output_interrupt("--wayland -X --dbus --pulse ") # Verify graceful failure on bad Wayland display name: -print(machine.fail("sudo -u alice -i fortify -v run --wayland true")) +print(machine.fail("sudo -u alice -i hakurei -v run --wayland true")) -# Start fortify permissive defaults within Wayland session: -fortify('-v run --wayland --dbus notify-send -a "NixOS Tests" "Test notification" "Notification from within sandbox." && touch /tmp/dbus-ok') +# Start hakurei permissive defaults within Wayland session: +hakurei('-v run --wayland --dbus notify-send -a "NixOS Tests" "Test notification" "Notification from within sandbox." && touch /tmp/dbus-ok') machine.wait_for_file("/tmp/dbus-ok", timeout=15) collect_state_ui("dbus_notify_exited") # not in pid namespace, verify termination @@ -157,10 +157,10 @@ machine.wait_until_fails("pgrep xdg-dbus-proxy") machine.succeed("pkill -9 mako") # Check revert type selection: -fortify("-v run --wayland -X --dbus --pulse -u p0 foot && touch /tmp/p0-exit-ok") +hakurei("-v run --wayland -X --dbus --pulse -u p0 foot && touch /tmp/p0-exit-ok") wait_for_window("p0@machine") print(machine.succeed("getfacl --absolute-names --omit-header --numeric /run/user/1000 | grep 1000000")) -fortify("-v run --wayland -X --dbus --pulse -u p1 foot && touch /tmp/p1-exit-ok") +hakurei("-v run --wayland -X --dbus --pulse -u p1 foot && touch /tmp/p1-exit-ok") wait_for_window("p1@machine") print(machine.succeed("getfacl --absolute-names --omit-header --numeric /run/user/1000 | grep 1000000")) machine.send_chars("exit\n") @@ -174,7 +174,7 @@ machine.fail("getfacl --absolute-names --omit-header --numeric /run/user/1000 | # Check interrupt shim behaviour: swaymsg("exec sh -c 'ne-foot; echo -n $? > /tmp/monitor-exit-code'") wait_for_window(f"u0_a{aid(0)}@machine") -machine.succeed("pkill -INT -f 'fortify -v app '") +machine.succeed("pkill -INT -f 'hakurei -v app '") machine.wait_until_fails("pgrep foot", timeout=5) machine.wait_for_file("/tmp/monitor-exit-code") interrupt_exit_code = int(machine.succeed("cat /tmp/monitor-exit-code")) @@ -194,7 +194,7 @@ machine.send_chars("exit\n") machine.wait_until_fails("pgrep foot", timeout=5) machine.fail(f"getfacl --absolute-names --omit-header --numeric /run/user/1000 | grep {aid(0) + 1000000}", timeout=5) -# Test PulseAudio (fortify does not support PipeWire yet): +# Test PulseAudio (hakurei does not support PipeWire yet): swaymsg("exec pa-foot") wait_for_window(f"u0_a{aid(1)}@machine") machine.send_chars("clear; pactl info && touch /tmp/pulse-ok\n") @@ -237,7 +237,7 @@ wait_for_window(f"u0_a{aid(0)}@machine") machine.send_chars("clear; wayland-info && touch /tmp/term-ok\n") machine.wait_for_file(tmpdir_path(0, "term-ok"), timeout=15) machine.send_key("alt-h") -machine.send_chars("clear; fortify show $(fortify ps --short) && touch /tmp/ps-show-ok && exec cat\n") +machine.send_chars("clear; hakurei show $(hakurei ps --short) && touch /tmp/ps-show-ok && exec cat\n") machine.wait_for_file("/tmp/ps-show-ok", timeout=5) collect_state_ui("foot_wayland_term") check_state("ne-foot", 1) @@ -251,10 +251,10 @@ machine.wait_until_fails("pgrep foot", timeout=5) swaymsg("exit", succeed=False) machine.wait_for_file("/tmp/sway-exit-ok") -# Print fortify runDir contents: -print(machine.succeed("find /run/user/1000/fortify")) +# Print hakurei runDir contents: +print(machine.succeed("find /run/user/1000/hakurei")) # Verify go test status: -machine.wait_for_file("/tmp/fortify-test-done") -print(machine.succeed("cat /tmp/fortify-test.log")) -machine.wait_for_file("/tmp/fortify-test-ok", timeout=2) +machine.wait_for_file("/tmp/hakurei-test-done") +print(machine.succeed("cat /tmp/hakurei-test.log")) +machine.wait_for_file("/tmp/hakurei-test-ok", timeout=2) |
