nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-08 19:46:02 +01:00
Code Activity

feat(libstore/filetransfer): add username/password authentication support

Browse source 
Add a `UsernameAuth` struct and optional `usernameAuth` field to
`FileTransferRequest` to support programmatic username/password
authentication.

This uses curl's `CURLOPT_USERNAME`/`CURLOPT_PASSWORD` options, which
works with multiple protocols (HTTP, FTP, etc.) and is not specific to
any particular authentication scheme.

The primary motivation is to enable S3 authentication refactoring where
AWS credentials (access key ID and secret access key) can be passed
through this general-purpose mechanism, reducing the amount of
S3-specific code behind `#if NIX_WITH_CURL_S3` guards.
This commit is contained in:
Bernardo Meurer Costa 2025-10-08 18:37:18 +00:00
parent 090f7fb05e
commit 3c1e2e56ea
No known key found for this signature in database
2 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/filetransfer.cc
View file

@ -426,6 +426,14 @@ struct curlFileTransfer : public FileTransfer
curl_easy_setopt(req, CURLOPT_ERRORBUFFER, errbuf);
errbuf[0] = 0;
// Set up username/password authentication if provided
if (request.usernameAuth) {
curl_easy_setopt(req, CURLOPT_USERNAME, request.usernameAuth->username.c_str());
if (request.usernameAuth->password) {
curl_easy_setopt(req, CURLOPT_PASSWORD, request.usernameAuth->password->c_str());
}
}
result.data.clear();
result.bodySize = 0;
}

16
src/libstore/include/nix/store/filetransfer.hh
View file

@ -77,6 +77,17 @@ extern FileTransferSettings fileTransferSettings;
extern const unsigned int RETRY_TIME_MS_DEFAULT;
/**
* Username and optional password for HTTP basic authentication.
* These are used with curl's CURLOPT_USERNAME and CURLOPT_PASSWORD options
* for various protocols including HTTP, FTP, and others.
*/
struct UsernameAuth
{
std::string username;
std::optional<std::string> password;
};
struct FileTransferRequest
{
ValidURL uri;
@ -92,6 +103,11 @@ struct FileTransferRequest
std::optional<std::string> data;
std::string mimeType;
std::function<void(std::string_view data)> dataCallback;
/**
* Optional username and password for HTTP basic authentication.
* When provided, these credentials will be used with curl's CURLOPT_USERNAME/PASSWORD option.
*/
std::optional<UsernameAuth> usernameAuth;
FileTransferRequest(ValidURL uri)
: uri(std::move(uri))