mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-09-21 16:58:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb: Refactor magic string in favour of TrustedTypeName

Browse source
This commit is contained in:
Tete17 2025-08-09 03:46:29 +02:00 • committed by Luke Wilde
commit 4f9eb78b9d
Notes: github-actions[bot] 2025-09-01 15:21:23 +00:00
4 changed files with 41 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Libraries/LibWeb/TrustedTypes/TrustedTypePolicy.cpp
View file

@ -33,6 +33,19 @@ void TrustedTypePolicy::initialize(JS::Realm& realm)
Base::initialize(realm); Base::initialize(realm);
} }
Utf16String to_string(TrustedTypeName trusted_type_name)
{
switch (trusted_type_name) {
case TrustedTypeName::TrustedHTML:
return "TrustedHTML"_utf16;
case TrustedTypeName::TrustedScript:
return "TrustedScript"_utf16;
case TrustedTypeName::TrustedScriptURL:
return "TrustedScriptURL"_utf16;
default:
VERIFY_NOT_REACHED();
}
}
// https://w3c.github.io/trusted-types/dist/spec/#dom-trustedtypepolicy-createhtml // https://w3c.github.io/trusted-types/dist/spec/#dom-trustedtypepolicy-createhtml
WebIDL::ExceptionOr<GC::Root<TrustedHTML>> TrustedTypePolicy::create_html(Utf16String const& input, GC::RootVector<JS::Value> const& arguments) WebIDL::ExceptionOr<GC::Root<TrustedHTML>> TrustedTypePolicy::create_html(Utf16String const& input, GC::RootVector<JS::Value> const& arguments)
{ {

2
Libraries/LibWeb/TrustedTypes/TrustedTypePolicy.h
View file

@ -23,6 +23,8 @@ enum class TrustedTypeName {
TrustedScriptURL, TrustedScriptURL,
}; };
Utf16String to_string(TrustedTypeName);
enum class ThrowIfCallbackMissing { enum class ThrowIfCallbackMissing {
Yes, Yes,
No No

38
Libraries/LibWeb/TrustedTypes/TrustedTypePolicyFactory.cpp
View file

@ -76,7 +76,7 @@ Optional<Utf16String> TrustedTypePolicyFactory::get_attribute_type(Utf16String c
// 8. If attributeData is not null, then set expectedType to the interface’s name of the value of the fourth member of attributeData. // 8. If attributeData is not null, then set expectedType to the interface’s name of the value of the fourth member of attributeData.
if (attribute_data.has_value()) { if (attribute_data.has_value()) {
expected_type = attribute_data.value().trusted_type; expected_type = to_string(attribute_data.value().trusted_type);
} }
// 9. Return expectedType. // 9. Return expectedType.
@ -108,24 +108,30 @@ Optional<Utf16String> TrustedTypePolicyFactory::get_property_type(Utf16String co
// 4. Let expectedType be null. // 4. Let expectedType be null.
Optional<Utf16String> expected_type; Optional<Utf16String> expected_type;
static Vector<Array<Utf16String, 3>> const table { struct TrustedTypesPropertyTypeData {
{ "HTMLIFrameElement"_utf16, "srcdoc"_utf16, "TrustedHTML"_utf16 }, Utf16String interface;
{ "HTMLScriptElement"_utf16, "innerText"_utf16, "TrustedScript"_utf16 }, Utf16String property;
{ "HTMLScriptElement"_utf16, "src"_utf16, "TrustedScriptURL"_utf16 }, TrustedTypeName trusted_type;
{ "HTMLScriptElement"_utf16, "text"_utf16, "TrustedScript"_utf16 }, };
{ "HTMLScriptElement"_utf16, "textContent"_utf16, "TrustedScript"_utf16 },
{ "*"_utf16, "innerHTML"_utf16, "TrustedHTML"_utf16 }, static Vector<TrustedTypesPropertyTypeData> const table {
{ "*"_utf16, "outerHTML"_utf16, "TrustedHTML"_utf16 }, { "HTMLIFrameElement"_utf16, "srcdoc"_utf16, TrustedTypeName::TrustedHTML },
{ "HTMLScriptElement"_utf16, "innerText"_utf16, TrustedTypeName::TrustedScript },
{ "HTMLScriptElement"_utf16, "src"_utf16, TrustedTypeName::TrustedScriptURL },
{ "HTMLScriptElement"_utf16, "text"_utf16, TrustedTypeName::TrustedScript },
{ "HTMLScriptElement"_utf16, "textContent"_utf16, TrustedTypeName::TrustedScript },
{ "*"_utf16, "innerHTML"_utf16, TrustedTypeName::TrustedHTML },
{ "*"_utf16, "outerHTML"_utf16, TrustedTypeName::TrustedHTML },
}; };
// 5. Find the row in the following table, where the first column is "*" or interface’s name, and property is in the second column. // 5. Find the row in the following table, where the first column is "*" or interface’s name, and property is in the second column.
// If a matching row is found, set expectedType to the interface’s name of the value of the third column. // If a matching row is found, set expectedType to the interface’s name of the value of the third column.
auto const matching_row = table.first_matching([&interface, &property](auto const& row) { auto const matching_row = table.first_matching([&interface, &property](auto const& row) {
return (row[0] == interface || row[0] == "*"sv) && row[1] == property; return (row.interface == interface || row.interface == "*"sv) && row.property == property;
}); });
if (matching_row.has_value()) { if (matching_row.has_value()) {
expected_type = matching_row.value()[2]; expected_type = to_string(matching_row.value().trusted_type);
} }
// 6. Return expectedType. // 6. Return expectedType.
@ -296,7 +302,7 @@ Optional<TrustedTypeData> get_trusted_type_data_for_attribute(Utf16String const&
#define __ENUMERATE(attribute_name, event_name) \ #define __ENUMERATE(attribute_name, event_name) \
if (attribute == HTML::AttributeNames::attribute_name) { \ if (attribute == HTML::AttributeNames::attribute_name) { \
/* 1. Return (Element, null, attribute, TrustedScript, "Element " + attribute). */ \ /* 1. Return (Element, null, attribute, TrustedScript, "Element " + attribute). */ \
return TrustedTypeData { "Element"_utf16, {}, attribute, "TrustedScript"_utf16, "Element " #attribute_name ""_utf16 }; \ return TrustedTypeData { "Element"_utf16, {}, attribute, TrustedTypeName::TrustedScript, "Element " #attribute_name ""_utf16 }; \
} }
ENUMERATE_GLOBAL_EVENT_HANDLERS(__ENUMERATE) ENUMERATE_GLOBAL_EVENT_HANDLERS(__ENUMERATE)
ENUMERATE_WINDOW_EVENT_HANDLERS(__ENUMERATE) ENUMERATE_WINDOW_EVENT_HANDLERS(__ENUMERATE)
@ -304,10 +310,10 @@ Optional<TrustedTypeData> get_trusted_type_data_for_attribute(Utf16String const&
} }
static Vector<TrustedTypeData> const table { static Vector<TrustedTypeData> const table {
{ "HTMLIFrameElement"_utf16, {}, "srcdoc"_utf16, "TrustedHTML"_utf16, "HTMLIFrameElement srcdoc"_utf16 }, { "HTMLIFrameElement"_utf16, {}, "srcdoc"_utf16, TrustedTypeName::TrustedHTML, "HTMLIFrameElement srcdoc"_utf16 },
{ "HTMLScriptElement"_utf16, {}, "src"_utf16, "TrustedScriptURL"_utf16, "HTMLScriptElement src"_utf16 }, { "HTMLScriptElement"_utf16, {}, "src"_utf16, TrustedTypeName::TrustedScriptURL, "HTMLScriptElement src"_utf16 },
{ "SVGScriptElement"_utf16, {}, "href"_utf16, "TrustedScriptURL"_utf16, "SVGScriptElement href"_utf16 }, { "SVGScriptElement"_utf16, {}, "href"_utf16, TrustedTypeName::TrustedScriptURL, "SVGScriptElement href"_utf16 },
{ "SVGScriptElement"_utf16, Utf16String::from_utf8(Namespace::XLink), "href"_utf16, "TrustedScriptURL"_utf16, "SVGScriptElement href"_utf16 }, { "SVGScriptElement"_utf16, Utf16String::from_utf8(Namespace::XLink), "href"_utf16, TrustedTypeName::TrustedScriptURL, "SVGScriptElement href"_utf16 },
}; };
// 3. Find the row in the following table, where element is in the first column, attributeNs is in the second column, // 3. Find the row in the following table, where element is in the first column, attributeNs is in the second column,

2
Libraries/LibWeb/TrustedTypes/TrustedTypePolicyFactory.h
View file

@ -57,7 +57,7 @@ struct TrustedTypeData {
Utf16String element; Utf16String element;
Optional<Utf16String> attribute_ns; Optional<Utf16String> attribute_ns;
Utf16String attribute_local_name; Utf16String attribute_local_name;
Utf16String trusted_type; TrustedTypeName trusted_type;
Utf16String sink; Utf16String sink;
}; };