forked from M-Labs/it-infra
81 lines
3.3 KiB
Diff
81 lines
3.3 KiB
Diff
diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
|
||
index 763045a80..d7c5cc82e 100644
|
||
--- a/src/libstore/build/local-derivation-goal.cc
|
||
+++ b/src/libstore/build/local-derivation-goal.cc
|
||
@@ -190,6 +190,8 @@ void LocalDerivationGoal::tryLocalBuild()
|
||
|
||
assert(derivationType);
|
||
|
||
+ networked = parsedDrv->getBoolAttr("__networked");
|
||
+
|
||
/* Are we doing a chroot build? */
|
||
{
|
||
auto noChroot = parsedDrv->getBoolAttr("__noChroot");
|
||
@@ -207,7 +209,7 @@ void LocalDerivationGoal::tryLocalBuild()
|
||
else if (settings.sandboxMode == smDisabled)
|
||
useChroot = false;
|
||
else if (settings.sandboxMode == smRelaxed)
|
||
- useChroot = derivationType->isSandboxed() && !noChroot;
|
||
+ useChroot = !networked && derivationType->isSandboxed() && !noChroot;
|
||
}
|
||
|
||
auto & localStore = getLocalStore();
|
||
@@ -717,7 +719,7 @@ void LocalDerivationGoal::startBuilder()
|
||
"nogroup:x:65534:\n", sandboxGid()));
|
||
|
||
/* Create /etc/hosts with localhost entry. */
|
||
- if (derivationType->isSandboxed())
|
||
+ if (!networked && derivationType->isSandboxed())
|
||
writeFile(chrootRootDir + "/etc/hosts", "127.0.0.1 localhost\n::1 localhost\n");
|
||
|
||
/* Make the closure of the inputs available in the chroot,
|
||
@@ -921,7 +923,7 @@ void LocalDerivationGoal::startBuilder()
|
||
us.
|
||
*/
|
||
|
||
- if (derivationType->isSandboxed())
|
||
+ if (!networked && derivationType->isSandboxed())
|
||
privateNetwork = true;
|
||
|
||
userNamespaceSync.create();
|
||
@@ -1160,7 +1162,7 @@ void LocalDerivationGoal::initEnv()
|
||
to the builder is generally impure, but the output of
|
||
fixed-output derivations is by definition pure (since we
|
||
already know the cryptographic hash of the output). */
|
||
- if (!derivationType->isSandboxed()) {
|
||
+ if (networked || !derivationType->isSandboxed()) {
|
||
for (auto & i : parsedDrv->getStringsAttr("impureEnvVars").value_or(Strings()))
|
||
env[i] = getEnv(i).value_or("");
|
||
}
|
||
@@ -1829,7 +1831,7 @@ void LocalDerivationGoal::runChild()
|
||
/* Fixed-output derivations typically need to access the
|
||
network, so give them access to /etc/resolv.conf and so
|
||
on. */
|
||
- if (!derivationType->isSandboxed()) {
|
||
+ if (networked || !derivationType->isSandboxed()) {
|
||
// Only use nss functions to resolve hosts and
|
||
// services. Don’t use it for anything else that may
|
||
// be configured for this system. This limits the
|
||
@@ -2071,7 +2073,7 @@ void LocalDerivationGoal::runChild()
|
||
#include "sandbox-defaults.sb"
|
||
;
|
||
|
||
- if (!derivationType->isSandboxed())
|
||
+ if (networked || !derivationType->isSandboxed())
|
||
sandboxProfile +=
|
||
#include "sandbox-network.sb"
|
||
;
|
||
diff --git a/src/libstore/build/local-derivation-goal.hh b/src/libstore/build/local-derivation-goal.hh
|
||
index 86b86c01e..95b03aae8 100644
|
||
--- a/src/libstore/build/local-derivation-goal.hh
|
||
+++ b/src/libstore/build/local-derivation-goal.hh
|
||
@@ -82,6 +82,8 @@ struct LocalDerivationGoal : public DerivationGoal
|
||
*/
|
||
Path chrootRootDir;
|
||
|
||
+ bool networked;
|
||
+
|
||
/**
|
||
* RAII object to delete the chroot directory.
|
||
*/
|