Ladybird+LibWeb: Add about scheme support for internal pages

bplaat · trflynn89 · commit 05c064047471 · 2024-01-13T13:41:09.000-05:00
diff --git a/Base/res/ladybird/about.html b/Base/res/ladybird/about.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>About URLs</title>
+</head>
+<body>
+    <h1>List of About URLs</h1>
+    <ul>
+        <li><a href="about:about">about:about</a></li>
+        <li><a href="about:newtab">about:newtab</a></li>
+    </ul>
+</body>
+</html>
diff --git a/Meta/gn/secondary/Ladybird/BUILD.gn b/Meta/gn/secondary/Ladybird/BUILD.gn
@@ -294,6 +294,7 @@ if (current_os == "mac") {
 
   bundle_data("ladybird_web_resources") {
     sources = [
+      "//Base/res/ladybird/about.html",
       "//Base/res/ladybird/inspector.css",
       "//Base/res/ladybird/inspector.js",
       "//Base/res/ladybird/newtab.html",
diff --git a/Userland/Libraries/LibWeb/Fetch/Fetching/Fetching.cpp b/Userland/Libraries/LibWeb/Fetch/Fetching/Fetching.cpp
@@ -718,6 +718,9 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<PendingResponse>> scheme_fetch(JS::Realm& r
             response->set_body(MUST(Infrastructure::byte_sequence_as_body(realm, ""sv.bytes())));
             return PendingResponse::create(vm, request, response);
         }
+
+        // FIXME: This is actually wrong, see note above.
+        return TRY(nonstandard_resource_loader_file_or_http_network_fetch(realm, fetch_params));
     }
     // -> "blob"
     else if (request->current_url().scheme() == "blob"sv) {
diff --git a/Userland/Libraries/LibWeb/Loader/ResourceLoader.cpp b/Userland/Libraries/LibWeb/Loader/ResourceLoader.cpp
@@ -230,6 +230,14 @@ void ResourceLoader::load(LoadRequest& request, SuccessCallback success_callback
         HashMap<ByteString, ByteString, CaseInsensitiveStringTraits> response_headers;
         response_headers.set("Content-Type", "text/html; charset=UTF-8");
 
+        // Other about static HTML pages
+        auto resource = Core::Resource::load_from_uri(MUST(String::formatted("resource://ladybird/{}.html", url.path_segment_at_index(0))));
+        if (!resource.is_error()) {
+            auto data = resource.value()->data();
+            success_callback(data, response_headers, {});
+            return;
+        }
+
         Platform::EventLoopPlugin::the().deferred_invoke([success_callback = move(success_callback), response_headers = move(response_headers)] {
             success_callback(ByteString::empty().to_byte_buffer(), response_headers, {});
         });

Original file line number	Diff line number	Diff line change
`@@ -718,6 +718,9 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<PendingResponse>> scheme_fetch(JS::Realm& r`
`718`	`718`	`response->set_body(MUST(Infrastructure::byte_sequence_as_body(realm, ""sv.bytes())));`
`719`	`719`	`return PendingResponse::create(vm, request, response);`
`720`	`720`	`}`
	`721`	`+`
	`722`	`+ // FIXME: This is actually wrong, see note above.`
	`723`	`+ return TRY(nonstandard_resource_loader_file_or_http_network_fetch(realm, fetch_params));`
`721`	`724`	`}`
`722`	`725`	`// -> "blob"`
`723`	`726`	`else if (request->current_url().scheme() == "blob"sv) {`