LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-07-14 16:50:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Pass network error message to generated error page

Browse Source
This commit is contained in:
circl 2024-06-18 15:26:12 +02:00 committed by Andrew Kaster
parent 4d97b29866
commit b83e82c32c
5 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Base/res/ladybird/templates/error.html
View File

@ -22,5 +22,6 @@
<img src="resource://icons/32x32/msgbox-warning.png" alt="Warning" width="24" height="24">
<h1>Failed to load @failed_url@</h1>
</header>
<p>@error_message@</p>
</body>
</html>

22
Userland/Libraries/LibWeb/HTML/Navigable.cpp
View File

@ -681,7 +681,7 @@ static WebIDL::ExceptionOr<JS::NonnullGCPtr<NavigationParams>> create_navigation
}
// https://html.spec.whatwg.org/multipage/browsing-the-web.html#create-navigation-params-by-fetching
static WebIDL::ExceptionOr<Variant<Empty, JS::NonnullGCPtr<NavigationParams>, JS::NonnullGCPtr<NonFetchSchemeNavigationParams>>> create_navigation_params_by_fetching(JS::GCPtr<SessionHistoryEntry> entry, JS::GCPtr<Navigable> navigable, SourceSnapshotParams const& source_snapshot_params, TargetSnapshotParams const& target_snapshot_params, CSPNavigationType csp_navigation_type, Optional<String> navigation_id)
static WebIDL::ExceptionOr<Navigable::NavigationParamsVariant> create_navigation_params_by_fetching(JS::GCPtr<SessionHistoryEntry> entry, JS::GCPtr<Navigable> navigable, SourceSnapshotParams const& source_snapshot_params, TargetSnapshotParams const& target_snapshot_params, CSPNavigationType csp_navigation_type, Optional<String> navigation_id)
{
auto& vm = navigable->vm();
auto& realm = navigable->active_window()->realm();
@ -982,9 +982,14 @@ static WebIDL::ExceptionOr<Variant<Empty, JS::NonnullGCPtr<NavigationParams>, JS
// - locationURL is failure; or
// - locationURL is a URL whose scheme is a fetch scheme
// then return null.
if (response_holder->response()->is_network_error() || location_url.is_error() || (location_url.value().has_value() && Fetch::Infrastructure::is_fetch_scheme(location_url.value().value().scheme()))) {
if (response_holder->response()->is_network_error()) {
// AD-HOC: We pass the error message if we have one in NullWithError
if (response_holder->response()->network_error_message().has_value() && !response_holder->response()->network_error_message().value().is_null())
return response_holder->response()->network_error_message().value();
else
return Empty {};
} else if (location_url.is_error() || (location_url.value().has_value() && Fetch::Infrastructure::is_fetch_scheme(location_url.value().value().scheme())))
return Empty {};
}
// 22. Assert: locationURL is null and response is not a network error.
VERIFY(!location_url.value().has_value());
@ -1039,7 +1044,7 @@ WebIDL::ExceptionOr<void> Navigable::populate_session_history_entry_document(
SourceSnapshotParams const& source_snapshot_params,
TargetSnapshotParams const& target_snapshot_params,
Optional<String> navigation_id,
Variant<Empty, JS::NonnullGCPtr<NavigationParams>, JS::NonnullGCPtr<NonFetchSchemeNavigationParams>> navigation_params,
Navigable::NavigationParamsVariant navigation_params,
CSPNavigationType csp_navigation_type,
bool allow_POST,
JS::SafeFunction<void()> completion_steps)
@ -1124,7 +1129,7 @@ WebIDL::ExceptionOr<void> Navigable::populate_session_history_entry_document(
}
// 4. Otherwise, if navigationParams is null, then set failure to true.
if (navigation_params.has<Empty>()) {
if (navigation_params.has<Empty>() || navigation_params.has<NullWithError>()) {
failure = true;
}
@ -1141,8 +1146,9 @@ WebIDL::ExceptionOr<void> Navigable::populate_session_history_entry_document(
if (failure) {
// 1. Set entry's document state's document to the result of creating a document for inline content that doesn't have a DOM, given navigable, null, and navTimingType.
// The inline content should indicate to the user the sort of error that occurred.
// FIXME: Add error message to generated error page
auto error_html = load_error_page(entry->url()).release_value_but_fixme_should_propagate_errors();
auto error_message = navigation_params.has<NullWithError>() ? navigation_params.get<NullWithError>() : "Unknown error"sv;
auto error_html = load_error_page(entry->url(), error_message).release_value_but_fixme_should_propagate_errors();
entry->document_state()->set_document(create_document_for_inline_content(this, navigation_id, [error_html](auto& document) {
auto parser = HTML::HTMLParser::create(document, error_html, "utf-8"sv);
document.set_url(URL::URL("about:error"));
@ -1427,7 +1433,7 @@ WebIDL::ExceptionOr<void> Navigable::navigate(NavigateParams params)
history_entry->set_document_state(document_state);
// 7. Let navigationParams be null.
Variant<Empty, JS::NonnullGCPtr<NavigationParams>, JS::NonnullGCPtr<NonFetchSchemeNavigationParams>> navigation_params = Empty {};
NavigationParamsVariant navigation_params = Empty {};
// FIXME: 8. If response is non-null:
if (response) {

5
Userland/Libraries/LibWeb/HTML/Navigable.h
View File

@ -52,6 +52,9 @@ class Navigable : public JS::Cell {
public:
virtual ~Navigable() override;
using NullWithError = StringView;
using NavigationParamsVariant = Variant<Empty, NullWithError, JS::NonnullGCPtr<NavigationParams>, JS::NonnullGCPtr<NonFetchSchemeNavigationParams>>;
ErrorOr<void> initialize_navigable(JS::NonnullGCPtr<DocumentState> document_state, JS::GCPtr<Navigable> parent);
Vector<JS::Handle<Navigable>> child_navigables() const;
@ -123,7 +126,7 @@ public:
SourceSnapshotParams const& source_snapshot_params,
TargetSnapshotParams const& target_snapshot_params,
Optional<String> navigation_id = {},
Variant<Empty, JS::NonnullGCPtr<NavigationParams>, JS::NonnullGCPtr<NonFetchSchemeNavigationParams>> navigation_params = Empty {},
NavigationParamsVariant navigation_params = Empty {},
CSPNavigationType csp_navigation_type = CSPNavigationType::Other,
bool allow_POST = false,
JS::SafeFunction<void()> completion_steps = [] {});

3
Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.cpp
View File

@ -26,7 +26,7 @@ void set_chrome_process_executable_path(StringView executable_path)
s_chrome_process_executable_path = MUST(String::from_utf8(executable_path));
}
ErrorOr<String> load_error_page(URL::URL const& url)
ErrorOr<String> load_error_page(URL::URL const& url, StringView error_message)
{
// Generate HTML error page from error template file
// FIXME: Use an actual templating engine (our own one when it's built, preferably with a way to check these usages at compile time)
@ -34,6 +34,7 @@ ErrorOr<String> load_error_page(URL::URL const& url)
StringBuilder builder;
SourceGenerator generator { builder };
generator.set("failed_url", url.to_byte_string());
generator.set("error_message", escape_html_entities(error_message));
generator.append(template_file->data());
return TRY(String::from_utf8(generator.as_string_view()));
}

2
Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.h
View File

@ -17,7 +17,7 @@ static String s_chrome_process_executable_path {};
void set_chrome_process_command_line(StringView command_line);
void set_chrome_process_executable_path(StringView executable_path);
ErrorOr<String> load_error_page(URL::URL const&);
ErrorOr<String> load_error_page(URL::URL const&, StringView error_message);
ErrorOr<String> load_file_directory_page(URL::URL const&);