@matheusbsbs / matheus-bagliano / commits / ccbbd8bf66

http: normalize curl results for dumb loose and alternates fetches

If the dumb-http walker encounters a 404 when fetching a loose object, it then looks at any http-alternates for the object. The 404 check is implemented by missing_target(), which checks not only the http code, but also that we got an http error from the CURLcode. That broke when we stopped using CURLOPT_FAILONERROR in 17966c0a63 (http: avoid disconnecting on 404s for loose objects, 2016-07-11), since our CURLcode will now be CURLE_OK. As a result, fetching over dumb-http from a repository with alternates could result in Git printing "Unable to find abcd1234..." and aborting. We could probably fix this just by loosening missing_target(). However, there's other code which looks at the curl result, and it would have to be tweaked as well. Instead, let's just normalize the result the same way the smart-http code does. There's a similar case in processing the alternates (where we failover from "info/http-alternates" to "info/alternates"). We'll give it the same treatment. After this patch, we should be hitting all code paths that need this normalization (notably absent here is the http_pack_request path, but it does not use FAILONERROR, nor missing_target()). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Mar 24, 2019 at 08:09 UTC ccbbd8bf66ca88385a34b16abcc1d5a800650d3a

2 files changed +24

http-walker.c

@@ -98,6 +98,11 @@ static void process_object_response(void *callback_data)

98 process_http_object_request(obj_req->req);

99 obj_req->state = COMPLETE;

100

101 + normalize_curl_result(&obj_req->req->curl_result,

102 + obj_req->req->http_code,

103 + obj_req->req->errorstr,

104 + sizeof(obj_req->req->errorstr));

105 +

106 /* Use alternates if necessary */

107 if (missing_target(obj_req->req)) {

108 fetch_alternates(walker, alt->base);

@@ -208,6 +213,9 @@ static void process_alternates_response(void *callback_data)

213 char *data;

214 int i = 0;

215

216 + normalize_curl_result(&slot->curl_result, slot->http_code,

217 + curl_errorstr, sizeof(curl_errorstr));

218 +

219 if (alt_req->http_specific) {

220 if (slot->curl_result != CURLE_OK ||

221 !alt_req->buffer->len) {

t/t5550-http-fetch-dumb.sh

+16

@@ -408,5 +408,21 @@ test_expect_success 'print HTTP error when any intermediate redirect throws erro

408 test_i18ngrep "unable to access.*/redir-to/502" stderr

409 '

410

411 +test_expect_success 'fetching via http alternates works' '

412 + parent=$HTTPD_DOCUMENT_ROOT_PATH/alt-parent.git &&

413 + git init --bare "$parent" &&

414 + git -C "$parent" --work-tree=. commit --allow-empty -m foo &&

415 + git -C "$parent" update-server-info &&

416 + commit=$(git -C "$parent" rev-parse HEAD) &&

417 +

418 + child=$HTTPD_DOCUMENT_ROOT_PATH/alt-child.git &&

419 + git init --bare "$child" &&

420 + echo "../../alt-parent.git/objects" >"$child/objects/info/alternates" &&

421 + git -C "$child" update-ref HEAD $commit &&

422 + git -C "$child" update-server-info &&

423 +

424 + git -c http.followredirects=true clone "$HTTPD_URL/dumb/alt-child.git"

425 +'

426 +

427 stop_httpd

428 test_done