@matheusbsbs / matheus-bagliano / commits / 1960897ebc

http: do not set up curl auth after a 401

When we get an http 401, we prompt for credentials and put them in our global credential struct. We also feed them to the curl handle that produced the 401, with the intent that they will be used on a retry. When the code was originally introduced in commit 42653c0, this was a necessary step. However, since dfa1725, we always feed our global credential into every curl handle when we initialize the slot with get_active_slot. So every further request already feeds the credential to curl. Moreover, accessing the slot here is somewhat dubious. After the slot has produced a response, we don't actually control it any more. If we are using curl_multi, it may even have been re-initialized to handle a different request. It just so happens that we will reuse the curl handle within the slot in such a case, and that because we only keep one global credential, it will be the one we want. So the current code is not buggy, but it is misleading. By cleaning it up, we can remove the slot argument entirely from handle_curl_result, making it much more obvious that slots should not be accessed after they are marked as finished. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Oct 12, 2012 at 03:35 UTC 1960897ebc5a899a8e4ec3c2afc1d2325574fe41

3 files changed +4 -7

http.c

+2 -4

@@ -744,8 +744,7 @@ char *get_remote_object_url(const char *url, const char *hex,

744 return strbuf_detach(&buf, NULL);

745 }

746

747 -int handle_curl_result(struct active_request_slot *slot,

748 - struct slot_results *results)

747 +int handle_curl_result(struct slot_results *results)

748 {

749 if (results->curl_result == CURLE_OK) {

750 credential_approve(&http_auth);

@@ -758,7 +757,6 @@ int handle_curl_result(struct active_request_slot *slot,

757 return HTTP_NOAUTH;

758 } else {

759 credential_fill(&http_auth);

761 - init_curl_http_auth(slot->curl);

760 return HTTP_REAUTH;

761 }

762 } else {

@@ -817,7 +815,7 @@ static int http_request(const char *url, void *result, int target, int options)

815

816 if (start_active_slot(slot)) {

817 run_active_slot(slot);

820 - ret = handle_curl_result(slot, &results);

818 + ret = handle_curl_result(&results);

819 } else {

820 error("Unable to start HTTP request for %s", url);

821 ret = HTTP_START_FAILED;

http.h

+1 -2

@@ -78,8 +78,7 @@ extern int start_active_slot(struct active_request_slot *slot);

78 extern void run_active_slot(struct active_request_slot *slot);

79 extern void finish_active_slot(struct active_request_slot *slot);

80 extern void finish_all_active_slots(void);

81 -extern int handle_curl_result(struct active_request_slot *slot,

82 - struct slot_results *results);

81 +extern int handle_curl_result(struct slot_results *results);

83 #ifdef USE_CURL_MULTI

84 extern void fill_active_slots(void);

remote-curl.c

+1 -1

@@ -369,7 +369,7 @@ static int run_slot(struct active_request_slot *slot)

369 slot->curl_result = curl_easy_perform(slot->curl);

370 finish_active_slot(slot);

371

372 - err = handle_curl_result(slot, &results);

372 + err = handle_curl_result(&results);

373 if (err != HTTP_OK && err != HTTP_REAUTH) {

374 error("RPC failed; result=%d, HTTP code = %ld",

375 results.curl_result, results.http_code);