From 275a1296e7dea89ebf81ec46aa2987f721533268 Mon Sep 17 00:00:00 2001 From: Alex David Date: Mon, 1 Sep 2025 19:19:48 -0700 Subject: [PATCH] Fix network combinator binding too many paths --- lib/combinators.nix | 86 +++++++++++++++++++++++++++++------ tests/spec/CombinatorsSpec.hs | 34 ++++++++++++++ website/flake.nix | 8 ++-- 3 files changed, 111 insertions(+), 17 deletions(-) diff --git a/lib/combinators.nix b/lib/combinators.nix index b01850d..4b83d55 100644 --- a/lib/combinators.nix +++ b/lib/combinators.nix @@ -457,6 +457,70 @@ in rec { ; }; + runtime-deep-ro-bind = { + sig = "String -> Permission"; + doc = '' + This is an internal (for now) combinator to bind a path at runtime in a + way. + + This is marked as internal which means it isn't publicly documented on + the website since this will likely change in the future. Feel free to + use, but a future update may break this combinator. + ''; + internal = true; + __functor = _: let + bindRuntimeHelperFunction = include-once "bindRuntimeHelperFunction" ( + add-runtime '' + function bindNixStoreClosure { + local NIX_STORE_PATH + NIX_STORE_PATH="$1" + while read -r P; do + RUNTIME_ARGS+=(--ro-bind "$P" "$P") + done <<< "$(${pkgs.nix}/bin/nix-store --query --requisites "$NIX_STORE_PATH")" + } + + function bindRuntime { + local MAX_DEPTH + local PATH_TO_BIND + MAX_DEPTH="$1" + PATH_TO_BIND="$2" + if ((MAX_DEPTH <= 0)); then + echo "jail.nix: bindRuntime hit max depth" >&2 + exit 1 + fi + if ! [ -e "$PATH_TO_BIND" ]; then + return + fi + case $(stat -c '%F' "$PATH_TO_BIND") in + 'regular file'|socket) + RUNTIME_ARGS+=(--ro-bind "$PATH_TO_BIND" "$PATH_TO_BIND") + ;; + directory) + for DIR_ENTRY in "$PATH_TO_BIND"/*; do + [ -e "$DIR_ENTRY" ] || continue + bindRuntime "$((MAX_DEPTH - 1))" "$DIR_ENTRY" + done + ;; + 'symbolic link') + LINK_PATH=$(realpath "$PATH_TO_BIND") + RUNTIME_ARGS+=(--symlink "$LINK_PATH" "$PATH_TO_BIND") + if [[ "$LINK_PATH" == /nix/store/* ]]; then + bindNixStoreClosure "$LINK_PATH" + fi + ;; + esac + } + '' + ); + in path: + compose [ + bindRuntimeHelperFunction + (add-runtime "bindRuntime 5 ${escape path}") + ] + ; + }; + + readonly = { sig = "String -> Permission"; doc = '' @@ -676,7 +740,7 @@ in rec { pulse pipewire wayland - (readonly (noescape "/etc/fonts")) + (runtime-deep-ro-bind (noescape "/etc/fonts")) (readonly (noescape "~/.config/dconf")) (fwd-env "XDG_RUNTIME_DIR") (fwd-env "XDG_DATA_DIRS") @@ -794,8 +858,8 @@ in rec { __functor = _: include-once "gpu" (compose [ - (readwrite (noescape "/run/opengl-driver")) - (unsafe-add-raw-args "--bind-try /run/opengl-driver-32 /run/opengl-driver-32") + (runtime-deep-ro-bind (noescape "/run/opengl-driver")) + (runtime-deep-ro-bind (noescape "/run/opengl-driver-32")) (readonly (noescape "/sys")) (unsafe-add-raw-args "--dev-bind /dev/dri /dev/dri") ]) @@ -809,11 +873,7 @@ in rec { ''; __functor = _: include-once "time-zone" - (compose [ - (unsafe-add-raw-args "--symlink \"$(readlink /etc/localtime)\" /etc/localtime") - (readonly "/etc/static/zoneinfo") - (readonly "/etc/zoneinfo") - ]) + (runtime-deep-ro-bind "/etc/localtime") ; }; @@ -832,12 +892,10 @@ in rec { (state: compose [ time-zone (share-ns "net") - (readonly "/etc/hosts") - (readonly "/etc/nsswitch.conf") - (readonly "/etc/resolv.conf") - (readonly "/etc/ssl") - (readonly "/etc/static/nsswitch.conf") - (readonly "/etc/static/ssl") + (runtime-deep-ro-bind "/etc/hosts") + (runtime-deep-ro-bind "/etc/nsswitch.conf") + (runtime-deep-ro-bind "/etc/resolv.conf") + (runtime-deep-ro-bind "/etc/ssl") (write-text "/etc/hostname" "${state.hostname}\n") (unsafe-add-raw-args "--hostname ${escape state.hostname}") ] state) diff --git a/tests/spec/CombinatorsSpec.hs b/tests/spec/CombinatorsSpec.hs index f217f7a..1e35061 100644 --- a/tests/spec/CombinatorsSpec.hs +++ b/tests/spec/CombinatorsSpec.hs @@ -63,6 +63,40 @@ spec = parallel $ inTestM $ do |] `shouldOutput` "secret\n" + describe "network" $ do + it "grants network access to the jailed program" $ do + out <- + runNixDrv + [i| + jail "test" (sh ''curl https://example.org'') (c: [ + (c.add-pkg-deps [ pkgs.curl ]) + c.network + ]) + |] + liftIO $ out `shouldContain` "

Example Domain

" + + it "does not add too many bwrap args" $ do + out <- + runNixDrv + [i| + let + jail' = jail-nix.extend { + inherit pkgs; + bubblewrapPackage = pkgs.writeShellApplication { + name = "my-bubblewrap"; + text = '' + # A version of bwrap that just prints how many arguments it + # was passed instead of actually running a jail. + echo -n "$#" + ''; + }; + basePermissions = null; + }; + in + jail' "test" "unused" (c: [ c.network ]) + |] + liftIO $ (read out :: Int) `shouldSatisfy` (< 100) + describe "readonly-from-path-var" $ do forM_ [":", " "] $ \separator -> describe ("with separator \"" <> separator <> "\"") $ do diff --git a/website/flake.nix b/website/flake.nix index fe32655..424f84a 100644 --- a/website/flake.nix +++ b/website/flake.nix @@ -44,6 +44,8 @@ ]; hr = ''
''; + + is = flag: combinator: combinator ? ${flag} && combinator.${flag}; in '' # Combinators @@ -61,7 +63,7 @@ ${hr} - ${formatSection (v: !(v ? deprecated || v ? includedInBasePermissions))} + ${formatSection (v: !(is "deprecated" v || is "includedInBasePermissions" v || is "internal" v))} ${hr} @@ -71,7 +73,7 @@ explicitly added to your jails unless you [override `basePermissions`](advanced-configuration.md#basepermissions). - ${formatSection (v: v ? includedInBasePermissions)} + ${formatSection (is "includedInBasePermissions")} ${hr} @@ -80,7 +82,7 @@ The following combinators have been deprecated, and may be removed in the future. - ${formatSection (v: v ? deprecated)} + ${formatSection (is "deprecated")} ''; mkdocsSettings = {