Move fake-passwd into combinators

This commit is contained in:
Alex David 2025-08-07 17:26:51 -07:00
commit d8500ab273
4 changed files with 46 additions and 14 deletions

View file

@ -11,17 +11,5 @@ pkgs: let helpers = import ./helpers.nix pkgs; in combinators: with combinators;
(fwd-env "LANG") (fwd-env "LANG")
(fwd-env "HOME") (fwd-env "HOME")
(fwd-env "TERM") (fwd-env "TERM")
fake-passwd
(add-runtime ''
if [ ! -e ${helpers.dataDirSubPath "passwd"} ] || [ ! -e ${helpers.dataDirSubPath "group"} ]; then
NOLOGIN=${pkgs.shadow}/bin/nologin
mkdir -p ${helpers.dataDir}
echo "root:x:0:0:System administrator:/root:$NOLOGIN" > ${helpers.dataDirSubPath "passwd"}
echo "$(id -un):x:$(id -u):$(id -g)::$HOME:$NOLOGIN" >> ${helpers.dataDirSubPath "passwd"}
echo "root:x:0:" > ${helpers.dataDirSubPath "group"}
echo "$(id -gn):x:$(id -g):" >> ${helpers.dataDirSubPath "group"}
fi
'')
(ro-bind (noescape (helpers.dataDirSubPath "passwd")) "/etc/passwd")
(ro-bind (noescape (helpers.dataDirSubPath "group")) "/etc/group")
] ]

View file

@ -230,6 +230,37 @@ in rec {
; ;
}; };
fake-passwd = {
sig = "Permission";
includedInBasePermissions = true;
doc = ''
Generates and mounts fake `/etc/passwd` and `/etc/group` files in the jail.
The fake `/etc/passwd` and `/etc/group` files contains a root user, and
forward the calling user's user id, username, group id and group name.
If you do not want to hide the users and groups that exist on your system,
you may consider just bind mounting `/etc/passwd` and `/etc/group` inside
the jail instead.
'';
__functor = _:
compose [
(add-runtime ''
if [ ! -e ${helpers.dataDirSubPath "passwd"} ] || [ ! -e ${helpers.dataDirSubPath "group"} ]; then
NOLOGIN=${pkgs.shadow}/bin/nologin
mkdir -p ${helpers.dataDir}
echo "root:x:0:0:System administrator:/root:$NOLOGIN" > ${helpers.dataDirSubPath "passwd"}
echo "$(id -un):x:$(id -u):$(id -g)::$HOME:$NOLOGIN" >> ${helpers.dataDirSubPath "passwd"}
echo "root:x:0:" > ${helpers.dataDirSubPath "group"}
echo "$(id -gn):x:$(id -g):" >> ${helpers.dataDirSubPath "group"}
fi
'')
(ro-bind (noescape (helpers.dataDirSubPath "passwd")) "/etc/passwd")
(ro-bind (noescape (helpers.dataDirSubPath "group")) "/etc/group")
]
;
};
wrap-entry = { wrap-entry = {
sig = "(String -> String) -> Permission"; sig = "(String -> String) -> Permission";
doc = '' doc = ''

View file

@ -54,7 +54,17 @@
funciton, as well as funciton, as well as
[`basePermissions`](../advanced-configuration/#basepermissions). [`basePermissions`](../advanced-configuration/#basepermissions).
${formatSection (v: !(v ? deprecated))} ${formatSection (v: !(v ? deprecated || v ? includedInBasePermissions))}
${hr}
## Default Included Combinators
The following combinators are enabled by default, and do not need to be
explicitly added to your jails unless you [override
`basePermissions`](../advanced-configuration/#basepermissions).
${formatSection (v: v ? includedInBasePermissions)}
${hr} ${hr}

View file

@ -43,6 +43,9 @@ inherit by default. This configuration option allows you to override these.
The goal of the base permissions are to provide a reasonably secure default The goal of the base permissions are to provide a reasonably secure default
with enough permissions to have most software behave correctly. with enough permissions to have most software behave correctly.
If you override this, you may want to take a look at the [default included
combinators](../combinators/#default-included-combinators).
Example: Example:
```nix ```nix
jail = jail-nix.lib.extend { jail = jail-nix.lib.extend {