aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPuck Meerburg <puck@puckipedia.com>2024-09-26 15:12:24 +0000
committerPuck Meerburg <puck@puckipedia.com>2024-09-26 15:25:28 +0000
commit37b22dae04f2da214e6b9bef3427e134280642ca (patch)
tree0e1980bab2adcd8def2e55b20ae2c90abfff4104 /src
parentc1631b0a39d34267345b41214f1f5e8a77d98cd2 (diff)
Fix passing custom CA files into the builtin:fetchurl sandbox
Without this, verifying TLS certificates would fail on macOS, as well as any system that doesn't have a certificate file at /etc/ssl/certs/ca-certificates.crt, which includes e.g. Fedora. Change-Id: Iaa2e0e9db3747645b5482c82e3e0e4e8f229f5f9
Diffstat (limited to 'src')
-rw-r--r--src/libstore/build/local-derivation-goal.cc19
-rw-r--r--src/libstore/builtins.hh2
-rw-r--r--src/libstore/builtins/fetchurl.cc5
3 files changed, 18 insertions, 8 deletions
diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
index 4baa525d9..f14d09652 100644
--- a/src/libstore/build/local-derivation-goal.cc
+++ b/src/libstore/build/local-derivation-goal.cc
@@ -1361,13 +1361,20 @@ void LocalDerivationGoal::runChild()
bool setUser = true;
- /* Make the contents of netrc available to builtin:fetchurl
- (which may run under a different uid and/or in a sandbox). */
+ /* Make the contents of netrc and the CA certificate bundle
+ available to builtin:fetchurl (which may run under a
+ different uid and/or in a sandbox). */
std::string netrcData;
- try {
- if (drv->isBuiltin() && drv->builder == "builtin:fetchurl" && !derivationType->isSandboxed())
+ std::string caFileData;
+ if (drv->isBuiltin() && drv->builder == "builtin:fetchurl" && !derivationType->isSandboxed()) {
+ try {
netrcData = readFile(settings.netrcFile);
- } catch (SysError &) { }
+ } catch (SysError &) { }
+
+ try {
+ caFileData = readFile(settings.caFile);
+ } catch (SysError &) { }
+ }
#if __linux__
if (useChroot) {
@@ -1802,7 +1809,7 @@ void LocalDerivationGoal::runChild()
e.second = rewriteStrings(e.second, inputRewrites);
if (drv->builder == "builtin:fetchurl")
- builtinFetchurl(drv2, netrcData);
+ builtinFetchurl(drv2, netrcData, caFileData);
else if (drv->builder == "builtin:buildenv")
builtinBuildenv(drv2);
else if (drv->builder == "builtin:unpack-channel")
diff --git a/src/libstore/builtins.hh b/src/libstore/builtins.hh
index d201fb3ac..e20d14b90 100644
--- a/src/libstore/builtins.hh
+++ b/src/libstore/builtins.hh
@@ -6,7 +6,7 @@
namespace nix {
// TODO: make pluggable.
-void builtinFetchurl(const BasicDerivation & drv, const std::string & netrcData);
+void builtinFetchurl(const BasicDerivation & drv, const std::string & netrcData, const std::string & caFileData);
void builtinUnpackChannel(const BasicDerivation & drv);
}
diff --git a/src/libstore/builtins/fetchurl.cc b/src/libstore/builtins/fetchurl.cc
index 3fb769fe6..b28eb01d0 100644
--- a/src/libstore/builtins/fetchurl.cc
+++ b/src/libstore/builtins/fetchurl.cc
@@ -7,7 +7,7 @@
namespace nix {
-void builtinFetchurl(const BasicDerivation & drv, const std::string & netrcData)
+void builtinFetchurl(const BasicDerivation & drv, const std::string & netrcData, const std::string & caFileData)
{
/* Make the host's netrc data available. Too bad curl requires
this to be stored in a file. It would be nice if we could just
@@ -17,6 +17,9 @@ void builtinFetchurl(const BasicDerivation & drv, const std::string & netrcData)
writeFile(settings.netrcFile, netrcData, 0600);
}
+ settings.caFile = "ca-certificates.crt";
+ writeFile(settings.caFile, caFileData, 0600);
+
auto getAttr = [&](const std::string & name) {
auto i = drv.env.find(name);
if (i == drv.env.end()) throw Error("attribute '%s' missing", name);