mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

s3: make scheme configurable

Browse source 
This enables using for http for S3 request for debugging or
implementations that don't have https configured.  This is not a problem
for binary caches since they should not contain sensitive information.
Both package signatures and AWS auth already protect against tampering.
This commit is contained in:
Daiderd Jordan 2018-12-07 23:38:24 +01:00
parent 05f0543a17
commit 898823b67d
No known key found for this signature in database
GPG key ID: D02435D05B810C96
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/download.cc
View file

@ -622,7 +622,7 @@ struct CurlDownloader : public Downloader
// FIXME: do this on a worker thread // FIXME: do this on a worker thread
try { try {
#ifdef ENABLE_S3 #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); auto slash = request.uri.find('/', 5);
if (slash == std::string::npos) if (slash == std::string::npos)
throw nix::Error("bad S3 URI '%s'", request.uri); throw nix::Error("bad S3 URI '%s'", request.uri);

12
src/libstore/s3-binary-cache-store.cc
View file

@ -82,8 +82,8 @@ static void initAWS()
}); });
} }
S3Helper::S3Helper(const std::string & profile, const std::string & region, const std::string & endpoint) S3Helper::S3Helper(const string & profile, const string & region, const string & scheme, const string & endpoint)
: config(makeConfig(region, endpoint)) : config(makeConfig(region, scheme, endpoint))
, client(make_ref<Aws::S3::S3Client>( , client(make_ref<Aws::S3::S3Client>(
profile == "" profile == ""
? std::dynamic_pointer_cast<Aws::Auth::AWSCredentialsProvider>( ? std::dynamic_pointer_cast<Aws::Auth::AWSCredentialsProvider>(
@ -114,11 +114,14 @@ class RetryStrategy : public Aws::Client::DefaultRetryStrategy
} }
}; };
ref<Aws::Client::ClientConfiguration> S3Helper::makeConfig(const string & region, const string & endpoint) ref<Aws::Client::ClientConfiguration> S3Helper::makeConfig(const string & region, const string & scheme, const string & endpoint)
{ {
initAWS(); initAWS();
auto res = make_ref<Aws::Client::ClientConfiguration>(); auto res = make_ref<Aws::Client::ClientConfiguration>();
res->region = region; res->region = region;
if (!scheme.empty()) {
res->scheme = Aws::Http::SchemeMapper::FromString(scheme.c_str());
}
if (!endpoint.empty()) { if (!endpoint.empty()) {
res->endpointOverride = endpoint; res->endpointOverride = endpoint;
} }
@ -169,6 +172,7 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
{ {
const Setting<std::string> profile{this, "", "profile", "The name of the AWS configuration profile to use."}; const Setting<std::string> profile{this, "", "profile", "The name of the AWS configuration profile to use."};
const Setting<std::string> region{this, Aws::Region::US_EAST_1, "region", {"aws-region"}}; const Setting<std::string> region{this, Aws::Region::US_EAST_1, "region", {"aws-region"}};
const Setting<std::string> scheme{this, "", "scheme", "The scheme to use for S3 requests, https by default."};
const Setting<std::string> endpoint{this, "", "endpoint", "An optional override of the endpoint to use when talking to S3."}; const Setting<std::string> endpoint{this, "", "endpoint", "An optional override of the endpoint to use when talking to S3."};
const Setting<std::string> narinfoCompression{this, "", "narinfo-compression", "compression method for .narinfo files"}; const Setting<std::string> narinfoCompression{this, "", "narinfo-compression", "compression method for .narinfo files"};
const Setting<std::string> lsCompression{this, "", "ls-compression", "compression method for .ls files"}; const Setting<std::string> lsCompression{this, "", "ls-compression", "compression method for .ls files"};
@ -188,7 +192,7 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
const Params & params, const std::string & bucketName) const Params & params, const std::string & bucketName)
: S3BinaryCacheStore(params) : S3BinaryCacheStore(params)
, bucketName(bucketName) , bucketName(bucketName)
, s3Helper(profile, region, endpoint) , s3Helper(profile, region, scheme, endpoint)
{ {
diskCache = getNarInfoDiskCache(); diskCache = getNarInfoDiskCache();
} }

4
src/libstore/s3.hh
View file

@ -14,9 +14,9 @@ struct S3Helper
ref<Aws::Client::ClientConfiguration> config; ref<Aws::Client::ClientConfiguration> config;
ref<Aws::S3::S3Client> client; ref<Aws::S3::S3Client> 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<Aws::Client::ClientConfiguration> makeConfig(const std::string & region, const std::string & endpoint); ref<Aws::Client::ClientConfiguration> makeConfig(const std::string & region, const std::string & scheme, const std::string & endpoint);
struct DownloadResult struct DownloadResult
{ {