connect: pass full packet reader when parsing v2 refs
[git/raj.git] / send-pack.c
blobfb037568a946a362b02f6a21e72e97c48a94b5d5
1 #include "builtin.h"
2 #include "config.h"
3 #include "commit.h"
4 #include "refs.h"
5 #include "object-store.h"
6 #include "pkt-line.h"
7 #include "sideband.h"
8 #include "run-command.h"
9 #include "remote.h"
10 #include "connect.h"
11 #include "send-pack.h"
12 #include "quote.h"
13 #include "transport.h"
14 #include "version.h"
15 #include "oid-array.h"
16 #include "gpg-interface.h"
17 #include "cache.h"
19 int option_parse_push_signed(const struct option *opt,
20 const char *arg, int unset)
22 if (unset) {
23 *(int *)(opt->value) = SEND_PACK_PUSH_CERT_NEVER;
24 return 0;
26 switch (git_parse_maybe_bool(arg)) {
27 case 1:
28 *(int *)(opt->value) = SEND_PACK_PUSH_CERT_ALWAYS;
29 return 0;
30 case 0:
31 *(int *)(opt->value) = SEND_PACK_PUSH_CERT_NEVER;
32 return 0;
34 if (!strcasecmp("if-asked", arg)) {
35 *(int *)(opt->value) = SEND_PACK_PUSH_CERT_IF_ASKED;
36 return 0;
38 die("bad %s argument: %s", opt->long_name, arg);
41 static void feed_object(const struct object_id *oid, FILE *fh, int negative)
43 if (negative &&
44 !has_object_file_with_flags(oid,
45 OBJECT_INFO_SKIP_FETCH_OBJECT |
46 OBJECT_INFO_QUICK))
47 return;
49 if (negative)
50 putc('^', fh);
51 fputs(oid_to_hex(oid), fh);
52 putc('\n', fh);
56 * Make a pack stream and spit it out into file descriptor fd
58 static int pack_objects(int fd, struct ref *refs, struct oid_array *extra, struct send_pack_args *args)
61 * The child becomes pack-objects --revs; we feed
62 * the revision parameters to it via its stdin and
63 * let its stdout go back to the other end.
65 struct child_process po = CHILD_PROCESS_INIT;
66 FILE *po_in;
67 int i;
68 int rc;
70 argv_array_push(&po.args, "pack-objects");
71 argv_array_push(&po.args, "--all-progress-implied");
72 argv_array_push(&po.args, "--revs");
73 argv_array_push(&po.args, "--stdout");
74 if (args->use_thin_pack)
75 argv_array_push(&po.args, "--thin");
76 if (args->use_ofs_delta)
77 argv_array_push(&po.args, "--delta-base-offset");
78 if (args->quiet || !args->progress)
79 argv_array_push(&po.args, "-q");
80 if (args->progress)
81 argv_array_push(&po.args, "--progress");
82 if (is_repository_shallow(the_repository))
83 argv_array_push(&po.args, "--shallow");
84 po.in = -1;
85 po.out = args->stateless_rpc ? -1 : fd;
86 po.git_cmd = 1;
87 if (start_command(&po))
88 die_errno("git pack-objects failed");
91 * We feed the pack-objects we just spawned with revision
92 * parameters by writing to the pipe.
94 po_in = xfdopen(po.in, "w");
95 for (i = 0; i < extra->nr; i++)
96 feed_object(&extra->oid[i], po_in, 1);
98 while (refs) {
99 if (!is_null_oid(&refs->old_oid))
100 feed_object(&refs->old_oid, po_in, 1);
101 if (!is_null_oid(&refs->new_oid))
102 feed_object(&refs->new_oid, po_in, 0);
103 refs = refs->next;
106 fflush(po_in);
107 if (ferror(po_in))
108 die_errno("error writing to pack-objects");
109 fclose(po_in);
111 if (args->stateless_rpc) {
112 char *buf = xmalloc(LARGE_PACKET_MAX);
113 while (1) {
114 ssize_t n = xread(po.out, buf, LARGE_PACKET_MAX);
115 if (n <= 0)
116 break;
117 send_sideband(fd, -1, buf, n, LARGE_PACKET_MAX);
119 free(buf);
120 close(po.out);
121 po.out = -1;
124 rc = finish_command(&po);
125 if (rc) {
127 * For a normal non-zero exit, we assume pack-objects wrote
128 * something useful to stderr. For death by signal, though,
129 * we should mention it to the user. The exception is SIGPIPE
130 * (141), because that's a normal occurrence if the remote end
131 * hangs up (and we'll report that by trying to read the unpack
132 * status).
134 if (rc > 128 && rc != 141)
135 error("pack-objects died of signal %d", rc - 128);
136 return -1;
138 return 0;
141 static int receive_unpack_status(struct packet_reader *reader)
143 if (packet_reader_read(reader) != PACKET_READ_NORMAL)
144 return error(_("unexpected flush packet while reading remote unpack status"));
145 if (!skip_prefix(reader->line, "unpack ", &reader->line))
146 return error(_("unable to parse remote unpack status: %s"), reader->line);
147 if (strcmp(reader->line, "ok"))
148 return error(_("remote unpack failed: %s"), reader->line);
149 return 0;
152 static int receive_status(struct packet_reader *reader, struct ref *refs)
154 struct ref *hint;
155 int ret;
157 hint = NULL;
158 ret = receive_unpack_status(reader);
159 while (1) {
160 const char *refname;
161 char *msg;
162 if (packet_reader_read(reader) != PACKET_READ_NORMAL)
163 break;
164 if (!starts_with(reader->line, "ok ") && !starts_with(reader->line, "ng ")) {
165 error("invalid ref status from remote: %s", reader->line);
166 ret = -1;
167 break;
170 refname = reader->line + 3;
171 msg = strchr(refname, ' ');
172 if (msg)
173 *msg++ = '\0';
175 /* first try searching at our hint, falling back to all refs */
176 if (hint)
177 hint = find_ref_by_name(hint, refname);
178 if (!hint)
179 hint = find_ref_by_name(refs, refname);
180 if (!hint) {
181 warning("remote reported status on unknown ref: %s",
182 refname);
183 continue;
185 if (hint->status != REF_STATUS_EXPECTING_REPORT) {
186 warning("remote reported status on unexpected ref: %s",
187 refname);
188 continue;
191 if (reader->line[0] == 'o' && reader->line[1] == 'k')
192 hint->status = REF_STATUS_OK;
193 else
194 hint->status = REF_STATUS_REMOTE_REJECT;
195 hint->remote_status = xstrdup_or_null(msg);
196 /* start our next search from the next ref */
197 hint = hint->next;
199 return ret;
202 static int sideband_demux(int in, int out, void *data)
204 int *fd = data, ret;
205 if (async_with_fork())
206 close(fd[1]);
207 ret = recv_sideband("send-pack", fd[0], out);
208 close(out);
209 return ret;
212 static int advertise_shallow_grafts_cb(const struct commit_graft *graft, void *cb)
214 struct strbuf *sb = cb;
215 if (graft->nr_parent == -1)
216 packet_buf_write(sb, "shallow %s\n", oid_to_hex(&graft->oid));
217 return 0;
220 static void advertise_shallow_grafts_buf(struct strbuf *sb)
222 if (!is_repository_shallow(the_repository))
223 return;
224 for_each_commit_graft(advertise_shallow_grafts_cb, sb);
227 #define CHECK_REF_NO_PUSH -1
228 #define CHECK_REF_STATUS_REJECTED -2
229 #define CHECK_REF_UPTODATE -3
230 static int check_to_send_update(const struct ref *ref, const struct send_pack_args *args)
232 if (!ref->peer_ref && !args->send_mirror)
233 return CHECK_REF_NO_PUSH;
235 /* Check for statuses set by set_ref_status_for_push() */
236 switch (ref->status) {
237 case REF_STATUS_REJECT_NONFASTFORWARD:
238 case REF_STATUS_REJECT_ALREADY_EXISTS:
239 case REF_STATUS_REJECT_FETCH_FIRST:
240 case REF_STATUS_REJECT_NEEDS_FORCE:
241 case REF_STATUS_REJECT_STALE:
242 case REF_STATUS_REJECT_NODELETE:
243 return CHECK_REF_STATUS_REJECTED;
244 case REF_STATUS_UPTODATE:
245 return CHECK_REF_UPTODATE;
246 default:
247 return 0;
252 * the beginning of the next line, or the end of buffer.
254 * NEEDSWORK: perhaps move this to git-compat-util.h or somewhere and
255 * convert many similar uses found by "git grep -A4 memchr".
257 static const char *next_line(const char *line, size_t len)
259 const char *nl = memchr(line, '\n', len);
260 if (!nl)
261 return line + len; /* incomplete line */
262 return nl + 1;
265 static int generate_push_cert(struct strbuf *req_buf,
266 const struct ref *remote_refs,
267 struct send_pack_args *args,
268 const char *cap_string,
269 const char *push_cert_nonce)
271 const struct ref *ref;
272 struct string_list_item *item;
273 char *signing_key = xstrdup(get_signing_key());
274 const char *cp, *np;
275 struct strbuf cert = STRBUF_INIT;
276 int update_seen = 0;
278 strbuf_addstr(&cert, "certificate version 0.1\n");
279 strbuf_addf(&cert, "pusher %s ", signing_key);
280 datestamp(&cert);
281 strbuf_addch(&cert, '\n');
282 if (args->url && *args->url) {
283 char *anon_url = transport_anonymize_url(args->url);
284 strbuf_addf(&cert, "pushee %s\n", anon_url);
285 free(anon_url);
287 if (push_cert_nonce[0])
288 strbuf_addf(&cert, "nonce %s\n", push_cert_nonce);
289 if (args->push_options)
290 for_each_string_list_item(item, args->push_options)
291 strbuf_addf(&cert, "push-option %s\n", item->string);
292 strbuf_addstr(&cert, "\n");
294 for (ref = remote_refs; ref; ref = ref->next) {
295 if (check_to_send_update(ref, args) < 0)
296 continue;
297 update_seen = 1;
298 strbuf_addf(&cert, "%s %s %s\n",
299 oid_to_hex(&ref->old_oid),
300 oid_to_hex(&ref->new_oid),
301 ref->name);
303 if (!update_seen)
304 goto free_return;
306 if (sign_buffer(&cert, &cert, signing_key))
307 die(_("failed to sign the push certificate"));
309 packet_buf_write(req_buf, "push-cert%c%s", 0, cap_string);
310 for (cp = cert.buf; cp < cert.buf + cert.len; cp = np) {
311 np = next_line(cp, cert.buf + cert.len - cp);
312 packet_buf_write(req_buf,
313 "%.*s", (int)(np - cp), cp);
315 packet_buf_write(req_buf, "push-cert-end\n");
317 free_return:
318 free(signing_key);
319 strbuf_release(&cert);
320 return update_seen;
323 #define NONCE_LEN_LIMIT 256
325 static void reject_invalid_nonce(const char *nonce, int len)
327 int i = 0;
329 if (NONCE_LEN_LIMIT <= len)
330 die("the receiving end asked to sign an invalid nonce <%.*s>",
331 len, nonce);
333 for (i = 0; i < len; i++) {
334 int ch = nonce[i] & 0xFF;
335 if (isalnum(ch) ||
336 ch == '-' || ch == '.' ||
337 ch == '/' || ch == '+' ||
338 ch == '=' || ch == '_')
339 continue;
340 die("the receiving end asked to sign an invalid nonce <%.*s>",
341 len, nonce);
345 int send_pack(struct send_pack_args *args,
346 int fd[], struct child_process *conn,
347 struct ref *remote_refs,
348 struct oid_array *extra_have)
350 int in = fd[0];
351 int out = fd[1];
352 struct strbuf req_buf = STRBUF_INIT;
353 struct strbuf cap_buf = STRBUF_INIT;
354 struct ref *ref;
355 int need_pack_data = 0;
356 int allow_deleting_refs = 0;
357 int status_report = 0;
358 int use_sideband = 0;
359 int quiet_supported = 0;
360 int agent_supported = 0;
361 int use_atomic = 0;
362 int atomic_supported = 0;
363 int use_push_options = 0;
364 int push_options_supported = 0;
365 int object_format_supported = 0;
366 unsigned cmds_sent = 0;
367 int ret;
368 struct async demux;
369 const char *push_cert_nonce = NULL;
370 struct packet_reader reader;
372 /* Does the other end support the reporting? */
373 if (server_supports("report-status"))
374 status_report = 1;
375 if (server_supports("delete-refs"))
376 allow_deleting_refs = 1;
377 if (server_supports("ofs-delta"))
378 args->use_ofs_delta = 1;
379 if (server_supports("side-band-64k"))
380 use_sideband = 1;
381 if (server_supports("quiet"))
382 quiet_supported = 1;
383 if (server_supports("agent"))
384 agent_supported = 1;
385 if (server_supports("no-thin"))
386 args->use_thin_pack = 0;
387 if (server_supports("atomic"))
388 atomic_supported = 1;
389 if (server_supports("push-options"))
390 push_options_supported = 1;
392 if (!server_supports_hash(the_hash_algo->name, &object_format_supported))
393 die(_("the receiving end does not support this repository's hash algorithm"));
395 if (args->push_cert != SEND_PACK_PUSH_CERT_NEVER) {
396 int len;
397 push_cert_nonce = server_feature_value("push-cert", &len);
398 if (push_cert_nonce) {
399 reject_invalid_nonce(push_cert_nonce, len);
400 push_cert_nonce = xmemdupz(push_cert_nonce, len);
401 } else if (args->push_cert == SEND_PACK_PUSH_CERT_ALWAYS) {
402 die(_("the receiving end does not support --signed push"));
403 } else if (args->push_cert == SEND_PACK_PUSH_CERT_IF_ASKED) {
404 warning(_("not sending a push certificate since the"
405 " receiving end does not support --signed"
406 " push"));
410 if (!remote_refs) {
411 fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
412 "Perhaps you should specify a branch such as 'master'.\n");
413 return 0;
415 if (args->atomic && !atomic_supported)
416 die(_("the receiving end does not support --atomic push"));
418 use_atomic = atomic_supported && args->atomic;
420 if (args->push_options && !push_options_supported)
421 die(_("the receiving end does not support push options"));
423 use_push_options = push_options_supported && args->push_options;
425 if (status_report)
426 strbuf_addstr(&cap_buf, " report-status");
427 if (use_sideband)
428 strbuf_addstr(&cap_buf, " side-band-64k");
429 if (quiet_supported && (args->quiet || !args->progress))
430 strbuf_addstr(&cap_buf, " quiet");
431 if (use_atomic)
432 strbuf_addstr(&cap_buf, " atomic");
433 if (use_push_options)
434 strbuf_addstr(&cap_buf, " push-options");
435 if (object_format_supported)
436 strbuf_addf(&cap_buf, " object-format=%s", the_hash_algo->name);
437 if (agent_supported)
438 strbuf_addf(&cap_buf, " agent=%s", git_user_agent_sanitized());
441 * NEEDSWORK: why does delete-refs have to be so specific to
442 * send-pack machinery that set_ref_status_for_push() cannot
443 * set this bit for us???
445 for (ref = remote_refs; ref; ref = ref->next)
446 if (ref->deletion && !allow_deleting_refs)
447 ref->status = REF_STATUS_REJECT_NODELETE;
449 if (!args->dry_run)
450 advertise_shallow_grafts_buf(&req_buf);
452 if (!args->dry_run && push_cert_nonce)
453 cmds_sent = generate_push_cert(&req_buf, remote_refs, args,
454 cap_buf.buf, push_cert_nonce);
457 * Clear the status for each ref and see if we need to send
458 * the pack data.
460 for (ref = remote_refs; ref; ref = ref->next) {
461 switch (check_to_send_update(ref, args)) {
462 case 0: /* no error */
463 break;
464 case CHECK_REF_STATUS_REJECTED:
466 * When we know the server would reject a ref update if
467 * we were to send it and we're trying to send the refs
468 * atomically, abort the whole operation.
470 if (use_atomic) {
471 strbuf_release(&req_buf);
472 strbuf_release(&cap_buf);
473 reject_atomic_push(remote_refs, args->send_mirror);
474 error("atomic push failed for ref %s. status: %d\n",
475 ref->name, ref->status);
476 return args->porcelain ? 0 : -1;
478 /* else fallthrough */
479 default:
480 continue;
482 if (!ref->deletion)
483 need_pack_data = 1;
485 if (args->dry_run || !status_report)
486 ref->status = REF_STATUS_OK;
487 else
488 ref->status = REF_STATUS_EXPECTING_REPORT;
492 * Finally, tell the other end!
494 for (ref = remote_refs; ref; ref = ref->next) {
495 char *old_hex, *new_hex;
497 if (args->dry_run || push_cert_nonce)
498 continue;
500 if (check_to_send_update(ref, args) < 0)
501 continue;
503 old_hex = oid_to_hex(&ref->old_oid);
504 new_hex = oid_to_hex(&ref->new_oid);
505 if (!cmds_sent) {
506 packet_buf_write(&req_buf,
507 "%s %s %s%c%s",
508 old_hex, new_hex, ref->name, 0,
509 cap_buf.buf);
510 cmds_sent = 1;
511 } else {
512 packet_buf_write(&req_buf, "%s %s %s",
513 old_hex, new_hex, ref->name);
517 if (use_push_options) {
518 struct string_list_item *item;
520 packet_buf_flush(&req_buf);
521 for_each_string_list_item(item, args->push_options)
522 packet_buf_write(&req_buf, "%s", item->string);
525 if (args->stateless_rpc) {
526 if (!args->dry_run && (cmds_sent || is_repository_shallow(the_repository))) {
527 packet_buf_flush(&req_buf);
528 send_sideband(out, -1, req_buf.buf, req_buf.len, LARGE_PACKET_MAX);
530 } else {
531 write_or_die(out, req_buf.buf, req_buf.len);
532 packet_flush(out);
534 strbuf_release(&req_buf);
535 strbuf_release(&cap_buf);
537 if (use_sideband && cmds_sent) {
538 memset(&demux, 0, sizeof(demux));
539 demux.proc = sideband_demux;
540 demux.data = fd;
541 demux.out = -1;
542 demux.isolate_sigpipe = 1;
543 if (start_async(&demux))
544 die("send-pack: unable to fork off sideband demultiplexer");
545 in = demux.out;
548 packet_reader_init(&reader, in, NULL, 0,
549 PACKET_READ_CHOMP_NEWLINE |
550 PACKET_READ_DIE_ON_ERR_PACKET);
552 if (need_pack_data && cmds_sent) {
553 if (pack_objects(out, remote_refs, extra_have, args) < 0) {
554 if (args->stateless_rpc)
555 close(out);
556 if (git_connection_is_socket(conn))
557 shutdown(fd[0], SHUT_WR);
560 * Do not even bother with the return value; we know we
561 * are failing, and just want the error() side effects,
562 * as well as marking refs with their remote status (if
563 * we get one).
565 if (status_report)
566 receive_status(&reader, remote_refs);
568 if (use_sideband) {
569 close(demux.out);
570 finish_async(&demux);
572 fd[1] = -1;
573 return -1;
575 if (!args->stateless_rpc)
576 /* Closed by pack_objects() via start_command() */
577 fd[1] = -1;
579 if (args->stateless_rpc && cmds_sent)
580 packet_flush(out);
582 if (status_report && cmds_sent)
583 ret = receive_status(&reader, remote_refs);
584 else
585 ret = 0;
586 if (args->stateless_rpc)
587 packet_flush(out);
589 if (use_sideband && cmds_sent) {
590 close(demux.out);
591 if (finish_async(&demux)) {
592 error("error in sideband demultiplexer");
593 ret = -1;
597 if (ret < 0)
598 return ret;
600 if (args->porcelain)
601 return 0;
603 for (ref = remote_refs; ref; ref = ref->next) {
604 switch (ref->status) {
605 case REF_STATUS_NONE:
606 case REF_STATUS_UPTODATE:
607 case REF_STATUS_OK:
608 break;
609 default:
610 return -1;
613 return 0;