aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Bereknyei <tomberek@gmail.com>2021-11-19 23:52:52 -0500
committerTom Bereknyei <tomberek@gmail.com>2021-11-20 00:25:36 -0500
commit4318ba2ec568a9fe7d5b4b014df6b7d252ae3481 (patch)
treef75f3dd998929709426c49a49f1a9aa09c07ff4d
parent9cd8cffefc65fe425c6aa07aa3bc67a8eec46087 (diff)
add real path to allowedPaths
-rw-r--r--src/libexpr/eval.cc4
-rw-r--r--src/libexpr/primops.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index f1ff3a6e0..97fc04711 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -520,7 +520,7 @@ Path EvalState::checkSourcePath(const Path & path_)
}
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. */
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);
}
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 5bd4e5545..8dccf6401 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -70,7 +70,7 @@ void EvalState::realiseContext(const PathSet & context)
if (outputPaths.count(outputName) == 0)
throw Error("derivation '%s' does not have an output named '%s'",
store->printStorePath(drvPath), outputName);
- allowedPaths->insert(store->printStorePath(outputPaths.at(outputName)));
+ allowPath(outputPaths.at(outputName));
}
}
}