mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-09 03:41:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

LibURL: Gracefully handle a host having no public suffix

Browse source 
Specifically, after implementing some recent spec changes to navigables,
we end up calling `get_public_suffix("localhost")` here, which returns
OptionalNone. This would previously crash.

Our get_public_suffix() seems a little incorrect. From the spec:
> If no rules match, the prevailing rule is "*".
> https://github.com/publicsuffix/list/wiki/Format#algorithm

However, ours returns an empty Optional in that case. To avoid breaking
other users of it, this patch modifies Host's uses of it, rather than
the function itself.
This commit is contained in:
Sam Atkins 2025-01-07 12:33:00 +00:00 • committed by Alexander Kalenik
parent c073127b99
commit 9a7ce901b7
Notes: github-actions[bot] 2025-01-21 17:18:37 +00:00
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Libraries/LibURL/Host.cpp
View file

@ -191,14 +191,13 @@ Optional<String> Host::public_suffix() const
auto trailing_dot = host_string.ends_with('.') ? "."sv : ""sv; auto trailing_dot = host_string.ends_with('.') ? "."sv : ""sv;
// 3. Let publicSuffix be the public suffix determined by running the Public Suffix List algorithm with host as domain. [PSL] // 3. Let publicSuffix be the public suffix determined by running the Public Suffix List algorithm with host as domain. [PSL]
auto public_suffix = get_public_suffix(host_string.bytes_as_string_view()); // NOTE: The spec algorithm for the public suffix returns "*" by default, but get_public_suffix() returns an empty Optional.
// Remove the `value_or()` if and when we update it.
// NOTE: get_public_suffix() returns Optional, but this algorithm assumes a value. Is that OK? auto public_suffix = get_public_suffix(host_string.bytes_as_string_view()).value_or("*"_string);
VERIFY(public_suffix.has_value());
// 4. Assert: publicSuffix is an ASCII string that does not end with ".". // 4. Assert: publicSuffix is an ASCII string that does not end with ".".
VERIFY(all_of(public_suffix->code_points(), is_ascii)); VERIFY(all_of(public_suffix.code_points(), is_ascii));
VERIFY(!public_suffix->ends_with('.')); VERIFY(!public_suffix.ends_with('.'));
// 5. Return publicSuffix and trailingDot concatenated. // 5. Return publicSuffix and trailingDot concatenated.
return MUST(String::formatted("{}{}", public_suffix, trailing_dot)); return MUST(String::formatted("{}{}", public_suffix, trailing_dot));
@ -219,14 +218,13 @@ Optional<String> Host::registrable_domain() const
auto trailing_dot = host_string.ends_with('.') ? "."sv : ""sv; auto trailing_dot = host_string.ends_with('.') ? "."sv : ""sv;
// 3. Let registrableDomain be the registrable domain determined by running the Public Suffix List algorithm with host as domain. [PSL] // 3. Let registrableDomain be the registrable domain determined by running the Public Suffix List algorithm with host as domain. [PSL]
auto registrable_domain = get_public_suffix(host_string); // NOTE: The spec algorithm for the public suffix returns "*" by default, but get_public_suffix() returns an empty Optional.
// Remove the `value_or()` if and when we update it.
// NOTE: get_public_suffix() returns Optional, but this algorithm assumes a value. Is that OK? auto registrable_domain = get_public_suffix(host_string).value_or("*"_string);
VERIFY(registrable_domain.has_value());
// 4. Assert: registrableDomain is an ASCII string that does not end with ".". // 4. Assert: registrableDomain is an ASCII string that does not end with ".".
VERIFY(all_of(registrable_domain->code_points(), is_ascii)); VERIFY(all_of(registrable_domain.code_points(), is_ascii));
VERIFY(!registrable_domain->ends_with('.')); VERIFY(!registrable_domain.ends_with('.'));
// 5. Return registrableDomain and trailingDot concatenated. // 5. Return registrableDomain and trailingDot concatenated.
return MUST(String::formatted("{}{}", registrable_domain, trailing_dot)); return MUST(String::formatted("{}{}", registrable_domain, trailing_dot));