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

minor refactor prep for tls

Browse Source
This commit is contained in:
sjorsdonkers
2025-07-18 14:19:43 +02:00
parent 878dbd81b1
commit 4ab611de0c
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/http/client.zig
View File

@@ -806,27 +806,12 @@ pub const Request = struct {
log.warn(.http, "not implemented", .{ .feature = "async tls connect" }); log.warn(.http, "not implemented", .{ .feature = "async tls connect" });
} }
const is_proxy = self._client.isProxy(); if (self._connection_from_keepalive and
if ((is_proxy and self._proxy_secure) or (!self._client.isForwardProxy() and self._request_secure)) { ((self._client.isProxy() and self._proxy_secure) or (!self._client.isForwardProxy() and self._request_secure)))
if (self._connection_from_keepalive) { {
// If the connection came from the keepalive pool, than we already // If the connection came from the keepalive pool, than we already have a TLS Connection.
// have a TLS Connection. async_handler.conn.protocol = .{ .encrypted = .{ .conn = &connection.tls.?.nonblocking } };
async_handler.conn.protocol = .{ .encrypted = .{ .conn = &connection.tls.?.nonblocking } }; // and we're already connected
} else {
std.debug.assert(connection.tls == null);
async_handler.conn.protocol = .{
.handshake = tls.nonblock.Client.init(.{
.host = if (self._client.isConnectProxy()) self._request_host else self._connect_host, // looks wrong
.root_ca = self._client.root_ca,
.insecure_skip_verify = self._tls_verify_host == false,
.key_log_callback = tls.config.key_log.callback,
}),
};
}
}
if (self._connection_from_keepalive) {
// we're already connected
async_handler.pending_connect = false; async_handler.pending_connect = false;
return async_handler.conn.connected(); return async_handler.conn.connected();
} }
@@ -1156,6 +1141,19 @@ fn AsyncHandler(comptime H: type) type {
result catch |err| return self.handleError("Connection failed", err); result catch |err| return self.handleError("Connection failed", err);
const request = self.request;
if ((request._client.isProxy() and request._proxy_secure) or (!request._client.isForwardProxy() and request._request_secure)) {
std.debug.assert(request._connection.?.tls == null);
self.conn.protocol = .{
.handshake = tls.nonblock.Client.init(.{
.host = if (request._client.isConnectProxy()) request._request_host else request._connect_host,
.root_ca = request._client.root_ca,
.insecure_skip_verify = request._tls_verify_host == false,
.key_log_callback = tls.config.key_log.callback,
}),
};
}
if (self.request.shouldProxyConnect()) { if (self.request.shouldProxyConnect()) {
self.state = .connect; self.state = .connect;
const header = self.request.buildConnectHeader() catch |err| { const header = self.request.buildConnectHeader() catch |err| {