lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #5613 from tomberek/allow_realpath

Browse source 
add real path to allowedPaths
This commit is contained in:
Eelco Dolstra 2021-11-22 15:10:47 +01:00 committed by GitHub
parent dcaa8dfd10 4318ba2ec5
commit 720ed47678
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libexpr/eval.cc
View file

@ -520,7 +520,7 @@ Path EvalState::checkSourcePath(const Path & path_)
} }
if (!found) if (!found)
throw RestrictedPathError("access to path '%1%' is forbidden in restricted mode", abspath); throw RestrictedPathError("access to absolute path '%1%' is forbidden in restricted mode", abspath);
/* Resolve symlinks. */ /* Resolve symlinks. */
debug(format("checking access to '%s'") % abspath); debug(format("checking access to '%s'") % abspath);
@ -533,7 +533,7 @@ Path EvalState::checkSourcePath(const Path & path_)
} }
} }
throw RestrictedPathError("access to path '%1%' is forbidden in restricted mode", path); throw RestrictedPathError("access to canonical path '%1%' is forbidden in restricted mode", path);
} }

2
src/libexpr/primops.cc
View file

@ -70,7 +70,7 @@ void EvalState::realiseContext(const PathSet & context)
if (outputPaths.count(outputName) == 0) if (outputPaths.count(outputName) == 0)
throw Error("derivation '%s' does not have an output named '%s'", throw Error("derivation '%s' does not have an output named '%s'",
store->printStorePath(drvPath), outputName); store->printStorePath(drvPath), outputName);
allowedPaths->insert(store->printStorePath(outputPaths.at(outputName))); allowPath(outputPaths.at(outputName));
} }
} }
} }