Skip to content

Lightpanda: the headless browser designed for AI and automation

check both covers on Request under single mutex

Muki Kiboigod9539fbbe157
diff --git a/src/network/CorsGate.zig b/src/network/CorsGate.zig
index de5e1e3ef..5b904cdc9 100644
--- a/src/network/CorsGate.zig
+++ b/src/network/CorsGate.zig
@@ -221,18 +221,12 @@ pub fn check(self: *CorsGate, transfer: *Transfer) !Result {
const authored = try collectAuthoredHeaders(transfer, transfer.arena.allocator());
- var covered = try self.network.cors_store.covers(.{
- .origin = origin,
- .target = req.url,
- .credentials = wants_credentials,
- }, req.method, authored.items);
- if (!covered and !wants_credentials) {
- covered = try self.network.cors_store.covers(.{
- .origin = origin,
- .target = req.url,
- .credentials = true,
- }, req.method, authored.items);
- }
+ const covered = try self.network.cors_store.coversRequest(
+ transfer.arena.allocator(),
+ .{ .origin = origin, .target = req.url, .credentials = wants_credentials },
+ req.method,
+ authored.items,
+ );
if (covered) {
log.debug(.cors, "cross origin", .{
diff --git a/src/network/CorsStore.zig b/src/network/CorsStore.zig
index f3688a4a1..6df9c1018 100644
--- a/src/network/CorsStore.zig
+++ b/src/network/CorsStore.zig
@@ -187,6 +187,32 @@ pub fn covers(
return matches(entry.*, method, authored_headers);
}
+pub fn coversRequest(
+ self: *CorsStore,
+ allocator: std.mem.Allocator,
+ key: Key,
+ method: http.Method,
+ authored_headers: []const []const u8,
+) !bool {
+ const primary_key = try key.build(allocator);
+ defer allocator.free(primary_key);
+
+ self.mutex.lockUncancelable(lp.io);
+ defer self.mutex.unlock(lp.io);
+
+ if (self.getWithExpiration(primary_key)) |entry| {
+ if (matches(entry.*, method, authored_headers)) return true;
+ }
+
+ if (key.credentials) return false;
+
+ const cred_key = try (Key{ .origin = key.origin, .target = key.target, .credentials = true }).build(allocator);
+ defer allocator.free(cred_key);
+
+ const entry = self.getWithExpiration(cred_key) orelse return false;
+ return matches(entry.*, method, authored_headers);
+}
+
/// Insert or merge a CORS grant for (origin, target). `entry` is not
/// consumed: `put` copies whatever it needs (via `dupe`/`merge`, which
/// always allocate their own copies) and never takes ownership of