diff --git a/doc/manual/packages/s3-substituter.xml b/doc/manual/packages/s3-substituter.xml
index ea654392c..2ec9687a0 100644
--- a/doc/manual/packages/s3-substituter.xml
+++ b/doc/manual/packages/s3-substituter.xml
@@ -51,6 +51,18 @@ the S3 URL:
addressing.
+
+ scheme
+
+
+ The scheme used for S3 requests, https
+ (default) or http. This option allows you to
+ disable HTTPS for binary caches which don't support it.
+
+ HTTPS should be used if the cache might contain
+ sensitive information.
+
+
In this example we will use the bucket named
@@ -165,7 +177,7 @@ the S3 URL:
Uploading to an S3-Compatible Binary Cache
- nix copy --to 's3://example-nix-cache?profile=cache-upload&endpoint=minio.example.com' nixpkgs.hello
+ nix copy --to 's3://example-nix-cache?profile=cache-upload&scheme=https&endpoint=minio.example.com' nixpkgs.hello
diff --git a/src/libstore/download.cc b/src/libstore/download.cc
index 7773d9032..fef2cf7a3 100644
--- a/src/libstore/download.cc
+++ b/src/libstore/download.cc
@@ -622,7 +622,7 @@ struct CurlDownloader : public Downloader
// FIXME: do this on a worker thread
try {
#ifdef ENABLE_S3
- S3Helper s3Helper("", Aws::Region::US_EAST_1, ""); // FIXME: make configurable
+ S3Helper s3Helper("", Aws::Region::US_EAST_1, "", ""); // FIXME: make configurable
auto slash = request.uri.find('/', 5);
if (slash == std::string::npos)
throw nix::Error("bad S3 URI '%s'", request.uri);
diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc
index 4f1e23198..51de89e0d 100644
--- a/src/libstore/s3-binary-cache-store.cc
+++ b/src/libstore/s3-binary-cache-store.cc
@@ -82,8 +82,8 @@ static void initAWS()
});
}
-S3Helper::S3Helper(const std::string & profile, const std::string & region, const std::string & endpoint)
- : config(makeConfig(region, endpoint))
+S3Helper::S3Helper(const string & profile, const string & region, const string & scheme, const string & endpoint)
+ : config(makeConfig(region, scheme, endpoint))
, client(make_ref(
profile == ""
? std::dynamic_pointer_cast(
@@ -114,11 +114,14 @@ class RetryStrategy : public Aws::Client::DefaultRetryStrategy
}
};
-ref S3Helper::makeConfig(const string & region, const string & endpoint)
+ref S3Helper::makeConfig(const string & region, const string & scheme, const string & endpoint)
{
initAWS();
auto res = make_ref();
res->region = region;
+ if (!scheme.empty()) {
+ res->scheme = Aws::Http::SchemeMapper::FromString(scheme.c_str());
+ }
if (!endpoint.empty()) {
res->endpointOverride = endpoint;
}
@@ -169,6 +172,7 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
{
const Setting profile{this, "", "profile", "The name of the AWS configuration profile to use."};
const Setting region{this, Aws::Region::US_EAST_1, "region", {"aws-region"}};
+ const Setting scheme{this, "", "scheme", "The scheme to use for S3 requests, https by default."};
const Setting endpoint{this, "", "endpoint", "An optional override of the endpoint to use when talking to S3."};
const Setting narinfoCompression{this, "", "narinfo-compression", "compression method for .narinfo files"};
const Setting lsCompression{this, "", "ls-compression", "compression method for .ls files"};
@@ -188,7 +192,7 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
const Params & params, const std::string & bucketName)
: S3BinaryCacheStore(params)
, bucketName(bucketName)
- , s3Helper(profile, region, endpoint)
+ , s3Helper(profile, region, scheme, endpoint)
{
diskCache = getNarInfoDiskCache();
}
diff --git a/src/libstore/s3.hh b/src/libstore/s3.hh
index 95d612b66..ef5f23d0f 100644
--- a/src/libstore/s3.hh
+++ b/src/libstore/s3.hh
@@ -14,9 +14,9 @@ struct S3Helper
ref config;
ref client;
- S3Helper(const std::string & profile, const std::string & region, const std::string & endpoint);
+ S3Helper(const std::string & profile, const std::string & region, const std::string & scheme, const std::string & endpoint);
- ref makeConfig(const std::string & region, const std::string & endpoint);
+ ref makeConfig(const std::string & region, const std::string & scheme, const std::string & endpoint);
struct DownloadResult
{