Skip to content

G
git2
Commit c78c7ee6 by Tyler Ang-Wanek Committed by Edward Thomson
Options

httpclient: no proxy creds in requests if proxy is CONNECT type

parent 28328570
Showing with 8 additions and 3 deletions
src/transports/httpclient.c
...@@ -658,6 +658,11 @@ static int generate_connect_request( ...@@ -658,6 +658,11 @@ static int generate_connect_request(
return git_buf_oom(buf) ? -1 : 0; return git_buf_oom(buf) ? -1 : 0;
} }
static bool use_connect_proxy(git_http_client *client)
{
return client->proxy.url.host && !strcmp(client->server.url.scheme, "https");
}
static int generate_request( static int generate_request(
git_http_client *client, git_http_client *client,
git_http_request *request) git_http_request *request)
...@@ -713,7 +718,8 @@ static int generate_request( ...@@ -713,7 +718,8 @@ static int generate_request(
git_buf_printf(buf, "Expect: 100-continue\r\n"); git_buf_printf(buf, "Expect: 100-continue\r\n");
if ((error = apply_server_credentials(buf, client, request)) < 0 || if ((error = apply_server_credentials(buf, client, request)) < 0 ||
(error = apply_proxy_credentials(buf, client, request)) < 0) (!use_connect_proxy(client) &&
(error = apply_proxy_credentials(buf, client, request)) < 0))
return error; return error;
if (request->custom_headers) { if (request->custom_headers) {
...@@ -1003,8 +1009,7 @@ static int http_client_connect( ...@@ -1003,8 +1009,7 @@ static int http_client_connect(
reset_parser(client); reset_parser(client);
/* Reconnect to the proxy if necessary. */ /* Reconnect to the proxy if necessary. */
use_proxy = client->proxy.url.host && use_proxy = use_connect_proxy(client);
!strcmp(client->server.url.scheme, "https");
if (use_proxy) { if (use_proxy) {
if (!client->proxy_connected || !client->keepalive || if (!client->proxy_connected || !client->keepalive ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment