error-handling: http
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564
diff --git a/src/transports/http.c b/src/transports/http.c
index f16a802..d8af99d 100644
--- a/src/transports/http.c
+++ b/src/transports/http.c
@@ -88,12 +88,11 @@ static int do_connect(transport_http *t, const char *host, const char *port)
GIT_SOCKET s = -1;
if (t->parent.connected && http_should_keep_alive(&t->parser))
- return GIT_SUCCESS;
+ return 0;
+
+ if ((s = gitno_connect(host, port)) < 0)
+ return -1;
- s = gitno_connect(host, port);
- if (s < GIT_SUCCESS) {
- return git__rethrow(s, "Failed to connect to host");
- }
t->socket = s;
t->parent.connected = 1;
@@ -119,8 +118,7 @@ static int on_header_field(http_parser *parser, const char *str, size_t len)
t->ct_finished = 1;
t->ct_found = 0;
t->content_type = git__strdup(git_buf_cstr(buf));
- if (t->content_type == NULL)
- return t->error = GIT_ENOMEM;
+ GITERR_CHECK_ALLOC(t->content_type);
git_buf_clear(buf);
}
@@ -176,10 +174,10 @@ static int on_headers_complete(http_parser *parser)
git_buf_clear(buf);
git_buf_printf(buf, "application/x-git-%s-advertisement", t->service);
if (git_buf_oom(buf))
- return GIT_ENOMEM;
+ return t->error = GIT_ENOMEM;
if (strcmp(t->content_type, git_buf_cstr(buf)))
- return t->error = git__throw(GIT_EOBJCORRUPTED, "Content-Type '%s' is wrong", t->content_type);
+ return t->error = -1;
git_buf_clear(buf);
return 0;
@@ -202,11 +200,11 @@ static int on_message_complete(http_parser *parser)
static int store_refs(transport_http *t)
{
- int error = GIT_SUCCESS;
http_parser_settings settings;
char buffer[1024];
gitno_buffer buf;
git_pkt *pkt;
+ int ret;
http_parser_init(&t->parser, HTTP_RESPONSE);
t->parser.data = t;
@@ -222,83 +220,76 @@ static int store_refs(transport_http *t)
while(1) {
size_t parsed;
- error = gitno_recv(&buf);
- if (error < GIT_SUCCESS)
- return git__rethrow(error, "Error receiving data from network");
+ if ((ret = gitno_recv(&buf)) < 0)
+ return -1;
parsed = http_parser_execute(&t->parser, &settings, buf.data, buf.offset);
/* Both should happen at the same time */
- if (parsed != buf.offset || t->error < GIT_SUCCESS)
- return git__rethrow(t->error, "Error parsing HTTP data");
+ if (parsed != buf.offset || t->error < 0)
+ return t->error;
gitno_consume_n(&buf, parsed);
- if (error == 0 || t->transfer_finished)
- return GIT_SUCCESS;
+ if (ret == 0 || t->transfer_finished)
+ return 0;
}
pkt = git_vector_get(&t->refs, 0);
- if (pkt == NULL || pkt->type != GIT_PKT_COMMENT)
- return t->error = git__throw(GIT_EOBJCORRUPTED, "Not a valid smart HTTP response");
- else
+ if (pkt == NULL || pkt->type != GIT_PKT_COMMENT) {
+ giterr_set(GITERR_NET, "Invalid HTTP response");
+ return t->error = -1;
+ } else {
git_vector_remove(&t->refs, 0);
+ }
- return error;
+ return 0;
}
static int http_connect(git_transport *transport, int direction)
{
transport_http *t = (transport_http *) transport;
- int error;
+ int ret;
git_buf request = GIT_BUF_INIT;
const char *service = "upload-pack";
const char *url = t->parent.url, *prefix = "http://";
- if (direction == GIT_DIR_PUSH)
- return git__throw(GIT_EINVALIDARGS, "Pushing over HTTP is not supported");
+ if (direction == GIT_DIR_PUSH) {
+ giterr_set(GITERR_NET, "Pushing over HTTP is not implemented");
+ return -1;
+ }
t->parent.direction = direction;
- error = git_vector_init(&t->refs, 16, NULL);
- if (error < GIT_SUCCESS)
- return git__rethrow(error, "Failed to init refs vector");
+ if (git_vector_init(&t->refs, 16, NULL) < 0)
+ return -1;
if (!git__prefixcmp(url, prefix))
url += strlen(prefix);
- error = gitno_extract_host_and_port(&t->host, &t->port, url, "80");
- if (error < GIT_SUCCESS)
+ if ((ret = gitno_extract_host_and_port(&t->host, &t->port, url, "80")) < 0)
goto cleanup;
t->service = git__strdup(service);
- if (t->service == NULL) {
- error = GIT_ENOMEM;
- goto cleanup;
- }
+ GITERR_CHECK_ALLOC(t->service);
- error = do_connect(t, t->host, t->port);
- if (error < GIT_SUCCESS) {
- error = git__rethrow(error, "Failed to connect to host");
+ if ((ret = do_connect(t, t->host, t->port)) < 0)
goto cleanup;
- }
/* Generate and send the HTTP request */
- error = gen_request(&request, url, t->host, "GET", service, 0, 1);
- if (error < GIT_SUCCESS) {
- error = git__throw(error, "Failed to generate request");
+ if ((ret = gen_request(&request, url, t->host, "GET", service, 0, 1)) < 0) {
+ giterr_set(GITERR_NET, "Failed to generate request");
goto cleanup;
}
- error = gitno_send(t->socket, request.ptr, request.size, 0);
- if (error < GIT_SUCCESS)
- error = git__rethrow(error, "Failed to send the HTTP request");
+ if ((ret = gitno_send(t->socket, request.ptr, request.size, 0)) < 0)
+ goto cleanup;
- error = store_refs(t);
+ ret = store_refs(t);
cleanup:
git_buf_free(&request);
git_buf_clear(&t->buf);
- return error;
+ return ret;
}
static int http_ls(git_transport *transport, git_headlist_cb list_cb, void *opaque)
@@ -312,12 +303,13 @@ static int http_ls(git_transport *transport, git_headlist_cb list_cb, void *opaq
if (p->type != GIT_PKT_REF)
continue;
- if (list_cb(&p->head, opaque) < 0)
- return git__throw(GIT_ERROR,
- "The user callback returned an error code");
+ if (list_cb(&p->head, opaque) < 0) {
+ giterr_set(GITERR_NET, "The user callback returned error");
+ return -1;
+ }
}
- return GIT_SUCCESS;
+ return 0;
}
static int on_body_parse_response(http_parser *parser, const char *str, size_t len)
@@ -329,10 +321,12 @@ static int on_body_parse_response(http_parser *parser, const char *str, size_t l
const char *line_end, *ptr;
if (len == 0) { /* EOF */
- if (buf->size != 0)
- return t->error = git__throw(GIT_ERROR, "EOF and unprocessed data");
- else
+ if (buf->size != 0) {
+ giterr_set(GITERR_NET, "Unexpected EOF");
+ return t->error = -1;
+ } else {
return 0;
+ }
}
git_buf_put(buf, str, len);
@@ -348,7 +342,7 @@ static int on_body_parse_response(http_parser *parser, const char *str, size_t l
return 0; /* Ask for more */
}
if (error < GIT_SUCCESS)
- return t->error = git__rethrow(error, "Failed to parse pkt-line");
+ return t->error = -1;
git_buf_consume(buf, line_end);
@@ -368,9 +362,8 @@ static int on_body_parse_response(http_parser *parser, const char *str, size_t l
continue;
}
- error = git_vector_insert(common, pkt);
- if (error < GIT_SUCCESS)
- return t->error = git__rethrow(error, "Failed to add pkt to list");
+ if (git_vector_insert(common, pkt) < 0)
+ return -1;
}
return error;
@@ -379,7 +372,7 @@ static int on_body_parse_response(http_parser *parser, const char *str, size_t l
static int parse_response(transport_http *t)
{
- int error = GIT_SUCCESS;
+ int ret = 0;
http_parser_settings settings;
char buffer[1024];
gitno_buffer buf;
@@ -399,23 +392,22 @@ static int parse_response(transport_http *t)
while(1) {
size_t parsed;
- error = gitno_recv(&buf);
- if (error < GIT_SUCCESS)
- return git__rethrow(error, "Error receiving data from network");
+ if ((ret = gitno_recv(&buf)) < 0)
+ return -1;
parsed = http_parser_execute(&t->parser, &settings, buf.data, buf.offset);
/* Both should happen at the same time */
- if (parsed != buf.offset || t->error < GIT_SUCCESS)
- return git__rethrow(t->error, "Error parsing HTTP data");
+ if (parsed != buf.offset || t->error < 0)
+ return t->error;
gitno_consume_n(&buf, parsed);
- if (error == 0 || t->transfer_finished || t->pack_ready) {
- return GIT_SUCCESS;
+ if (ret == 0 || t->transfer_finished || t->pack_ready) {
+ return 0;
}
}
- return error;
+ return ret;
}
static int setup_walk(git_revwalk **out, git_repository *repo)
@@ -424,15 +416,12 @@ static int setup_walk(git_revwalk **out, git_repository *repo)
git_strarray refs;
unsigned int i;
git_reference *ref;
- int error;
- error = git_reference_listall(&refs, repo, GIT_REF_LISTALL);
- if (error < GIT_SUCCESS)
- return git__rethrow(error, "Failed to list references");
+ if (git_reference_listall(&refs, repo, GIT_REF_LISTALL) < 0)
+ return -1;
- error = git_revwalk_new(&walk, repo);
- if (error < GIT_SUCCESS)
- return git__rethrow(error, "Failed to setup walk");
+ if (git_revwalk_new(&walk, repo) < 0)
+ return -1;
git_revwalk_sorting(walk, GIT_SORT_TIME);
@@ -441,32 +430,28 @@ static int setup_walk(git_revwalk **out, git_repository *repo)
if (!git__prefixcmp(refs.strings[i], GIT_REFS_TAGS_DIR))
continue;
- error = git_reference_lookup(&ref, repo, refs.strings[i]);
- if (error < GIT_ERROR) {
- error = git__rethrow(error, "Failed to lookup %s", refs.strings[i]);
- goto cleanup;
- }
+ if (git_reference_lookup(&ref, repo, refs.strings[i]) < 0)
+ goto on_error;
if (git_reference_type(ref) == GIT_REF_SYMBOLIC)
continue;
- error = git_revwalk_push(walk, git_reference_oid(ref));
- if (error < GIT_ERROR) {
- error = git__rethrow(error, "Failed to push %s", refs.strings[i]);
- goto cleanup;
- }
+ if (git_revwalk_push(walk, git_reference_oid(ref)) < 0)
+ goto on_error;
}
- *out = walk;
-cleanup:
git_strarray_free(&refs);
+ *out = walk;
+ return 0;
- return error;
+on_error:
+ git_strarray_free(&refs);
+ return -1;
}
static int http_negotiate_fetch(git_transport *transport, git_repository *repo, const git_vector *wants)
{
transport_http *t = (transport_http *) transport;
- int error;
+ int ret;
unsigned int i;
char buff[128];
gitno_buffer buf;
@@ -482,82 +467,55 @@ static int http_negotiate_fetch(git_transport *transport, git_repository *repo,
if (!git__prefixcmp(url, prefix))
url += strlen(prefix);
- error = git_vector_init(common, 16, NULL);
- if (error < GIT_SUCCESS)
- return git__rethrow(error, "Failed to init common vector");
+ if (git_vector_init(common, 16, NULL) < 0)
+ return -1;
- error = setup_walk(&walk, repo);
- if (error < GIT_SUCCESS) {
- error = git__rethrow(error, "Failed to setup walk");
- goto cleanup;
- }
+ if (setup_walk(&walk, repo) < 0)
+ return -1;
do {
- error = do_connect(t, t->host, t->port);
- if (error < GIT_SUCCESS) {
- error = git__rethrow(error, "Failed to connect to host");
+ if ((ret = do_connect(t, t->host, t->port)) < 0)
goto cleanup;
- }
- error = git_pkt_buffer_wants(wants, &t->caps, &data);
- if (error < GIT_SUCCESS) {
- error = git__rethrow(error, "Failed to send wants");
+ if ((ret = git_pkt_buffer_wants(wants, &t->caps, &data)) < 0)
goto cleanup;
- }
/* We need to send these on each connection */
git_vector_foreach (common, i, pkt) {
- error = git_pkt_buffer_have(&pkt->oid, &data);
- if (error < GIT_SUCCESS) {
- error = git__rethrow(error, "Failed to buffer common have");
+ if ((ret = git_pkt_buffer_have(&pkt->oid, &data)) < 0)
goto cleanup;
- }
}
i = 0;
- while ((i < 20) && ((error = git_revwalk_next(&oid, walk)) == GIT_SUCCESS)) {
- error = git_pkt_buffer_have(&oid, &data);
- if (error < GIT_SUCCESS) {
- error = git__rethrow(error, "Failed to buffer have");
+ while ((i < 20) && ((ret = git_revwalk_next(&oid, walk)) == 0)) {
+ if ((ret = git_pkt_buffer_have(&oid, &data)) < 0)
goto cleanup;
- }
+
i++;
}
git_pkt_buffer_done(&data);
- error = gen_request(&request, url, t->host, "POST", "upload-pack", data.size, 0);
- if (error < GIT_SUCCESS) {
- error = git__rethrow(error, "Failed to generate request");
+ if ((ret = gen_request(&request, url, t->host, "POST", "upload-pack", data.size, 0)) < 0)
goto cleanup;
- }
- error = gitno_send(t->socket, request.ptr, request.size, 0);
- if (error < GIT_SUCCESS) {
- error = git__rethrow(error, "Failed to send request");
+ if ((ret = gitno_send(t->socket, request.ptr, request.size, 0)) < 0)
goto cleanup;
- }
- error = gitno_send(t->socket, data.ptr, data.size, 0);
- if (error < GIT_SUCCESS) {
- error = git__rethrow(error, "Failed to send data");
+ if ((ret = gitno_send(t->socket, data.ptr, data.size, 0)) < 0)
goto cleanup;
- }
git_buf_clear(&request);
git_buf_clear(&data);
- if (error < GIT_SUCCESS || i >= 256)
+ if (ret < GIT_SUCCESS || i >= 256)
break;
- error = parse_response(t);
- if (error < GIT_SUCCESS) {
- error = git__rethrow(error, "Error parsing the response");
+ if ((ret = parse_response(t)) < 0)
goto cleanup;
- }
if (t->pack_ready) {
- error = GIT_SUCCESS;
+ ret = 0;
goto cleanup;
}
@@ -567,7 +525,7 @@ cleanup:
git_buf_free(&request);
git_buf_free(&data);
git_revwalk_free(walk);
- return error;
+ return ret;
}
typedef struct {
@@ -603,7 +561,7 @@ static int http_download_pack(char **out, git_transport *transport, git_reposito
{
transport_http *t = (transport_http *) transport;
git_buf *oldbuf = &t->buf;
- int error = GIT_SUCCESS;
+ int ret = 0;
http_parser_settings settings;
char buffer[1024];
gitno_buffer buf;
@@ -627,68 +585,65 @@ static int http_download_pack(char **out, git_transport *transport, git_reposito
gitno_buffer_setup(&buf, buffer, sizeof(buffer), t->socket);
if (memcmp(oldbuf->ptr, "PACK", strlen("PACK"))) {
- return git__throw(GIT_ERROR, "The pack doesn't start with the signature");
+ giterr_set(GITERR_NET, "The pack doesn't start with a pack signature");
+ return -1;
}
- error = git_buf_joinpath(&path, repo->path_repository, suff);
- if (error < GIT_SUCCESS)
- goto cleanup;
+ if (git_buf_joinpath(&path, repo->path_repository, suff) < 0)
+ goto on_error;
- error = git_filebuf_open(&file, path.ptr, GIT_FILEBUF_TEMPORARY);
- if (error < GIT_SUCCESS)
- goto cleanup;
+ if (git_filebuf_open(&file, path.ptr, GIT_FILEBUF_TEMPORARY) < 0)
+ goto on_error;
/* Part of the packfile has been received, don't loose it */
- error = git_filebuf_write(&file, oldbuf->ptr, oldbuf->size);
- if (error < GIT_SUCCESS)
- goto cleanup;
+ if (git_filebuf_write(&file, oldbuf->ptr, oldbuf->size) < 0)
+ goto on_error;
while(1) {
size_t parsed;
- error = gitno_recv(&buf);
- if (error < GIT_SUCCESS)
- return git__rethrow(error, "Error receiving data from network");
+ ret = gitno_recv(&buf);
+ if (ret < 0)
+ goto on_error;
parsed = http_parser_execute(&t->parser, &settings, buf.data, buf.offset);
/* Both should happen at the same time */
- if (parsed != buf.offset || t->error < GIT_SUCCESS)
- return git__rethrow(t->error, "Error parsing HTTP data");
+ if (parsed != buf.offset || t->error < 0)
+ return t->error;
gitno_consume_n(&buf, parsed);
- if (error == 0 || t->transfer_finished) {
+ if (ret == 0 || t->transfer_finished) {
break;
}
}
*out = git__strdup(file.path_lock);
- if (*out == NULL) {
- error = GIT_ENOMEM;
- goto cleanup;
- }
+ GITERR_CHECK_ALLOC(*out);
/* A bit dodgy, but we need to keep the pack at the temporary path */
- error = git_filebuf_commit_at(&file, file.path_lock, GIT_PACK_FILE_MODE);
+ ret = git_filebuf_commit_at(&file, file.path_lock, GIT_PACK_FILE_MODE);
-cleanup:
- if (error < GIT_SUCCESS)
- git_filebuf_cleanup(&file);
git_buf_free(&path);
- return error;
+ return 0;
+
+on_error:
+ git_filebuf_cleanup(&file);
+ git_buf_free(&path);
+ return -1;
}
static int http_close(git_transport *transport)
{
transport_http *t = (transport_http *) transport;
- int error;
- error = gitno_close(t->socket);
- if (error < 0)
- return git__throw(GIT_EOSERR, "Failed to close the socket: %s", strerror(errno));
+ if (gitno_close(t->socket) < 0) {
+ giterr_set(GITERR_OS, "Failed to close the socket: %s", strerror(errno));
+ return -1;
+ }
- return GIT_SUCCESS;
+ return 0;
}
@@ -732,8 +687,7 @@ int git_transport_http(git_transport **out)
transport_http *t;
t = git__malloc(sizeof(transport_http));
- if (t == NULL)
- return GIT_ENOMEM;
+ GITERR_CHECK_ALLOC(t);
memset(t, 0x0, sizeof(transport_http));
@@ -751,10 +705,11 @@ int git_transport_http(git_transport **out)
* before any socket calls can be performed */
if (WSAStartup(MAKEWORD(2,2), &t->wsd) != 0) {
http_free((git_transport *) t);
- return git__throw(GIT_EOSERR, "Winsock init failed");
+ giterr_set(GITERR_OS, "Winsock init failed");
+ return -1;
}
#endif
*out = (git_transport *) t;
- return GIT_SUCCESS;
+ return 0;
}