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

LibURL+LibWeb: Make URL::basic_parse return an Optional<URL>

Browse source 
URL::basic_parse has a subtle bug where the resulting URL is not set
to valid when StateOveride is provided and the URL parser early returns
a valid URL.

This has not surfaced as a problem so far, as the only users of the
state override API provide an already valid URL buffer and also ignore
the result of basic parsing with a state override.

However, this bug surfaces implementing the URL pattern spec, which as
part of URL canonicalization:
 * Provides a dummy URL record
 * Basic URL parses that URL with state override
 * Checks the result of the URL parser to validate the URL

While we could set URL validity on every early return of the URL parser
during state override, it has been a long standing FIXME around the code
to try and remove the awkward validity state of the URL class. So this
commit makes the first stage of this change by migrating the basic
parser API to return Optional, which also happens to make this subtle
issue not a problem any more.
This commit is contained in:
Shannon Booth 2025-01-10 04:50:34 +13:00 • committed by Tim Flynn
parent b6ec055bf9
commit 5bed8f4055
Notes: github-actions[bot] 2025-01-11 15:09:28 +00:00
9 changed files with 56 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Libraries/LibWeb/DOMURL/DOMURL.cpp
View file

@ -28,9 +28,6 @@ GC::Ref<DOMURL> DOMURL::create(JS::Realm& realm, URL::URL url, GC::Ref<URLSearch
// https://url.spec.whatwg.org/#api-url-parser
static Optional<URL::URL> parse_api_url(String const& url, Optional<String> const& base)
{
// FIXME: We somewhat awkwardly have two failure states encapsulated in the return type (and convert between them in the steps),
// ideally we'd get rid of URL's valid flag
// 1. Let parsedBase be null.
Optional<URL::URL> parsed_base;
@ -40,15 +37,14 @@ static Optional<URL::URL> parse_api_url(String const& url, Optional<String> cons
auto parsed_base_url = URL::Parser::basic_parse(*base);
// 2. If parsedBase is failure, then return failure.
if (!parsed_base_url.is_valid())
if (!parsed_base_url.has_value())
return {};
parsed_base = parsed_base_url;
}
// 3. Return the result of running the basic URL parser on url with parsedBase.
auto parsed = URL::Parser::basic_parse(url, parsed_base);
return parsed.is_valid() ? parsed : Optional<URL::URL> {};
return URL::Parser::basic_parse(url, parsed_base);
}
// https://url.spec.whatwg.org/#url-initialize
@ -183,17 +179,17 @@ String DOMURL::to_json() const
}
// https://url.spec.whatwg.org/#ref-for-dom-url-href②
WebIDL::ExceptionOr<void> DOMURL::set_href(String const& href)
WebIDL::ExceptionOr<void> DOMURL::set_href(String const& value)
{
// 1. Let parsedURL be the result of running the basic URL parser on the given value.
URL::URL parsed_url = href;
auto parsed_url = URL::Parser::basic_parse(value);
// 2. If parsedURL is failure, then throw a TypeError.
if (!parsed_url.is_valid())
if (!parsed_url.has_value())
return WebIDL::SimpleException { WebIDL::SimpleExceptionType::TypeError, "Invalid URL"sv };
// 3. Set this’s URL to parsedURL.
m_url = move(parsed_url);
m_url = parsed_url.release_value();
// 4. Empty this’s query object’s list.
m_query->m_list.clear();
@ -509,17 +505,17 @@ URL::URL parse(StringView input, Optional<URL::URL const&> base_url, Optional<St
auto url = URL::Parser::basic_parse(input, base_url, {}, {}, encoding);
// 2. If url is failure, return failure.
if (!url.is_valid())
return {};
if (!url.has_value())
return {}; // FIXME: Migrate this API to return an OptionalNone on failure.
// 3. If url’s scheme is not "blob", return url.
if (url.scheme() != "blob")
return url;
if (url->scheme() != "blob")
return url.release_value();
// 4. Set url’s blob URL entry to the result of resolving the blob URL url, if that did not return failure, and null otherwise.
auto blob_url_entry = FileAPI::resolve_a_blob_url(url);
auto blob_url_entry = FileAPI::resolve_a_blob_url(*url);
if (blob_url_entry.has_value()) {
url.set_blob_url_entry(URL::BlobURLEntry {
url->set_blob_url_entry(URL::BlobURLEntry {
.type = blob_url_entry->object->type(),
.byte_buffer = MUST(ByteBuffer::copy(blob_url_entry->object->raw_bytes())),
.environment_origin = blob_url_entry->environment->origin(),
@ -527,7 +523,7 @@ URL::URL parse(StringView input, Optional<URL::URL const&> base_url, Optional<St
}
// 5. Return url
return url;
return url.release_value();
}
}