forked from lix-project/lix
Merge pull request #5613 from tomberek/allow_realpath
add real path to allowedPaths
This commit is contained in:
commit
720ed47678
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue