wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

pathExists: isDir when endswith /

Browse source 
Fixes https://github.com/NixOS/nix/issues/8838

(cherry picked from commit 1e08e12d81)
This commit is contained in:
Robert Hensing 2023-08-25 17:18:37 +02:00 • committed by github-actions[bot]
parent 9fcf142ee0
commit 6305ea6ad2
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libexpr/primops.cc
View file

@ -1508,15 +1508,25 @@ static RegisterPrimOp primop_storePath({
static void prim_pathExists(EvalState & state, const PosIdx pos, Value * * args, Value & v) static void prim_pathExists(EvalState & state, const PosIdx pos, Value * * args, Value & v)
{ {
auto & arg = *args[0];
/* We don’t check the path right now, because we don’t want to /* We don’t check the path right now, because we don’t want to
throw if the path isn’t allowed, but just return false (and we throw if the path isn’t allowed, but just return false (and we
can’t just catch the exception here because we still want to can’t just catch the exception here because we still want to
throw if something in the evaluation of `*args[0]` tries to throw if something in the evaluation of `arg` tries to
access an unauthorized path). */ access an unauthorized path). */
auto path = realisePath(state, pos, *args[0], { .checkForPureEval = false }); auto path = realisePath(state, pos, arg, { .checkForPureEval = false });
/* SourcePath doesn't know about trailing slash. */
auto mustBeDir = arg.type() == nString && arg.str().ends_with("/");
try { try {
v.mkBool(state.checkSourcePath(path).pathExists()); auto checked = state.checkSourcePath(path);
auto exists = checked.pathExists();
if (exists && mustBeDir) {
exists = checked.lstat().type == InputAccessor::tDirectory;
}
v.mkBool(exists);
} catch (SysError & e) { } catch (SysError & e) {
/* Don't give away info from errors while canonicalising /* Don't give away info from errors while canonicalising
‘path’ in restricted mode. */ ‘path’ in restricted mode. */

1
tests/lang/eval-okay-pathexists.nix
View file

@ -1,6 +1,7 @@
builtins.pathExists (./lib.nix) builtins.pathExists (./lib.nix)
&& builtins.pathExists (builtins.toPath ./lib.nix) && builtins.pathExists (builtins.toPath ./lib.nix)
&& builtins.pathExists (builtins.toString ./lib.nix) && builtins.pathExists (builtins.toString ./lib.nix)
&& !builtins.pathExists (builtins.toString ./lib.nix + "/")
&& builtins.pathExists (builtins.toPath (builtins.toString ./lib.nix)) && builtins.pathExists (builtins.toPath (builtins.toString ./lib.nix))
&& !builtins.pathExists (builtins.toPath (builtins.toString ./bla.nix)) && !builtins.pathExists (builtins.toPath (builtins.toString ./bla.nix))
&& builtins.pathExists ./lib.nix && builtins.pathExists ./lib.nix