Skip to content

Commit

Permalink
fix: builtins.toFile adds path to allowedPaths
Browse files Browse the repository at this point in the history
The produced path is then allowed be imported or utilized elsewhere:
```
assert (43 == import (builtins.toFile "source" "43")); "good"
```

This will still fail on write-only stores.
  • Loading branch information
tomberek committed Apr 21, 2022
1 parent 9345b4e commit f25112d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
4 changes: 4 additions & 0 deletions doc/manual/src/release-notes/rl-next.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@

* `nix repl` has a new build-'n-link (`:bl`) command that builds a derivation
while creating GC root symlinks.

* The path produced by `builtins.toFile` is now allowed to be imported or read
even with restricted evaluation. Note that this will not work with a
read-only store.
7 changes: 4 additions & 3 deletions src/libexpr/primops.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1798,15 +1798,16 @@ static void prim_toFile(EvalState & state, const Pos & pos, Value * * args, Valu
refs.insert(state.store->parseStorePath(path));
}

auto storePath = state.store->printStorePath(settings.readOnlyMode
auto storePath = settings.readOnlyMode
? state.store->computeStorePathForText(name, contents, refs)
: state.store->addTextToStore(name, contents, refs, state.repair));
: state.store->addTextToStore(name, contents, refs, state.repair);

/* Note: we don't need to add `context' to the context of the
result, since `storePath' itself has references to the paths
used in args[1]. */

v.mkString(storePath, {storePath});
/* Add the output of this to the allowed paths. */
state.allowAndSetStorePathString(storePath, v);
}

static RegisterPrimOp primop_toFile({
Expand Down
2 changes: 2 additions & 0 deletions tests/eval.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ nix eval --expr 'assert 1 + 2 == 3; true'
[[ $(nix eval attr --json -f "./eval.nix") == '{"foo":"bar"}' ]]
[[ $(nix eval int -f - < "./eval.nix") == 123 ]]

# Check if toFile can be utilized during restricted eval
[[ $(nix eval --restrict-eval --expr 'import (builtins.toFile "source" "42")') == 42 ]]

nix-instantiate --eval -E 'assert 1 + 2 == 3; true'
[[ $(nix-instantiate -A int --eval "./eval.nix") == 123 ]]
Expand Down

0 comments on commit f25112d

Please sign in to comment.