Skip to content

Lightpanda: the headless browser designed for AI and automation

fall back to frame referrer policy

Muki Kiboigo8e0a9a558b86
diff --git a/src/browser/global_scope.zig b/src/browser/global_scope.zig
index 71cc25ab0..f8980af83 100644
--- a/src/browser/global_scope.zig
+++ b/src/browser/global_scope.zig
@@ -32,6 +32,7 @@ const WorkerGlobalScope = @import("webapi/WorkerGlobalScope.zig");
const Frame = @import("Frame.zig");
const Session = @import("Session.zig");
+const referrer = @import("referrer.zig");
const EventManagerBase = @import("EventManagerBase.zig");
pub const GlobalScope = union(enum) {
@@ -98,6 +99,13 @@ pub const GlobalScope = union(enum) {
};
}
+ pub fn referrerPolicy(self: GlobalScope) referrer.Policy {
+ return switch (self) {
+ .frame => |frame| frame.referrer_policy,
+ .worker => |worker| worker._frame.referrer_policy,
+ };
+ }
+
pub fn isSameOrigin(self: GlobalScope, target: [:0]const u8) bool {
return switch (self) {
inline else => |g| g.isSameOrigin(target),
diff --git a/src/browser/js/Execution.zig b/src/browser/js/Execution.zig
index 16066896b..9d15660a1 100644
--- a/src/browser/js/Execution.zig
+++ b/src/browser/js/Execution.zig
@@ -34,6 +34,7 @@ const Page = @import("../Page.zig");
const Session = @import("../Session.zig");
const Factory = @import("../Factory.zig");
const HttpClient = @import("../../network/HttpClient.zig");
+const referrer = @import("../referrer.zig");
const EventManagerBase = @import("../EventManagerBase.zig");
const Console = @import("../webapi/Console.zig");
@@ -96,6 +97,10 @@ pub fn referrerSource(self: *const Execution) [:0]const u8 {
return self.js.global.referrerSource();
}
+pub fn referrerPolicy(self: *const Execution) referrer.Policy {
+ return self.js.global.referrerPolicy();
+}
+
pub fn isSameOrigin(self: *const Execution, url: [:0]const u8) bool {
return self.js.global.isSameOrigin(url);
}
diff --git a/src/browser/webapi/net/Fetch.zig b/src/browser/webapi/net/Fetch.zig
index aa9ed4f9f..40061f234 100644
--- a/src/browser/webapi/net/Fetch.zig
+++ b/src/browser/webapi/net/Fetch.zig
@@ -144,26 +144,18 @@ pub fn init(input: Input, options: ?InitOpts, exec: *const Execution) !js.Promis
try h.populateRequestHeaders(transfer);
}
- switch (request._referrer) {
- .none => {},
- .client => {
- if (request._referrer_policy) |policy| {
- const source = exec.referrerSource();
- if (try referrer.compute(transfer.arena.allocator(), policy, source, transfer.req.url)) |ref| {
- try transfer.setHeader("Referer", ref, .{});
- }
- transfer.req.referrer_policy = policy;
- } else {
- try exec.headersForRequest(transfer);
- }
- },
- .url => |source| {
- const policy = request._referrer_policy orelse referrer.Policy.default;
- if (try referrer.compute(transfer.arena.allocator(), policy, source, transfer.req.url)) |ref| {
- try transfer.setHeader("Referer", ref, .{});
- }
+ const source: ?[:0]const u8 = switch (request._referrer) {
+ .none => null,
+ .client => exec.referrerSource(),
+ .url => |u| u,
+ };
+
+ if (source) |s| {
+ const policy = request._referrer_policy orelse exec.referrerPolicy();
+ if (try referrer.compute(transfer.arena.allocator(), policy, s, transfer.req.url)) |ref| {
+ try transfer.setHeader("Referer", ref, .{});
transfer.req.referrer_policy = policy;
- },
+ }
}
}
diff --git a/src/browser/webapi/net/Request.zig b/src/browser/webapi/net/Request.zig
index 1f530acc9..16fc5ab31 100644
--- a/src/browser/webapi/net/Request.zig
+++ b/src/browser/webapi/net/Request.zig
@@ -74,7 +74,7 @@ pub const InitOpts = struct {
pub const ReferrerValue = union(enum) {
client,
- @"no-referrer",
+ none,
url: [:0]const u8,
};
@@ -184,7 +184,7 @@ pub fn init(input: Input, opts_: ?InitOpts, exec: *const Execution) !*Request {
};
const referrer_value: ReferrerValue = if (opts.referrer) |r| blk: {
- if (r.len == 0) break :blk .@"no-referrer";
+ if (r.len == 0) break :blk .none;
if (std.mem.eql(u8, r, "about:client")) break :blk .client;
break :blk .{ .url = try URL.resolve(arena.allocator(), exec.base(), r, .{ .encoding = exec.charset.* }) };
} else switch (input) {
@@ -418,7 +418,7 @@ pub fn clone(self: *Request, exec: *const Execution) !*Request {
pub fn getReferrer(self: *Request) []const u8 {
return switch (self._referrer) {
.client => "about:client",
- .@"no-referrer" => "",
+ .none => "",
.url => |url| url,
};
}