From 06c72101273b74f0a259cea23252a414922ab46b Mon Sep 17 00:00:00 2001 From: Alex David Date: Thu, 7 Aug 2025 16:26:18 -0700 Subject: [PATCH] Refactor path handling * Moves the default coreutils path into base permissions to allow override. * Makes paths defined *later* in the permissions list appear *earlier* which should have the effect of later calls to `add-path` override binaries provided by earlier ones. * Makes the `path` variable on state a list rather than a string. --- lib/base-permissions.nix | 1 + lib/combinators.nix | 2 +- lib/jail.nix | 4 ++-- tests/test-cases.nix | 5 +++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/base-permissions.nix b/lib/base-permissions.nix index 3c2bf3c..fc51198 100644 --- a/lib/base-permissions.nix +++ b/lib/base-permissions.nix @@ -5,6 +5,7 @@ pkgs: let helpers = import ./helpers.nix pkgs; in combinators: with combinators; (unsafe-add-raw-args "--tmpfs ~") (unsafe-add-raw-args "--clearenv") (unsafe-add-raw-args "--die-with-parent") + (add-pkg-deps [ pkgs.coreutils ]) (readonly "/nix/store") (readonly "/bin/sh") (fwd-env "LANG") diff --git a/lib/combinators.nix b/lib/combinators.nix index 47c4c48..5d55f01 100644 --- a/lib/combinators.nix +++ b/lib/combinators.nix @@ -147,7 +147,7 @@ in rec { Appends the passed string to `$PATH`. ''; __functor = _: - path: state: state // { path = "${state.path}:${path}"; } + path: state: state // { path = [ path ] ++ state.path; } ; }; diff --git a/lib/jail.nix b/lib/jail.nix index 9e3d0fa..d4ebee8 100644 --- a/lib/jail.nix +++ b/lib/jail.nix @@ -23,7 +23,7 @@ in { name = name; cmd = "${lib.getExe pkgs.bubblewrap}"; entry = if builtins.typeOf exe == "string" then lib.escapeShellArg exe else lib.getExe exe; - path = "${pkgs.coreutils}/bin"; + path = []; argv = "\"$@\""; runtime = ""; new-session = true; @@ -51,7 +51,7 @@ in { unsafe-add-raw-args ] s ) - (s: set-env "PATH" s.path s) + (s: if builtins.length s.path > 0 then set-env "PATH" (lib.concatStringsSep ":" s.path) s else s) (s: if s.new-session then unsafe-add-raw-args "--new-session" s else s) (s: lib.foldr (envVar: assert pkgs.lib.isValidPosixName envVar; diff --git a/tests/test-cases.nix b/tests/test-cases.nix index dd6338b..8452ea2 100644 --- a/tests/test-cases.nix +++ b/tests/test-cases.nix @@ -12,6 +12,7 @@ in { inherit pkgs; basePermissions = c: [ (c.readonly "/build/secret") + (c.add-pkg-deps [ pkgs.coreutils ]) (c.readonly "/nix/store") ]; }; @@ -48,13 +49,13 @@ in { (jail "test" (sh ''echo "$PATH"'') (c: [ (c.add-path "/some/new/path") ])) - "${defaultPath}:/some/new/path"; + "/some/new/path:${defaultPath}"; "combinators/add-pkg-deps" = assertStdout (jail "test" (sh ''echo "$PATH"'') (c: [ (c.add-pkg-deps [ pkgs.hello ]) ])) - "${defaultPath}:${pkgs.hello}/bin"; + "${pkgs.hello}/bin:${defaultPath}"; "combinators/bind-pkg" = assertStdout (jail "test" (sh "cat /foo") (c: [