Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/libfetchers/tarball.cc
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ static DownloadTarballResult downloadTarball_(

auto source = sinkToSource([&](Sink & sink) {
FileTransferRequest req(url);
req.headers = headers;
req.expectedETag = cached ? getStrAttr(cached->value, "etag") : "";
getFileTransfer()->download(std::move(req), sink, [_res](FileTransferResult r) { *_res->lock() = r; });
});
Expand Down Expand Up @@ -484,7 +485,20 @@ struct TarballInputScheme : CurlInputScheme
{
auto input(_input);

auto result = downloadTarball_(settings, getStrAttr(input.attrs, "url"), {}, "«" + input.to_string() + "»");
auto urlS = getStrAttr(input.attrs, "url");

// Build auth headers from access-tokens for the URL's host.
Headers headers;
auto parsedUrl = parseURL(urlS);
if (parsedUrl.authority) {
auto & host = parsedUrl.authority->host;
auto tokens = settings.accessTokens.get();
if (auto token = get(tokens, host)) {
headers.push_back({"Authorization", fmt("token %s", *token)});
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GitHub supports Authorization: Bearer[1] so for more generalized support (since most forges require that), we should use Bearer

Suggested change
headers.push_back({"Authorization", fmt("token %s", *token)});
headers.push_back({"Authorization", fmt("Bearer %s", *token)});

}
}

auto result = downloadTarball_(settings, urlS, headers, "«" + input.to_string() + "»");

if (result.immutableUrl) {
auto immutableInput = Input::fromURL(settings, *result.immutableUrl);
Expand Down
Loading