224c8182df
When the common pattern for store config constructors is to accept
an arbitrary string it's unclear whether it needs pct-decoding or not.
Prior to c436b7a32a the string passed to
the constructors was a mix of encoded authority and decoded path concatenated
with a `/`. After that commit it accidentally started accepting pct-encoded
result of renderAuthorityAndPath, but only in some code paths. This lead to
file:///tmp/a+b to be created on disk in /tmp/a%2Bb directory. Similar issue
affected the less-known variant with local:///tmp/a+b. Regular store references
that are local paths were not affected.
This patch changes the constructors to accept different types to signify what
is actually needed to let the factory method handle this in a consistent way:
- std::filesystem::path - local binary cache store and local store
- ParsedURL::Authority - for ssh stores
- ParsedURL - for http stores
(Some MinGW build fixes by Amaan Qureshi <git@amaanq.com>)
92 lines
2.8 KiB
Bash
Executable File
92 lines
2.8 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
source common.sh
|
|
|
|
# Regression test for #11503.
|
|
mkdir -p "$TEST_ROOT/directory"
|
|
cat > "$TEST_ROOT/directory/default.nix" <<EOF
|
|
let
|
|
root = ./.;
|
|
filter = path: type:
|
|
let
|
|
rootStr = builtins.toString ./.;
|
|
in
|
|
if builtins.substring 0 (builtins.stringLength rootStr) (builtins.toString path) == rootStr then true
|
|
else builtins.throw "root path\n\${rootStr}\nnot prefix of path\n\${builtins.toString path}";
|
|
in
|
|
builtins.filterSource filter root
|
|
EOF
|
|
|
|
result="$(nix-store --add-fixed --recursive sha256 "$TEST_ROOT/directory")"
|
|
nix-instantiate --eval "$result"
|
|
nix-instantiate --eval "$result" --store "$TEST_ROOT/2nd-store"
|
|
nix-store --add-fixed --recursive sha256 "$TEST_ROOT/directory" --store "$TEST_ROOT/2nd-store"
|
|
nix-instantiate --eval "$result" --store "$TEST_ROOT/2nd-store"
|
|
|
|
# Misc tests.
|
|
echo example > "$TEST_ROOT"/example.txt
|
|
mkdir -p "$TEST_ROOT/x"
|
|
|
|
export NIX_STORE_DIR=/nix2/store
|
|
|
|
CORRECT_PATH=$(cd "$TEST_ROOT" && nix-store --store ./x --add example.txt)
|
|
|
|
[[ $CORRECT_PATH =~ ^/nix2/store/.*-example.txt$ ]]
|
|
|
|
PATH1=$(cd "$TEST_ROOT" && nix path-info --store ./x "$CORRECT_PATH")
|
|
[ "$CORRECT_PATH" == "$PATH1" ]
|
|
|
|
PATH2=$(nix path-info --store "$TEST_ROOT/x" "$CORRECT_PATH")
|
|
[ "$CORRECT_PATH" == "$PATH2" ]
|
|
|
|
PATH3=$(nix path-info --store "local?root=$TEST_ROOT/x" "$CORRECT_PATH")
|
|
[ "$CORRECT_PATH" == "$PATH3" ]
|
|
|
|
# Test chroot store path with + symbols in it to exercise pct-encoding issues.
|
|
cp -r "$TEST_ROOT/x" "$TEST_ROOT/x+chroot"
|
|
|
|
PATH4=$(nix path-info --store "local://$TEST_ROOT/x+chroot" "$CORRECT_PATH")
|
|
[ "$CORRECT_PATH" == "$PATH4" ]
|
|
|
|
PATH5=$(nix path-info --store "$TEST_ROOT/x+chroot" "$CORRECT_PATH")
|
|
[ "$CORRECT_PATH" == "$PATH5" ]
|
|
|
|
# Params are pct-encoded.
|
|
PATH6=$(nix path-info --store "local?root=$TEST_ROOT/x%2Bchroot" "$CORRECT_PATH")
|
|
[ "$CORRECT_PATH" == "$PATH6" ]
|
|
|
|
PATH7=$(nix path-info --store "local://$TEST_ROOT/x%2Bchroot" "$CORRECT_PATH")
|
|
[ "$CORRECT_PATH" == "$PATH7" ]
|
|
# Path gets decoded.
|
|
[[ ! -d "$TEST_ROOT/x%2Bchroot" ]]
|
|
|
|
# Ensure store info trusted works with local store
|
|
nix --store "$TEST_ROOT/x" store info --json | jq -e '.trusted'
|
|
|
|
# Test building in a chroot store.
|
|
if canUseSandbox; then
|
|
|
|
flakeDir=$TEST_ROOT/flake
|
|
mkdir -p "$flakeDir"
|
|
|
|
cat > "$flakeDir"/flake.nix <<EOF
|
|
{
|
|
outputs = inputs: rec {
|
|
packages.$system.default = import ./simple.nix;
|
|
};
|
|
}
|
|
EOF
|
|
|
|
cp simple.nix shell.nix simple.builder.sh "${config_nix}" "$flakeDir/"
|
|
|
|
TODO_NixOS
|
|
requiresUnprivilegedUserNamespaces
|
|
|
|
outPath=$(nix build --print-out-paths --no-link --sandbox-paths '/nix? /bin? /lib? /lib64? /usr?' --store "$TEST_ROOT/x" path:"$flakeDir")
|
|
|
|
[[ $outPath =~ ^/nix2/store/.*-simple$ ]]
|
|
|
|
base=$(basename "$outPath")
|
|
[[ $(cat "$TEST_ROOT"/x/nix/store/"$base"/hello) = 'Hello World!' ]]
|
|
fi
|