Merge branch 'ds/in-merge-bases-many-optim-bug' into sk/force-if-includes
[git] / send-pack.c
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"
18 #include "shallow.h"
19
20 int option_parse_push_signed(const struct option *opt,
21                              const char *arg, int unset)
22 {
23         if (unset) {
24                 *(int *)(opt->value) = SEND_PACK_PUSH_CERT_NEVER;
25                 return 0;
26         }
27         switch (git_parse_maybe_bool(arg)) {
28         case 1:
29                 *(int *)(opt->value) = SEND_PACK_PUSH_CERT_ALWAYS;
30                 return 0;
31         case 0:
32                 *(int *)(opt->value) = SEND_PACK_PUSH_CERT_NEVER;
33                 return 0;
34         }
35         if (!strcasecmp("if-asked", arg)) {
36                 *(int *)(opt->value) = SEND_PACK_PUSH_CERT_IF_ASKED;
37                 return 0;
38         }
39         die("bad %s argument: %s", opt->long_name, arg);
40 }
41
42 static void feed_object(const struct object_id *oid, FILE *fh, int negative)
43 {
44         if (negative &&
45             !has_object_file_with_flags(oid,
46                                         OBJECT_INFO_SKIP_FETCH_OBJECT |
47                                         OBJECT_INFO_QUICK))
48                 return;
49
50         if (negative)
51                 putc('^', fh);
52         fputs(oid_to_hex(oid), fh);
53         putc('\n', fh);
54 }
55
56 /*
57  * Make a pack stream and spit it out into file descriptor fd
58  */
59 static int pack_objects(int fd, struct ref *refs, struct oid_array *extra, struct send_pack_args *args)
60 {
61         /*
62          * The child becomes pack-objects --revs; we feed
63          * the revision parameters to it via its stdin and
64          * let its stdout go back to the other end.
65          */
66         struct child_process po = CHILD_PROCESS_INIT;
67         FILE *po_in;
68         int i;
69         int rc;
70
71         strvec_push(&po.args, "pack-objects");
72         strvec_push(&po.args, "--all-progress-implied");
73         strvec_push(&po.args, "--revs");
74         strvec_push(&po.args, "--stdout");
75         if (args->use_thin_pack)
76                 strvec_push(&po.args, "--thin");
77         if (args->use_ofs_delta)
78                 strvec_push(&po.args, "--delta-base-offset");
79         if (args->quiet || !args->progress)
80                 strvec_push(&po.args, "-q");
81         if (args->progress)
82                 strvec_push(&po.args, "--progress");
83         if (is_repository_shallow(the_repository))
84                 strvec_push(&po.args, "--shallow");
85         po.in = -1;
86         po.out = args->stateless_rpc ? -1 : fd;
87         po.git_cmd = 1;
88         if (start_command(&po))
89                 die_errno("git pack-objects failed");
90
91         /*
92          * We feed the pack-objects we just spawned with revision
93          * parameters by writing to the pipe.
94          */
95         po_in = xfdopen(po.in, "w");
96         for (i = 0; i < extra->nr; i++)
97                 feed_object(&extra->oid[i], po_in, 1);
98
99         while (refs) {
100                 if (!is_null_oid(&refs->old_oid))
101                         feed_object(&refs->old_oid, po_in, 1);
102                 if (!is_null_oid(&refs->new_oid))
103                         feed_object(&refs->new_oid, po_in, 0);
104                 refs = refs->next;
105         }
106
107         fflush(po_in);
108         if (ferror(po_in))
109                 die_errno("error writing to pack-objects");
110         fclose(po_in);
111
112         if (args->stateless_rpc) {
113                 char *buf = xmalloc(LARGE_PACKET_MAX);
114                 while (1) {
115                         ssize_t n = xread(po.out, buf, LARGE_PACKET_MAX);
116                         if (n <= 0)
117                                 break;
118                         send_sideband(fd, -1, buf, n, LARGE_PACKET_MAX);
119                 }
120                 free(buf);
121                 close(po.out);
122                 po.out = -1;
123         }
124
125         rc = finish_command(&po);
126         if (rc) {
127                 /*
128                  * For a normal non-zero exit, we assume pack-objects wrote
129                  * something useful to stderr. For death by signal, though,
130                  * we should mention it to the user. The exception is SIGPIPE
131                  * (141), because that's a normal occurrence if the remote end
132                  * hangs up (and we'll report that by trying to read the unpack
133                  * status).
134                  */
135                 if (rc > 128 && rc != 141)
136                         error("pack-objects died of signal %d", rc - 128);
137                 return -1;
138         }
139         return 0;
140 }
141
142 static int receive_unpack_status(struct packet_reader *reader)
143 {
144         if (packet_reader_read(reader) != PACKET_READ_NORMAL)
145                 return error(_("unexpected flush packet while reading remote unpack status"));
146         if (!skip_prefix(reader->line, "unpack ", &reader->line))
147                 return error(_("unable to parse remote unpack status: %s"), reader->line);
148         if (strcmp(reader->line, "ok"))
149                 return error(_("remote unpack failed: %s"), reader->line);
150         return 0;
151 }
152
153 static int receive_status(struct packet_reader *reader, struct ref *refs)
154 {
155         struct ref *hint;
156         int ret;
157         struct ref_push_report *report = NULL;
158         int new_report = 0;
159         int once = 0;
160
161         hint = NULL;
162         ret = receive_unpack_status(reader);
163         while (1) {
164                 struct object_id old_oid, new_oid;
165                 const char *head;
166                 const char *refname;
167                 char *p;
168                 if (packet_reader_read(reader) != PACKET_READ_NORMAL)
169                         break;
170                 head = reader->line;
171                 p = strchr(head, ' ');
172                 if (!p) {
173                         error("invalid status line from remote: %s", reader->line);
174                         ret = -1;
175                         break;
176                 }
177                 *p++ = '\0';
178
179                 if (!strcmp(head, "option")) {
180                         const char *key, *val;
181
182                         if (!hint || !(report || new_report)) {
183                                 if (!once++)
184                                         error("'option' without a matching 'ok/ng' directive");
185                                 ret = -1;
186                                 continue;
187                         }
188                         if (new_report) {
189                                 if (!hint->report) {
190                                         hint->report = xcalloc(1, sizeof(struct ref_push_report));
191                                         report = hint->report;
192                                 } else {
193                                         report = hint->report;
194                                         while (report->next)
195                                                 report = report->next;
196                                         report->next = xcalloc(1, sizeof(struct ref_push_report));
197                                         report = report->next;
198                                 }
199                                 new_report = 0;
200                         }
201                         key = p;
202                         p = strchr(key, ' ');
203                         if (p)
204                                 *p++ = '\0';
205                         val = p;
206                         if (!strcmp(key, "refname"))
207                                 report->ref_name = xstrdup_or_null(val);
208                         else if (!strcmp(key, "old-oid") && val &&
209                                  !parse_oid_hex(val, &old_oid, &val))
210                                 report->old_oid = oiddup(&old_oid);
211                         else if (!strcmp(key, "new-oid") && val &&
212                                  !parse_oid_hex(val, &new_oid, &val))
213                                 report->new_oid = oiddup(&new_oid);
214                         else if (!strcmp(key, "forced-update"))
215                                 report->forced_update = 1;
216                         continue;
217                 }
218
219                 report = NULL;
220                 new_report = 0;
221                 if (strcmp(head, "ok") && strcmp(head, "ng")) {
222                         error("invalid ref status from remote: %s", head);
223                         ret = -1;
224                         break;
225                 }
226                 refname = p;
227                 p = strchr(refname, ' ');
228                 if (p)
229                         *p++ = '\0';
230                 /* first try searching at our hint, falling back to all refs */
231                 if (hint)
232                         hint = find_ref_by_name(hint, refname);
233                 if (!hint)
234                         hint = find_ref_by_name(refs, refname);
235                 if (!hint) {
236                         warning("remote reported status on unknown ref: %s",
237                                 refname);
238                         continue;
239                 }
240                 if (hint->status != REF_STATUS_EXPECTING_REPORT &&
241                     hint->status != REF_STATUS_OK &&
242                     hint->status != REF_STATUS_REMOTE_REJECT) {
243                         warning("remote reported status on unexpected ref: %s",
244                                 refname);
245                         continue;
246                 }
247                 if (!strcmp(head, "ng")) {
248                         hint->status = REF_STATUS_REMOTE_REJECT;
249                         if (p)
250                                 hint->remote_status = xstrdup(p);
251                         else
252                                 hint->remote_status = "failed";
253                 } else {
254                         hint->status = REF_STATUS_OK;
255                         hint->remote_status = xstrdup_or_null(p);
256                         new_report = 1;
257                 }
258         }
259         return ret;
260 }
261
262 static int sideband_demux(int in, int out, void *data)
263 {
264         int *fd = data, ret;
265         if (async_with_fork())
266                 close(fd[1]);
267         ret = recv_sideband("send-pack", fd[0], out);
268         close(out);
269         return ret;
270 }
271
272 static int advertise_shallow_grafts_cb(const struct commit_graft *graft, void *cb)
273 {
274         struct strbuf *sb = cb;
275         if (graft->nr_parent == -1)
276                 packet_buf_write(sb, "shallow %s\n", oid_to_hex(&graft->oid));
277         return 0;
278 }
279
280 static void advertise_shallow_grafts_buf(struct strbuf *sb)
281 {
282         if (!is_repository_shallow(the_repository))
283                 return;
284         for_each_commit_graft(advertise_shallow_grafts_cb, sb);
285 }
286
287 #define CHECK_REF_NO_PUSH -1
288 #define CHECK_REF_STATUS_REJECTED -2
289 #define CHECK_REF_UPTODATE -3
290 static int check_to_send_update(const struct ref *ref, const struct send_pack_args *args)
291 {
292         if (!ref->peer_ref && !args->send_mirror)
293                 return CHECK_REF_NO_PUSH;
294
295         /* Check for statuses set by set_ref_status_for_push() */
296         switch (ref->status) {
297         case REF_STATUS_REJECT_NONFASTFORWARD:
298         case REF_STATUS_REJECT_ALREADY_EXISTS:
299         case REF_STATUS_REJECT_FETCH_FIRST:
300         case REF_STATUS_REJECT_NEEDS_FORCE:
301         case REF_STATUS_REJECT_STALE:
302         case REF_STATUS_REJECT_NODELETE:
303                 return CHECK_REF_STATUS_REJECTED;
304         case REF_STATUS_UPTODATE:
305                 return CHECK_REF_UPTODATE;
306         default:
307                 return 0;
308         }
309 }
310
311 /*
312  * the beginning of the next line, or the end of buffer.
313  *
314  * NEEDSWORK: perhaps move this to git-compat-util.h or somewhere and
315  * convert many similar uses found by "git grep -A4 memchr".
316  */
317 static const char *next_line(const char *line, size_t len)
318 {
319         const char *nl = memchr(line, '\n', len);
320         if (!nl)
321                 return line + len; /* incomplete line */
322         return nl + 1;
323 }
324
325 static int generate_push_cert(struct strbuf *req_buf,
326                               const struct ref *remote_refs,
327                               struct send_pack_args *args,
328                               const char *cap_string,
329                               const char *push_cert_nonce)
330 {
331         const struct ref *ref;
332         struct string_list_item *item;
333         char *signing_key = xstrdup(get_signing_key());
334         const char *cp, *np;
335         struct strbuf cert = STRBUF_INIT;
336         int update_seen = 0;
337
338         strbuf_addstr(&cert, "certificate version 0.1\n");
339         strbuf_addf(&cert, "pusher %s ", signing_key);
340         datestamp(&cert);
341         strbuf_addch(&cert, '\n');
342         if (args->url && *args->url) {
343                 char *anon_url = transport_anonymize_url(args->url);
344                 strbuf_addf(&cert, "pushee %s\n", anon_url);
345                 free(anon_url);
346         }
347         if (push_cert_nonce[0])
348                 strbuf_addf(&cert, "nonce %s\n", push_cert_nonce);
349         if (args->push_options)
350                 for_each_string_list_item(item, args->push_options)
351                         strbuf_addf(&cert, "push-option %s\n", item->string);
352         strbuf_addstr(&cert, "\n");
353
354         for (ref = remote_refs; ref; ref = ref->next) {
355                 if (check_to_send_update(ref, args) < 0)
356                         continue;
357                 update_seen = 1;
358                 strbuf_addf(&cert, "%s %s %s\n",
359                             oid_to_hex(&ref->old_oid),
360                             oid_to_hex(&ref->new_oid),
361                             ref->name);
362         }
363         if (!update_seen)
364                 goto free_return;
365
366         if (sign_buffer(&cert, &cert, signing_key))
367                 die(_("failed to sign the push certificate"));
368
369         packet_buf_write(req_buf, "push-cert%c%s", 0, cap_string);
370         for (cp = cert.buf; cp < cert.buf + cert.len; cp = np) {
371                 np = next_line(cp, cert.buf + cert.len - cp);
372                 packet_buf_write(req_buf,
373                                  "%.*s", (int)(np - cp), cp);
374         }
375         packet_buf_write(req_buf, "push-cert-end\n");
376
377 free_return:
378         free(signing_key);
379         strbuf_release(&cert);
380         return update_seen;
381 }
382
383 #define NONCE_LEN_LIMIT 256
384
385 static void reject_invalid_nonce(const char *nonce, int len)
386 {
387         int i = 0;
388
389         if (NONCE_LEN_LIMIT <= len)
390                 die("the receiving end asked to sign an invalid nonce <%.*s>",
391                     len, nonce);
392
393         for (i = 0; i < len; i++) {
394                 int ch = nonce[i] & 0xFF;
395                 if (isalnum(ch) ||
396                     ch == '-' || ch == '.' ||
397                     ch == '/' || ch == '+' ||
398                     ch == '=' || ch == '_')
399                         continue;
400                 die("the receiving end asked to sign an invalid nonce <%.*s>",
401                     len, nonce);
402         }
403 }
404
405 int send_pack(struct send_pack_args *args,
406               int fd[], struct child_process *conn,
407               struct ref *remote_refs,
408               struct oid_array *extra_have)
409 {
410         int in = fd[0];
411         int out = fd[1];
412         struct strbuf req_buf = STRBUF_INIT;
413         struct strbuf cap_buf = STRBUF_INIT;
414         struct ref *ref;
415         int need_pack_data = 0;
416         int allow_deleting_refs = 0;
417         int status_report = 0;
418         int use_sideband = 0;
419         int quiet_supported = 0;
420         int agent_supported = 0;
421         int use_atomic = 0;
422         int atomic_supported = 0;
423         int use_push_options = 0;
424         int push_options_supported = 0;
425         int object_format_supported = 0;
426         unsigned cmds_sent = 0;
427         int ret;
428         struct async demux;
429         const char *push_cert_nonce = NULL;
430         struct packet_reader reader;
431
432         /* Does the other end support the reporting? */
433         if (server_supports("report-status-v2"))
434                 status_report = 2;
435         else if (server_supports("report-status"))
436                 status_report = 1;
437         if (server_supports("delete-refs"))
438                 allow_deleting_refs = 1;
439         if (server_supports("ofs-delta"))
440                 args->use_ofs_delta = 1;
441         if (server_supports("side-band-64k"))
442                 use_sideband = 1;
443         if (server_supports("quiet"))
444                 quiet_supported = 1;
445         if (server_supports("agent"))
446                 agent_supported = 1;
447         if (server_supports("no-thin"))
448                 args->use_thin_pack = 0;
449         if (server_supports("atomic"))
450                 atomic_supported = 1;
451         if (server_supports("push-options"))
452                 push_options_supported = 1;
453
454         if (!server_supports_hash(the_hash_algo->name, &object_format_supported))
455                 die(_("the receiving end does not support this repository's hash algorithm"));
456
457         if (args->push_cert != SEND_PACK_PUSH_CERT_NEVER) {
458                 int len;
459                 push_cert_nonce = server_feature_value("push-cert", &len);
460                 if (push_cert_nonce) {
461                         reject_invalid_nonce(push_cert_nonce, len);
462                         push_cert_nonce = xmemdupz(push_cert_nonce, len);
463                 } else if (args->push_cert == SEND_PACK_PUSH_CERT_ALWAYS) {
464                         die(_("the receiving end does not support --signed push"));
465                 } else if (args->push_cert == SEND_PACK_PUSH_CERT_IF_ASKED) {
466                         warning(_("not sending a push certificate since the"
467                                   " receiving end does not support --signed"
468                                   " push"));
469                 }
470         }
471
472         if (!remote_refs) {
473                 fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
474                         "Perhaps you should specify a branch.\n");
475                 return 0;
476         }
477         if (args->atomic && !atomic_supported)
478                 die(_("the receiving end does not support --atomic push"));
479
480         use_atomic = atomic_supported && args->atomic;
481
482         if (args->push_options && !push_options_supported)
483                 die(_("the receiving end does not support push options"));
484
485         use_push_options = push_options_supported && args->push_options;
486
487         if (status_report == 1)
488                 strbuf_addstr(&cap_buf, " report-status");
489         else if (status_report == 2)
490                 strbuf_addstr(&cap_buf, " report-status-v2");
491         if (use_sideband)
492                 strbuf_addstr(&cap_buf, " side-band-64k");
493         if (quiet_supported && (args->quiet || !args->progress))
494                 strbuf_addstr(&cap_buf, " quiet");
495         if (use_atomic)
496                 strbuf_addstr(&cap_buf, " atomic");
497         if (use_push_options)
498                 strbuf_addstr(&cap_buf, " push-options");
499         if (object_format_supported)
500                 strbuf_addf(&cap_buf, " object-format=%s", the_hash_algo->name);
501         if (agent_supported)
502                 strbuf_addf(&cap_buf, " agent=%s", git_user_agent_sanitized());
503
504         /*
505          * NEEDSWORK: why does delete-refs have to be so specific to
506          * send-pack machinery that set_ref_status_for_push() cannot
507          * set this bit for us???
508          */
509         for (ref = remote_refs; ref; ref = ref->next)
510                 if (ref->deletion && !allow_deleting_refs)
511                         ref->status = REF_STATUS_REJECT_NODELETE;
512
513         if (!args->dry_run)
514                 advertise_shallow_grafts_buf(&req_buf);
515
516         if (!args->dry_run && push_cert_nonce)
517                 cmds_sent = generate_push_cert(&req_buf, remote_refs, args,
518                                                cap_buf.buf, push_cert_nonce);
519
520         /*
521          * Clear the status for each ref and see if we need to send
522          * the pack data.
523          */
524         for (ref = remote_refs; ref; ref = ref->next) {
525                 switch (check_to_send_update(ref, args)) {
526                 case 0: /* no error */
527                         break;
528                 case CHECK_REF_STATUS_REJECTED:
529                         /*
530                          * When we know the server would reject a ref update if
531                          * we were to send it and we're trying to send the refs
532                          * atomically, abort the whole operation.
533                          */
534                         if (use_atomic) {
535                                 strbuf_release(&req_buf);
536                                 strbuf_release(&cap_buf);
537                                 reject_atomic_push(remote_refs, args->send_mirror);
538                                 error("atomic push failed for ref %s. status: %d\n",
539                                       ref->name, ref->status);
540                                 return args->porcelain ? 0 : -1;
541                         }
542                         /* else fallthrough */
543                 default:
544                         continue;
545                 }
546                 if (!ref->deletion)
547                         need_pack_data = 1;
548
549                 if (args->dry_run || !status_report)
550                         ref->status = REF_STATUS_OK;
551                 else
552                         ref->status = REF_STATUS_EXPECTING_REPORT;
553         }
554
555         /*
556          * Finally, tell the other end!
557          */
558         for (ref = remote_refs; ref; ref = ref->next) {
559                 char *old_hex, *new_hex;
560
561                 if (args->dry_run || push_cert_nonce)
562                         continue;
563
564                 if (check_to_send_update(ref, args) < 0)
565                         continue;
566
567                 old_hex = oid_to_hex(&ref->old_oid);
568                 new_hex = oid_to_hex(&ref->new_oid);
569                 if (!cmds_sent) {
570                         packet_buf_write(&req_buf,
571                                          "%s %s %s%c%s",
572                                          old_hex, new_hex, ref->name, 0,
573                                          cap_buf.buf);
574                         cmds_sent = 1;
575                 } else {
576                         packet_buf_write(&req_buf, "%s %s %s",
577                                          old_hex, new_hex, ref->name);
578                 }
579         }
580
581         if (use_push_options) {
582                 struct string_list_item *item;
583
584                 packet_buf_flush(&req_buf);
585                 for_each_string_list_item(item, args->push_options)
586                         packet_buf_write(&req_buf, "%s", item->string);
587         }
588
589         if (args->stateless_rpc) {
590                 if (!args->dry_run && (cmds_sent || is_repository_shallow(the_repository))) {
591                         packet_buf_flush(&req_buf);
592                         send_sideband(out, -1, req_buf.buf, req_buf.len, LARGE_PACKET_MAX);
593                 }
594         } else {
595                 write_or_die(out, req_buf.buf, req_buf.len);
596                 packet_flush(out);
597         }
598         strbuf_release(&req_buf);
599         strbuf_release(&cap_buf);
600
601         if (use_sideband && cmds_sent) {
602                 memset(&demux, 0, sizeof(demux));
603                 demux.proc = sideband_demux;
604                 demux.data = fd;
605                 demux.out = -1;
606                 demux.isolate_sigpipe = 1;
607                 if (start_async(&demux))
608                         die("send-pack: unable to fork off sideband demultiplexer");
609                 in = demux.out;
610         }
611
612         packet_reader_init(&reader, in, NULL, 0,
613                            PACKET_READ_CHOMP_NEWLINE |
614                            PACKET_READ_DIE_ON_ERR_PACKET);
615
616         if (need_pack_data && cmds_sent) {
617                 if (pack_objects(out, remote_refs, extra_have, args) < 0) {
618                         if (args->stateless_rpc)
619                                 close(out);
620                         if (git_connection_is_socket(conn))
621                                 shutdown(fd[0], SHUT_WR);
622
623                         /*
624                          * Do not even bother with the return value; we know we
625                          * are failing, and just want the error() side effects,
626                          * as well as marking refs with their remote status (if
627                          * we get one).
628                          */
629                         if (status_report)
630                                 receive_status(&reader, remote_refs);
631
632                         if (use_sideband) {
633                                 close(demux.out);
634                                 finish_async(&demux);
635                         }
636                         fd[1] = -1;
637                         return -1;
638                 }
639                 if (!args->stateless_rpc)
640                         /* Closed by pack_objects() via start_command() */
641                         fd[1] = -1;
642         }
643         if (args->stateless_rpc && cmds_sent)
644                 packet_flush(out);
645
646         if (status_report && cmds_sent)
647                 ret = receive_status(&reader, remote_refs);
648         else
649                 ret = 0;
650         if (args->stateless_rpc)
651                 packet_flush(out);
652
653         if (use_sideband && cmds_sent) {
654                 close(demux.out);
655                 if (finish_async(&demux)) {
656                         error("error in sideband demultiplexer");
657                         ret = -1;
658                 }
659         }
660
661         if (ret < 0)
662                 return ret;
663
664         if (args->porcelain)
665                 return 0;
666
667         for (ref = remote_refs; ref; ref = ref->next) {
668                 switch (ref->status) {
669                 case REF_STATUS_NONE:
670                 case REF_STATUS_UPTODATE:
671                 case REF_STATUS_OK:
672                         break;
673                 default:
674                         return -1;
675                 }
676         }
677         return 0;
678 }