Nixyri/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-15 16:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.http.Client: add proxy scheme guessing, fix typo

Browse Source 
This adds scheme guessing when loading proxies, such that
`HTTP_PROXY=127.0.0.1` and such are valid now and it behaves identically
to `HTTP_PROXY=http://127.0.0.1`. Additionally fixed a typo that was
causing loadDefaultProxies to never populate the https_proxy.
This commit is contained in:
Nameless 2023-10-26 17:55:48 -05:00 committed by Andrew Kelley
parent da06269d70
commit 87735e4dae
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/std/Uri.zig
View File

@ -176,7 +176,7 @@ pub fn parseWithoutScheme(text: []const u8) ParseError!Uri {
var end_of_host: usize = authority.len;
if (authority[start_of_host] == '[') { // IPv6
if (authority.len > start_of_host and authority[start_of_host] == '[') { // IPv6
end_of_host = std.mem.lastIndexOf(u8, authority, "]") orelse return error.InvalidFormat;
end_of_host += 1;

38
lib/std/http/Client.zig
View File

@ -1046,9 +1046,15 @@ pub fn loadDefaultProxies(client: *Client) !void {
break :http;
defer client.allocator.free(content);
const uri = try Uri.parse(content);
const uri = Uri.parse(content) catch
Uri.parseWithoutScheme(content) catch
break :http;
const protocol = if (uri.scheme.len == 0)
.plain // No scheme, assume http://
else
protocol_map.get(uri.scheme) orelse break :http; // Unknown scheme, ignore
const protocol = protocol_map.get(uri.scheme) orelse break :http; // Unknown scheme, ignore
const host = if (uri.host) |host| try client.allocator.dupe(u8, host) else break :http; // Missing host, ignore
client.http_proxy = .{
.allocator = client.allocator,
@ -1063,16 +1069,16 @@ pub fn loadDefaultProxies(client: *Client) !void {
};
if (uri.user != null and uri.password != null) {
const prefix_len = "Basic ".len;
const prefix = "Basic ";
const unencoded = try std.fmt.allocPrint(client.allocator, "{s}:{s}", .{ uri.user.?, uri.password.? });
defer client.allocator.free(unencoded);
const buffer = try client.allocator.alloc(u8, std.base64.standard.Encoder.calcSize(unencoded.len) + prefix_len);
const buffer = try client.allocator.alloc(u8, std.base64.standard.Encoder.calcSize(unencoded.len) + prefix.len);
defer client.allocator.free(buffer);
const result = std.base64.standard.Encoder.encode(buffer[prefix_len..], unencoded);
@memcpy(buffer[0..prefix_len], "Basic ");
const result = std.base64.standard.Encoder.encode(buffer[prefix.len..], unencoded);
@memcpy(buffer[0..prefix.len], prefix);
try client.http_proxy.?.headers.append("proxy-authorization", result);
}
@ -1091,11 +1097,17 @@ pub fn loadDefaultProxies(client: *Client) !void {
break :https;
defer client.allocator.free(content);
const uri = try Uri.parse(content);
const uri = Uri.parse(content) catch
Uri.parseWithoutScheme(content) catch
break :https;
const protocol = if (uri.scheme.len == 0)
.plain // No scheme, assume http://
else
protocol_map.get(uri.scheme) orelse break :https; // Unknown scheme, ignore
const protocol = protocol_map.get(uri.scheme) orelse break :https; // Unknown scheme, ignore
const host = if (uri.host) |host| try client.allocator.dupe(u8, host) else break :https; // Missing host, ignore
client.http_proxy = .{
client.https_proxy = .{
.allocator = client.allocator,
.headers = .{ .allocator = client.allocator },
@ -1108,16 +1120,16 @@ pub fn loadDefaultProxies(client: *Client) !void {
};
if (uri.user != null and uri.password != null) {
const prefix_len = "Basic ".len;
const prefix = "Basic ";
const unencoded = try std.fmt.allocPrint(client.allocator, "{s}:{s}", .{ uri.user.?, uri.password.? });
defer client.allocator.free(unencoded);
const buffer = try client.allocator.alloc(u8, std.base64.standard.Encoder.calcSize(unencoded.len) + prefix_len);
const buffer = try client.allocator.alloc(u8, std.base64.standard.Encoder.calcSize(unencoded.len) + prefix.len);
defer client.allocator.free(buffer);
const result = std.base64.standard.Encoder.encode(buffer[prefix_len..], unencoded);
@memcpy(buffer[0..prefix_len], "Basic ");
const result = std.base64.standard.Encoder.encode(buffer[prefix.len..], unencoded);
@memcpy(buffer[0..prefix.len], prefix);
try client.https_proxy.?.headers.append("proxy-authorization", result);
}