Skip to content

Lightpanda: the headless browser designed for AI and automation

update `Config` + `help.zon`

Halil Durak814a2ab5493d
diff --git a/src/Config.zig b/src/Config.zig
index c5d1fa360..160bade5b 100644
--- a/src/Config.zig
+++ b/src/Config.zig
@@ -276,9 +276,9 @@ const CommonOptions = .{
.{ .name = "web_bot_auth_domain", .type = ?[]const u8 },
.{ .name = "user_agent", .type = ?[]const u8, .validator = userAgentValidator },
.{ .name = "block_private_networks", .type = bool },
- .{ .name = "block_cidrs", .type = ?[]const u8 },
- .{ .name = "block_urls", .type = ?[]const u8 },
- .{ .name = "adblock_lists", .type = ?[]const u8 },
+ .{ .name = "block_cidrs", .type = ?[]const u8, .validator = accumulateValidator },
+ .{ .name = "block_urls", .type = ?[]const u8, .validator = accumulateValidator },
+ .{ .name = "adblock_lists", .type = ?[]const u8, .validator = accumulateValidator },
.{ .name = "cookie", .type = ?[]const u8 },
.{ .name = "cookie_jar", .type = ?[]const u8 },
.{ .name = "disable_subframes", .type = bool, .deprecated = "subframes are now disabled by default, use \"--load-resources iframe\" to enable" },
@@ -1264,6 +1264,30 @@ test "Config: parseArgs refuses an invalid --http-header" {
}
}
+test "Config: parseArgs accumulates repeated list flags" {
+ var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
+ defer arena.deinit();
+
+ const argv = [_][*:0]const u8{
+ "lightpanda", "fetch",
+ "--adblock-lists", "easylist.txt",
+ "--adblock-lists", "easyprivacy.txt,annoyances.txt",
+ "--block-cidrs", "10.0.0.0/8",
+ "--block-cidrs", "-10.0.0.42/32",
+ "http://example.com",
+ };
+ const proc_args: std.process.Args = .{ .vector = &argv };
+ const config = try parseArgs(arena.allocator(), proc_args);
+
+ var paths = config.adblockLists().?;
+ try std.testing.expectEqualStrings("easylist.txt", paths.next().?);
+ try std.testing.expectEqualStrings("easyprivacy.txt", paths.next().?);
+ try std.testing.expectEqualStrings("annoyances.txt", paths.next().?);
+ try std.testing.expectEqual(null, paths.next());
+
+ try std.testing.expectEqualStrings("10.0.0.0/8,-10.0.0.42/32", config.blockCidrs().?);
+}
+
test "Config: parseArgs collects --http-header" {
// The parsed headers are owned by the allocator for the process lifetime;
// an arena stands in for main's.
@@ -1311,6 +1335,18 @@ test "Config: httpHeaders accessor" {
}
}
+/// For comma-separated flags the help documents as repeatable: each
+/// occurrence appends to what earlier ones left, so "--x a --x b" equals
+/// "--x a,b" instead of the last flag silently winning.
+fn accumulateValidator(allocator: Allocator, args: *std.process.Args.Iterator, field: *?[]const u8) !void {
+ const str = args.next() orelse return error.MissingArgument;
+ const existing = field.* orelse {
+ field.* = try allocator.dupe(u8, str);
+ return;
+ };
+ field.* = try std.mem.join(allocator, ",", &.{ existing, str });
+}
+
fn userAgentValidator(allocator: Allocator, args: *std.process.Args.Iterator, ua: *?[]const u8) !void {
const str = args.next() orelse return error.MissingArgument;
validateUserAgent(str) catch |err| {
diff --git a/src/help.zon b/src/help.zon
index 90308e9b6..523e4a193 100644
--- a/src/help.zon
+++ b/src/help.zon
@@ -328,7 +328,8 @@
\\common options:
\\ --adblock-lists <LIST>
\\ EasyList-syntax filter files to load. Can be passed multiple times.
- \\ Requests to a hostname blocked by any list are failed before they leave.
+ \\ Requests a list blocks are failed before they leave; the URL,
+ \\ resource type, party and $domain= of each one decide.
\\ e.g. --adblock-lists easylist.txt --adblock-lists easyprivacy.txt
\\ --block-cidrs <CIDR>
\\ Additional CIDR ranges to block. Can be passed multiple times.