|
 |
6c1422 |
From 9d5903ebcbcbcc4f3a997ec7d5552721c5383b9f Mon Sep 17 00:00:00 2001
|
|
|
6c1422 |
From: =?UTF-8?q?Martin=20Ba=C5=A1ti?= <mbasti@redhat.com>
|
|
|
6c1422 |
Date: Thu, 27 Aug 2020 23:09:56 +0200
|
|
|
6c1422 |
Subject: [PATCH] http_proxy: do not crash with HTTPS_PROXY and NO_PROXY set
|
|
|
6c1422 |
|
|
|
6c1422 |
... in case NO_PROXY takes an effect
|
|
|
6c1422 |
|
|
|
6c1422 |
Without this patch, the following command crashes:
|
|
|
6c1422 |
|
|
|
6c1422 |
$ GIT_CURL_VERBOSE=1 NO_PROXY=github.com HTTPS_PROXY=https://example.com \
|
|
|
6c1422 |
git clone https://github.com/curl/curl.git
|
|
|
6c1422 |
|
|
|
6c1422 |
Minimal libcurl-based reproducer:
|
|
|
6c1422 |
|
|
|
6c1422 |
#include <curl/curl.h>
|
|
|
6c1422 |
|
|
|
6c1422 |
int main() {
|
|
|
6c1422 |
CURL *curl = curl_easy_init();
|
|
|
6c1422 |
if(curl) {
|
|
|
6c1422 |
CURLcode ret;
|
|
|
6c1422 |
curl_easy_setopt(curl, CURLOPT_URL, "https://github.com/");
|
|
|
6c1422 |
curl_easy_setopt(curl, CURLOPT_PROXY, "example.com");
|
|
|
6c1422 |
/* set the proxy type */
|
|
|
6c1422 |
curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_HTTPS);
|
|
|
6c1422 |
curl_easy_setopt(curl, CURLOPT_NOPROXY, "github.com");
|
|
|
6c1422 |
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
|
|
|
6c1422 |
ret = curl_easy_perform(curl);
|
|
|
6c1422 |
curl_easy_cleanup(curl);
|
|
|
6c1422 |
return ret;
|
|
|
6c1422 |
}
|
|
|
6c1422 |
return -1;
|
|
|
6c1422 |
}
|
|
|
6c1422 |
|
|
|
6c1422 |
Assisted-by: Kamil Dudka
|
|
|
6c1422 |
Bug: https://bugzilla.redhat.com/1873327
|
|
|
6c1422 |
Closes #5902
|
|
|
6c1422 |
|
|
|
6c1422 |
Upstream-commit: 3eff1c5092e542819ac7e6454a70c94b36ab2a40
|
|
|
6c1422 |
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
|
6c1422 |
---
|
|
|
6c1422 |
lib/url.c | 3 +++
|
|
|
6c1422 |
1 file changed, 3 insertions(+)
|
|
|
6c1422 |
|
|
|
6c1422 |
diff --git a/lib/url.c b/lib/url.c
|
|
|
6c1422 |
index d65d17d..e77f391 100644
|
|
|
6c1422 |
--- a/lib/url.c
|
|
|
6c1422 |
+++ b/lib/url.c
|
|
|
6c1422 |
@@ -3074,6 +3074,9 @@ static CURLcode create_conn_helper_init_proxy(struct connectdata *conn)
|
|
|
6c1422 |
conn->bits.socksproxy = FALSE;
|
|
|
6c1422 |
conn->bits.proxy_user_passwd = FALSE;
|
|
|
6c1422 |
conn->bits.tunnel_proxy = FALSE;
|
|
|
6c1422 |
+ /* CURLPROXY_HTTPS does not have its own flag in conn->bits, yet we need
|
|
|
6c1422 |
+ to signal that CURLPROXY_HTTPS is not used for this connection */
|
|
|
6c1422 |
+ conn->http_proxy.proxytype = CURLPROXY_HTTP;
|
|
|
6c1422 |
}
|
|
|
6c1422 |
|
|
|
6c1422 |
out:
|
|
|
6c1422 |
--
|
|
|
6c1422 |
2.25.4
|
|
|
6c1422 |
|