Skip to content

Classify AWS JSON MIME types as text #7418

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

Open
bsobel-cf wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Classify AWS JSON MIME types as text #7418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bed571c
Classify AWS JSON MIME types as text
bsobel-cf Sep 17, 2026
8e87f65
Avoid copying AWS MIME test inputs
bsobel-cf Sep 17, 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
17 changes: 17 additions & 0 deletions src/workerd/util/mimetype-test.c++
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,23 @@ KJ_TEST("Quoted-string escape handling") {
}
}

KJ_TEST("AWS JSON MIME types are classified as text") {
static constexpr kj::StringPtr supportedTypes[] = {
"application/x-amz-json-1.0"_kj,
"application/x-amz-json-1.1"_kj,
};

for (const auto& input: supportedTypes) {
auto mimeType = KJ_ASSERT_NONNULL(MimeType::tryParse(input));
KJ_ASSERT(MimeType::isText(mimeType));
KJ_ASSERT(!MimeType::isJson(mimeType));
}

auto unsupportedType = KJ_ASSERT_NONNULL(MimeType::tryParse("application/x-amz-json-1.2"_kj));
KJ_ASSERT(!MimeType::isText(unsupportedType));
KJ_ASSERT(!MimeType::isJson(unsupportedType));
}

KJ_TEST("Backslash escaping in serialization round-trips") {
// A value containing both backslash and non-token chars must be quoted
// with the backslash escaped, and the result must round-trip.
Expand Down
3 changes: 2 additions & 1 deletion src/workerd/util/mimetype.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ class MimeType final {
auto type = mimeType.type();
auto subtype = mimeType.subtype();
return type == "text" || isXml(mimeType) || isJson(mimeType) || isJavascript(mimeType) ||
(type == "application" && subtype == "dns-json");
(type == "application" &&
(subtype == "dns-json" || subtype == "x-amz-json-1.0" || subtype == "x-amz-json-1.1"));
}

template <IsMimeType T>
Expand Down
Loading