Lightpanda: the headless browser designed for AI and automation
base: add an inherit base url for about: pages
Pierre Tachoired1af25567c16
diff --git a/src/browser/Frame.zig b/src/browser/Frame.zigindex 60d8bbff4..e49b329e3 100644--- a/src/browser/Frame.zig+++ b/src/browser/Frame.zig@@ -249,9 +249,12 @@ origin: ?[]const u8 = null,// The base url specifies the base URL used to resolve the relative urls.// It is set by a <base> tag.-// If null the url must be used.+// If null, inherited_base_url is used, then url.base_url: ?[:0]const u8 = null,+// Set for about:blank and about:srcdoc documents: their creator's base URL.+inherited_base_url: ?[:0]const u8 = null,+// Document charset (canonical name from encoding_rs, static lifetime)charset: []const u8 = "UTF-8",@@ -577,7 +580,7 @@ pub fn removeWorker(self: *Frame, worker: *Worker) void {}pub fn base(self: *const Frame) [:0]const u8 {- return self.base_url orelse self.url;+ return self.base_url orelse self.inherited_base_url orelse self.url;}// The base a relative navigation URL resolves against: this frame's base,@@ -742,7 +745,7 @@ pub fn navigate(self: *Frame, request_url: [:0]const u8, opts: NavigateOpts) !vo} else if (self.parent) |parent| {self.origin = parent.origin;if (is_about_blank or is_srcdoc) {- self.base_url = parent.base();+ self.inherited_base_url = parent.base();// about:blank and about:srcdoc documents inherit their// creator's policy container, including the referrer policyself.referrer_policy = parent.referrer_policy;@@ -750,7 +753,7 @@ pub fn navigate(self: *Frame, request_url: [:0]const u8, opts: NavigateOpts) !vo} else if (self.window._opener) |opener| {self.origin = opener._frame.origin;if (is_about_blank) {- self.base_url = opener._frame.base();+ self.inherited_base_url = opener._frame.base();self.referrer_policy = opener._frame.referrer_policy;}} else {diff --git a/src/browser/tests/element/html/base_dynamic.html b/src/browser/tests/element/html/base_dynamic.htmlindex d53de1221..7a9836183 100644--- a/src/browser/tests/element/html/base_dynamic.html+++ b/src/browser/tests/element/html/base_dynamic.html@@ -193,7 +193,11 @@// WPT html/semantics/document-metadata/the-base-element/base-data.html// and base-javascript.html: a data: or javascript: frozen base URL// falls back to the document's fallback base URL.- for (const href of ['data:/,more-test', 'javascript:/,more-test']) {+ // The URL parser lowercases the scheme and strips spaces, tabs and+ // newlines: these are data: and javascript: URLs too.+ for (const href of ['data:/,more-test', 'javascript:/,more-test',+ 'DATA:/,more-test', 'JavaScript:/,more-test',+ ' data:/,more-test', 'java\tscript:/,more-test']) {const b = document.createElement('base');b.href = href;document.head.prepend(b);diff --git a/src/browser/webapi/element/html/Base.zig b/src/browser/webapi/element/html/Base.zigindex 0d7ae5b51..3283c91dc 100644--- a/src/browser/webapi/element/html/Base.zig+++ b/src/browser/webapi/element/html/Base.zig@@ -83,7 +83,8 @@ fn updateBaseURL(self: *Base, frame: *Frame) !void {return;}- owner.base_url = try URL.resolve(owner.arena, owner.url, href, .{});+ const fallback = owner.inherited_base_url orelse owner.url;+ owner.base_url = try URL.resolve(owner.arena, fallback, href, .{});}pub const JsApi = struct {