Skip to content
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

Jump to bottom

Improve error message for R2 etag parsing logic #2233

Merged
merged 1 commit into from
Jun 7, 2024
Merged

Improve error message for R2 etag parsing logic #2233

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 21 additions & 2 deletions src/workerd/api/r2-bucket.c++
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,8 +846,27 @@ kj::Array<R2Bucket::Etag> parseConditionalEtagHeader(
// which just results in an empty list if it's out of bounds by 1.
return parseConditionalEtagHeader(condHeader.slice(nextComma + 1), kj::mv(etagAccumulator));
} else if (leadingCommaRequired) {
// Did not find a leading comma, and we expected a leading comma before any further etags
JSG_FAIL_REQUIRE(Error, "Comma was expected to separate etags");
// we don't need to include nextComma in this min check since in this else branch nextComma is
// always larger than at least one of nextWildcard, nextQuotation and nextWeak
size_t firstEncounteredProblem = std::min({nextWildcard, nextQuotation, nextWeak});

kj::String failureReason;
if (firstEncounteredProblem == nextWildcard) {
failureReason = kj::str("Encountered a wildcard character '*' instead.");
} else if (firstEncounteredProblem == nextQuotation) {
failureReason = kj::str(
"Encountered a double quote character '\"' instead. "
"This would otherwise indicate the start of a new strong etag.");
} else if (firstEncounteredProblem == nextWeak) {
failureReason = kj::str(
"Encountered a weak quotation character 'W' instead. "
"This would otherwise indicate the start of a new weak etag.");
} else {
KJ_FAIL_ASSERT("We shouldn't be able to reach this point. The above etag parsing code is incorrect.");
}

// Did not find a leading comma, and we expected a leading comma before any further etags
JSG_FAIL_REQUIRE(Error, "Comma was expected to separate etags. ", failureReason);
}

if (nextWildcard < nextQuotation) {
Expand Down
Loading