Fix restricted mode when installing in non-canonical data dir #1815
+1
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Ping |
|
Why does it matter whether the install location is non-canonical? (What's the canonical location anyway?) |
|
Canonical as-in |
|
It matters because NIX_PATH lookup canonicalizes the path first, so it's disallowed in restricted mode. |
|
I think there's a similar problem when |
|
This is related, yeah. |
|
@edolstra ping |
edolstra
reviewed
Feb 22, 2018
src/libexpr/eval.cc
Outdated
| @@ -311,7 +311,7 @@ EvalState::EvalState(const Strings & _searchPath, ref<Store> store) | |||
| addToSearchPath("nix=" + settings.nixDataDir + "/nix/corepkgs"); | |||
|
|
|||
| if (settings.restrictEval || settings.pureEval) { | |||
| allowedPaths = PathSet(); | |||
| allowedPaths = {canonPath(settings.nixDataDir + "/nix/corepkgs", true)}; | |||
There was a problem hiding this comment.
Isn't the correct fix to do
addToSearchPath("nix=" + canonPath(settings.nixDataDir + "/nix/corepkgs"));
?
There was a problem hiding this comment.
Sure, I'll switch to that.
shlevy
force-pushed
the
data-dir-non-canon
branch
from
1970179 to
ddbcd01
Compare
|
@edolstra Fixed |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.