wip

Author: krichprollsch

src/cdp/cdp.zig

@@ -477,9 +477,9 @@ pub fn BrowserContext(comptime CDP_T: type) type {
             self.cdp.browser.notification.unregister(.http_response_header_done, self);
         }
 
-        pub fn fetchEnable(self: *Self, auth: bool) !void {
+        pub fn fetchEnable(self: *Self, authRequests: bool) !void {
             try self.cdp.browser.notification.register(.http_request_intercept, self, onHttpRequestIntercept);
-            if (auth) {
+            if (authRequests) {
                 try self.cdp.browser.notification.register(.http_request_auth_required, self, onHttpRequestAuthRequired);
             }
         }

src/cdp/domains/fetch.zig

@@ -371,6 +371,7 @@ const AuthChallenge = struct {
 };
 
 pub fn requestAuthRequired(arena: Allocator, bc: anytype, intercept: *const Notification.RequestAuthRequired) !void {
+    std.log.debug("AUTH REQU FETCH\n", .{});
     // unreachable because we _have_ to have a page.
     const session_id = bc.session_id orelse unreachable;
     const target_id = bc.target_id orelse unreachable;

src/http/Client.zig

@@ -365,10 +365,21 @@ fn perform(self: *Client, timeout_ms: c_int) !void {
         const easy = msg.easy_handle.?;
         const transfer = try Transfer.fromEasy(easy);
 
+        var code: c_long = undefined;
+        try errorCheck(c.curl_easy_getinfo(easy, c.CURLINFO_RESPONSE_CODE, &code));
+        std.debug.print("FAILED REQ: {any}\n", .{code});
+
         // release it ASAP so that it's available; some done_callbacks
         // will load more resources.
         self.endTransfer(transfer);
 
+        // If the transfer is waiting for auth challenge interception, don't
+        // deinit the transfer and don't call the callbacks. All will be done
+        // later during the interception's response.
+        if (transfer._auth_challenge) {
+            continue;
+        }
+
         defer transfer.deinit();
 
         if (errorCheck(msg.data.result)) {
@@ -569,7 +580,9 @@ pub const Transfer = struct {
     _handle: ?*Handle = null,
 
     _redirecting: bool = false,
-    _forbidden: bool = false,
+    // True when a request returns a 401 or 407 and we wait for a request
+    // interception to continue with auth.
+    _auth_challenge: bool = false,
 
     fn deinit(self: *Transfer) void {
         self.req.headers.deinit();
@@ -668,6 +681,7 @@ pub const Transfer = struct {
     }
 
     fn headerCallback(buffer: [*]const u8, header_count: usize, buf_len: usize, data: *anyopaque) callconv(.c) usize {
+        std.debug.print("HEADER CALLBACK\n", .{});
         // libcurl should only ever emit 1 header at a time
         std.debug.assert(header_count == 1);
 
@@ -721,6 +735,7 @@ pub const Transfer = struct {
                 log.err(.http, "failed to get URL", .{ .err = err });
                 return 0;
             };
+            std.debug.print("STATUS {d}\n", .{status});
 
             transfer.response_header = .{
                 .url = url,
@@ -761,6 +776,7 @@ pub const Transfer = struct {
                     var wait_for_interception = false;
                     notification.dispatch(.http_request_auth_required, &.{ .transfer = transfer, .wait_for_interception = &wait_for_interception });
                     if (wait_for_interception) {
+                        transfer._auth_challenge = true;
                         // The user is send an invitation to intercept this request.
                         return buf_len;
                     }
@@ -792,7 +808,7 @@ pub const Transfer = struct {
             return c.CURL_WRITEFUNC_ERROR;
         };
 
-        if (transfer._redirecting) {
+        if (transfer._redirecting or transfer._auth_challenge) {
             return chunk_len;
         }
 

src/http/Http.zig

@@ -22,7 +22,7 @@ pub const c = @cImport({
     @cInclude("curl/curl.h");
 });
 
-pub const ENABLE_DEBUG = false;
+pub const ENABLE_DEBUG = true;
 pub const Client = @import("Client.zig");
 pub const Transfer = Client.Transfer;
 
@@ -114,7 +114,7 @@ pub const Connection = struct {
         // proxy
         if (opts.http_proxy) |proxy| {
             try errorCheck(c.curl_easy_setopt(easy, c.CURLOPT_PROXY, proxy.ptr));
-            try errorCheck(c.curl_easy_setopt(easy, c.CURLOPT_SUPPRESS_CONNECT_HEADERS, @as(c_long, 1)));
+            try errorCheck(c.curl_easy_setopt(easy, c.CURLOPT_SUPPRESS_CONNECT_HEADERS, @as(c_long, 0)));
         }
 
         // tls