http-push: enable "proactive auth"
Before commit986bbc08
, git was proactive about asking for http passwords. It assumed that if you had a username in your URL, you would also want a password, and asked for it before making any http requests. However, this could interfere with the use of .netrc (see986bbc08
for details). And it was also unnecessary, since the http fetching code had learned to recognize an HTTP 401 and prompt the user then. Furthermore, the proactive prompt could interfere with the usage of .netrc (see986bbc08
for details). Unfortunately, the http push-over-DAV code never learned to recognize HTTP 401, and so was broken by this change. This patch does a quick fix of re-enabling the "proactive auth" strategy only for http-push, leaving the dumb http fetch and smart-http as-is. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
0521710a8b
commit
a4ddbc33d7
@ -67,7 +67,7 @@ int main(int argc, const char **argv)
|
|||||||
|
|
||||||
git_config(git_default_config, NULL);
|
git_config(git_default_config, NULL);
|
||||||
|
|
||||||
http_init(NULL, url);
|
http_init(NULL, url, 0);
|
||||||
walker = get_http_walker(url);
|
walker = get_http_walker(url);
|
||||||
walker->get_tree = get_tree;
|
walker->get_tree = get_tree;
|
||||||
walker->get_history = get_history;
|
walker->get_history = get_history;
|
||||||
|
@ -1820,7 +1820,7 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
memset(remote_dir_exists, -1, 256);
|
memset(remote_dir_exists, -1, 256);
|
||||||
|
|
||||||
http_init(NULL, repo->url);
|
http_init(NULL, repo->url, 1);
|
||||||
|
|
||||||
#ifdef USE_CURL_MULTI
|
#ifdef USE_CURL_MULTI
|
||||||
is_running_queue = 0;
|
is_running_queue = 0;
|
||||||
|
8
http.c
8
http.c
@ -43,6 +43,7 @@ static int curl_ftp_no_epsv;
|
|||||||
static const char *curl_http_proxy;
|
static const char *curl_http_proxy;
|
||||||
static const char *curl_cookie_file;
|
static const char *curl_cookie_file;
|
||||||
static char *user_name, *user_pass, *description;
|
static char *user_name, *user_pass, *description;
|
||||||
|
static int http_proactive_auth;
|
||||||
static const char *user_agent;
|
static const char *user_agent;
|
||||||
|
|
||||||
#if LIBCURL_VERSION_NUM >= 0x071700
|
#if LIBCURL_VERSION_NUM >= 0x071700
|
||||||
@ -279,6 +280,9 @@ static CURL *get_curl_handle(void)
|
|||||||
curl_easy_setopt(result, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
|
curl_easy_setopt(result, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (http_proactive_auth)
|
||||||
|
init_curl_http_auth(result);
|
||||||
|
|
||||||
if (ssl_cert != NULL)
|
if (ssl_cert != NULL)
|
||||||
curl_easy_setopt(result, CURLOPT_SSLCERT, ssl_cert);
|
curl_easy_setopt(result, CURLOPT_SSLCERT, ssl_cert);
|
||||||
if (has_cert_password())
|
if (has_cert_password())
|
||||||
@ -367,7 +371,7 @@ static void set_from_env(const char **var, const char *envname)
|
|||||||
*var = val;
|
*var = val;
|
||||||
}
|
}
|
||||||
|
|
||||||
void http_init(struct remote *remote, const char *url)
|
void http_init(struct remote *remote, const char *url, int proactive_auth)
|
||||||
{
|
{
|
||||||
char *low_speed_limit;
|
char *low_speed_limit;
|
||||||
char *low_speed_time;
|
char *low_speed_time;
|
||||||
@ -378,6 +382,8 @@ void http_init(struct remote *remote, const char *url)
|
|||||||
|
|
||||||
curl_global_init(CURL_GLOBAL_ALL);
|
curl_global_init(CURL_GLOBAL_ALL);
|
||||||
|
|
||||||
|
http_proactive_auth = proactive_auth;
|
||||||
|
|
||||||
if (remote && remote->http_proxy)
|
if (remote && remote->http_proxy)
|
||||||
curl_http_proxy = xstrdup(remote->http_proxy);
|
curl_http_proxy = xstrdup(remote->http_proxy);
|
||||||
|
|
||||||
|
3
http.h
3
http.h
@ -86,7 +86,8 @@ extern void add_fill_function(void *data, int (*fill)(void *));
|
|||||||
extern void step_active_slots(void);
|
extern void step_active_slots(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern void http_init(struct remote *remote, const char *url);
|
extern void http_init(struct remote *remote, const char *url,
|
||||||
|
int proactive_auth);
|
||||||
extern void http_cleanup(void);
|
extern void http_cleanup(void);
|
||||||
|
|
||||||
extern int data_received;
|
extern int data_received;
|
||||||
|
@ -859,7 +859,7 @@ int main(int argc, const char **argv)
|
|||||||
|
|
||||||
url = strbuf_detach(&buf, NULL);
|
url = strbuf_detach(&buf, NULL);
|
||||||
|
|
||||||
http_init(remote, url);
|
http_init(remote, url, 0);
|
||||||
|
|
||||||
do {
|
do {
|
||||||
if (strbuf_getline(&buf, stdin, '\n') == EOF) {
|
if (strbuf_getline(&buf, stdin, '\n') == EOF) {
|
||||||
|
@ -160,7 +160,7 @@ test_expect_success 'PUT and MOVE sends object to URLs with SHA-1 hash suffix' '
|
|||||||
test_http_push_nonff "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
|
test_http_push_nonff "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
|
||||||
"$ROOT_PATH"/test_repo_clone master
|
"$ROOT_PATH"/test_repo_clone master
|
||||||
|
|
||||||
test_expect_failure 'push to password-protected repository (user in URL)' '
|
test_expect_success 'push to password-protected repository (user in URL)' '
|
||||||
test_commit pw-user &&
|
test_commit pw-user &&
|
||||||
git push "$HTTPD_URL_USER/auth/dumb/test_repo.git" HEAD &&
|
git push "$HTTPD_URL_USER/auth/dumb/test_repo.git" HEAD &&
|
||||||
git rev-parse --verify HEAD >expect &&
|
git rev-parse --verify HEAD >expect &&
|
||||||
|
Loading…
Reference in New Issue
Block a user