diff options
| -rw-r--r-- | cmd/hsu/main.go | 24 | ||||
| -rw-r--r-- | test/interactive/trace.nix | 9 | ||||
| -rw-r--r-- | test/test.py | 6 |
3 files changed, 13 insertions, 26 deletions
diff --git a/cmd/hsu/main.go b/cmd/hsu/main.go index 2acc8d4c..2a4eb6da 100644 --- a/cmd/hsu/main.go +++ b/cmd/hsu/main.go @@ -21,15 +21,6 @@ // following paragraphs are considered an internal detail and not covered by the // compatibility promise. // -// After checking credentials, hsu checks via /proc/ the absolute pathname of -// its parent process, and fails if it does not match the hakurei pathname set -// at link time. This is not a security feature: the priv-side is considered -// trusted, and this feature makes no attempt to address the racy nature of -// querying /proc/, or debuggers attached to the parent process. Instead, this -// aims to discourage misuse and reduce confusion if the user accidentally -// stumbles upon this program. It also prevents accidental use of the incorrect -// installation of hsu in some environments. -// // Since target container environment variables are set up in shim via the // [container] infrastructure, the environment is used for parameters from the // parent process. @@ -62,7 +53,6 @@ import ( "runtime" "slices" "strconv" - "strings" "syscall" ) @@ -107,18 +97,6 @@ func main() { return } - var toolPath string - pexe := filepath.Join("/proc", strconv.Itoa(os.Getppid()), "exe") - if p, err := os.Readlink(pexe); err != nil { - log.Fatalf("cannot read parent executable path: %v", err) - } else if strings.HasSuffix(p, " (deleted)") { - log.Fatal("hakurei executable has been deleted") - } else if p != hakureiPath { - log.Fatal("this program must be started by hakurei") - } else { - toolPath = p - } - // refuse to run if hsurc is not protected correctly if s, err := os.Stat(hsuConfPath); err != nil { log.Fatal(err) @@ -205,7 +183,7 @@ func main() { log.Fatalf("cannot set no_new_privs flag: %s", errno.Error()) } - if err := syscall.Exec(toolPath, []string{ + if err := syscall.Exec(hakureiPath, []string{ "hakurei", "shim", }, []string{ diff --git a/test/interactive/trace.nix b/test/interactive/trace.nix index e307361f..b9ef872c 100644 --- a/test/interactive/trace.nix +++ b/test/interactive/trace.nix @@ -22,7 +22,14 @@ in { name = "funcgraph-retval"; patch = null; - structuredExtraConfig.FUNCTION_GRAPH_RETVAL = lib.kernel.yes; + structuredExtraConfig = with lib.kernel; { + FUNCTION_GRAPH_RETVAL = yes; + + RUST = lib.mkForce unset; + DRM_NOVA = lib.mkForce unset; + DRM_PANIC_SCREEN_QR_CODE = lib.mkForce unset; + NOVA_CORE = lib.mkForce unset; + }; } ]; } diff --git a/test/test.py b/test/test.py index a9e60d8b..05001bdf 100644 --- a/test/test.py +++ b/test/test.py @@ -92,8 +92,10 @@ print(denyOutput) denyOutputVerbose = machine.fail("sudo -u untrusted -i hakurei -v exec &>/dev/stdout") print(denyOutputVerbose) -# Fail direct hsu call: -print(machine.fail("sudo -u alice -i hsu")) +# Direct hsu call: +userid = machine.succeed("sudo -u alice -i hsu") +if userid != "0": + raise Exception(f"unexpected userid: {userid}") # Verify hsu fault behaviour: if denyOutput != "hsu: uid 1001 is not in the hsurc file\n": |