public/browser
1
0
Fork 0
mirror of https://github.com/lightpanda-io/browser.git synced 2025-10-28 22:53:28 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

http: handle proxy's request header callback

Browse Source
This commit is contained in:
Pierre Tachoire
2025-08-21 15:09:07 +02:00
parent 5e78a26e3d
commit e2320ebe66
2 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/http/Client.zig
View File

@@ -569,6 +569,7 @@ pub const Transfer = struct {
bytes_received: usize = 0,
// We'll store the response header here
proxy_response_header: ?ResponseHeader = null,
response_header: ?ResponseHeader = null,
_notified_fail: bool = false,
@@ -705,8 +706,6 @@ pub const Transfer = struct {
// mark the end of parsing headers
if (buf_len == 2) transfer._resp_header_status = .end;
log.debug(.http, "header parsing", .{ .status = transfer._resp_header_status });
switch (transfer._resp_header_status) {
.empty => unreachable,
.first => {
@@ -726,18 +725,36 @@ pub const Transfer = struct {
return 0;
};
if (status >= 300 and status <= 399) {
transfer._redirecting = true;
return buf_len;
}
transfer._redirecting = false;
var url: [*c]u8 = undefined;
errorCheck(c.curl_easy_getinfo(easy, c.CURLINFO_EFFECTIVE_URL, &url)) catch |err| {
log.err(.http, "failed to get URL", .{ .err = err });
return 0;
};
// When using proxy, curl call the header function for all HTTP
// requests, including the CONNECT one used tunneling requests.
if (transfer._use_proxy and transfer.proxy_response_header == null) {
transfer.proxy_response_header = .{
.url = "",
.status = status,
};
// We want to ignore the successful proxy's CONNECT request.
// But there is no proper way to detect if the current
// request is a proxy CONNECT one.
// We know curl uses a CONNECT when it establishes a TLS
// conn.
if (status == 200 and std.mem.startsWith(u8, std.mem.span(url), "https")) {
return buf_len;
}
}
if (status >= 300 and status <= 399) {
transfer._redirecting = true;
return buf_len;
}
transfer._redirecting = false;
transfer.response_header = .{
.url = url,
.status = status,
@@ -755,6 +772,11 @@ pub const Transfer = struct {
return buf_len;
}
if (transfer._use_proxy and transfer.response_header == null) {
// we are in a successful CONNECT proxy request, ignore it.
return buf_len;
}
if (getResponseHeader(easy, "content-type", 0)) |ct| {
var hdr = &transfer.response_header.?;
const value = ct.value;

1
src/http/Http.zig
View File

@@ -116,7 +116,6 @@ pub const Connection = struct {
var use_proxy = false;
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)));
use_proxy = true;
}