Nelson Benítez LeónHi, my initial motivation for this patch was to add NTLM proxy authentication so I could 'git clone' from inside my employers network, but apart from doing that, I also added two more features, so, this patch adds the following improvements to the http proxy support:
- Support NTLM proxy authentication (as well as other authentication methods) by setting CURLOPT_PROXYAUTH[1] to CURLAUTH_ANY.
- Look up environment vars http_proxy and HTTP_PROXY in case git http.proxy config option is not set. This supports system wide proxy support in terminals.
- Support proxy urls with username but without a password, in which case we interactively ask for the password (as it's already done in http auth code). This makes possible to not have the password written down in git config files or in env vars.
Thanks!
[1] http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTPROXYAUTH
--- http.c 2012-01-19 01:19:22.000000000 +0100 +++ http.mod2.c 2012-02-22 14:44:11.727773038 +0100
Show changes to diff +48 −2
@@ -299,8 +299,54 @@ if (curl_ftp_no_epsv) curl_easy_setopt(result, CURLOPT_FTP_USE_EPSV, 0); - if (curl_http_proxy) - curl_easy_setopt(result, CURLOPT_PROXY, curl_http_proxy); + if (!curl_http_proxy) { + const char *env_proxy; + env_proxy = getenv("HTTP_PROXY"); + if (!env_proxy) { + env_proxy = getenv("http_proxy"); + } + if (env_proxy) { + curl_http_proxy = xstrdup(env_proxy); + } + } + if (curl_http_proxy) { + char *at, *colon, *proxyuser; + const char *cp; + cp = strstr(curl_http_proxy, "://"); + if (cp == NULL) { + cp = curl_http_proxy; + } else { + cp += 3; + } + at = strchr(cp, '@'); + colon = strchr(cp, ':'); + if (at && (!colon || at < colon)) { + /* proxy string has username but no password, ask for password */ + char *ask_str, *proxyuser, *proxypass; + int len; + struct strbuf pbuf = STRBUF_INIT; + len = at - cp; + proxyuser = xmalloc(len + 1); + memcpy(proxyuser, cp, len); + proxyuser[len] = '\0'; + + strbuf_addf(&pbuf, "Enter password for proxy %s...", at+1); + ask_str = strbuf_detach(&pbuf, NULL); + proxypass = xstrdup(git_getpass(ask_str)); + + strbuf_insert(&pbuf, 0, curl_http_proxy, cp - curl_http_proxy); + strbuf_addf(&pbuf, "%s:%s", proxyuser, proxypass); + strbuf_add(&pbuf, at, strlen(at)); + curl_easy_setopt(result, CURLOPT_PROXY, strbuf_detach(&pbuf, NULL)); + + free(ask_str); + free(proxyuser); + free(proxypass); + } else { + curl_easy_setopt(result, CURLOPT_PROXY, curl_http_proxy); + } + curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY); + } return result; }
