RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 14:37:46 +00:00
Code Issues Activity Actions

LibWeb/MimeSniff: Add sniffing in a browsing context

Browse source
This commit is contained in:
Kemal Zebari 2023-11-30 12:44:27 -08:00 • committed by Andrew Kaster
parent f6d3ea33fa
commit ea15501f37
3 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Tests/LibWeb/TestMimeSniff.cpp
View file

@ -31,7 +31,7 @@ TEST_CASE(determine_computed_mime_type_given_no_sniff_is_unset)
EXPECT_EQ(xml_mime_type, MUST(computed_mime_type.serialized()));
}
TEST_CASE(compute_unknown_mime_type)
TEST_CASE(determine_computed_mime_type_in_both_none_and_browsing_sniffing_context)
{
HashMap<StringView, Vector<StringView>> mime_type_to_headers_map;
@ -84,8 +84,14 @@ TEST_CASE(compute_unknown_mime_type)
auto mime_type = mime_type_to_headers.key;
for (auto const& header : mime_type_to_headers.value) {
// Test in a non-specific sniffing context.
auto computed_mime_type = MUST(Web::MimeSniff::Resource::sniff(header.bytes()));
EXPECT_EQ(mime_type, computed_mime_type.essence());
// Test sniffing in a browsing context.
computed_mime_type = MUST(Web::MimeSniff::Resource::sniff(header.bytes(), Web::MimeSniff::SniffingConfiguration { .sniffing_context = Web::MimeSniff::SniffingContext::Browsing }));
EXPECT_EQ(mime_type, computed_mime_type.essence());
}
}
}

16
Userland/Libraries/LibWeb/MimeSniff/Resource.cpp
View file

@ -370,7 +370,7 @@ ErrorOr<Resource> Resource::create(ReadonlyBytes data, SniffingConfiguration con
auto resource = Resource { data, configuration.no_sniff, move(default_computed_mime_type) };
TRY(resource.supplied_mime_type_detection_algorithm(configuration.scheme, move(configuration.supplied_type)));
TRY(resource.mime_type_sniffing_algorithm());
TRY(resource.context_specific_sniffing_algorithm(configuration.sniffing_context));
return resource;
}
@ -520,4 +520,18 @@ ErrorOr<void> Resource::mime_type_sniffing_algorithm()
return {};
}
// https://mimesniff.spec.whatwg.org/#context-specific-sniffing-algorithm
ErrorOr<void> Resource::context_specific_sniffing_algorithm(SniffingContext sniffing_context)
{
// A context-specific sniffing algorithm determines the computed MIME type of a resource only if
// the resource is a MIME type relevant to a particular context.
if (sniffing_context == SniffingContext::None || sniffing_context == SniffingContext::Browsing) {
// https://mimesniff.spec.whatwg.org/#sniffing-in-a-browsing-context
// Use the MIME type sniffing algorithm.
return mime_type_sniffing_algorithm();
}
return {};
}
}

7
Userland/Libraries/LibWeb/MimeSniff/Resource.h
View file

@ -10,7 +10,13 @@
namespace Web::MimeSniff {
enum class SniffingContext {
None,
Browsing
};
struct SniffingConfiguration {
SniffingContext sniffing_context { SniffingContext::None };
StringView scheme { ""sv };
Optional<MimeType> supplied_type = {};
bool no_sniff { false };
@ -33,6 +39,7 @@ private:
void read_the_resource_header(ReadonlyBytes data);
ErrorOr<void> supplied_mime_type_detection_algorithm(StringView scheme, Optional<MimeType> supplied_type);
ErrorOr<void> mime_type_sniffing_algorithm();
ErrorOr<void> context_specific_sniffing_algorithm(SniffingContext sniffing_context);
// https://mimesniff.spec.whatwg.org/#supplied-mime-type
// A supplied MIME type, the MIME type determined by the supplied MIME type detection algorithm.