Lightpanda: the headless browser designed for AI and automation
Cleanup sloppy tests, Fix potential UAF, smaller cleanup (PR feedback).
Karl Seguin9482a9af9893
diff --git a/src/browser/Session.zig b/src/browser/Session.zigindex a9dde38f2..7aad34ba7 100644--- a/src/browser/Session.zig+++ b/src/browser/Session.zig@@ -270,16 +270,22 @@ fn retire(self: *Session, page: *Page) void {live.replacement = null;}- page.frame.abortTransfers();- for (self.pages.items, 0..) |p, i| {- if (p == page) {- _ = self.pages.swapRemove(i);- break;- }+ if (page.replacement) |replacement| {+ // page is being destroyed, also detroy its replacement+ self.discardPendingPage(replacement);}++ page.frame.abortTransfers();+ self.removePageFromList(page);self.queuePageDestruction(page);}+fn removePageFromList(self: *Session, page: *Page) void {+ if (std.mem.indexOfScalar(*Page, self.pages.items, page)) |i| {+ _ = self.pages.swapRemove(i);+ }+}+// Tear down the currently-active Page. Dispatches `frame_remove` first// so CDP can clear inspector state while the OLD page is still walkable,// then frees the slot and notifies Navigation. Used by removePage and@@ -438,11 +444,13 @@ pub fn currentFrame(self: *Session) ?*Frame {return &page.frame;}-// Multi-page aware: frame ids are globally unique (monotonic on `Browser`), so-// search every live page's frame tree. During a root navigation the old and-// replacement pages share the root frame_id; the old page sits at index 0 and-// is matched first — the addressable page until commit.+// Multi-page aware: frame ids are globally unique (monotonic on `Browser`).+// First we find the "live" page for a frame, then we search every nested+// frame within that page.pub fn findFrameByFrameId(self: *Session, frame_id: u32) ?*Frame {+ if (self.livePage(frame_id)) |page| {+ return &page.frame;+ }for (self.pages.items) |page| {if (page.findFrameByFrameId(frame_id)) |frame| {return frame;@@ -846,12 +854,7 @@ pub fn commitPendingPage(self: *Session, replacement: *Page) !void {old.replacement = null;replacement.replaces = null;- for (self.pages.items, 0..) |p, i| {- if (p == old) {- _ = self.pages.swapRemove(i);- break;- }- }+ self.removePageFromList(old);// Step 4: tear down the OLD page LAST. Anything in steps 1-3 that needed to// walk the OLD page's state has already done so. Kill any remaining@@ -903,6 +906,11 @@ pub const PageHandle = struct {return self.session.livePage(self.frame_id);}+ pub fn inCommit(self: PageHandle) bool {+ const live = self.page() orelse return false;+ return self.session.replacementOf(live) != null;+ }+pub fn close(self: PageHandle) void {self.session.closePage(self.frame_id);}diff --git a/src/browser/forms.zig b/src/browser/forms.zigindex d0f29b0cd..18d068734 100644--- a/src/browser/forms.zig+++ b/src/browser/forms.zig@@ -278,6 +278,7 @@ fn collectSelectOptions(const testing = @import("../testing.zig");fn testForms(html: []const u8) ![]FormInfo {const frame = try testing.createFrame();+ errdefer testing.test_session.closeAllPages();const doc = frame.window._document;const div = try doc.createElement("div", null, frame);diff --git a/src/browser/interactive.zig b/src/browser/interactive.zigindex 5c5d9b4f8..45bd7d7b7 100644--- a/src/browser/interactive.zig+++ b/src/browser/interactive.zig@@ -497,7 +497,7 @@ const testing = @import("../testing.zig");fn testInteractive(html: []const u8) ![]InteractiveElement {const frame = try testing.createFrame();- defer testing.test_session.closeAllPages();+ errdefer testing.test_session.closeAllPages();const doc = frame.window._document;const div = try doc.createElement("div", null, frame);@@ -508,6 +508,7 @@ fn testInteractive(html: []const u8) ![]InteractiveElement {test "browser.interactive: button" {const elements = try testInteractive("<button>Click me</button>");+ defer testing.test_session.closeAllPages();try testing.expectEqual(1, elements.len);try testing.expectEqual("button", elements[0].tag_name);try testing.expectEqual("button", elements[0].role.?);@@ -517,6 +518,7 @@ test "browser.interactive: button" {test "browser.interactive: anchor with href" {const elements = try testInteractive("<a href=\"/page\">Link</a>");+ defer testing.test_session.closeAllPages();try testing.expectEqual(1, elements.len);try testing.expectEqual("a", elements[0].tag_name);try testing.expectEqual("link", elements[0].role.?);@@ -525,6 +527,7 @@ test "browser.interactive: anchor with href" {test "browser.interactive: anchor without href" {const elements = try testInteractive("<a>Not a link</a>");+ defer testing.test_session.closeAllPages();try testing.expectEqual(0, elements.len);}@@ -533,6 +536,7 @@ test "browser.interactive: input types" {\\<input type="text" placeholder="Search">\\<input type="hidden" name="csrf">);+ defer testing.test_session.closeAllPages();try testing.expectEqual(1, elements.len);try testing.expectEqual("input", elements[0].tag_name);try testing.expectEqual("text", elements[0].input_type.?);@@ -544,6 +548,7 @@ test "browser.interactive: select and textarea" {\\<select name="color"><option>Red</option></select>\\<textarea name="msg"></textarea>);+ defer testing.test_session.closeAllPages();try testing.expectEqual(2, elements.len);try testing.expectEqual("select", elements[0].tag_name);try testing.expectEqual("textarea", elements[1].tag_name);@@ -551,6 +556,7 @@ test "browser.interactive: select and textarea" {test "browser.interactive: aria role" {const elements = try testInteractive("<div role=\"button\">Custom</div>");+ defer testing.test_session.closeAllPages();try testing.expectEqual(1, elements.len);try testing.expectEqual("div", elements[0].tag_name);try testing.expectEqual("button", elements[0].role.?);@@ -559,12 +565,14 @@ test "browser.interactive: aria role" {test "browser.interactive: contenteditable" {const elements = try testInteractive("<div contenteditable=\"true\">Edit me</div>");+ defer testing.test_session.closeAllPages();try testing.expectEqual(1, elements.len);try testing.expectEqual(InteractivityType.contenteditable, elements[0].interactivity_type);}test "browser.interactive: tabindex" {const elements = try testInteractive("<div tabindex=\"0\">Focusable</div>");+ defer testing.test_session.closeAllPages();try testing.expectEqual(1, elements.len);try testing.expectEqual(InteractivityType.focusable, elements[0].interactivity_type);try testing.expectEqual(@as(i32, 0), elements[0].tab_index);@@ -572,6 +580,7 @@ test "browser.interactive: tabindex" {test "browser.interactive: disabled" {const elements = try testInteractive("<button disabled>Off</button>");+ defer testing.test_session.closeAllPages();try testing.expectEqual(1, elements.len);try testing.expect(elements[0].disabled);}@@ -583,6 +592,7 @@ test "browser.interactive: disabled by fieldset" {\\ <legend><button>In legend</button></legend>\\</fieldset>);+ defer testing.test_session.closeAllPages();try testing.expectEqual(2, elements.len);// Button outside legend is disabled by fieldsettry testing.expect(elements[0].disabled);@@ -592,16 +602,19 @@ test "browser.interactive: disabled by fieldset" {test "browser.interactive: pointer-events none" {const elements = try testInteractive("<button style=\"pointer-events: none;\">Click me</button>");+ defer testing.test_session.closeAllPages();try testing.expectEqual(0, elements.len);}test "browser.interactive: non-interactive div" {const elements = try testInteractive("<div>Just text</div>");+ defer testing.test_session.closeAllPages();try testing.expectEqual(0, elements.len);}test "browser.interactive: details and summary" {const elements = try testInteractive("<details><summary>More</summary><p>Content</p></details>");+ defer testing.test_session.closeAllPages();try testing.expectEqual(2, elements.len);try testing.expectEqual("details", elements[0].tag_name);try testing.expectEqual("summary", elements[1].tag_name);@@ -618,5 +631,6 @@ test "browser.interactive: mixed elements" {\\ <div role="tab">Tab</div>\\</div>);+ defer testing.test_session.closeAllPages();try testing.expectEqual(4, elements.len);}diff --git a/src/browser/links.zig b/src/browser/links.zigindex f2f130e6e..45695923a 100644--- a/src/browser/links.zig+++ b/src/browser/links.zig@@ -90,6 +90,8 @@ const testing = @import("../testing.zig");fn testLinks(html: []const u8) ![]Link {const frame = try testing.createFrame();+ errdefer testing.test_session.closeAllPages();+const doc = frame.window._document;const div = try doc.createElement("div", null, frame);try frame.parseHtmlAsChildren(div.asNode(), html);diff --git a/src/browser/structured_data.zig b/src/browser/structured_data.zigindex c41de220f..30dbf5a63 100644--- a/src/browser/structured_data.zig+++ b/src/browser/structured_data.zig@@ -490,6 +490,7 @@ const testing = @import("../testing.zig");fn testStructuredData(html: []const u8) !StructuredData {const frame = try testing.createFrame();+ errdefer testing.test_session.closeAllPages();const doc = frame.window._document;const div = try doc.createElement("div", null, frame);diff --git a/src/cdp/CDP.zig b/src/cdp/CDP.zigindex 54c5e3797..77041f5d7 100644--- a/src/cdp/CDP.zig+++ b/src/cdp/CDP.zig@@ -500,11 +500,12 @@ pub const BrowserContext = struct {// time, we only have 1 target_id.target_id: ?[14]u8,- // Root frame_id of this context's page, captured when `frameCreated`- // fires. A BrowserContext is single-target by protocol, so it can resolve- // its (live) page/frame from the Session by this id — see `mainFrame` /- // `mainPage`. Stable across navigations (the replacement reuses it).- frame_id: ?u32 = null,+ // Navigation-safe handle to this context's page, set when `frameCreated`+ // fires. A BrowserContext is single-target by protocol, so it resolves its+ // (live) page/frame through this handle — see `mainFrame` / `mainPage`. The+ // handle's frame_id is stable across navigations (the replacement reuses+ // it). null until the first page is created.+ page_handle: ?Session.PageHandle = null,// The CDP session_id. After the target/page is created, the client// "attaches" to it (either explicitly or automatically). We return a@@ -743,14 +744,13 @@ pub const BrowserContext = struct {// True while this context's page is mid-commit (a root navigation's// replacement is being promoted).pub fn inCommit(self: *const BrowserContext) bool {- const page = self.mainPage() orelse return false;- return self.session.replacementOf(page) != null;+ return (self.page_handle orelse return false).inCommit();}- // The live Page for this single-target context (resolved by frame_id),- // or null if no page is loaded.+ // The live Page for this single-target context, or null if no page is+ // loaded.pub fn mainPage(self: *const BrowserContext) ?*Page {- return self.session.livePage(self.frame_id orelse return null);+ return (self.page_handle orelse return null).page();}pub fn getURL(self: *const BrowserContext) ?[:0]const u8 {diff --git a/src/cdp/domains/page.zig b/src/cdp/domains/page.zigindex 53aeedcd9..808a2fa70 100644--- a/src/cdp/domains/page.zig+++ b/src/cdp/domains/page.zig@@ -240,8 +240,10 @@ fn close(cmd: *CDP.Command) !void {bc.session_id = null;}- if (bc.frame_id) |frame_id| bc.session.closePage(frame_id);- bc.frame_id = null;+ if (bc.page_handle) |handle| {+ handle.close();+ }+ bc.page_handle = null;for (bc.isolated_worlds.items) |world| {world.deinit();}@@ -528,9 +530,9 @@ pub fn frameRemove(bc: *CDP.BrowserContext) void {}pub fn frameCreated(bc: *CDP.BrowserContext, frame: *Frame) !void {- // Record the root frame_id so the context can resolve its live page/frame- // (mainFrame / mainPage) without a session-wide "current" shim.- bc.frame_id = frame._frame_id;+ // Record a handle to the new page so the context can resolve its live+ // page/frame (mainFrame / mainPage) without a session-wide "current" shim.+ bc.page_handle = .{ .session = bc.session, .frame_id = frame._frame_id };// Detect "in commit" mode: Session.commitPendingPage dispatches frame_// created BEFORE clearing `replaces` (deliberate ordering — seediff --git a/src/cdp/domains/target.zig b/src/cdp/domains/target.zigindex da4603862..d1543e055 100644--- a/src/cdp/domains/target.zig+++ b/src/cdp/domains/target.zig@@ -306,9 +306,9 @@ fn closeTarget(cmd: *CDP.Command) !void {bc.session_id = null;}- if (bc.frame_id) |frame_id| {- bc.session.closePage(frame_id);- bc.frame_id = null;+ if (bc.page_handle) |handle| {+ handle.close();+ bc.page_handle = null;}for (bc.isolated_worlds.items) |world| {world.deinit();