cookie support

Author: karlseguin

src/browser/ScriptManager.zig

@@ -222,6 +222,7 @@ pub fn addFromElement(self: *ScriptManager, element: *parser.Element) !void {
         .url = remote_url.?,
         .ctx = pending_script,
         .method = .GET,
+        .cookie = page.requestCookie(.{}),
         .start_callback = if (log.enabled(.http, .debug)) startCallback else null,
         .header_done_callback = headerCallback,
         .data_callback = dataCallback,
@@ -274,6 +275,7 @@ pub fn blockingGet(self: *ScriptManager, url: [:0]const u8) !BlockingResult {
         .url = url,
         .method = .GET,
         .ctx = &blocking,
+        .cookie = self.page.requestCookie(.{}),
         .start_callback = if (log.enabled(.http, .debug)) Blocking.startCallback else null,
         .header_done_callback = Blocking.headerCallback,
         .data_callback = Blocking.dataCallback,

src/browser/html/document.zig

@@ -85,7 +85,10 @@ pub const HTMLDocument = struct {
 
     pub fn get_cookie(_: *parser.DocumentHTML, page: *Page) ![]const u8 {
         var buf: std.ArrayListUnmanaged(u8) = .{};
-        try page.cookie_jar.forRequest(&page.url.uri, buf.writer(page.arena), .{ .navigation = true, .is_http = false });
+        try page.cookie_jar.forRequest(&page.url.uri, buf.writer(page.arena), .{
+            .is_http = false,
+            .is_navigation = true,
+        });
         return buf.items;
     }
 

src/browser/page.zig

@@ -392,6 +392,19 @@ pub const Page = struct {
         return arr.items;
     }
 
+    const RequestCookieOpts = struct {
+        is_http: bool = true,
+        is_navigation: bool = false,
+    };
+    pub fn requestCookie(self: *const Page, opts: RequestCookieOpts) HttpClient.RequestCookie {
+        return .{
+            .jar = self.cookie_jar,
+            .origin = &self.url.uri,
+            .is_http = opts.is_http,
+            .is_navigation = opts.is_navigation,
+        };
+    }
+
     // spec reference: https://html.spec.whatwg.org/#document-lifecycle
     pub fn navigate(self: *Page, request_url: []const u8, opts: NavigateOpts) !void {
         if (self.mode != .pre) {
@@ -419,17 +432,22 @@ pub const Page = struct {
         }
 
         const owned_url = try self.arena.dupeZ(u8, request_url);
+        self.url = try URL.parse(owned_url, null);
 
-        try self.http_client.request(.{
+        self.http_client.request(.{
             .ctx = self,
             .url = owned_url,
             .method = opts.method,
             .body = opts.body,
+            .cookie = self.requestCookie(.{ .is_navigation = true }),
             .header_done_callback = pageHeaderDoneCallback,
             .data_callback = pageDataCallback,
             .done_callback = pageDoneCallback,
             .error_callback = pageErrorCallback,
-        });
+        }) catch |err| {
+            log.err(.http, "navigate request", .{ .url = owned_url, .err = err });
+            return err;
+        };
 
         self.session.browser.notification.dispatch(.page_navigate, &.{
             .opts = opts,

src/browser/storage/cookie.zig

@@ -10,8 +10,8 @@ const public_suffix_list = @import("../../data/public_suffix_list.zig").lookup;
 pub const LookupOpts = struct {
     request_time: ?i64 = null,
     origin_uri: ?*const Uri = null,
-    navigation: bool = true,
     is_http: bool,
+    is_navigation: bool = true,
 };
 
 pub const Jar = struct {
@@ -91,7 +91,7 @@ pub const Jar = struct {
 
         var first = true;
         for (self.cookies.items) |*cookie| {
-            if (!cookie.appliesTo(&target, same_site, opts.navigation, opts.is_http)) continue;
+            if (!cookie.appliesTo(&target, same_site, opts.is_navigation, opts.is_http)) continue;
 
             // we have a match!
             if (first) {
@@ -103,18 +103,15 @@ pub const Jar = struct {
         }
     }
 
-    // @newhttp
-    // pub fn populateFromResponse(self: *Jar, uri: *const Uri, header: *const http.ResponseHeader) !void {
-    //     const now = std.time.timestamp();
-    //     var it = header.iterate("set-cookie");
-    //     while (it.next()) |set_cookie| {
-    //         const c = Cookie.parse(self.allocator, uri, set_cookie) catch |err| {
-    //             log.warn(.web_api, "cookie parse failed", .{ .raw = set_cookie, .err = err });
-    //             continue;
-    //         };
-    //         try self.add(c, now);
-    //     }
-    // }
+    pub fn populateFromResponse(self: *Jar, uri: *const Uri, set_cookie: []const u8) !void {
+        const c = Cookie.parse(self.allocator, uri, set_cookie) catch |err| {
+            log.warn(.web_api, "cookie parse failed", .{ .raw = set_cookie, .err = err });
+            return;
+        };
+
+        const now = std.time.timestamp();
+        try self.add(c, now);
+    }
 
     fn writeCookie(cookie: *const Cookie, writer: anytype) !void {
         if (cookie.name.len > 0) {
@@ -429,7 +426,7 @@ pub const Cookie = struct {
         return .{ name, value, rest };
     }
 
-    pub fn appliesTo(self: *const Cookie, url: *const PreparedUri, same_site: bool, navigation: bool, is_http: bool) bool {
+    pub fn appliesTo(self: *const Cookie, url: *const PreparedUri, same_site: bool, is_navigation: bool, is_http: bool) bool {
         if (self.http_only and is_http == false) {
             // http only cookies can be accessed from Javascript
             return false;
@@ -448,7 +445,7 @@ pub const Cookie = struct {
             // and cookie.same_site == .lax
             switch (self.same_site) {
                 .strict => return false,
-                .lax => if (navigation == false) return false,
+                .lax => if (is_navigation == false) return false,
                 .none => {},
             }
         }
@@ -619,7 +616,7 @@ test "Jar: forRequest" {
 
     // nothing fancy here
     try expectCookies("global1=1; global2=2", &jar, test_uri, .{ .is_http = true });
-    try expectCookies("global1=1; global2=2", &jar, test_uri, .{ .origin_uri = &test_uri, .navigation = false, .is_http = true });
+    try expectCookies("global1=1; global2=2", &jar, test_uri, .{ .origin_uri = &test_uri, .is_navigation = false, .is_http = true });
 
     // We have a cookie where Domain=lightpanda.io
     // This should _not_ match xyxlightpanda.io
@@ -685,22 +682,22 @@ test "Jar: forRequest" {
     // non-navigational cross domain, insecure
     try expectCookies("", &jar, try std.Uri.parse("http://lightpanda.io/x/"), .{
         .origin_uri = &(try std.Uri.parse("https://example.com/")),
-        .navigation = false,
         .is_http = true,
+        .is_navigation = false,
     });
 
     // non-navigational cross domain, secure
     try expectCookies("sitenone=6", &jar, try std.Uri.parse("https://lightpanda.io/x/"), .{
         .origin_uri = &(try std.Uri.parse("https://example.com/")),
-        .navigation = false,
         .is_http = true,
+        .is_navigation = false,
     });
 
     // non-navigational same origin
     try expectCookies("global1=1; global2=2; sitelax=7; sitestrict=8", &jar, try std.Uri.parse("http://lightpanda.io/x/"), .{
         .origin_uri = &(try std.Uri.parse("https://lightpanda.io/")),
-        .navigation = false,
         .is_http = true,
+        .is_navigation = false,
     });
 
     // exact domain match + suffix

src/browser/xhr/xhr.zig

@@ -81,7 +81,6 @@ pub const XMLHttpRequest = struct {
     proto: XMLHttpRequestEventTarget = XMLHttpRequestEventTarget{},
     arena: Allocator,
     transfer: ?*HttpClient.Transfer = null,
-    cookie_jar: *CookieJar,
     err: ?anyerror = null,
     last_dispatch: i64 = 0,
     send_flag: bool = false,
@@ -169,7 +168,6 @@ pub const XMLHttpRequest = struct {
             .headers = .{},
             .method = undefined,
             .state = .unsent,
-            .cookie_jar = page.cookie_jar,
         };
     }
 
@@ -378,6 +376,7 @@ pub const XMLHttpRequest = struct {
             .method = self.method,
             .body = self.request_body,
             .content_type = "Content-Type: text/plain; charset=UTF-8", // @newhttp TODO
+            .cookie = page.requestCookie(.{}),
             .start_callback = httpStartCallback,
             .header_callback = httpHeaderCallback,
             .header_done_callback = httpHeaderDoneCallback,
@@ -395,20 +394,6 @@ pub const XMLHttpRequest = struct {
         }
 
         log.debug(.http, "request start", .{ .method = self.method, .url = self.url, .source = "xhr" });
-
-        // @newhttp
-        // {
-        //     var arr: std.ArrayListUnmanaged(u8) = .{};
-        //     try self.cookie_jar.forRequest(&self.url.?.uri, arr.writer(self.arena), .{
-        //         .navigation = false,
-        //         .origin_uri = &self.origin_url.uri,
-        //         .is_http = true,
-        //     });
-
-        //     if (arr.items.len > 0) {
-        //         try request.addHeader("Cookie", arr.items, .{});
-        //     }
-        // }
         self.transfer = transfer;
     }
 
@@ -445,9 +430,6 @@ pub const XMLHttpRequest = struct {
 
         self.state = .loading;
         self.dispatchEvt("readystatechange");
-
-        // @newhttp
-        // try self.cookie_jar.populateFromResponse(self.request.?.request_uri, &header);
     }
 
     fn httpDataCallback(transfer: *HttpClient.Transfer, data: []const u8) !void {

src/data/public_suffix_list.zig

@@ -8,8 +8,7 @@ pub fn lookup(value: []const u8) bool {
 const public_suffix_list = std.StaticStringMap(void).initComptime(entries);
 
 const entries: []const struct { []const u8, void } =
-    // @newhttp
-    if (builtin.is_test or true) &.{
+    if (builtin.is_test) &.{
         .{ "api.gov.uk", {} },
         .{ "gov.uk", {} },
     } else &.{