Skip to content

Refactor Parsing Content Encoding Http Headers #15245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Hrushi20 wants to merge 4 commits into from
Closed

Refactor Parsing Content Encoding Http Headers #15245

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
87d074f
Parse content-encoding in filetransfer
Hrushi20 Feb 15, 2026
2e63cd8
remove compression-algo.hh
Hrushi20 Feb 15, 2026
a5a9888
remove xz from Accept-Encoding, Point to RFC doc for Case-insensitive…
Hrushi20 Feb 15, 2026
6b0837a
make method static
Hrushi20 Feb 22, 2026
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
32 changes: 30 additions & 2 deletions src/libstore/filetransfer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
#include "nix/util/callback.hh"
#include "nix/util/signals.hh"

#include "nix/util/util.hh"
#include "store-config-private.hh"
#include "nix/store/s3-url.hh"
#include <optional>
#include <string_view>
#if NIX_WITH_AWS_AUTH
# include "nix/store/aws-creds.hh"
#endif
Expand Down Expand Up @@ -177,7 +179,7 @@ struct curlFileTransfer : public FileTransfer
#if NIX_WITH_AWS_AUTH
if (!request.awsSigV4Provider)
#endif
appendHeaders("Accept-Encoding: zstd, br, gzip, deflate, bzip2, xz");
appendHeaders("Accept-Encoding: zstd, br, gzip, deflate, bzip2");
if (!request.expectedETag.empty())
appendHeaders("If-None-Match: " + request.expectedETag);
if (!request.mimeType.empty())
Expand Down Expand Up @@ -275,6 +277,29 @@ struct curlFileTransfer : public FileTransfer
result.urls.push_back(effectiveUriCStr);
}

static std::string parseContentEncoding(std::string_view contentEncoding)
{

if (contentEncoding.find(",") != std::string::npos) {
throw nix::Error("Stacked Content-Encoding is not supported: %s", contentEncoding);
}

if (contentEncoding == "gzip" || contentEncoding == "x-gzip")
return "gzip";
else if (contentEncoding == "compress" || contentEncoding == "x-compress")
return "compress";
else if (contentEncoding == "br")
return "br";
else if (contentEncoding == "zstd")
return "zstd";
else if (contentEncoding == "bzip2")
return "bzip2";
else if (contentEncoding == "identity")
return "identity";

throw nix::Error("Invalid content-encoding: %s", contentEncoding);
}

size_t headerCallback(void * contents, size_t size, size_t nmemb) noexcept
try {
size_t realSize = size * nmemb;
Expand Down Expand Up @@ -311,8 +336,11 @@ struct curlFileTransfer : public FileTransfer
}
}

/* https://www.rfc-editor.org/rfc/rfc9110.html#name-content-codings
* All content codings are case-insensitive and ought to be
* registered within the "HTTP Content Coding Registry" */
else if (name == "content-encoding")
encoding = trim(line.substr(i + 1));
encoding = parseContentEncoding(toLower(trim(line.substr(i + 1))));
Copy link
Contributor

@xokdvium xokdvium Feb 15, 2026

Choose a reason for hiding this comment

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

Should we add a comment referring to the spec paragraph about case insensitivity?

Copy link
Author

@Hrushi20 Hrushi20 Feb 18, 2026

Choose a reason for hiding this comment

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

Added this.


else if (name == "accept-ranges" && toLower(trim(line.substr(i + 1))) == "bytes")
acceptRanges = true;
Expand Down