mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-24 10:22:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

LibWeb: Throw exception for invalid URL before creating traversable

Browse source 
Which fixes the following WPT test from failing due to issues stemming
from all of the windows which have been opened.

https://wpt.live/url/failure.html

This will give us 1205 new subtests passing in WPT.

(cherry picked from commit f2134dc1e960cb1d0c743b375509fe165885ddbe)
This commit is contained in:
Shannon Booth 2024-10-07 13:43:37 +13:00 • committed by Nico Weber
parent 9150241db9
commit 191b686699
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Userland/Libraries/LibWeb/HTML/Window.cpp
View file

@ -146,6 +146,20 @@ WebIDL::ExceptionOr<JS::GCPtr<WindowProxy>> Window::open_impl(StringView url, St
if (main_thread_event_loop().termination_nesting_level() != 0)
return nullptr;
// FIXME: Spec-issue: https://github.com/whatwg/html/issues/10681
// We need to check for an invalid URL before running the 'rules for choosing a navigable' otherwise
// and invalid URL will result in a window being created before an exception is thrown.
//
// 12.3. Let urlRecord be the URL record about:blank.
auto url_record = URL::URL("about:blank"sv);
// 12.4. If url is not the empty string, then set urlRecord to the result of encoding-parsing a URL given url, relative to the entry settings object.
if (!url.is_empty()) {
url_record = entry_settings_object().parse_url(url);
// 12.5. If urlRecord is failure, then throw a "SyntaxError" DOMException.
if (!url_record.is_valid())
return WebIDL::SyntaxError::create(realm(), MUST(String::formatted("Invalid URL '{}'", url)));
}
// 2. Let sourceDocument be the entry global object's associated Document.
auto& source_document = verify_cast<Window>(entry_global_object()).associated_document();
@ -203,16 +217,10 @@ WebIDL::ExceptionOr<JS::GCPtr<WindowProxy>> Window::open_impl(StringView url, St
// 2. Set up browsing context features for target browsing context given tokenizedFeatures. [CSSOMVIEW]
// NOTE: This is implemented in choose_a_navigable when creating the top level traversable.
// NOTE: See spec issue above
// 3. Let urlRecord be the URL record about:blank.
auto url_record = URL::URL("about:blank"sv);
// 4. If url is not the empty string, then set urlRecord to the result of encoding-parsing a URL given url, relative to the entry settings object.
if (!url.is_empty()) {
url_record = entry_settings_object().parse_url(url);
// 5. If urlRecord is failure, then throw a "SyntaxError" DOMException.
if (!url_record.is_valid())
return WebIDL::SyntaxError::create(realm(), "URL is not valid"_fly_string);
}
// 5. If urlRecord is failure, then throw a "SyntaxError" DOMException.
// 6. If urlRecord matches about:blank, then perform the URL and history update steps given targetNavigable's active document and urlRecord.
if (url_matches_about_blank(url_record)) {
@ -233,12 +241,9 @@ WebIDL::ExceptionOr<JS::GCPtr<WindowProxy>> Window::open_impl(StringView url, St
else {
// 1. If url is not the empty string, then:
if (!url.is_empty()) {
// NOTE: See spec issue above
// 1. Let urlRecord be the result of encoding-parsing a URL url, relative to the entry settings object.
auto url_record = entry_settings_object().parse_url(url);
// 2. If urlRecord is failure, then throw a "SyntaxError" DOMException.
if (!url_record.is_valid())
return WebIDL::SyntaxError::create(realm(), "URL is not valid"_fly_string);
// 3. Navigate targetNavigable to urlRecord using sourceDocument, with referrerPolicy set to referrerPolicy and exceptionsEnabled set to true.
TRY(target_navigable->navigate({ .url = url_record, .source_document = source_document, .exceptions_enabled = true, .referrer_policy = referrer_policy }));