From 98a6bd032c676b718c9fa26cc60a85eae92afd62 Mon Sep 17 00:00:00 2001 From: Alex David Date: Mon, 10 Nov 2025 11:50:37 -0800 Subject: [PATCH] Add `reset` combinator --- lib/combinators.nix | 1 + lib/combinators/reset.nix | 28 ++++++++++++++++++++++++++++ lib/jail.nix | 1 + tests/spec/CombinatorsSpec.hs | 23 +++++++++++++++++++++++ 4 files changed, 53 insertions(+) create mode 100644 lib/combinators/reset.nix diff --git a/lib/combinators.nix b/lib/combinators.nix index 4d984f0..c187804 100644 --- a/lib/combinators.nix +++ b/lib/combinators.nix @@ -51,6 +51,7 @@ let readonly-runtime-args = ./combinators/readonly-runtime-args.nix; readwrite = ./combinators/readwrite.nix; readwrite-runtime-args = ./combinators/readwrite-runtime-args.nix; + reset = ./combinators/reset.nix; ro-bind = ./combinators/ro-bind.nix; runtime-deep-ro-bind = ./combinators/runtime-deep-ro-bind.nix; rw-bind = ./combinators/rw-bind.nix; diff --git a/lib/combinators/reset.nix b/lib/combinators/reset.nix new file mode 100644 index 0000000..fa2f73c --- /dev/null +++ b/lib/combinators/reset.nix @@ -0,0 +1,28 @@ +_: { + sig = "Permission"; + doc = '' + Resets the jail state back to the initial empty state. + + All permissions before this one (including ones set in + [`basePermissions`](advanced-configuration.md#basepermissions)) are + removed. + + This is useful if you have some permissions set in + [`basePermissions`](advanced-configuration.md#basepermissions) that you + want for most of your jails, but want to remove them in a one-off jail. + + Example: + ```nix + jail "some-package" some-package (combinators: with combinators; [ + # First, use reset to remove the base combinators: + reset + + # Then, re-apply the base combinators you want: + base + bind-nix-store-runtime-closure + fake-passwd + ]) + ``` + ''; + impl = state: state.initialState; +} diff --git a/lib/jail.nix b/lib/jail.nix index 182eca6..2dd507c 100644 --- a/lib/jail.nix +++ b/lib/jail.nix @@ -45,6 +45,7 @@ let additionalRuntimeClosures = [ ]; # See bind-nix-store-runtime-closure dbusPermissions = [ ]; # See dbus combinator seccompPermissions = [ ]; # See add-seccomp combinator + inherit initialState; # See reset combinator }; in lib.pipe initialState ( diff --git a/tests/spec/CombinatorsSpec.hs b/tests/spec/CombinatorsSpec.hs index 46e165c..51c2c69 100644 --- a/tests/spec/CombinatorsSpec.hs +++ b/tests/spec/CombinatorsSpec.hs @@ -213,6 +213,29 @@ spec = parallel $ inTestM $ do ]) |] + describe "reset" $ do + it "clears all set permissions - including ones set in base permissions" $ do + [i| + let + jail' = jail-nix.extend { + inherit pkgs; + basePermissions = c: [ + c.base + (c.readonly "/nix/store") + (c.write-text "/test-from-base-permissions" "") + ]; + }; + in + jail' "test" (sh "echo /test-from-*") (c: [ + (c.write-text "/test-from-pre-reset-jail-permissions" "") + c.reset + c.base + (c.readonly "/nix/store") + (c.write-text "/test-from-post-reset-jail-permissions" "") + ]) + |] + `shouldOutput` "/test-from-post-reset-jail-permissions\n" + describe "set-argv" $ do it "overrides argv passed to the jailed program" $ do [i|