alois31/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #5654 from NixOS/pure-file-access-error-message

Browse source 
Fix the error when accessing a forbidden path in pure eval
This commit is contained in:
Eelco Dolstra 2021-11-25 16:51:26 +01:00 committed by GitHub
parent ca82967ee3 c47027f3a1
commit 1d2dbbb977
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libexpr/eval.cc
View file

@ -519,8 +519,12 @@ Path EvalState::checkSourcePath(const Path & path_)
} }
} }
if (!found) if (!found) {
throw RestrictedPathError("access to absolute path '%1%' is forbidden in restricted mode", abspath); auto modeInformation = evalSettings.pureEval
? "in pure eval mode (use '--impure' to override)"
: "in restricted mode";
throw RestrictedPathError("access to absolute path '%1%' is forbidden %2%", abspath, modeInformation);
}
/* Resolve symlinks. */ /* Resolve symlinks. */
debug(format("checking access to '%s'") % abspath); debug(format("checking access to '%s'") % abspath);

5
tests/pure-eval.sh
View file

@ -6,7 +6,10 @@ nix eval --expr 'assert 1 + 2 == 3; true'
[[ $(nix eval --impure --expr 'builtins.readFile ./pure-eval.sh') =~ clearStore ]] [[ $(nix eval --impure --expr 'builtins.readFile ./pure-eval.sh') =~ clearStore ]]
(! nix eval --expr 'builtins.readFile ./pure-eval.sh') missingImpureErrorMsg=$(! nix eval --expr 'builtins.readFile ./pure-eval.sh' 2>&1)
echo "$missingImpureErrorMsg" | grep -q -- --impure || \
fail "The error message should mention the “--impure” flag to unblock users"
(! nix eval --expr builtins.currentTime) (! nix eval --expr builtins.currentTime)
(! nix eval --expr builtins.currentSystem) (! nix eval --expr builtins.currentSystem)