2024-12-03 19:27:26 +08:00
|
|
|
|
diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
|
|
|
|
|
index 2a09e3dd4..7dc03855f 100644
|
|
|
|
|
--- a/src/libstore/unix/build/local-derivation-goal.cc
|
|
|
|
|
+++ b/src/libstore/unix/build/local-derivation-goal.cc
|
|
|
|
|
@@ -197,6 +197,8 @@ Goal::Co LocalDerivationGoal::tryLocalBuild()
|
2023-12-16 13:03:19 +08:00
|
|
|
|
|
|
|
|
|
assert(derivationType);
|
2022-06-04 13:52:21 +08:00
|
|
|
|
|
|
|
|
|
+ networked = parsedDrv->getBoolAttr("__networked");
|
|
|
|
|
+
|
|
|
|
|
/* Are we doing a chroot build? */
|
|
|
|
|
{
|
|
|
|
|
auto noChroot = parsedDrv->getBoolAttr("__noChroot");
|
2024-12-03 19:27:26 +08:00
|
|
|
|
@@ -214,7 +216,7 @@ Goal::Co LocalDerivationGoal::tryLocalBuild()
|
2022-06-04 13:52:21 +08:00
|
|
|
|
else if (settings.sandboxMode == smDisabled)
|
|
|
|
|
useChroot = false;
|
|
|
|
|
else if (settings.sandboxMode == smRelaxed)
|
2023-12-16 13:03:19 +08:00
|
|
|
|
- useChroot = derivationType->isSandboxed() && !noChroot;
|
|
|
|
|
+ useChroot = !networked && derivationType->isSandboxed() && !noChroot;
|
2022-06-04 13:52:21 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
auto & localStore = getLocalStore();
|
2024-12-03 19:27:26 +08:00
|
|
|
|
@@ -737,7 +739,7 @@ void LocalDerivationGoal::startBuilder()
|
2022-06-04 13:52:21 +08:00
|
|
|
|
"nogroup:x:65534:\n", sandboxGid()));
|
|
|
|
|
|
|
|
|
|
/* Create /etc/hosts with localhost entry. */
|
2023-12-16 13:03:19 +08:00
|
|
|
|
- if (derivationType->isSandboxed())
|
|
|
|
|
+ if (!networked && derivationType->isSandboxed())
|
2022-06-04 13:52:21 +08:00
|
|
|
|
writeFile(chrootRootDir + "/etc/hosts", "127.0.0.1 localhost\n::1 localhost\n");
|
|
|
|
|
|
|
|
|
|
/* Make the closure of the inputs available in the chroot,
|
2024-12-03 19:27:26 +08:00
|
|
|
|
@@ -938,7 +940,7 @@ void LocalDerivationGoal::startBuilder()
|
2022-06-04 13:52:21 +08:00
|
|
|
|
us.
|
|
|
|
|
*/
|
|
|
|
|
|
2023-12-16 13:03:19 +08:00
|
|
|
|
- if (derivationType->isSandboxed())
|
|
|
|
|
+ if (!networked && derivationType->isSandboxed())
|
2022-06-04 13:52:21 +08:00
|
|
|
|
privateNetwork = true;
|
|
|
|
|
|
|
|
|
|
userNamespaceSync.create();
|
2024-12-03 19:27:26 +08:00
|
|
|
|
@@ -1177,7 +1179,7 @@ void LocalDerivationGoal::initEnv()
|
2022-06-04 13:52:21 +08:00
|
|
|
|
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). */
|
2023-12-16 13:03:19 +08:00
|
|
|
|
- if (!derivationType->isSandboxed()) {
|
|
|
|
|
+ if (networked || !derivationType->isSandboxed()) {
|
2024-12-03 19:27:26 +08:00
|
|
|
|
auto & impureEnv = settings.impureEnv.get();
|
|
|
|
|
if (!impureEnv.empty())
|
|
|
|
|
experimentalFeatureSettings.require(Xp::ConfigurableImpureEnv);
|
|
|
|
|
@@ -1851,7 +1853,7 @@ void LocalDerivationGoal::runChild()
|
2022-06-04 13:52:21 +08:00
|
|
|
|
/* Fixed-output derivations typically need to access the
|
|
|
|
|
network, so give them access to /etc/resolv.conf and so
|
|
|
|
|
on. */
|
2023-12-16 13:03:19 +08:00
|
|
|
|
- if (!derivationType->isSandboxed()) {
|
|
|
|
|
+ if (networked || !derivationType->isSandboxed()) {
|
2022-06-04 13:52:21 +08:00
|
|
|
|
// 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
|
2024-12-03 19:27:26 +08:00
|
|
|
|
@@ -2083,7 +2085,7 @@ void LocalDerivationGoal::runChild()
|
2024-11-05 18:45:40 +08:00
|
|
|
|
#include "sandbox-defaults.sb"
|
|
|
|
|
;
|
2022-06-04 13:52:21 +08:00
|
|
|
|
|
2024-11-05 18:45:40 +08:00
|
|
|
|
- if (!derivationType->isSandboxed())
|
|
|
|
|
+ if (networked || !derivationType->isSandboxed())
|
|
|
|
|
sandboxProfile +=
|
|
|
|
|
#include "sandbox-network.sb"
|
|
|
|
|
;
|
2024-12-03 19:27:26 +08:00
|
|
|
|
diff --git a/src/libstore/unix/build/local-derivation-goal.hh b/src/libstore/unix/build/local-derivation-goal.hh
|
|
|
|
|
index bf25cf2a6..28f8c1e95 100644
|
|
|
|
|
--- a/src/libstore/unix/build/local-derivation-goal.hh
|
|
|
|
|
+++ b/src/libstore/unix/build/local-derivation-goal.hh
|
|
|
|
|
@@ -83,6 +83,8 @@ struct LocalDerivationGoal : public DerivationGoal
|
2024-11-05 18:45:40 +08:00
|
|
|
|
*/
|
2022-06-04 13:52:21 +08:00
|
|
|
|
Path chrootRootDir;
|
|
|
|
|
|
|
|
|
|
+ bool networked;
|
|
|
|
|
+
|
2023-12-16 13:03:19 +08:00
|
|
|
|
/**
|
|
|
|
|
* RAII object to delete the chroot directory.
|
|
|
|
|
*/
|