diff --git a/lib/jail.nix b/lib/jail.nix index 313ecd2..cca88da 100644 --- a/lib/jail.nix +++ b/lib/jail.nix @@ -111,8 +111,18 @@ let } ) - # forward man pages - (jailed: if exe ? man then jailed // { inherit (exe) man; } else jailed) + # Add additional properties on the jailed derivation + ( + jailed: + jailed + # forward man pages + // lib.optionalAttrs (exe ? man) { inherit (exe) man; } + + # forward `override` + // lib.optionalAttrs (exe ? override) { + override = overrideFn: jail name (exe.override overrideFn) permissions; + } + ) ] ); diff --git a/tests/spec/JailSpec.hs b/tests/spec/JailSpec.hs index de88545..1427e1c 100644 --- a/tests/spec/JailSpec.hs +++ b/tests/spec/JailSpec.hs @@ -29,6 +29,46 @@ spec = parallel $ inTestM $ do [i| jail "test" (sh ''echo -n "''${MY_ENV_VAR-unset}"'') [] |] `shouldOutput` "unset" + describe "forwarding package overrides to the jailed derivation" $ do + -- This is a nix expression of a package that prints out the value of an + -- overridable `run`: + let overrideablePackage = + [i| pkgs.callPackage (opts: sh opts.run) { run = "printf unchanged"; } |] + + it "successfully wraps overridable packages" $ do + [i| + let some-pkg = #{overrideablePackage}; in + jail "some-pkg" some-pkg [] + |] + `shouldOutput` "unchanged" + + it "forwards overrides to the underlying package" $ do + [i| + let + some-pkg = #{overrideablePackage}; + jailed-some-pkg = jail "some-pkg" some-pkg []; + in + jailed-some-pkg.override { run = "printf 'new message!'"; } + |] + `shouldOutput` "new message!" + + it "correctly sets the passed combinators on the overridden package" $ do + [i| + let + some-pkg = #{overrideablePackage}; + jailed-some-pkg = jail "some-pkg" some-pkg (c: [ + (c.write-text "/foo" "foo contents") + ]); + in + jailed-some-pkg.override { run = "cat /foo"; } + |] + `shouldOutput` "foo contents" + + it "does not set `override` if the jailed package did not have it" $ do + jailHasOverride <- + evalNixExpr [i| (jail "not-overridable" (sh "") []) ? override |] + liftIO $ jailHasOverride `shouldBe` False + describe "advanced configuration" $ do it "allows overriding base permissions shared across all jails" $ do tmpDir <- getTestDir