make-sandboxed: migrate to binary wrapper
This commit is contained in:
parent
4839a40205
commit
e82feb9f71
@ -4,7 +4,7 @@
|
||||
buildPackages,
|
||||
file,
|
||||
gnugrep,
|
||||
makeWrapper,
|
||||
makeBinaryWrapper,
|
||||
runCommandLocal,
|
||||
runtimeShell,
|
||||
sanebox,
|
||||
@ -56,10 +56,12 @@ let
|
||||
# TODO: handle multi-output packages; until then, squash lib into the main output, particularly for `libexec`.
|
||||
# (this line here only affects `inplace` style wrapping)
|
||||
outputs = lib.remove "lib" (unwrapped.outputs or [ "out" ]);
|
||||
nativeBuildInputs = (unwrapped.nativeBuildInputs or []) ++ [
|
||||
nativeBuildInputs = [
|
||||
# the ordering here is specific: inject our deps BEFORE the unwrapped program's
|
||||
# so that the unwrapped's take precendence and we limit interference (e.g. makeWrapper impl)
|
||||
fakeSaneSandboxed
|
||||
makeWrapper
|
||||
];
|
||||
makeBinaryWrapper
|
||||
] ++ (unwrapped.nativeBuildInputs or []);
|
||||
disallowedReferences = (unwrapped.disallowedReferences or []) ++ [
|
||||
# the fake sandbox gates itself behind SANEBOX_DISABLE, so if it did end up deployed
|
||||
# then it wouldn't permit anything not already permitted. but it would still be annoying.
|
||||
@ -71,14 +73,25 @@ let
|
||||
# my programs refer to sanebox by name, not path, which triggers an over-eager assertion in nixpkgs (so, mask that)
|
||||
:
|
||||
}
|
||||
makeDocumentedCWrapper() {
|
||||
# this is identical to nixpkgs' implementation, only replace execv with execvp, the latter which looks for the executable on PATH.
|
||||
local src docs
|
||||
src=$(makeCWrapper "$@")
|
||||
src="''${src/return execv(/return execvp(}"
|
||||
docs=$(docstring "$@")
|
||||
printf '%s\n\n' "$src"
|
||||
printf '%s\n' "$docs"
|
||||
}
|
||||
|
||||
sandboxWrap() {
|
||||
local _dir="$1"
|
||||
local _name="$2"
|
||||
|
||||
# N.B.: unlike `makeWrapper`, we place the unwrapped binary in a subdirectory and *preserve its name*.
|
||||
# N.B.: unlike stock `wrapProgram`, we place the unwrapped binary in a subdirectory and *preserve its name*.
|
||||
# the upside of this is that for applications which read "$0" to decide what to do (e.g. busybox, git)
|
||||
# they work as expected without any special hacks.
|
||||
# if desired, makeWrapper-style naming could be achieved by leveraging `exec -a <original_name>`.
|
||||
# if desired, makeWrapper-style naming could be achieved by leveraging `exec -a <original_name>`
|
||||
# or `make-wrapper --inherit-argv0`
|
||||
mkdir -p "$_dir/.sandboxed"
|
||||
if [[ "$(readlink $_dir/$_name)" =~ ^\.\./ ]]; then
|
||||
# relative links which ascend a directory (into a non-bin/ directory)
|
||||
@ -88,7 +101,7 @@ let
|
||||
else
|
||||
mv "$_dir/$_name" "$_dir/.sandboxed/"
|
||||
fi
|
||||
makeShellWrapper ${sanebox'} "$_dir/$_name" --inherit-argv0 ${lib.escapeShellArgs (lib.flatten (builtins.map (f: [ "--add-flags" f ]) extraSandboxArgs))} --add-flags "$_dir/.sandboxed/$_name"
|
||||
makeBinaryWrapper ${sanebox'} "$_dir/$_name" ${lib.escapeShellArgs (lib.flatten (builtins.map (f: [ "--add-flags" f ]) extraSandboxArgs))} --add-flags "$_dir/.sandboxed/$_name"
|
||||
}
|
||||
|
||||
crawlAndWrap() {
|
||||
|
Loading…
Reference in New Issue
Block a user