op public repos

Blob

Date:: Mon Nov 14 22:56:04 2022 UTC
Message:: got send: show server error Print the error message reported by the remote server when failing to update a branch (for e.g. because of a server-side check.) Reported by gonzalo@, with help and ok stsp@.
Actions:: History | Blame | Raw File
1 /*
2  * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
3  * Copyright (c) 2020 Ori Bernstein <ori@openbsd.org>
4  *
5  * Permission to use, copy, modify, and distribute this software for any
6  * purpose with or without fee is hereby granted, provided that the above
7  * copyright notice and this permission notice appear in all copies.
8  *
9  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16  */
17 
18 #include <sys/types.h>
19 #include <sys/queue.h>
20 #include <sys/uio.h>
21 #include <sys/wait.h>
22 
23 #include <ctype.h>
24 #include <limits.h>
25 #include <signal.h>
26 #include <stdio.h>
27 #include <stdlib.h>
28 #include <string.h>
29 #include <errno.h>
30 #include <stdint.h>
31 #include <poll.h>
32 #include <imsg.h>
33 #include <sha1.h>
34 #include <unistd.h>
35 #include <zlib.h>
36 
37 #include "got_object.h"
38 #include "got_error.h"
39 #include "got_path.h"
40 #include "got_repository.h"
41 
42 #include "got_lib_sha1.h"
43 #include "got_lib_delta.h"
44 #include "got_lib_inflate.h"
45 #include "got_lib_object.h"
46 #include "got_lib_object_parse.h"
47 #include "got_lib_privsep.h"
48 #include "got_lib_pack.h"
49 #include "got_lib_poll.h"
50 
51 #include "got_privsep.h"
52 
53 #ifndef MIN
54 #define	MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
55 #endif
56 
57 #ifndef nitems
58 #define nitems(_a)	(sizeof((_a)) / sizeof((_a)[0]))
59 #endif
60 
61 static const struct got_error *
62 read_imsg(struct imsgbuf *ibuf)
63 {
64 	const struct got_error *err;
65 	size_t n;
66 
67 	err = got_poll_fd(ibuf->fd, POLLIN, INFTIM);
68 	if (err) {
69 		if (err->code == GOT_ERR_EOF)
70 			return got_error(GOT_ERR_PRIVSEP_PIPE);
71 		return err;
72 	}
73 
74 	n = imsg_read(ibuf);
75 	if (n == -1) {
76 		if (errno == EAGAIN) /* Could be a file-descriptor leak. */
77 			return got_error(GOT_ERR_PRIVSEP_NO_FD);
78 		return got_error(GOT_ERR_PRIVSEP_READ);
79 	}
80 	if (n == 0)
81 		return got_error(GOT_ERR_PRIVSEP_PIPE);
82 
83 	return NULL;
84 }
85 
86 const struct got_error *
87 got_privsep_wait_for_child(pid_t pid)
88 {
89 	int child_status;
90 
91 	if (waitpid(pid, &child_status, 0) == -1)
92 		return got_error_from_errno("waitpid");
93 
94 	if (!WIFEXITED(child_status))
95 		return got_error(GOT_ERR_PRIVSEP_DIED);
96 
97 	if (WEXITSTATUS(child_status) != 0)
98 		return got_error(GOT_ERR_PRIVSEP_EXIT);
99 
100 	return NULL;
101 }
102 
103 static const struct got_error *
104 recv_imsg_error(struct imsg *imsg, size_t datalen)
105 {
106 	struct got_imsg_error *ierr;
107 
108 	if (datalen != sizeof(*ierr))
109 		return got_error(GOT_ERR_PRIVSEP_LEN);
110 
111 	ierr = imsg->data;
112 	if (ierr->code == GOT_ERR_ERRNO) {
113 		static struct got_error serr;
114 		serr.code = GOT_ERR_ERRNO;
115 		serr.msg = strerror(ierr->errno_code);
116 		return &serr;
117 	}
118 
119 	return got_error(ierr->code);
120 }
121 
122 const struct got_error *
123 got_privsep_recv_imsg(struct imsg *imsg, struct imsgbuf *ibuf,
124     size_t min_datalen)
125 {
126 	const struct got_error *err;
127 	ssize_t n;
128 
129 	n = imsg_get(ibuf, imsg);
130 	if (n == -1)
131 		return got_error_from_errno("imsg_get");
132 
133 	while (n == 0) {
134 		err = read_imsg(ibuf);
135 		if (err)
136 			return err;
137 		n = imsg_get(ibuf, imsg);
138 		if (n == -1)
139 			return got_error_from_errno("imsg_get");
140 	}
141 
142 	if (imsg->hdr.len < IMSG_HEADER_SIZE + min_datalen)
143 		return got_error(GOT_ERR_PRIVSEP_LEN);
144 
145 	if (imsg->hdr.type == GOT_IMSG_ERROR) {
146 		size_t datalen = imsg->hdr.len - IMSG_HEADER_SIZE;
147 		return recv_imsg_error(imsg, datalen);
148 	}
149 
150 	return NULL;
151 }
152 
153 /* Attempt to send an error in an imsg. Complain on stderr as a last resort. */
154 void
155 got_privsep_send_error(struct imsgbuf *ibuf, const struct got_error *err)
156 {
157 	const struct got_error *poll_err;
158 	struct got_imsg_error ierr;
159 	int ret;
160 
161 	ierr.code = err->code;
162 	if (err->code == GOT_ERR_ERRNO)
163 		ierr.errno_code = errno;
164 	else
165 		ierr.errno_code = 0;
166 	ret = imsg_compose(ibuf, GOT_IMSG_ERROR, 0, 0, -1, &ierr, sizeof(ierr));
167 	if (ret == -1) {
168 		fprintf(stderr, "%s: error %d \"%s\": imsg_compose: %s\n",
169 		    getprogname(), err->code, err->msg, strerror(errno));
170 		return;
171 	}
172 
173 	poll_err = got_poll_fd(ibuf->fd, POLLOUT, INFTIM);
174 	if (poll_err) {
175 		fprintf(stderr, "%s: error %d \"%s\": poll: %s\n",
176 		    getprogname(), err->code, err->msg, poll_err->msg);
177 		return;
178 	}
179 
180 	ret = imsg_flush(ibuf);
181 	if (ret == -1) {
182 		fprintf(stderr, "%s: error %d \"%s\": imsg_flush: %s\n",
183 		    getprogname(), err->code, err->msg, strerror(errno));
184 		imsg_clear(ibuf);
185 		return;
186 	}
187 }
188 
189 static const struct got_error *
190 flush_imsg(struct imsgbuf *ibuf)
191 {
192 	const struct got_error *err;
193 
194 	err = got_poll_fd(ibuf->fd, POLLOUT, INFTIM);
195 	if (err)
196 		return err;
197 
198 	if (imsg_flush(ibuf) == -1) {
199 		imsg_clear(ibuf);
200 		return got_error_from_errno("imsg_flush");
201 	}
202 
203 	return NULL;
204 }
205 
206 const struct got_error *
207 got_privsep_flush_imsg(struct imsgbuf *ibuf)
208 {
209 	return flush_imsg(ibuf);
210 }
211 
212 const struct got_error *
213 got_privsep_send_stop(int fd)
214 {
215 	const struct got_error *err = NULL;
216 	struct imsgbuf ibuf;
217 
218 	imsg_init(&ibuf, fd);
219 
220 	if (imsg_compose(&ibuf, GOT_IMSG_STOP, 0, 0, -1, NULL, 0) == -1)
221 		return got_error_from_errno("imsg_compose STOP");
222 
223 	err = flush_imsg(&ibuf);
224 	return err;
225 }
226 
227 const struct got_error *
228 got_privsep_send_obj_req(struct imsgbuf *ibuf, int fd,
229     struct got_object_id *id)
230 {
231 	if (imsg_compose(ibuf, GOT_IMSG_OBJECT_REQUEST, 0, 0, fd,
232 	    id, sizeof(*id)) == -1)
233 		return got_error_from_errno("imsg_compose OBJECT_REQUEST");
234 
235 	return flush_imsg(ibuf);
236 }
237 
238 const struct got_error *
239 got_privsep_send_raw_obj_req(struct imsgbuf *ibuf, int fd,
240     struct got_object_id *id)
241 {
242 	if (imsg_compose(ibuf, GOT_IMSG_RAW_OBJECT_REQUEST, 0, 0, fd,
243 	    id, sizeof(*id)) == -1)
244 		return got_error_from_errno("imsg_compose RAW_OBJECT_REQUEST");
245 
246 	return flush_imsg(ibuf);
247 }
248 
249 const struct got_error *
250 got_privsep_send_raw_obj_outfd(struct imsgbuf *ibuf, int outfd)
251 {
252 	const struct got_error *err = NULL;
253 
254 	if (imsg_compose(ibuf, GOT_IMSG_RAW_OBJECT_OUTFD, 0, 0, outfd, NULL, 0)
255 	    == -1) {
256 		err = got_error_from_errno("imsg_compose RAW_OBJECT_OUTFD");
257 		close(outfd);
258 		return err;
259 	}
260 
261 	return flush_imsg(ibuf);
262 }
263 
264 const struct got_error *
265 got_privsep_send_raw_obj(struct imsgbuf *ibuf, off_t size, size_t hdrlen,
266     uint8_t *data)
267 {
268 	const struct got_error *err = NULL;
269 	struct got_imsg_raw_obj iobj;
270 	size_t len = sizeof(iobj);
271 	struct ibuf *wbuf;
272 
273 	memset(&iobj, 0, sizeof(iobj));
274 	iobj.hdrlen = hdrlen;
275 	iobj.size = size;
276 
277 	if (data && size + hdrlen <= GOT_PRIVSEP_INLINE_OBJECT_DATA_MAX)
278 		len += (size_t)size + hdrlen;
279 
280 	wbuf = imsg_create(ibuf, GOT_IMSG_RAW_OBJECT, 0, 0, len);
281 	if (wbuf == NULL) {
282 		err = got_error_from_errno("imsg_create RAW_OBJECT");
283 		return err;
284 	}
285 
286 	if (imsg_add(wbuf, &iobj, sizeof(iobj)) == -1)
287 		return got_error_from_errno("imsg_add RAW_OBJECT");
288 
289 	if (data && size + hdrlen <= GOT_PRIVSEP_INLINE_OBJECT_DATA_MAX) {
290 		if (imsg_add(wbuf, data, size + hdrlen) == -1)
291 			return got_error_from_errno("imsg_add RAW_OBJECT");
292 	}
293 
294 	wbuf->fd = -1;
295 	imsg_close(ibuf, wbuf);
296 
297 	return flush_imsg(ibuf);
298 }
299 
300 const struct got_error *
301 got_privsep_recv_raw_obj(uint8_t **outbuf, off_t *size, size_t *hdrlen,
302     struct imsgbuf *ibuf)
303 {
304 	const struct got_error *err = NULL;
305 	struct imsg imsg;
306 	struct got_imsg_raw_obj *iobj;
307 	size_t datalen;
308 
309 	*outbuf = NULL;
310 
311 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
312 	if (err)
313 		return err;
314 
315 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
316 
317 	switch (imsg.hdr.type) {
318 	case GOT_IMSG_RAW_OBJECT:
319 		if (datalen < sizeof(*iobj)) {
320 			err = got_error(GOT_ERR_PRIVSEP_LEN);
321 			break;
322 		}
323 		iobj = imsg.data;
324 		*size = iobj->size;
325 		*hdrlen = iobj->hdrlen;
326 
327 		if (datalen == sizeof(*iobj)) {
328 			/* Data has been written to file descriptor. */
329 			break;
330 		}
331 
332 		if (*size < 0 ||
333 		    *size + *hdrlen > GOT_PRIVSEP_INLINE_OBJECT_DATA_MAX) {
334 			err = got_error(GOT_ERR_PRIVSEP_LEN);
335 			break;
336 		}
337 
338 		*outbuf = malloc(*size + *hdrlen);
339 		if (*outbuf == NULL) {
340 			err = got_error_from_errno("malloc");
341 			break;
342 		}
343 		memcpy(*outbuf, imsg.data + sizeof(*iobj), *size + *hdrlen);
344 		break;
345 	default:
346 		err = got_error(GOT_ERR_PRIVSEP_MSG);
347 		break;
348 	}
349 
350 	imsg_free(&imsg);
351 
352 	return err;
353 }
354 
355 const struct got_error *
356 got_privsep_send_commit_req(struct imsgbuf *ibuf, int fd,
357     struct got_object_id *id, int pack_idx)
358 {
359 	const struct got_error *err = NULL;
360 	struct got_imsg_packed_object iobj;
361 	void *data;
362 	size_t len;
363 
364 	memset(&iobj, 0, sizeof(iobj));
365 	if (pack_idx != -1) { /* commit is packed */
366 		iobj.idx = pack_idx;
367 		memcpy(iobj.id, id->sha1, sizeof(iobj.id));
368 		data = &iobj;
369 		len = sizeof(iobj);
370 	} else {
371 		data = id;
372 		len = sizeof(*id);
373 	}
374 
375 	if (imsg_compose(ibuf, GOT_IMSG_COMMIT_REQUEST, 0, 0, fd, data, len)
376 	    == -1) {
377 		err = got_error_from_errno("imsg_compose COMMIT_REQUEST");
378 		close(fd);
379 		return err;
380 	}
381 
382 	return flush_imsg(ibuf);
383 }
384 
385 const struct got_error *
386 got_privsep_send_tree_req(struct imsgbuf *ibuf, int fd,
387     struct got_object_id *id, int pack_idx)
388 {
389 	struct ibuf *wbuf;
390 	size_t len;
391 
392 	if (pack_idx != -1)
393 		len = sizeof(struct got_imsg_packed_object);
394 	else
395 		len = sizeof(*id);
396 
397 	wbuf = imsg_create(ibuf, GOT_IMSG_TREE_REQUEST, 0, 0, len);
398 	if (wbuf == NULL)
399 		return got_error_from_errno("imsg_create TREE_REQUEST");
400 
401 	if (imsg_add(wbuf, id->sha1, SHA1_DIGEST_LENGTH) == -1)
402 		return got_error_from_errno("imsg_add TREE_REQUEST");
403 
404 	if (pack_idx != -1) { /* tree is packed */
405 		if (imsg_add(wbuf, &pack_idx, sizeof(pack_idx)) == -1)
406 			return got_error_from_errno("imsg_add TREE_REQUEST");
407 	}
408 
409 	wbuf->fd = fd;
410 	imsg_close(ibuf, wbuf);
411 
412 	return flush_imsg(ibuf);
413 }
414 
415 const struct got_error *
416 got_privsep_send_tag_req(struct imsgbuf *ibuf, int fd,
417     struct got_object_id *id, int pack_idx)
418 {
419 	struct got_imsg_packed_object iobj;
420 	void *data;
421 	size_t len;
422 
423 	memset(&iobj, 0, sizeof(iobj));
424 	if (pack_idx != -1) { /* tag is packed */
425 		iobj.idx = pack_idx;
426 		memcpy(iobj.id, id->sha1, sizeof(iobj.id));
427 		data = &iobj;
428 		len = sizeof(iobj);
429 	} else {
430 		data = id;
431 		len = sizeof(*id);
432 	}
433 
434 	if (imsg_compose(ibuf, GOT_IMSG_TAG_REQUEST, 0, 0, fd, data, len)
435 	    == -1)
436 		return got_error_from_errno("imsg_compose TAG_REQUEST");
437 
438 	return flush_imsg(ibuf);
439 }
440 
441 const struct got_error *
442 got_privsep_send_blob_req(struct imsgbuf *ibuf, int infd,
443     struct got_object_id *id, int pack_idx)
444 {
445 	const struct got_error *err = NULL;
446 	struct got_imsg_packed_object iobj;
447 	void *data;
448 	size_t len;
449 
450 	memset(&iobj, 0, sizeof(iobj));
451 	if (pack_idx != -1) { /* blob is packed */
452 		iobj.idx = pack_idx;
453 		memcpy(iobj.id, id->sha1, sizeof(iobj.id));
454 		data = &iobj;
455 		len = sizeof(iobj);
456 	} else {
457 		data = id;
458 		len = sizeof(*id);
459 	}
460 
461 	if (imsg_compose(ibuf, GOT_IMSG_BLOB_REQUEST, 0, 0, infd, data, len)
462 	    == -1) {
463 		err = got_error_from_errno("imsg_compose BLOB_REQUEST");
464 		close(infd);
465 		return err;
466 	}
467 
468 	return flush_imsg(ibuf);
469 }
470 
471 const struct got_error *
472 got_privsep_send_blob_outfd(struct imsgbuf *ibuf, int outfd)
473 {
474 	const struct got_error *err = NULL;
475 
476 	if (imsg_compose(ibuf, GOT_IMSG_BLOB_OUTFD, 0, 0, outfd, NULL, 0)
477 	    == -1) {
478 		err = got_error_from_errno("imsg_compose BLOB_OUTFD");
479 		close(outfd);
480 		return err;
481 	}
482 
483 	return flush_imsg(ibuf);
484 }
485 
486 static const struct got_error *
487 send_fd(struct imsgbuf *ibuf, int imsg_code, int fd)
488 {
489 	const struct got_error *err = NULL;
490 
491 	if (imsg_compose(ibuf, imsg_code, 0, 0, fd, NULL, 0) == -1) {
492 		err = got_error_from_errno("imsg_compose TMPFD");
493 		close(fd);
494 		return err;
495 	}
496 
497 	return flush_imsg(ibuf);
498 }
499 
500 const struct got_error *
501 got_privsep_send_tmpfd(struct imsgbuf *ibuf, int fd)
502 {
503 	return send_fd(ibuf, GOT_IMSG_TMPFD, fd);
504 }
505 
506 const struct got_error *
507 got_privsep_send_obj(struct imsgbuf *ibuf, struct got_object *obj)
508 {
509 	struct got_imsg_object iobj;
510 
511 	memset(&iobj, 0, sizeof(iobj));
512 
513 	memcpy(iobj.id, obj->id.sha1, sizeof(iobj.id));
514 	iobj.type = obj->type;
515 	iobj.flags = obj->flags;
516 	iobj.hdrlen = obj->hdrlen;
517 	iobj.size = obj->size;
518 	if (iobj.flags & GOT_OBJ_FLAG_PACKED) {
519 		iobj.pack_offset = obj->pack_offset;
520 		iobj.pack_idx = obj->pack_idx;
521 	}
522 
523 	if (imsg_compose(ibuf, GOT_IMSG_OBJECT, 0, 0, -1, &iobj, sizeof(iobj))
524 	    == -1)
525 		return got_error_from_errno("imsg_compose OBJECT");
526 
527 	return flush_imsg(ibuf);
528 }
529 
530 const struct got_error *
531 got_privsep_send_fetch_req(struct imsgbuf *ibuf, int fd,
532     struct got_pathlist_head *have_refs, int fetch_all_branches,
533     struct got_pathlist_head *wanted_branches,
534     struct got_pathlist_head *wanted_refs, int list_refs_only, int verbosity)
535 {
536 	const struct got_error *err = NULL;
537 	struct ibuf *wbuf;
538 	size_t len;
539 	struct got_pathlist_entry *pe;
540 	struct got_imsg_fetch_request fetchreq;
541 
542 	memset(&fetchreq, 0, sizeof(fetchreq));
543 	fetchreq.fetch_all_branches = fetch_all_branches;
544 	fetchreq.list_refs_only = list_refs_only;
545 	fetchreq.verbosity = verbosity;
546 	TAILQ_FOREACH(pe, have_refs, entry)
547 		fetchreq.n_have_refs++;
548 	TAILQ_FOREACH(pe, wanted_branches, entry)
549 		fetchreq.n_wanted_branches++;
550 	TAILQ_FOREACH(pe, wanted_refs, entry)
551 		fetchreq.n_wanted_refs++;
552 	len = sizeof(struct got_imsg_fetch_request);
553 	if (len >= MAX_IMSGSIZE - IMSG_HEADER_SIZE) {
554 		close(fd);
555 		return got_error(GOT_ERR_NO_SPACE);
556 	}
557 
558 	if (imsg_compose(ibuf, GOT_IMSG_FETCH_REQUEST, 0, 0, fd,
559 	    &fetchreq, sizeof(fetchreq)) == -1)
560 		return got_error_from_errno(
561 		    "imsg_compose FETCH_SERVER_PROGRESS");
562 
563 	err = flush_imsg(ibuf);
564 	if (err) {
565 		close(fd);
566 		return err;
567 	}
568 	fd = -1;
569 
570 	TAILQ_FOREACH(pe, have_refs, entry) {
571 		const char *name = pe->path;
572 		size_t name_len = pe->path_len;
573 		struct got_object_id *id = pe->data;
574 
575 		len = sizeof(struct got_imsg_fetch_have_ref) + name_len;
576 		wbuf = imsg_create(ibuf, GOT_IMSG_FETCH_HAVE_REF, 0, 0, len);
577 		if (wbuf == NULL)
578 			return got_error_from_errno("imsg_create FETCH_HAVE_REF");
579 
580 		/* Keep in sync with struct got_imsg_fetch_have_ref! */
581 		if (imsg_add(wbuf, id->sha1, sizeof(id->sha1)) == -1)
582 			return got_error_from_errno("imsg_add FETCH_HAVE_REF");
583 		if (imsg_add(wbuf, &name_len, sizeof(name_len)) == -1)
584 			return got_error_from_errno("imsg_add FETCH_HAVE_REF");
585 		if (imsg_add(wbuf, name, name_len) == -1)
586 			return got_error_from_errno("imsg_add FETCH_HAVE_REF");
587 
588 		wbuf->fd = -1;
589 		imsg_close(ibuf, wbuf);
590 		err = flush_imsg(ibuf);
591 		if (err)
592 			return err;
593 	}
594 
595 	TAILQ_FOREACH(pe, wanted_branches, entry) {
596 		const char *name = pe->path;
597 		size_t name_len = pe->path_len;
598 
599 		len = sizeof(struct got_imsg_fetch_wanted_branch) + name_len;
600 		wbuf = imsg_create(ibuf, GOT_IMSG_FETCH_WANTED_BRANCH, 0, 0,
601 		    len);
602 		if (wbuf == NULL)
603 			return got_error_from_errno(
604 			    "imsg_create FETCH_WANTED_BRANCH");
605 
606 		/* Keep in sync with struct got_imsg_fetch_wanted_branch! */
607 		if (imsg_add(wbuf, &name_len, sizeof(name_len)) == -1)
608 			return got_error_from_errno(
609 			    "imsg_add FETCH_WANTED_BRANCH");
610 		if (imsg_add(wbuf, name, name_len) == -1)
611 			return got_error_from_errno(
612 			    "imsg_add FETCH_WANTED_BRANCH");
613 
614 		wbuf->fd = -1;
615 		imsg_close(ibuf, wbuf);
616 		err = flush_imsg(ibuf);
617 		if (err)
618 			return err;
619 	}
620 
621 	TAILQ_FOREACH(pe, wanted_refs, entry) {
622 		const char *name = pe->path;
623 		size_t name_len = pe->path_len;
624 
625 		len = sizeof(struct got_imsg_fetch_wanted_ref) + name_len;
626 		wbuf = imsg_create(ibuf, GOT_IMSG_FETCH_WANTED_REF, 0, 0,
627 		    len);
628 		if (wbuf == NULL)
629 			return got_error_from_errno(
630 			    "imsg_create FETCH_WANTED_REF");
631 
632 		/* Keep in sync with struct got_imsg_fetch_wanted_ref! */
633 		if (imsg_add(wbuf, &name_len, sizeof(name_len)) == -1)
634 			return got_error_from_errno(
635 			    "imsg_add FETCH_WANTED_REF");
636 		if (imsg_add(wbuf, name, name_len) == -1)
637 			return got_error_from_errno(
638 			    "imsg_add FETCH_WANTED_REF");
639 
640 		wbuf->fd = -1;
641 		imsg_close(ibuf, wbuf);
642 		err = flush_imsg(ibuf);
643 		if (err)
644 			return err;
645 	}
646 
647 
648 	return NULL;
649 
650 }
651 
652 const struct got_error *
653 got_privsep_send_fetch_outfd(struct imsgbuf *ibuf, int fd)
654 {
655 	return send_fd(ibuf, GOT_IMSG_FETCH_OUTFD, fd);
656 }
657 
658 const struct got_error *
659 got_privsep_recv_fetch_progress(int *done, struct got_object_id **id,
660     char **refname, struct got_pathlist_head *symrefs, char **server_progress,
661     off_t *packfile_size, uint8_t *pack_sha1, struct imsgbuf *ibuf)
662 {
663 	const struct got_error *err = NULL;
664 	struct imsg imsg;
665 	size_t datalen;
666 	struct got_imsg_fetch_symrefs *isymrefs = NULL;
667 	size_t n, remain;
668 	off_t off;
669 	int i;
670 
671 	*done = 0;
672 	*id = NULL;
673 	*refname = NULL;
674 	*server_progress = NULL;
675 	*packfile_size = 0;
676 	memset(pack_sha1, 0, SHA1_DIGEST_LENGTH);
677 
678 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
679 	if (err)
680 		return err;
681 
682 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
683 	switch (imsg.hdr.type) {
684 	case GOT_IMSG_FETCH_SYMREFS:
685 		if (datalen < sizeof(*isymrefs)) {
686 			err = got_error(GOT_ERR_PRIVSEP_LEN);
687 			break;
688 		}
689 		if (isymrefs != NULL) {
690 			err = got_error(GOT_ERR_PRIVSEP_MSG);
691 			break;
692 		}
693 		isymrefs = (struct got_imsg_fetch_symrefs *)imsg.data;
694 		off = sizeof(*isymrefs);
695 		remain = datalen - off;
696 		for (n = 0; n < isymrefs->nsymrefs; n++) {
697 			struct got_imsg_fetch_symref *s;
698 			char *name, *target;
699 			if (remain < sizeof(struct got_imsg_fetch_symref)) {
700 				err = got_error(GOT_ERR_PRIVSEP_LEN);
701 				goto done;
702 			}
703 			s = (struct got_imsg_fetch_symref *)(imsg.data + off);
704 			off += sizeof(*s);
705 			remain -= sizeof(*s);
706 			if (remain < s->name_len) {
707 				err = got_error(GOT_ERR_PRIVSEP_LEN);
708 				goto done;
709 			}
710 			name = strndup(imsg.data + off, s->name_len);
711 			if (name == NULL) {
712 				err = got_error_from_errno("strndup");
713 				goto done;
714 			}
715 			off += s->name_len;
716 			remain -= s->name_len;
717 			if (remain < s->target_len) {
718 				err = got_error(GOT_ERR_PRIVSEP_LEN);
719 				free(name);
720 				goto done;
721 			}
722 			target = strndup(imsg.data + off, s->target_len);
723 			if (target == NULL) {
724 				err = got_error_from_errno("strndup");
725 				free(name);
726 				goto done;
727 			}
728 			off += s->target_len;
729 			remain -= s->target_len;
730 			err = got_pathlist_append(symrefs, name, target);
731 			if (err) {
732 				free(name);
733 				free(target);
734 				goto done;
735 			}
736 		}
737 		break;
738 	case GOT_IMSG_FETCH_REF:
739 		if (datalen <= SHA1_DIGEST_LENGTH) {
740 			err = got_error(GOT_ERR_PRIVSEP_MSG);
741 			break;
742 		}
743 		*id = malloc(sizeof(**id));
744 		if (*id == NULL) {
745 			err = got_error_from_errno("malloc");
746 			break;
747 		}
748 		memcpy((*id)->sha1, imsg.data, SHA1_DIGEST_LENGTH);
749 		*refname = strndup(imsg.data + SHA1_DIGEST_LENGTH,
750 		    datalen - SHA1_DIGEST_LENGTH);
751 		if (*refname == NULL) {
752 			err = got_error_from_errno("strndup");
753 			break;
754 		}
755 		break;
756 	case GOT_IMSG_FETCH_SERVER_PROGRESS:
757 		if (datalen == 0) {
758 			err = got_error(GOT_ERR_PRIVSEP_LEN);
759 			break;
760 		}
761 		*server_progress = strndup(imsg.data, datalen);
762 		if (*server_progress == NULL) {
763 			err = got_error_from_errno("strndup");
764 			break;
765 		}
766 		for (i = 0; i < datalen; i++) {
767 			if (!isprint((unsigned char)(*server_progress)[i]) &&
768 			    !isspace((unsigned char)(*server_progress)[i])) {
769 				err = got_error(GOT_ERR_PRIVSEP_MSG);
770 				free(*server_progress);
771 				*server_progress = NULL;
772 				goto done;
773 			}
774 		}
775 		break;
776 	case GOT_IMSG_FETCH_DOWNLOAD_PROGRESS:
777 		if (datalen < sizeof(*packfile_size)) {
778 			err = got_error(GOT_ERR_PRIVSEP_MSG);
779 			break;
780 		}
781 		memcpy(packfile_size, imsg.data, sizeof(*packfile_size));
782 		break;
783 	case GOT_IMSG_FETCH_DONE:
784 		if (datalen != SHA1_DIGEST_LENGTH) {
785 			err = got_error(GOT_ERR_PRIVSEP_MSG);
786 			break;
787 		}
788 		memcpy(pack_sha1, imsg.data, SHA1_DIGEST_LENGTH);
789 		*done = 1;
790 		break;
791 	default:
792 		err = got_error(GOT_ERR_PRIVSEP_MSG);
793 		break;
794 	}
795 done:
796 	if (err) {
797 		free(*id);
798 		*id = NULL;
799 		free(*refname);
800 		*refname = NULL;
801 	}
802 	imsg_free(&imsg);
803 	return err;
804 }
805 
806 static const struct got_error *
807 send_send_ref(const char *name, size_t name_len, struct got_object_id *id,
808     int delete, struct imsgbuf *ibuf)
809 {
810 	size_t len;
811 	struct ibuf *wbuf;
812 
813 	len = sizeof(struct got_imsg_send_ref) + name_len;
814 	wbuf = imsg_create(ibuf, GOT_IMSG_SEND_REF, 0, 0, len);
815 	if (wbuf == NULL)
816 		return got_error_from_errno("imsg_create SEND_REF");
817 
818 	/* Keep in sync with struct got_imsg_send_ref! */
819 	if (imsg_add(wbuf, id->sha1, sizeof(id->sha1)) == -1)
820 		return got_error_from_errno("imsg_add SEND_REF");
821 	if (imsg_add(wbuf, &delete, sizeof(delete)) == -1)
822 		return got_error_from_errno("imsg_add SEND_REF");
823 	if (imsg_add(wbuf, &name_len, sizeof(name_len)) == -1)
824 		return got_error_from_errno("imsg_add SEND_REF");
825 	if (imsg_add(wbuf, name, name_len) == -1)
826 		return got_error_from_errno("imsg_add SEND_REF");
827 
828 	wbuf->fd = -1;
829 	imsg_close(ibuf, wbuf);
830 	return flush_imsg(ibuf);
831 }
832 
833 const struct got_error *
834 got_privsep_send_send_req(struct imsgbuf *ibuf, int fd,
835     struct got_pathlist_head *have_refs,
836     struct got_pathlist_head *delete_refs,
837     int verbosity)
838 {
839 	const struct got_error *err = NULL;
840 	struct got_pathlist_entry *pe;
841 	struct got_imsg_send_request sendreq;
842 	struct got_object_id zero_id;
843 
844 	memset(&zero_id, 0, sizeof(zero_id));
845 	memset(&sendreq, 0, sizeof(sendreq));
846 	sendreq.verbosity = verbosity;
847 	TAILQ_FOREACH(pe, have_refs, entry)
848 		sendreq.nrefs++;
849 	TAILQ_FOREACH(pe, delete_refs, entry)
850 		sendreq.nrefs++;
851 	if (imsg_compose(ibuf, GOT_IMSG_SEND_REQUEST, 0, 0, fd,
852 	    &sendreq, sizeof(sendreq)) == -1) {
853 		err = got_error_from_errno(
854 		    "imsg_compose FETCH_SERVER_PROGRESS");
855 		goto done;
856 	}
857 
858 	err = flush_imsg(ibuf);
859 	if (err)
860 		goto done;
861 	fd = -1;
862 
863 	TAILQ_FOREACH(pe, have_refs, entry) {
864 		const char *name = pe->path;
865 		size_t name_len = pe->path_len;
866 		struct got_object_id *id = pe->data;
867 		err = send_send_ref(name, name_len, id, 0, ibuf);
868 		if (err)
869 			goto done;
870 	}
871 
872 	TAILQ_FOREACH(pe, delete_refs, entry) {
873 		const char *name = pe->path;
874 		size_t name_len = pe->path_len;
875 		err = send_send_ref(name, name_len, &zero_id, 1, ibuf);
876 		if (err)
877 			goto done;
878 	}
879 done:
880 	if (fd != -1 && close(fd) == -1 && err == NULL)
881 		err = got_error_from_errno("close");
882 	return err;
883 
884 }
885 
886 const struct got_error *
887 got_privsep_recv_send_remote_refs(struct got_pathlist_head *remote_refs,
888     struct imsgbuf *ibuf)
889 {
890 	const struct got_error *err = NULL;
891 	struct imsg imsg;
892 	size_t datalen;
893 	int done = 0;
894 	struct got_imsg_send_remote_ref iremote_ref;
895 	struct got_object_id *id = NULL;
896 	char *refname = NULL;
897 	struct got_pathlist_entry *new;
898 
899 	while (!done) {
900 		err = got_privsep_recv_imsg(&imsg, ibuf, 0);
901 		if (err)
902 			return err;
903 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
904 		switch (imsg.hdr.type) {
905 		case GOT_IMSG_SEND_REMOTE_REF:
906 			if (datalen < sizeof(iremote_ref)) {
907 				err = got_error(GOT_ERR_PRIVSEP_MSG);
908 				goto done;
909 			}
910 			memcpy(&iremote_ref, imsg.data, sizeof(iremote_ref));
911 			if (datalen != sizeof(iremote_ref) +
912 			    iremote_ref.name_len) {
913 				err = got_error(GOT_ERR_PRIVSEP_MSG);
914 				goto done;
915 			}
916 			id = malloc(sizeof(*id));
917 			if (id == NULL) {
918 				err = got_error_from_errno("malloc");
919 				goto done;
920 			}
921 			memcpy(id->sha1, iremote_ref.id, SHA1_DIGEST_LENGTH);
922 			refname = strndup(imsg.data + sizeof(iremote_ref),
923 			    datalen - sizeof(iremote_ref));
924 			if (refname == NULL) {
925 				err = got_error_from_errno("strndup");
926 				goto done;
927 			}
928 			err = got_pathlist_insert(&new, remote_refs,
929 			    refname, id);
930 			if (err)
931 				goto done;
932 			if (new == NULL) { /* duplicate which wasn't inserted */
933 				free(id);
934 				free(refname);
935 			}
936 			id = NULL;
937 			refname = NULL;
938 			break;
939 		case GOT_IMSG_SEND_PACK_REQUEST:
940 			if (datalen != 0) {
941 				err = got_error(GOT_ERR_PRIVSEP_MSG);
942 				goto done;
943 			}
944 			/* got-send-pack is now waiting for a pack file. */
945 			done = 1;
946 			break;
947 		default:
948 			err = got_error(GOT_ERR_PRIVSEP_MSG);
949 			break;
950 		}
951 	}
952 done:
953 	free(id);
954 	free(refname);
955 	imsg_free(&imsg);
956 	return err;
957 }
958 
959 const struct got_error *
960 got_privsep_send_packfd(struct imsgbuf *ibuf, int fd)
961 {
962 	return send_fd(ibuf, GOT_IMSG_SEND_PACKFD, fd);
963 }
964 
965 const struct got_error *
966 got_privsep_recv_send_progress(int *done, off_t *bytes_sent,
967     int *success, char **refname, char **errmsg, struct imsgbuf *ibuf)
968 {
969 	const struct got_error *err = NULL;
970 	struct imsg imsg;
971 	size_t datalen;
972 	struct got_imsg_send_ref_status iref_status;
973 
974 	/* Do not reset the current value of 'bytes_sent', it accumulates. */
975 	*done = 0;
976 	*success = 0;
977 	*refname = NULL;
978 	*errmsg = NULL;
979 
980 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
981 	if (err)
982 		return err;
983 
984 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
985 	switch (imsg.hdr.type) {
986 	case GOT_IMSG_SEND_UPLOAD_PROGRESS:
987 		if (datalen < sizeof(*bytes_sent)) {
988 			err = got_error(GOT_ERR_PRIVSEP_MSG);
989 			break;
990 		}
991 		memcpy(bytes_sent, imsg.data, sizeof(*bytes_sent));
992 		break;
993 	case GOT_IMSG_SEND_REF_STATUS:
994 		if (datalen < sizeof(iref_status)) {
995 			err = got_error(GOT_ERR_PRIVSEP_MSG);
996 			break;
997 		}
998 		memcpy(&iref_status, imsg.data, sizeof(iref_status));
999 		if (datalen != sizeof(iref_status) + iref_status.name_len +
1000 		    iref_status.errmsg_len) {
1001 			err = got_error(GOT_ERR_PRIVSEP_MSG);
1002 			break;
1003 		}
1004 		*success = iref_status.success;
1005 		*refname = strndup(imsg.data + sizeof(iref_status),
1006 		    iref_status.name_len);
1007 
1008 		if (iref_status.errmsg_len != 0)
1009 			*errmsg = strndup(imsg.data + sizeof(iref_status) +
1010 			    iref_status.name_len, iref_status.errmsg_len);
1011 		break;
1012 	case GOT_IMSG_SEND_DONE:
1013 		if (datalen != 0) {
1014 			err = got_error(GOT_ERR_PRIVSEP_MSG);
1015 			break;
1016 		}
1017 		*done = 1;
1018 		break;
1019 	default:
1020 		err = got_error(GOT_ERR_PRIVSEP_MSG);
1021 		break;
1022 	}
1023 
1024 	imsg_free(&imsg);
1025 	return err;
1026 }
1027 
1028 const struct got_error *
1029 got_privsep_send_index_pack_req(struct imsgbuf *ibuf, uint8_t *pack_sha1,
1030     int fd)
1031 {
1032 	const struct got_error *err = NULL;
1033 
1034 	/* Keep in sync with struct got_imsg_index_pack_request */
1035 	if (imsg_compose(ibuf, GOT_IMSG_IDXPACK_REQUEST, 0, 0, fd,
1036 	    pack_sha1, SHA1_DIGEST_LENGTH) == -1) {
1037 		err = got_error_from_errno("imsg_compose INDEX_REQUEST");
1038 		close(fd);
1039 		return err;
1040 	}
1041 	return flush_imsg(ibuf);
1042 }
1043 
1044 const struct got_error *
1045 got_privsep_send_index_pack_outfd(struct imsgbuf *ibuf, int fd)
1046 {
1047 	return send_fd(ibuf, GOT_IMSG_IDXPACK_OUTFD, fd);
1048 }
1049 
1050 const struct got_error *
1051 got_privsep_recv_index_progress(int *done, int *nobj_total,
1052     int *nobj_indexed, int *nobj_loose, int *nobj_resolved,
1053     struct imsgbuf *ibuf)
1054 {
1055 	const struct got_error *err = NULL;
1056 	struct imsg imsg;
1057 	struct got_imsg_index_pack_progress *iprogress;
1058 	size_t datalen;
1059 
1060 	*done = 0;
1061 	*nobj_total = 0;
1062 	*nobj_indexed = 0;
1063 	*nobj_resolved = 0;
1064 
1065 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
1066 	if (err)
1067 		return err;
1068 
1069 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
1070 	switch (imsg.hdr.type) {
1071 	case GOT_IMSG_IDXPACK_PROGRESS:
1072 		if (datalen < sizeof(*iprogress)) {
1073 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1074 			break;
1075 		}
1076 		iprogress = (struct got_imsg_index_pack_progress *)imsg.data;
1077 		if (iprogress->nobj_total < 0 || iprogress->nobj_indexed < 0 ||
1078 		    iprogress->nobj_loose < 0 || iprogress->nobj_resolved < 0) {
1079 			err = got_error(GOT_ERR_RANGE);
1080 			break;
1081 		}
1082 		*nobj_total = iprogress->nobj_total;
1083 		*nobj_indexed = iprogress->nobj_indexed;
1084 		*nobj_loose = iprogress->nobj_loose;
1085 		*nobj_resolved = iprogress->nobj_resolved;
1086 		break;
1087 	case GOT_IMSG_IDXPACK_DONE:
1088 		if (datalen != 0) {
1089 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1090 			break;
1091 		}
1092 		*done = 1;
1093 		break;
1094 	default:
1095 		err = got_error(GOT_ERR_PRIVSEP_MSG);
1096 		break;
1097 	}
1098 
1099 	imsg_free(&imsg);
1100 	return err;
1101 }
1102 
1103 const struct got_error *
1104 got_privsep_get_imsg_obj(struct got_object **obj, struct imsg *imsg,
1105     struct imsgbuf *ibuf)
1106 {
1107 	struct got_imsg_object *iobj;
1108 	size_t datalen = imsg->hdr.len - IMSG_HEADER_SIZE;
1109 
1110 	if (datalen != sizeof(*iobj))
1111 		return got_error(GOT_ERR_PRIVSEP_LEN);
1112 	iobj = imsg->data;
1113 
1114 	if (iobj->pack_offset < 0)
1115 		return got_error(GOT_ERR_PACK_OFFSET);
1116 
1117 	*obj = calloc(1, sizeof(**obj));
1118 	if (*obj == NULL)
1119 		return got_error_from_errno("calloc");
1120 
1121 	memcpy((*obj)->id.sha1, iobj->id, SHA1_DIGEST_LENGTH);
1122 	(*obj)->type = iobj->type;
1123 	(*obj)->flags = iobj->flags;
1124 	(*obj)->hdrlen = iobj->hdrlen;
1125 	(*obj)->size = iobj->size;
1126 	/* path_packfile is handled by caller */
1127 	if (iobj->flags & GOT_OBJ_FLAG_PACKED) {
1128 		(*obj)->pack_offset = iobj->pack_offset;
1129 		(*obj)->pack_idx = iobj->pack_idx;
1130 	}
1131 	STAILQ_INIT(&(*obj)->deltas.entries);
1132 	return NULL;
1133 }
1134 
1135 const struct got_error *
1136 got_privsep_recv_obj(struct got_object **obj, struct imsgbuf *ibuf)
1137 {
1138 	const struct got_error *err = NULL;
1139 	struct imsg imsg;
1140 	const size_t min_datalen =
1141 	    MIN(sizeof(struct got_imsg_error), sizeof(struct got_imsg_object));
1142 
1143 	*obj = NULL;
1144 
1145 	err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
1146 	if (err)
1147 		return err;
1148 
1149 	switch (imsg.hdr.type) {
1150 	case GOT_IMSG_OBJECT:
1151 		err = got_privsep_get_imsg_obj(obj, &imsg, ibuf);
1152 		break;
1153 	default:
1154 		err = got_error(GOT_ERR_PRIVSEP_MSG);
1155 		break;
1156 	}
1157 
1158 	imsg_free(&imsg);
1159 
1160 	return err;
1161 }
1162 
1163 static const struct got_error *
1164 send_commit_logmsg(struct imsgbuf *ibuf, struct got_commit_object *commit,
1165     size_t logmsg_len)
1166 {
1167 	const struct got_error *err = NULL;
1168 	size_t offset, remain;
1169 
1170 	offset = 0;
1171 	remain = logmsg_len;
1172 	while (remain > 0) {
1173 		size_t n = MIN(MAX_IMSGSIZE - IMSG_HEADER_SIZE, remain);
1174 
1175 		if (imsg_compose(ibuf, GOT_IMSG_COMMIT_LOGMSG, 0, 0, -1,
1176 		    commit->logmsg + offset, n) == -1) {
1177 			err = got_error_from_errno("imsg_compose "
1178 			    "COMMIT_LOGMSG");
1179 			break;
1180 		}
1181 
1182 		err = flush_imsg(ibuf);
1183 		if (err)
1184 			break;
1185 
1186 		offset += n;
1187 		remain -= n;
1188 	}
1189 
1190 	return err;
1191 }
1192 
1193 const struct got_error *
1194 got_privsep_send_commit(struct imsgbuf *ibuf, struct got_commit_object *commit)
1195 {
1196 	const struct got_error *err = NULL;
1197 	struct got_imsg_commit_object *icommit;
1198 	uint8_t *buf;
1199 	size_t len, total;
1200 	struct got_object_qid *qid;
1201 	size_t author_len = strlen(commit->author);
1202 	size_t committer_len = strlen(commit->committer);
1203 	size_t logmsg_len = strlen(commit->logmsg);
1204 
1205 	total = sizeof(*icommit) + author_len + committer_len +
1206 	    commit->nparents * SHA1_DIGEST_LENGTH;
1207 
1208 	buf = malloc(total);
1209 	if (buf == NULL)
1210 		return got_error_from_errno("malloc");
1211 
1212 	icommit = (struct got_imsg_commit_object *)buf;
1213 	memcpy(icommit->tree_id, commit->tree_id->sha1,
1214 	    sizeof(icommit->tree_id));
1215 	icommit->author_len = author_len;
1216 	icommit->author_time = commit->author_time;
1217 	icommit->author_gmtoff = commit->author_gmtoff;
1218 	icommit->committer_len = committer_len;
1219 	icommit->committer_time = commit->committer_time;
1220 	icommit->committer_gmtoff = commit->committer_gmtoff;
1221 	icommit->logmsg_len = logmsg_len;
1222 	icommit->nparents = commit->nparents;
1223 
1224 	len = sizeof(*icommit);
1225 	memcpy(buf + len, commit->author, author_len);
1226 	len += author_len;
1227 	memcpy(buf + len, commit->committer, committer_len);
1228 	len += committer_len;
1229 	STAILQ_FOREACH(qid, &commit->parent_ids, entry) {
1230 		memcpy(buf + len, &qid->id, SHA1_DIGEST_LENGTH);
1231 		len += SHA1_DIGEST_LENGTH;
1232 	}
1233 
1234 	if (imsg_compose(ibuf, GOT_IMSG_COMMIT, 0, 0, -1, buf, len) == -1) {
1235 		err = got_error_from_errno("imsg_compose COMMIT");
1236 		goto done;
1237 	}
1238 
1239 	if (logmsg_len == 0 ||
1240 	    logmsg_len + len > MAX_IMSGSIZE - IMSG_HEADER_SIZE) {
1241 		err = flush_imsg(ibuf);
1242 		if (err)
1243 			goto done;
1244 	}
1245 	err = send_commit_logmsg(ibuf, commit, logmsg_len);
1246 done:
1247 	free(buf);
1248 	return err;
1249 }
1250 
1251 static const struct got_error *
1252 get_commit_from_imsg(struct got_commit_object **commit,
1253     struct imsg *imsg, size_t datalen, struct imsgbuf *ibuf)
1254 {
1255 	const struct got_error *err = NULL;
1256 	struct got_imsg_commit_object *icommit;
1257 	size_t len = 0;
1258 	int i;
1259 
1260 	if (datalen < sizeof(*icommit))
1261 		return got_error(GOT_ERR_PRIVSEP_LEN);
1262 
1263 	icommit = imsg->data;
1264 	if (datalen != sizeof(*icommit) + icommit->author_len +
1265 	    icommit->committer_len +
1266 	    icommit->nparents * SHA1_DIGEST_LENGTH)
1267 		return got_error(GOT_ERR_PRIVSEP_LEN);
1268 
1269 	if (icommit->nparents < 0)
1270 		return got_error(GOT_ERR_PRIVSEP_LEN);
1271 
1272 	len += sizeof(*icommit);
1273 
1274 	*commit = got_object_commit_alloc_partial();
1275 	if (*commit == NULL)
1276 		return got_error_from_errno(
1277 		    "got_object_commit_alloc_partial");
1278 
1279 	memcpy((*commit)->tree_id->sha1, icommit->tree_id,
1280 	    SHA1_DIGEST_LENGTH);
1281 	(*commit)->author_time = icommit->author_time;
1282 	(*commit)->author_gmtoff = icommit->author_gmtoff;
1283 	(*commit)->committer_time = icommit->committer_time;
1284 	(*commit)->committer_gmtoff = icommit->committer_gmtoff;
1285 
1286 	(*commit)->author = strndup(imsg->data + len, icommit->author_len);
1287 	if ((*commit)->author == NULL) {
1288 		err = got_error_from_errno("strndup");
1289 		goto done;
1290 	}
1291 	len += icommit->author_len;
1292 
1293 	(*commit)->committer = strndup(imsg->data + len,
1294 	    icommit->committer_len);
1295 	if ((*commit)->committer == NULL) {
1296 		err = got_error_from_errno("strndup");
1297 		goto done;
1298 	}
1299 	len += icommit->committer_len;
1300 
1301 	if (icommit->logmsg_len == 0) {
1302 		(*commit)->logmsg = strdup("");
1303 		if ((*commit)->logmsg == NULL) {
1304 			err = got_error_from_errno("strdup");
1305 			goto done;
1306 		}
1307 	} else {
1308 		size_t offset = 0, remain = icommit->logmsg_len;
1309 
1310 		(*commit)->logmsg = malloc(icommit->logmsg_len + 1);
1311 		if ((*commit)->logmsg == NULL) {
1312 			err = got_error_from_errno("malloc");
1313 			goto done;
1314 		}
1315 		while (remain > 0) {
1316 			struct imsg imsg_log;
1317 			size_t n = MIN(MAX_IMSGSIZE - IMSG_HEADER_SIZE,
1318 			    remain);
1319 
1320 			err = got_privsep_recv_imsg(&imsg_log, ibuf, n);
1321 			if (err)
1322 				goto done;
1323 
1324 			if (imsg_log.hdr.type != GOT_IMSG_COMMIT_LOGMSG) {
1325 				err = got_error(GOT_ERR_PRIVSEP_MSG);
1326 				goto done;
1327 			}
1328 
1329 			memcpy((*commit)->logmsg + offset,
1330 			    imsg_log.data, n);
1331 			imsg_free(&imsg_log);
1332 			offset += n;
1333 			remain -= n;
1334 		}
1335 		(*commit)->logmsg[icommit->logmsg_len] = '\0';
1336 	}
1337 
1338 	for (i = 0; i < icommit->nparents; i++) {
1339 		struct got_object_qid *qid;
1340 
1341 		err = got_object_qid_alloc_partial(&qid);
1342 		if (err)
1343 			break;
1344 		memcpy(&qid->id, imsg->data + len +
1345 		    i * SHA1_DIGEST_LENGTH, sizeof(qid->id));
1346 		STAILQ_INSERT_TAIL(&(*commit)->parent_ids, qid, entry);
1347 		(*commit)->nparents++;
1348 	}
1349 done:
1350 	if (err) {
1351 		got_object_commit_close(*commit);
1352 		*commit = NULL;
1353 	}
1354 	return err;
1355 }
1356 
1357 const struct got_error *
1358 got_privsep_recv_commit(struct got_commit_object **commit, struct imsgbuf *ibuf)
1359 {
1360 	const struct got_error *err = NULL;
1361 	struct imsg imsg;
1362 	size_t datalen;
1363 	const size_t min_datalen =
1364 	    MIN(sizeof(struct got_imsg_error),
1365 	    sizeof(struct got_imsg_commit_object));
1366 
1367 	*commit = NULL;
1368 
1369 	err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
1370 	if (err)
1371 		return err;
1372 
1373 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
1374 
1375 	switch (imsg.hdr.type) {
1376 	case GOT_IMSG_COMMIT:
1377 		err = get_commit_from_imsg(commit, &imsg, datalen, ibuf);
1378 		break;
1379 	default:
1380 		err = got_error(GOT_ERR_PRIVSEP_MSG);
1381 		break;
1382 	}
1383 
1384 	imsg_free(&imsg);
1385 
1386 	return err;
1387 }
1388 
1389 static const struct got_error *
1390 send_tree_entries_batch(struct imsgbuf *ibuf,
1391     struct got_parsed_tree_entry *entries, int idx0, int idxN, size_t len)
1392 {
1393 	struct ibuf *wbuf;
1394 	struct got_imsg_tree_entries ientries;
1395 	int i;
1396 
1397 	memset(&ientries, 0, sizeof(ientries));
1398 
1399 	wbuf = imsg_create(ibuf, GOT_IMSG_TREE_ENTRIES, 0, 0, len);
1400 	if (wbuf == NULL)
1401 		return got_error_from_errno("imsg_create TREE_ENTRY");
1402 
1403 	ientries.nentries = idxN - idx0 + 1;
1404 	if (imsg_add(wbuf, &ientries, sizeof(ientries)) == -1)
1405 		return got_error_from_errno("imsg_add TREE_ENTRY");
1406 
1407 	for (i = idx0; i <= idxN; i++) {
1408 		struct got_parsed_tree_entry *pte = &entries[i];
1409 
1410 		/* Keep in sync with struct got_imsg_tree_object definition! */
1411 		if (imsg_add(wbuf, pte->id, SHA1_DIGEST_LENGTH) == -1)
1412 			return got_error_from_errno("imsg_add TREE_ENTRY");
1413 		if (imsg_add(wbuf, &pte->mode, sizeof(pte->mode)) == -1)
1414 			return got_error_from_errno("imsg_add TREE_ENTRY");
1415 		if (imsg_add(wbuf, &pte->namelen, sizeof(pte->namelen)) == -1)
1416 			return got_error_from_errno("imsg_add TREE_ENTRY");
1417 
1418 		/* Remaining bytes are the entry's name. */
1419 		if (imsg_add(wbuf, pte->name, pte->namelen) == -1)
1420 			return got_error_from_errno("imsg_add TREE_ENTRY");
1421 	}
1422 
1423 	wbuf->fd = -1;
1424 	imsg_close(ibuf, wbuf);
1425 	return NULL;
1426 }
1427 
1428 static const struct got_error *
1429 send_tree_entries(struct imsgbuf *ibuf, struct got_parsed_tree_entry *entries,
1430     int nentries)
1431 {
1432 	const struct got_error *err = NULL;
1433 	int i, j;
1434 	size_t entries_len = sizeof(struct got_imsg_tree_entries);
1435 
1436 	i = 0;
1437 	for (j = 0; j < nentries; j++) {
1438 		struct got_parsed_tree_entry *pte = &entries[j];
1439 		size_t len = SHA1_DIGEST_LENGTH + sizeof(pte->mode) +
1440 		    sizeof(pte->namelen) + pte->namelen;
1441 
1442 		if (j > 0 &&
1443 		    entries_len + len > MAX_IMSGSIZE - IMSG_HEADER_SIZE) {
1444 			err = send_tree_entries_batch(ibuf, entries,
1445 			    i, j - 1, entries_len);
1446 			if (err)
1447 				return err;
1448 			i = j;
1449 			entries_len = sizeof(struct got_imsg_tree_entries);
1450 		}
1451 
1452 		entries_len += len;
1453 	}
1454 
1455 	if (j > 0) {
1456 		err = send_tree_entries_batch(ibuf, entries, i, j - 1,
1457 		    entries_len);
1458 		if (err)
1459 			return err;
1460 	}
1461 
1462 	return NULL;
1463 }
1464 
1465 const struct got_error *
1466 got_privsep_send_tree(struct imsgbuf *ibuf,
1467     struct got_parsed_tree_entry *entries, int nentries)
1468 {
1469 	const struct got_error *err = NULL;
1470 	struct got_imsg_tree_object itree;
1471 
1472 	memset(&itree, 0, sizeof(itree));
1473 	itree.nentries = nentries;
1474 	if (imsg_compose(ibuf, GOT_IMSG_TREE, 0, 0, -1, &itree, sizeof(itree))
1475 	    == -1)
1476 		return got_error_from_errno("imsg_compose TREE");
1477 
1478 	err = send_tree_entries(ibuf, entries, nentries);
1479 	if (err)
1480 		return err;
1481 
1482 	return flush_imsg(ibuf);
1483 }
1484 
1485 
1486 static const struct got_error *
1487 recv_tree_entries(void *data, size_t datalen, struct got_tree_object *tree,
1488     int *nentries)
1489 {
1490 	const struct got_error *err = NULL;
1491 	struct got_imsg_tree_entries *ientries;
1492 	struct got_tree_entry *te;
1493 	size_t te_offset;
1494 	size_t i;
1495 
1496 	if (datalen <= sizeof(*ientries) ||
1497 	    datalen > MAX_IMSGSIZE - IMSG_HEADER_SIZE)
1498 		return got_error(GOT_ERR_PRIVSEP_LEN);
1499 
1500 	ientries = (struct got_imsg_tree_entries *)data;
1501 	if (ientries->nentries > INT_MAX) {
1502 		return got_error_msg(GOT_ERR_NO_SPACE,
1503 		    "too many tree entries");
1504 	}
1505 
1506 	te_offset = sizeof(*ientries);
1507 	for (i = 0; i < ientries->nentries; i++) {
1508 		struct got_imsg_tree_entry ite;
1509 		const char *te_name;
1510 		uint8_t *buf = (uint8_t *)data + te_offset;
1511 
1512 		if (te_offset >= datalen) {
1513 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1514 			break;
1515 		}
1516 
1517 		/* Might not be aligned, size is ~32 bytes. */
1518 		memcpy(&ite, buf, sizeof(ite));
1519 
1520 		if (ite.namelen >= sizeof(te->name)) {
1521 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1522 			break;
1523 		}
1524 		if (te_offset + sizeof(ite) + ite.namelen > datalen) {
1525 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1526 			break;
1527 		}
1528 
1529 		if (*nentries >= tree->nentries) {
1530 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1531 			break;
1532 		}
1533 		te = &tree->entries[*nentries];
1534 		te_name = buf + sizeof(ite);
1535 		memcpy(te->name, te_name, ite.namelen);
1536 		te->name[ite.namelen] = '\0';
1537 		memcpy(te->id.sha1, ite.id, SHA1_DIGEST_LENGTH);
1538 		te->mode = ite.mode;
1539 		te->idx = *nentries;
1540 		(*nentries)++;
1541 
1542 		te_offset += sizeof(ite) + ite.namelen;
1543 	}
1544 
1545 	return err;
1546 }
1547 
1548 const struct got_error *
1549 got_privsep_recv_tree(struct got_tree_object **tree, struct imsgbuf *ibuf)
1550 {
1551 	const struct got_error *err = NULL;
1552 	const size_t min_datalen =
1553 	    MIN(sizeof(struct got_imsg_error),
1554 	    sizeof(struct got_imsg_tree_object));
1555 	struct got_imsg_tree_object *itree;
1556 	int nentries = 0;
1557 
1558 	*tree = NULL;
1559 
1560 	while (*tree == NULL || nentries < (*tree)->nentries) {
1561 		struct imsg imsg;
1562 		size_t datalen;
1563 
1564 		err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
1565 		if (err)
1566 			break;
1567 
1568 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
1569 
1570 		switch (imsg.hdr.type) {
1571 		case GOT_IMSG_TREE:
1572 			/* This message should only appear once. */
1573 			if (*tree != NULL) {
1574 				err = got_error(GOT_ERR_PRIVSEP_MSG);
1575 				break;
1576 			}
1577 			if (datalen != sizeof(*itree)) {
1578 				err = got_error(GOT_ERR_PRIVSEP_LEN);
1579 				break;
1580 			}
1581 			itree = imsg.data;
1582 			if (itree->nentries < 0) {
1583 				err = got_error(GOT_ERR_PRIVSEP_LEN);
1584 				break;
1585 			}
1586 			*tree = malloc(sizeof(**tree));
1587 			if (*tree == NULL) {
1588 				err = got_error_from_errno("malloc");
1589 				break;
1590 			}
1591 			(*tree)->entries = calloc(itree->nentries,
1592 			    sizeof(struct got_tree_entry));
1593 			if ((*tree)->entries == NULL) {
1594 				err = got_error_from_errno("malloc");
1595 				free(*tree);
1596 				*tree = NULL;
1597 				break;
1598 			}
1599 			(*tree)->nentries = itree->nentries;
1600 			(*tree)->refcnt = 0;
1601 			break;
1602 		case GOT_IMSG_TREE_ENTRIES:
1603 			/* This message should be preceeded by GOT_IMSG_TREE. */
1604 			if (*tree == NULL) {
1605 				err = got_error(GOT_ERR_PRIVSEP_MSG);
1606 				break;
1607 			}
1608 			err = recv_tree_entries(imsg.data, datalen,
1609 			    *tree, &nentries);
1610 			break;
1611 		default:
1612 			err = got_error(GOT_ERR_PRIVSEP_MSG);
1613 			break;
1614 		}
1615 
1616 		imsg_free(&imsg);
1617 		if (err)
1618 			break;
1619 	}
1620 
1621 	if (*tree && (*tree)->nentries != nentries) {
1622 		if (err == NULL)
1623 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1624 		got_object_tree_close(*tree);
1625 		*tree = NULL;
1626 	}
1627 
1628 	return err;
1629 }
1630 
1631 const struct got_error *
1632 got_privsep_send_blob(struct imsgbuf *ibuf, size_t size, size_t hdrlen,
1633     const uint8_t *data)
1634 {
1635 	struct got_imsg_blob iblob;
1636 
1637 	memset(&iblob, 0, sizeof(iblob));
1638 	iblob.size = size;
1639 	iblob.hdrlen = hdrlen;
1640 
1641 	if (data) {
1642 		uint8_t *buf;
1643 
1644 		if (size > GOT_PRIVSEP_INLINE_BLOB_DATA_MAX)
1645 			return got_error(GOT_ERR_NO_SPACE);
1646 
1647 		buf = malloc(sizeof(iblob) + size);
1648 		if (buf == NULL)
1649 			return got_error_from_errno("malloc");
1650 
1651 		memcpy(buf, &iblob, sizeof(iblob));
1652 		memcpy(buf + sizeof(iblob), data, size);
1653 		if (imsg_compose(ibuf, GOT_IMSG_BLOB, 0, 0, -1, buf,
1654 		    sizeof(iblob) + size) == -1) {
1655 			free(buf);
1656 			return got_error_from_errno("imsg_compose BLOB");
1657 		}
1658 		free(buf);
1659 	} else {
1660 		/* Data has already been written to file descriptor. */
1661 		if (imsg_compose(ibuf, GOT_IMSG_BLOB, 0, 0, -1, &iblob,
1662 		    sizeof(iblob)) == -1)
1663 			return got_error_from_errno("imsg_compose BLOB");
1664 	}
1665 
1666 
1667 	return flush_imsg(ibuf);
1668 }
1669 
1670 const struct got_error *
1671 got_privsep_recv_blob(uint8_t **outbuf, size_t *size, size_t *hdrlen,
1672     struct imsgbuf *ibuf)
1673 {
1674 	const struct got_error *err = NULL;
1675 	struct imsg imsg;
1676 	struct got_imsg_blob *iblob;
1677 	size_t datalen;
1678 
1679 	*outbuf = NULL;
1680 
1681 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
1682 	if (err)
1683 		return err;
1684 
1685 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
1686 
1687 	switch (imsg.hdr.type) {
1688 	case GOT_IMSG_BLOB:
1689 		if (datalen < sizeof(*iblob)) {
1690 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1691 			break;
1692 		}
1693 		iblob = imsg.data;
1694 		*size = iblob->size;
1695 		*hdrlen = iblob->hdrlen;
1696 
1697 		if (datalen == sizeof(*iblob)) {
1698 			/* Data has been written to file descriptor. */
1699 			break;
1700 		}
1701 
1702 		if (*size > GOT_PRIVSEP_INLINE_BLOB_DATA_MAX ||
1703 		    *size > datalen + sizeof(*iblob)) {
1704 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1705 			break;
1706 		}
1707 
1708 		*outbuf = malloc(*size);
1709 		if (*outbuf == NULL) {
1710 			err = got_error_from_errno("malloc");
1711 			break;
1712 		}
1713 		memcpy(*outbuf, imsg.data + sizeof(*iblob), *size);
1714 		break;
1715 	default:
1716 		err = got_error(GOT_ERR_PRIVSEP_MSG);
1717 		break;
1718 	}
1719 
1720 	imsg_free(&imsg);
1721 
1722 	return err;
1723 }
1724 
1725 static const struct got_error *
1726 send_tagmsg(struct imsgbuf *ibuf, struct got_tag_object *tag, size_t tagmsg_len)
1727 {
1728 	const struct got_error *err = NULL;
1729 	size_t offset, remain;
1730 
1731 	offset = 0;
1732 	remain = tagmsg_len;
1733 	while (remain > 0) {
1734 		size_t n = MIN(MAX_IMSGSIZE - IMSG_HEADER_SIZE, remain);
1735 
1736 		if (imsg_compose(ibuf, GOT_IMSG_TAG_TAGMSG, 0, 0, -1,
1737 		    tag->tagmsg + offset, n) == -1) {
1738 			err = got_error_from_errno("imsg_compose TAG_TAGMSG");
1739 			break;
1740 		}
1741 
1742 		err = flush_imsg(ibuf);
1743 		if (err)
1744 			break;
1745 
1746 		offset += n;
1747 		remain -= n;
1748 	}
1749 
1750 	return err;
1751 }
1752 
1753 const struct got_error *
1754 got_privsep_send_tag(struct imsgbuf *ibuf, struct got_tag_object *tag)
1755 {
1756 	const struct got_error *err = NULL;
1757 	struct got_imsg_tag_object *itag;
1758 	uint8_t *buf;
1759 	size_t len, total;
1760 	size_t tag_len = strlen(tag->tag);
1761 	size_t tagger_len = strlen(tag->tagger);
1762 	size_t tagmsg_len = strlen(tag->tagmsg);
1763 
1764 	total = sizeof(*itag) + tag_len + tagger_len + tagmsg_len;
1765 
1766 	buf = malloc(total);
1767 	if (buf == NULL)
1768 		return got_error_from_errno("malloc");
1769 
1770 	itag = (struct got_imsg_tag_object *)buf;
1771 	memcpy(itag->id, tag->id.sha1, sizeof(itag->id));
1772 	itag->obj_type = tag->obj_type;
1773 	itag->tag_len = tag_len;
1774 	itag->tagger_len = tagger_len;
1775 	itag->tagger_time = tag->tagger_time;
1776 	itag->tagger_gmtoff = tag->tagger_gmtoff;
1777 	itag->tagmsg_len = tagmsg_len;
1778 
1779 	len = sizeof(*itag);
1780 	memcpy(buf + len, tag->tag, tag_len);
1781 	len += tag_len;
1782 	memcpy(buf + len, tag->tagger, tagger_len);
1783 	len += tagger_len;
1784 
1785 	if (imsg_compose(ibuf, GOT_IMSG_TAG, 0, 0, -1, buf, len) == -1) {
1786 		err = got_error_from_errno("imsg_compose TAG");
1787 		goto done;
1788 	}
1789 
1790 	if (tagmsg_len == 0 ||
1791 	    tagmsg_len + len > MAX_IMSGSIZE - IMSG_HEADER_SIZE) {
1792 		err = flush_imsg(ibuf);
1793 		if (err)
1794 			goto done;
1795 	}
1796 	err = send_tagmsg(ibuf, tag, tagmsg_len);
1797 done:
1798 	free(buf);
1799 	return err;
1800 }
1801 
1802 const struct got_error *
1803 got_privsep_recv_tag(struct got_tag_object **tag, struct imsgbuf *ibuf)
1804 {
1805 	const struct got_error *err = NULL;
1806 	struct imsg imsg;
1807 	struct got_imsg_tag_object *itag;
1808 	size_t len, datalen;
1809 	const size_t min_datalen =
1810 	    MIN(sizeof(struct got_imsg_error),
1811 	    sizeof(struct got_imsg_tag_object));
1812 
1813 	*tag = NULL;
1814 
1815 	err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
1816 	if (err)
1817 		return err;
1818 
1819 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
1820 	len = 0;
1821 
1822 	switch (imsg.hdr.type) {
1823 	case GOT_IMSG_TAG:
1824 		if (datalen < sizeof(*itag)) {
1825 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1826 			break;
1827 		}
1828 		itag = imsg.data;
1829 		if (datalen != sizeof(*itag) + itag->tag_len +
1830 		    itag->tagger_len) {
1831 			err = got_error(GOT_ERR_PRIVSEP_LEN);
1832 			break;
1833 		}
1834 		len += sizeof(*itag);
1835 
1836 		*tag = calloc(1, sizeof(**tag));
1837 		if (*tag == NULL) {
1838 			err = got_error_from_errno("calloc");
1839 			break;
1840 		}
1841 
1842 		memcpy((*tag)->id.sha1, itag->id, SHA1_DIGEST_LENGTH);
1843 
1844 		(*tag)->tag = strndup(imsg.data + len, itag->tag_len);
1845 		if ((*tag)->tag == NULL) {
1846 			err = got_error_from_errno("strndup");
1847 			break;
1848 		}
1849 		len += itag->tag_len;
1850 
1851 		(*tag)->obj_type = itag->obj_type;
1852 		(*tag)->tagger_time = itag->tagger_time;
1853 		(*tag)->tagger_gmtoff = itag->tagger_gmtoff;
1854 
1855 		(*tag)->tagger = strndup(imsg.data + len, itag->tagger_len);
1856 		if ((*tag)->tagger == NULL) {
1857 			err = got_error_from_errno("strndup");
1858 			break;
1859 		}
1860 		len += itag->tagger_len;
1861 
1862 		if (itag->tagmsg_len == 0) {
1863 			(*tag)->tagmsg = strdup("");
1864 			if ((*tag)->tagmsg == NULL) {
1865 				err = got_error_from_errno("strdup");
1866 				break;
1867 			}
1868 		} else {
1869 			size_t offset = 0, remain = itag->tagmsg_len;
1870 
1871 			(*tag)->tagmsg = malloc(itag->tagmsg_len + 1);
1872 			if ((*tag)->tagmsg == NULL) {
1873 				err = got_error_from_errno("malloc");
1874 				break;
1875 			}
1876 			while (remain > 0) {
1877 				struct imsg imsg_log;
1878 				size_t n = MIN(MAX_IMSGSIZE - IMSG_HEADER_SIZE,
1879 				    remain);
1880 
1881 				err = got_privsep_recv_imsg(&imsg_log, ibuf, n);
1882 				if (err)
1883 					return err;
1884 
1885 				if (imsg_log.hdr.type != GOT_IMSG_TAG_TAGMSG)
1886 					return got_error(GOT_ERR_PRIVSEP_MSG);
1887 
1888 				memcpy((*tag)->tagmsg + offset, imsg_log.data,
1889 				    n);
1890 				imsg_free(&imsg_log);
1891 				offset += n;
1892 				remain -= n;
1893 			}
1894 			(*tag)->tagmsg[itag->tagmsg_len] = '\0';
1895 		}
1896 
1897 		break;
1898 	default:
1899 		err = got_error(GOT_ERR_PRIVSEP_MSG);
1900 		break;
1901 	}
1902 
1903 	imsg_free(&imsg);
1904 
1905 	return err;
1906 }
1907 
1908 const struct got_error *
1909 got_privsep_init_pack_child(struct imsgbuf *ibuf, struct got_pack *pack,
1910     struct got_packidx *packidx)
1911 {
1912 	const struct got_error *err = NULL;
1913 	struct got_imsg_packidx ipackidx;
1914 	struct got_imsg_pack ipack;
1915 	int fd;
1916 
1917 	memset(&ipackidx, 0, sizeof(ipackidx));
1918 	memset(&ipack, 0, sizeof(ipack));
1919 
1920 	ipackidx.len = packidx->len;
1921 	ipackidx.packfile_size = pack->filesize;
1922 	fd = dup(packidx->fd);
1923 	if (fd == -1)
1924 		return got_error_from_errno("dup");
1925 
1926 	if (imsg_compose(ibuf, GOT_IMSG_PACKIDX, 0, 0, fd, &ipackidx,
1927 	    sizeof(ipackidx)) == -1) {
1928 		err = got_error_from_errno("imsg_compose PACKIDX");
1929 		close(fd);
1930 		return err;
1931 	}
1932 
1933 	if (strlcpy(ipack.path_packfile, pack->path_packfile,
1934 	    sizeof(ipack.path_packfile)) >= sizeof(ipack.path_packfile))
1935 		return got_error(GOT_ERR_NO_SPACE);
1936 	ipack.filesize = pack->filesize;
1937 
1938 	fd = dup(pack->fd);
1939 	if (fd == -1)
1940 		return got_error_from_errno("dup");
1941 
1942 	if (imsg_compose(ibuf, GOT_IMSG_PACK, 0, 0, fd, &ipack, sizeof(ipack))
1943 	    == -1) {
1944 		err = got_error_from_errno("imsg_compose PACK");
1945 		close(fd);
1946 		return err;
1947 	}
1948 
1949 	return flush_imsg(ibuf);
1950 }
1951 
1952 const struct got_error *
1953 got_privsep_send_packed_obj_req(struct imsgbuf *ibuf, int idx,
1954     struct got_object_id *id)
1955 {
1956 	struct got_imsg_packed_object iobj;
1957 
1958 	memset(&iobj, 0, sizeof(iobj));
1959 	iobj.idx = idx;
1960 	memcpy(iobj.id, id->sha1, sizeof(iobj.id));
1961 
1962 	if (imsg_compose(ibuf, GOT_IMSG_PACKED_OBJECT_REQUEST, 0, 0, -1,
1963 	    &iobj, sizeof(iobj)) == -1)
1964 		return got_error_from_errno("imsg_compose "
1965 		    "PACKED_OBJECT_REQUEST");
1966 
1967 	return flush_imsg(ibuf);
1968 }
1969 
1970 const struct got_error *
1971 got_privsep_send_packed_raw_obj_req(struct imsgbuf *ibuf, int idx,
1972     struct got_object_id *id)
1973 {
1974 	struct got_imsg_packed_object iobj;
1975 
1976 	memset(&iobj, 0, sizeof(iobj));
1977 	iobj.idx = idx;
1978 	memcpy(iobj.id, id->sha1, sizeof(iobj.id));
1979 
1980 	if (imsg_compose(ibuf, GOT_IMSG_PACKED_RAW_OBJECT_REQUEST, 0, 0, -1,
1981 	    &iobj, sizeof(iobj)) == -1)
1982 		return got_error_from_errno("imsg_compose "
1983 		    "PACKED_OBJECT_REQUEST");
1984 
1985 	return flush_imsg(ibuf);
1986 }
1987 
1988 const struct got_error *
1989 got_privsep_send_gitconfig_parse_req(struct imsgbuf *ibuf, int fd)
1990 {
1991 	const struct got_error *err = NULL;
1992 
1993 	if (imsg_compose(ibuf, GOT_IMSG_GITCONFIG_PARSE_REQUEST, 0, 0, fd,
1994 	    NULL, 0) == -1) {
1995 		err = got_error_from_errno("imsg_compose "
1996 		    "GITCONFIG_PARSE_REQUEST");
1997 		close(fd);
1998 		return err;
1999 	}
2000 
2001 	return flush_imsg(ibuf);
2002 }
2003 
2004 const struct got_error *
2005 got_privsep_send_gitconfig_repository_format_version_req(struct imsgbuf *ibuf)
2006 {
2007 	if (imsg_compose(ibuf,
2008 	    GOT_IMSG_GITCONFIG_REPOSITORY_FORMAT_VERSION_REQUEST, 0, 0, -1,
2009 	    NULL, 0) == -1)
2010 		return got_error_from_errno("imsg_compose "
2011 		    "GITCONFIG_REPOSITORY_FORMAT_VERSION_REQUEST");
2012 
2013 	return flush_imsg(ibuf);
2014 }
2015 
2016 const struct got_error *
2017 got_privsep_send_gitconfig_repository_extensions_req(struct imsgbuf *ibuf)
2018 {
2019 	if (imsg_compose(ibuf,
2020 	    GOT_IMSG_GITCONFIG_REPOSITORY_EXTENSIONS_REQUEST, 0, 0, -1,
2021 	    NULL, 0) == -1)
2022 		return got_error_from_errno("imsg_compose "
2023 		    "GITCONFIG_REPOSITORY_EXTENSIONS_REQUEST");
2024 
2025 	return flush_imsg(ibuf);
2026 }
2027 
2028 
2029 const struct got_error *
2030 got_privsep_send_gitconfig_author_name_req(struct imsgbuf *ibuf)
2031 {
2032 	if (imsg_compose(ibuf,
2033 	    GOT_IMSG_GITCONFIG_AUTHOR_NAME_REQUEST, 0, 0, -1, NULL, 0) == -1)
2034 		return got_error_from_errno("imsg_compose "
2035 		    "GITCONFIG_AUTHOR_NAME_REQUEST");
2036 
2037 	return flush_imsg(ibuf);
2038 }
2039 
2040 const struct got_error *
2041 got_privsep_send_gitconfig_author_email_req(struct imsgbuf *ibuf)
2042 {
2043 	if (imsg_compose(ibuf,
2044 	    GOT_IMSG_GITCONFIG_AUTHOR_EMAIL_REQUEST, 0, 0, -1, NULL, 0) == -1)
2045 		return got_error_from_errno("imsg_compose "
2046 		    "GITCONFIG_AUTHOR_EMAIL_REQUEST");
2047 
2048 	return flush_imsg(ibuf);
2049 }
2050 
2051 const struct got_error *
2052 got_privsep_send_gitconfig_remotes_req(struct imsgbuf *ibuf)
2053 {
2054 	if (imsg_compose(ibuf,
2055 	    GOT_IMSG_GITCONFIG_REMOTES_REQUEST, 0, 0, -1, NULL, 0) == -1)
2056 		return got_error_from_errno("imsg_compose "
2057 		    "GITCONFIG_REMOTE_REQUEST");
2058 
2059 	return flush_imsg(ibuf);
2060 }
2061 
2062 const struct got_error *
2063 got_privsep_send_gitconfig_owner_req(struct imsgbuf *ibuf)
2064 {
2065 	if (imsg_compose(ibuf,
2066 	    GOT_IMSG_GITCONFIG_OWNER_REQUEST, 0, 0, -1, NULL, 0) == -1)
2067 		return got_error_from_errno("imsg_compose "
2068 		    "GITCONFIG_OWNER_REQUEST");
2069 
2070 	return flush_imsg(ibuf);
2071 }
2072 
2073 const struct got_error *
2074 got_privsep_recv_gitconfig_str(char **str, struct imsgbuf *ibuf)
2075 {
2076 	const struct got_error *err = NULL;
2077 	struct imsg imsg;
2078 	size_t datalen;
2079 
2080 	*str = NULL;
2081 
2082 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
2083 	if (err)
2084 		return err;
2085 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2086 
2087 	switch (imsg.hdr.type) {
2088 	case GOT_IMSG_GITCONFIG_STR_VAL:
2089 		if (datalen == 0)
2090 			break;
2091 		/* datalen does not include terminating \0 */
2092 		*str = malloc(datalen + 1);
2093 		if (*str == NULL) {
2094 			err = got_error_from_errno("malloc");
2095 			break;
2096 		}
2097 		memcpy(*str, imsg.data, datalen);
2098 		(*str)[datalen] = '\0';
2099 		break;
2100 	default:
2101 		err = got_error(GOT_ERR_PRIVSEP_MSG);
2102 		break;
2103 	}
2104 
2105 	imsg_free(&imsg);
2106 	return err;
2107 }
2108 
2109 const struct got_error *
2110 got_privsep_recv_gitconfig_int(int *val, struct imsgbuf *ibuf)
2111 {
2112 	const struct got_error *err = NULL;
2113 	struct imsg imsg;
2114 	size_t datalen;
2115 	const size_t min_datalen =
2116 	    MIN(sizeof(struct got_imsg_error), sizeof(int));
2117 
2118 	*val = 0;
2119 
2120 	err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
2121 	if (err)
2122 		return err;
2123 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2124 
2125 	switch (imsg.hdr.type) {
2126 	case GOT_IMSG_GITCONFIG_INT_VAL:
2127 		if (datalen != sizeof(*val)) {
2128 			err = got_error(GOT_ERR_PRIVSEP_LEN);
2129 			break;
2130 		}
2131 		memcpy(val, imsg.data, sizeof(*val));
2132 		break;
2133 	default:
2134 		err = got_error(GOT_ERR_PRIVSEP_MSG);
2135 		break;
2136 	}
2137 
2138 	imsg_free(&imsg);
2139 	return err;
2140 }
2141 
2142 static void
2143 free_remote_data(struct got_remote_repo *remote)
2144 {
2145 	int i;
2146 
2147 	free(remote->name);
2148 	free(remote->fetch_url);
2149 	free(remote->send_url);
2150 	for (i = 0; i < remote->nfetch_branches; i++)
2151 		free(remote->fetch_branches[i]);
2152 	free(remote->fetch_branches);
2153 	for (i = 0; i < remote->nsend_branches; i++)
2154 		free(remote->send_branches[i]);
2155 	free(remote->send_branches);
2156 	for (i = 0; i < remote->nfetch_refs; i++)
2157 		free(remote->fetch_refs[i]);
2158 	free(remote->fetch_refs);
2159 }
2160 
2161 const struct got_error *
2162 got_privsep_recv_gitconfig_remotes(struct got_remote_repo **remotes,
2163     int *nremotes, struct imsgbuf *ibuf)
2164 {
2165 	const struct got_error *err = NULL;
2166 	struct imsg imsg;
2167 	size_t datalen;
2168 	struct got_imsg_remotes iremotes;
2169 	struct got_imsg_remote iremote;
2170 
2171 	*remotes = NULL;
2172 	*nremotes = 0;
2173 	iremotes.nremotes = 0;
2174 
2175 	err = got_privsep_recv_imsg(&imsg, ibuf, sizeof(iremotes));
2176 	if (err)
2177 		return err;
2178 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2179 
2180 	switch (imsg.hdr.type) {
2181 	case GOT_IMSG_GITCONFIG_REMOTES:
2182 		if (datalen != sizeof(iremotes)) {
2183 			err = got_error(GOT_ERR_PRIVSEP_LEN);
2184 			break;
2185 		}
2186 		memcpy(&iremotes, imsg.data, sizeof(iremotes));
2187 		if (iremotes.nremotes == 0) {
2188 			imsg_free(&imsg);
2189 			return NULL;
2190 		}
2191 		break;
2192 	default:
2193 		imsg_free(&imsg);
2194 		return got_error(GOT_ERR_PRIVSEP_MSG);
2195 	}
2196 
2197 	imsg_free(&imsg);
2198 
2199 	*remotes = recallocarray(NULL, 0, iremotes.nremotes, sizeof(**remotes));
2200 	if (*remotes == NULL)
2201 		return got_error_from_errno("recallocarray");
2202 
2203 	while (*nremotes < iremotes.nremotes) {
2204 		struct got_remote_repo *remote;
2205 
2206 		err = got_privsep_recv_imsg(&imsg, ibuf, sizeof(iremote));
2207 		if (err)
2208 			break;
2209 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2210 
2211 		switch (imsg.hdr.type) {
2212 		case GOT_IMSG_GITCONFIG_REMOTE:
2213 			remote = &(*remotes)[*nremotes];
2214 			memset(remote, 0, sizeof(*remote));
2215 			if (datalen < sizeof(iremote)) {
2216 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2217 				break;
2218 			}
2219 			memcpy(&iremote, imsg.data, sizeof(iremote));
2220 			if (iremote.name_len == 0 ||
2221 			    iremote.fetch_url_len == 0 ||
2222 			    iremote.send_url_len == 0 ||
2223 			    (sizeof(iremote) + iremote.name_len +
2224 			    iremote.fetch_url_len + iremote.send_url_len) > datalen) {
2225 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2226 				break;
2227 			}
2228 			remote->name = strndup(imsg.data + sizeof(iremote),
2229 			    iremote.name_len);
2230 			if (remote->name == NULL) {
2231 				err = got_error_from_errno("strndup");
2232 				break;
2233 			}
2234 			remote->fetch_url = strndup(imsg.data + sizeof(iremote) +
2235 			    iremote.name_len, iremote.fetch_url_len);
2236 			if (remote->fetch_url == NULL) {
2237 				err = got_error_from_errno("strndup");
2238 				free_remote_data(remote);
2239 				break;
2240 			}
2241 			remote->send_url = strndup(imsg.data + sizeof(iremote) +
2242 			    iremote.name_len + iremote.fetch_url_len,
2243 			    iremote.send_url_len);
2244 			if (remote->send_url == NULL) {
2245 				err = got_error_from_errno("strndup");
2246 				free_remote_data(remote);
2247 				break;
2248 			}
2249 			remote->mirror_references = iremote.mirror_references;
2250 			remote->fetch_all_branches = iremote.fetch_all_branches;
2251 			remote->nfetch_branches = 0;
2252 			remote->fetch_branches = NULL;
2253 			remote->nsend_branches = 0;
2254 			remote->send_branches = NULL;
2255 			remote->nfetch_refs = 0;
2256 			remote->fetch_refs = NULL;
2257 			(*nremotes)++;
2258 			break;
2259 		default:
2260 			err = got_error(GOT_ERR_PRIVSEP_MSG);
2261 			break;
2262 		}
2263 
2264 		imsg_free(&imsg);
2265 		if (err)
2266 			break;
2267 	}
2268 
2269 	if (err) {
2270 		int i;
2271 		for (i = 0; i < *nremotes; i++)
2272 			free_remote_data(&(*remotes)[i]);
2273 		free(*remotes);
2274 		*remotes = NULL;
2275 		*nremotes = 0;
2276 	}
2277 	return err;
2278 }
2279 
2280 const struct got_error *
2281 got_privsep_send_gotconfig_parse_req(struct imsgbuf *ibuf, int fd)
2282 {
2283 	const struct got_error *err = NULL;
2284 
2285 	if (imsg_compose(ibuf, GOT_IMSG_GOTCONFIG_PARSE_REQUEST, 0, 0, fd,
2286 	    NULL, 0) == -1) {
2287 		err = got_error_from_errno("imsg_compose "
2288 		    "GOTCONFIG_PARSE_REQUEST");
2289 		close(fd);
2290 		return err;
2291 	}
2292 
2293 	return flush_imsg(ibuf);
2294 }
2295 
2296 const struct got_error *
2297 got_privsep_send_gotconfig_author_req(struct imsgbuf *ibuf)
2298 {
2299 	if (imsg_compose(ibuf,
2300 	    GOT_IMSG_GOTCONFIG_AUTHOR_REQUEST, 0, 0, -1, NULL, 0) == -1)
2301 		return got_error_from_errno("imsg_compose "
2302 		    "GOTCONFIG_AUTHOR_REQUEST");
2303 
2304 	return flush_imsg(ibuf);
2305 }
2306 
2307 const struct got_error *
2308 got_privsep_send_gotconfig_allowed_signers_req(struct imsgbuf *ibuf)
2309 {
2310 	if (imsg_compose(ibuf,
2311 	    GOT_IMSG_GOTCONFIG_ALLOWEDSIGNERS_REQUEST, 0, 0, -1, NULL, 0) == -1)
2312 		return got_error_from_errno("imsg_compose "
2313 		    "GOTCONFIG_ALLOWEDSIGNERS_REQUEST");
2314 
2315 	return flush_imsg(ibuf);
2316 }
2317 
2318 const struct got_error *
2319 got_privsep_send_gotconfig_revoked_signers_req(struct imsgbuf *ibuf)
2320 {
2321 	if (imsg_compose(ibuf,
2322 	    GOT_IMSG_GOTCONFIG_REVOKEDSIGNERS_REQUEST, 0, 0, -1, NULL, 0) == -1)
2323 		return got_error_from_errno("imsg_compose "
2324 		    "GOTCONFIG_REVOKEDSIGNERS_REQUEST");
2325 
2326 	return flush_imsg(ibuf);
2327 }
2328 
2329 const struct got_error *
2330 got_privsep_send_gotconfig_signer_id_req(struct imsgbuf *ibuf)
2331 {
2332 	if (imsg_compose(ibuf,
2333 	    GOT_IMSG_GOTCONFIG_SIGNERID_REQUEST, 0, 0, -1, NULL, 0) == -1)
2334 		return got_error_from_errno("imsg_compose "
2335 		    "GOTCONFIG_SIGNERID_REQUEST");
2336 
2337 	return flush_imsg(ibuf);
2338 }
2339 
2340 const struct got_error *
2341 got_privsep_send_gotconfig_remotes_req(struct imsgbuf *ibuf)
2342 {
2343 	if (imsg_compose(ibuf,
2344 	    GOT_IMSG_GOTCONFIG_REMOTES_REQUEST, 0, 0, -1, NULL, 0) == -1)
2345 		return got_error_from_errno("imsg_compose "
2346 		    "GOTCONFIG_REMOTE_REQUEST");
2347 
2348 	return flush_imsg(ibuf);
2349 }
2350 
2351 const struct got_error *
2352 got_privsep_recv_gotconfig_str(char **str, struct imsgbuf *ibuf)
2353 {
2354 	const struct got_error *err = NULL;
2355 	struct imsg imsg;
2356 	size_t datalen;
2357 
2358 	*str = NULL;
2359 
2360 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
2361 	if (err)
2362 		return err;
2363 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2364 
2365 	switch (imsg.hdr.type) {
2366 	case GOT_IMSG_GOTCONFIG_STR_VAL:
2367 		if (datalen == 0)
2368 			break;
2369 		/* datalen does not include terminating \0 */
2370 		*str = malloc(datalen + 1);
2371 		if (*str == NULL) {
2372 			err = got_error_from_errno("malloc");
2373 			break;
2374 		}
2375 		memcpy(*str, imsg.data, datalen);
2376 		(*str)[datalen] = '\0';
2377 		break;
2378 	default:
2379 		err = got_error(GOT_ERR_PRIVSEP_MSG);
2380 		break;
2381 	}
2382 
2383 	imsg_free(&imsg);
2384 	return err;
2385 }
2386 
2387 const struct got_error *
2388 got_privsep_recv_gotconfig_remotes(struct got_remote_repo **remotes,
2389     int *nremotes, struct imsgbuf *ibuf)
2390 {
2391 	const struct got_error *err = NULL;
2392 	struct imsg imsg;
2393 	size_t datalen;
2394 	struct got_imsg_remotes iremotes;
2395 	struct got_imsg_remote iremote;
2396 	const size_t min_datalen =
2397 	    MIN(sizeof(struct got_imsg_error), sizeof(iremotes));
2398 
2399 	*remotes = NULL;
2400 	*nremotes = 0;
2401 	iremotes.nremotes = 0;
2402 
2403 	err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
2404 	if (err)
2405 		return err;
2406 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2407 
2408 	switch (imsg.hdr.type) {
2409 	case GOT_IMSG_GOTCONFIG_REMOTES:
2410 		if (datalen != sizeof(iremotes)) {
2411 			err = got_error(GOT_ERR_PRIVSEP_LEN);
2412 			break;
2413 		}
2414 		memcpy(&iremotes, imsg.data, sizeof(iremotes));
2415 		if (iremotes.nremotes < 0) {
2416 			err = got_error(GOT_ERR_PRIVSEP_LEN);
2417 			break;
2418 		}
2419 		if (iremotes.nremotes == 0) {
2420 			imsg_free(&imsg);
2421 			return NULL;
2422 		}
2423 		break;
2424 	default:
2425 		imsg_free(&imsg);
2426 		return got_error(GOT_ERR_PRIVSEP_MSG);
2427 	}
2428 
2429 	imsg_free(&imsg);
2430 
2431 	*remotes = recallocarray(NULL, 0, iremotes.nremotes, sizeof(**remotes));
2432 	if (*remotes == NULL)
2433 		return got_error_from_errno("recallocarray");
2434 
2435 	while (*nremotes < iremotes.nremotes) {
2436 		struct got_remote_repo *remote;
2437 		const size_t min_datalen =
2438 		    MIN(sizeof(struct got_imsg_error), sizeof(iremote));
2439 		int i;
2440 
2441 		err = got_privsep_recv_imsg(&imsg, ibuf, min_datalen);
2442 		if (err)
2443 			break;
2444 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2445 
2446 		switch (imsg.hdr.type) {
2447 		case GOT_IMSG_GOTCONFIG_REMOTE:
2448 			remote = &(*remotes)[*nremotes];
2449 			memset(remote, 0, sizeof(*remote));
2450 			if (datalen < sizeof(iremote)) {
2451 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2452 				break;
2453 			}
2454 			memcpy(&iremote, imsg.data, sizeof(iremote));
2455 			if (iremote.name_len == 0 ||
2456 			    (iremote.fetch_url_len == 0 &&
2457 			    iremote.send_url_len == 0) ||
2458 			    (sizeof(iremote) + iremote.name_len +
2459 			    iremote.fetch_url_len + iremote.send_url_len) >
2460 			    datalen) {
2461 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2462 				break;
2463 			}
2464 			remote->name = strndup(imsg.data + sizeof(iremote),
2465 			    iremote.name_len);
2466 			if (remote->name == NULL) {
2467 				err = got_error_from_errno("strndup");
2468 				break;
2469 			}
2470 			remote->fetch_url = strndup(imsg.data +
2471 			    sizeof(iremote) + iremote.name_len,
2472 			    iremote.fetch_url_len);
2473 			if (remote->fetch_url == NULL) {
2474 				err = got_error_from_errno("strndup");
2475 				free_remote_data(remote);
2476 				break;
2477 			}
2478 			remote->send_url = strndup(imsg.data +
2479 			    sizeof(iremote) + iremote.name_len +
2480 			    iremote.fetch_url_len, iremote.send_url_len);
2481 			if (remote->send_url == NULL) {
2482 				err = got_error_from_errno("strndup");
2483 				free_remote_data(remote);
2484 				break;
2485 			}
2486 			remote->mirror_references = iremote.mirror_references;
2487 			remote->fetch_all_branches = iremote.fetch_all_branches;
2488 			if (iremote.nfetch_branches > 0) {
2489 				remote->fetch_branches = recallocarray(NULL, 0,
2490 				    iremote.nfetch_branches, sizeof(char *));
2491 				if (remote->fetch_branches == NULL) {
2492 					err = got_error_from_errno("calloc");
2493 					free_remote_data(remote);
2494 					break;
2495 				}
2496 			}
2497 			remote->nfetch_branches = 0;
2498 			for (i = 0; i < iremote.nfetch_branches; i++) {
2499 				char *branch;
2500 				err = got_privsep_recv_gotconfig_str(&branch,
2501 				    ibuf);
2502 				if (err) {
2503 					free_remote_data(remote);
2504 					goto done;
2505 				}
2506 				remote->fetch_branches[i] = branch;
2507 				remote->nfetch_branches++;
2508 			}
2509 			if (iremote.nsend_branches > 0) {
2510 				remote->send_branches = recallocarray(NULL, 0,
2511 				    iremote.nsend_branches, sizeof(char *));
2512 				if (remote->send_branches == NULL) {
2513 					err = got_error_from_errno("calloc");
2514 					free_remote_data(remote);
2515 					break;
2516 				}
2517 			}
2518 			remote->nsend_branches = 0;
2519 			for (i = 0; i < iremote.nsend_branches; i++) {
2520 				char *branch;
2521 				err = got_privsep_recv_gotconfig_str(&branch,
2522 				    ibuf);
2523 				if (err) {
2524 					free_remote_data(remote);
2525 					goto done;
2526 				}
2527 				remote->send_branches[i] = branch;
2528 				remote->nsend_branches++;
2529 			}
2530 			if (iremote.nfetch_refs > 0) {
2531 				remote->fetch_refs = recallocarray(NULL, 0,
2532 				    iremote.nfetch_refs, sizeof(char *));
2533 				if (remote->fetch_refs == NULL) {
2534 					err = got_error_from_errno("calloc");
2535 					free_remote_data(remote);
2536 					break;
2537 				}
2538 			}
2539 			remote->nfetch_refs = 0;
2540 			for (i = 0; i < iremote.nfetch_refs; i++) {
2541 				char *ref;
2542 				err = got_privsep_recv_gotconfig_str(&ref,
2543 				    ibuf);
2544 				if (err) {
2545 					free_remote_data(remote);
2546 					goto done;
2547 				}
2548 				remote->fetch_refs[i] = ref;
2549 				remote->nfetch_refs++;
2550 			}
2551 			(*nremotes)++;
2552 			break;
2553 		default:
2554 			err = got_error(GOT_ERR_PRIVSEP_MSG);
2555 			break;
2556 		}
2557 
2558 		imsg_free(&imsg);
2559 		if (err)
2560 			break;
2561 	}
2562 done:
2563 	if (err) {
2564 		int i;
2565 		for (i = 0; i < *nremotes; i++)
2566 			free_remote_data(&(*remotes)[i]);
2567 		free(*remotes);
2568 		*remotes = NULL;
2569 		*nremotes = 0;
2570 	}
2571 	return err;
2572 }
2573 
2574 const struct got_error *
2575 got_privsep_send_commit_traversal_request(struct imsgbuf *ibuf,
2576     struct got_object_id *id, int idx, const char *path)
2577 {
2578 	struct ibuf *wbuf;
2579 	size_t path_len = strlen(path) + 1;
2580 
2581 	wbuf = imsg_create(ibuf, GOT_IMSG_COMMIT_TRAVERSAL_REQUEST, 0, 0,
2582 	    sizeof(struct got_imsg_commit_traversal_request) + path_len);
2583 	if (wbuf == NULL)
2584 		return got_error_from_errno(
2585 		    "imsg_create COMMIT_TRAVERSAL_REQUEST");
2586 	if (imsg_add(wbuf, id->sha1, SHA1_DIGEST_LENGTH) == -1)
2587 		return got_error_from_errno("imsg_add "
2588 		    "COMMIT_TRAVERSAL_REQUEST");
2589 	if (imsg_add(wbuf, &idx, sizeof(idx)) == -1)
2590 		return got_error_from_errno("imsg_add "
2591 		    "COMMIT_TRAVERSAL_REQUEST");
2592 	if (imsg_add(wbuf, path, path_len) == -1)
2593 		return got_error_from_errno("imsg_add "
2594 		    "COMMIT_TRAVERSAL_REQUEST");
2595 
2596 	wbuf->fd = -1;
2597 	imsg_close(ibuf, wbuf);
2598 
2599 	return flush_imsg(ibuf);
2600 }
2601 
2602 const struct got_error *
2603 got_privsep_recv_traversed_commits(struct got_commit_object **changed_commit,
2604     struct got_object_id **changed_commit_id,
2605     struct got_object_id_queue *commit_ids, struct imsgbuf *ibuf)
2606 {
2607 	const struct got_error *err = NULL;
2608 	struct imsg imsg;
2609 	struct got_imsg_traversed_commits *icommits;
2610 	size_t datalen;
2611 	int i, done = 0;
2612 
2613 	*changed_commit = NULL;
2614 	*changed_commit_id = NULL;
2615 
2616 	while (!done) {
2617 		err = got_privsep_recv_imsg(&imsg, ibuf, 0);
2618 		if (err)
2619 			return err;
2620 
2621 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2622 		switch (imsg.hdr.type) {
2623 		case GOT_IMSG_TRAVERSED_COMMITS:
2624 			icommits = imsg.data;
2625 			if (datalen != sizeof(*icommits) +
2626 			    icommits->ncommits * SHA1_DIGEST_LENGTH) {
2627 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2628 				break;
2629 			}
2630 			for (i = 0; i < icommits->ncommits; i++) {
2631 				struct got_object_qid *qid;
2632 				uint8_t *sha1 = (uint8_t *)imsg.data +
2633 				    sizeof(*icommits) + i * SHA1_DIGEST_LENGTH;
2634 				err = got_object_qid_alloc_partial(&qid);
2635 				if (err)
2636 					break;
2637 				memcpy(qid->id.sha1, sha1, SHA1_DIGEST_LENGTH);
2638 				STAILQ_INSERT_TAIL(commit_ids, qid, entry);
2639 
2640 				/* The last commit may contain a change. */
2641 				if (i == icommits->ncommits - 1) {
2642 					*changed_commit_id =
2643 					    got_object_id_dup(&qid->id);
2644 					if (*changed_commit_id == NULL) {
2645 						err = got_error_from_errno(
2646 						    "got_object_id_dup");
2647 						break;
2648 					}
2649 				}
2650 			}
2651 			break;
2652 		case GOT_IMSG_COMMIT:
2653 			if (*changed_commit_id == NULL) {
2654 				err = got_error(GOT_ERR_PRIVSEP_MSG);
2655 				break;
2656 			}
2657 			err = get_commit_from_imsg(changed_commit, &imsg,
2658 			    datalen, ibuf);
2659 			break;
2660 		case GOT_IMSG_COMMIT_TRAVERSAL_DONE:
2661 			done = 1;
2662 			break;
2663 		default:
2664 			err = got_error(GOT_ERR_PRIVSEP_MSG);
2665 			break;
2666 		}
2667 
2668 		imsg_free(&imsg);
2669 		if (err)
2670 			break;
2671 	}
2672 
2673 	if (err)
2674 		got_object_id_queue_free(commit_ids);
2675 	return err;
2676 }
2677 
2678 const struct got_error *
2679 got_privsep_send_enumerated_tree(size_t *totlen, struct imsgbuf *ibuf,
2680     struct got_object_id *tree_id, const char *path,
2681     struct got_parsed_tree_entry *entries, int nentries)
2682 {
2683 	const struct got_error *err = NULL;
2684 	struct ibuf *wbuf;
2685 	size_t path_len = strlen(path);
2686 	size_t msglen;
2687 
2688 	msglen = sizeof(struct got_imsg_enumerated_tree) + path_len;
2689 	wbuf = imsg_create(ibuf, GOT_IMSG_ENUMERATED_TREE, 0, 0, msglen);
2690 	if (wbuf == NULL)
2691 		return got_error_from_errno("imsg_create ENUMERATED_TREE");
2692 
2693 	if (imsg_add(wbuf, tree_id->sha1, SHA1_DIGEST_LENGTH) == -1)
2694 		return got_error_from_errno("imsg_add ENUMERATED_TREE");
2695 	if (imsg_add(wbuf, &nentries, sizeof(nentries)) == -1)
2696 		return got_error_from_errno("imsg_add ENUMERATED_TREE");
2697 	if (imsg_add(wbuf, path, path_len) == -1)
2698 		return got_error_from_errno("imsg_add ENUMERATED_TREE");
2699 
2700 	wbuf->fd = -1;
2701 	imsg_close(ibuf, wbuf);
2702 
2703 	if (entries) {
2704 		err = send_tree_entries(ibuf, entries, nentries);
2705 		if (err)
2706 			return err;
2707 	}
2708 
2709 	return flush_imsg(ibuf);
2710 }
2711 
2712 const struct got_error *
2713 got_privsep_send_object_enumeration_request(struct imsgbuf *ibuf)
2714 {
2715 	if (imsg_compose(ibuf, GOT_IMSG_OBJECT_ENUMERATION_REQUEST,
2716 	    0, 0, -1, NULL, 0) == -1)
2717 		return got_error_from_errno("imsg_compose "
2718 		    "OBJECT_ENUMERATION_REQUEST");
2719 
2720 	return flush_imsg(ibuf);
2721 }
2722 
2723 const struct got_error *
2724 got_privsep_send_object_enumeration_done(struct imsgbuf *ibuf)
2725 {
2726 	if (imsg_compose(ibuf, GOT_IMSG_OBJECT_ENUMERATION_DONE,
2727 	    0, 0, -1, NULL, 0) == -1)
2728 		return got_error_from_errno("imsg_compose "
2729 		    "OBJECT_ENUMERATION_DONE");
2730 
2731 	return flush_imsg(ibuf);
2732 }
2733 
2734 const struct got_error *
2735 got_privsep_send_object_enumeration_incomplete(struct imsgbuf *ibuf)
2736 {
2737 	if (imsg_compose(ibuf, GOT_IMSG_OBJECT_ENUMERATION_INCOMPLETE,
2738 	    0, 0, -1, NULL, 0) == -1)
2739 		return got_error_from_errno("imsg_compose "
2740 		    "OBJECT_ENUMERATION_INCOMPLETE");
2741 
2742 	return flush_imsg(ibuf);
2743 }
2744 
2745 const struct got_error *
2746 got_privsep_send_enumerated_commit(struct imsgbuf *ibuf,
2747     struct got_object_id *id, time_t mtime)
2748 {
2749 	struct ibuf *wbuf;
2750 
2751 	wbuf = imsg_create(ibuf, GOT_IMSG_ENUMERATED_COMMIT, 0, 0,
2752 	    sizeof(struct got_imsg_enumerated_commit) + SHA1_DIGEST_LENGTH);
2753 	if (wbuf == NULL)
2754 		return got_error_from_errno("imsg_create ENUMERATED_COMMIT");
2755 
2756 	/* Keep in sync with struct got_imsg_enumerated_commit! */
2757 	if (imsg_add(wbuf, id, SHA1_DIGEST_LENGTH) == -1)
2758 		return got_error_from_errno("imsg_add ENUMERATED_COMMIT");
2759 	if (imsg_add(wbuf, &mtime, sizeof(mtime)) == -1)
2760 		return got_error_from_errno("imsg_add ENUMERATED_COMMIT");
2761 
2762 	wbuf->fd = -1;
2763 	imsg_close(ibuf, wbuf);
2764 	/* Don't flush yet, tree entries or ENUMERATION_DONE will follow. */
2765 	return NULL;
2766 }
2767 
2768 const struct got_error *
2769 got_privsep_recv_enumerated_objects(int *found_all_objects,
2770     struct imsgbuf *ibuf,
2771     got_object_enumerate_commit_cb cb_commit,
2772     got_object_enumerate_tree_cb cb_tree, void *cb_arg,
2773     struct got_repository *repo)
2774 {
2775 	const struct got_error *err = NULL;
2776 	struct imsg imsg;
2777 	struct got_imsg_enumerated_commit *icommit = NULL;
2778 	struct got_object_id commit_id;
2779 	int have_commit = 0;
2780 	time_t mtime = 0;
2781 	struct got_tree_object tree;
2782 	struct got_imsg_enumerated_tree *itree;
2783 	struct got_object_id tree_id;
2784 	char *path = NULL, *canon_path = NULL;
2785 	size_t datalen, path_len;
2786 	int nentries = -1;
2787 	int done = 0;
2788 
2789 	*found_all_objects = 0;
2790 	memset(&tree, 0, sizeof(tree));
2791 
2792 	while (!done) {
2793 		err = got_privsep_recv_imsg(&imsg, ibuf, 0);
2794 		if (err)
2795 			break;
2796 
2797 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
2798 		switch (imsg.hdr.type) {
2799 		case GOT_IMSG_ENUMERATED_COMMIT:
2800 			if (have_commit && nentries != -1) {
2801 				err = got_error(GOT_ERR_PRIVSEP_MSG);
2802 				break;
2803 			}
2804 			if (datalen != sizeof(*icommit)) {
2805 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2806 				break;
2807 			}
2808 			icommit = (struct got_imsg_enumerated_commit *)imsg.data;
2809 			memcpy(commit_id.sha1, icommit->id, SHA1_DIGEST_LENGTH);
2810 			mtime = icommit->mtime;
2811 			have_commit = 1;
2812 			break;
2813 		case GOT_IMSG_ENUMERATED_TREE:
2814 			/* Should be preceeded by GOT_IMSG_ENUMERATED_COMMIT. */
2815 			if (!have_commit) {
2816 				err = got_error(GOT_ERR_PRIVSEP_MSG);
2817 				break;
2818 			}
2819 			if (datalen < sizeof(*itree)) {
2820 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2821 				break;
2822 			}
2823 			itree = imsg.data;
2824 			path_len = datalen - sizeof(*itree);
2825 			if (path_len == 0) {
2826 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2827 				break;
2828 			}
2829 			memcpy(tree_id.sha1, itree->id, sizeof(tree_id.sha1));
2830 			free(path);
2831 			path = malloc(path_len + 1);
2832 			if (path == NULL) {
2833 				err = got_error_from_errno("malloc");
2834 				break;
2835 			}
2836 			free(canon_path);
2837 			canon_path = malloc(path_len + 1);
2838 			if (canon_path == NULL) {
2839 				err = got_error_from_errno("malloc");
2840 				break;
2841 			}
2842 			memcpy(path, (uint8_t *)imsg.data + sizeof(*itree),
2843 			    path_len);
2844 			path[path_len] = '\0';
2845 			if (!got_path_is_absolute(path)) {
2846 				err = got_error(GOT_ERR_BAD_PATH);
2847 				break;
2848 			}
2849 			if (got_path_is_root_dir(path)) {
2850 				/* XXX check what got_canonpath() does wrong */
2851 				canon_path[0] = '/';
2852 				canon_path[1] = '\0';
2853 			} else {
2854 				err = got_canonpath(path, canon_path,
2855 				    path_len + 1);
2856 				if (err)
2857 					break;
2858 			}
2859 			if (strcmp(path, canon_path) != 0) {
2860 				err = got_error(GOT_ERR_BAD_PATH);
2861 				break;
2862 			}
2863 			if (nentries != -1) {
2864 				err = got_error(GOT_ERR_PRIVSEP_MSG);
2865 				break;
2866 			}
2867 			if (itree->nentries < -1) {
2868 				err = got_error(GOT_ERR_PRIVSEP_MSG);
2869 				break;
2870 			}
2871 			if (itree->nentries == -1) {
2872 				/* Tree was not found in pack file. */
2873 				err = cb_tree(cb_arg, NULL, mtime, &tree_id,
2874 				    path, repo);
2875 				break;
2876 			}
2877 			if (itree->nentries > INT_MAX) {
2878 				err = got_error(GOT_ERR_PRIVSEP_LEN);
2879 				break;
2880 			}
2881 			tree.entries = calloc(itree->nentries,
2882 			    sizeof(struct got_tree_entry));
2883 			if (tree.entries == NULL) {
2884 				err = got_error_from_errno("calloc");
2885 				break;
2886 			}
2887 			if (itree->nentries == 0) {
2888 				err = cb_tree(cb_arg, &tree, mtime, &tree_id,
2889 				    path, repo);
2890 				if (err)
2891 					break;
2892 
2893 				/* Prepare for next tree. */
2894 				free(tree.entries);
2895 				memset(&tree, 0, sizeof(tree));
2896 				nentries = -1;
2897 			} else {
2898 				tree.nentries = itree->nentries;
2899 				nentries = 0;
2900 			}
2901 			break;
2902 		case GOT_IMSG_TREE_ENTRIES:
2903 			/* Should be preceeded by GOT_IMSG_ENUMERATED_TREE. */
2904 			if (nentries <= -1) {
2905 				err = got_error(GOT_ERR_PRIVSEP_MSG);
2906 				break;
2907 			}
2908 			err = recv_tree_entries(imsg.data, datalen,
2909 			    &tree, &nentries);
2910 			if (err)
2911 				break;
2912 			if (tree.nentries == nentries) {
2913 				err = cb_tree(cb_arg, &tree, mtime, &tree_id,
2914 				    path, repo);
2915 				if (err)
2916 					break;
2917 
2918 				/* Prepare for next tree. */
2919 				free(tree.entries);
2920 				memset(&tree, 0, sizeof(tree));
2921 				nentries = -1;
2922 			}
2923 			break;
2924 		case GOT_IMSG_TREE_ENUMERATION_DONE:
2925 			/* All trees have been found and traversed. */
2926 			if (!have_commit || path == NULL || nentries != -1) {
2927 				err = got_error(GOT_ERR_PRIVSEP_MSG);
2928 				break;
2929 			}
2930 			err = cb_commit(cb_arg, mtime, &commit_id, repo);
2931 			if (err)
2932 				break;
2933 			have_commit = 0;
2934 			break;
2935 		case GOT_IMSG_OBJECT_ENUMERATION_DONE:
2936 			*found_all_objects = 1;
2937 			done = 1;
2938 			break;
2939 		case GOT_IMSG_OBJECT_ENUMERATION_INCOMPLETE:
2940 			done = 1;
2941 			break;
2942 		default:
2943 			err = got_error(GOT_ERR_PRIVSEP_MSG);
2944 			break;
2945 		}
2946 
2947 		imsg_free(&imsg);
2948 		if (err)
2949 			break;
2950 	}
2951 
2952 	free(path);
2953 	free(canon_path);
2954 	free(tree.entries);
2955 	return err;
2956 }
2957 
2958 const struct got_error *
2959 got_privsep_send_raw_delta_req(struct imsgbuf *ibuf, int idx,
2960     struct got_object_id *id)
2961 {
2962 	struct got_imsg_raw_delta_request dreq;
2963 
2964 	memset(&dreq, 0, sizeof(dreq));
2965 	dreq.idx = idx;
2966 	memcpy(dreq.id, id->sha1, SHA1_DIGEST_LENGTH);
2967 
2968 	if (imsg_compose(ibuf, GOT_IMSG_RAW_DELTA_REQUEST, 0, 0, -1,
2969 	    &dreq, sizeof(dreq)) == -1)
2970 		return got_error_from_errno("imsg_compose RAW_DELTA_REQUEST");
2971 
2972 	return flush_imsg(ibuf);
2973 }
2974 
2975 const struct got_error *
2976 got_privsep_send_raw_delta_outfd(struct imsgbuf *ibuf, int fd)
2977 {
2978 	return send_fd(ibuf, GOT_IMSG_RAW_DELTA_OUTFD, fd);
2979 }
2980 
2981 const struct got_error *
2982 got_privsep_send_raw_delta(struct imsgbuf *ibuf, uint64_t base_size,
2983     uint64_t result_size,  off_t delta_size, off_t delta_compressed_size,
2984     off_t delta_offset, off_t delta_out_offset, struct got_object_id *base_id)
2985 {
2986 	struct got_imsg_raw_delta idelta;
2987 	int ret;
2988 
2989 	memset(&idelta, 0, sizeof(idelta));
2990 	idelta.base_size = base_size;
2991 	idelta.result_size = result_size;
2992 	idelta.delta_size = delta_size;
2993 	idelta.delta_compressed_size = delta_compressed_size;
2994 	idelta.delta_offset = delta_offset;
2995 	idelta.delta_out_offset = delta_out_offset;
2996 	memcpy(idelta.base_id, base_id->sha1, SHA1_DIGEST_LENGTH);
2997 
2998 	ret = imsg_compose(ibuf, GOT_IMSG_RAW_DELTA, 0, 0, -1,
2999 	    &idelta, sizeof(idelta));
3000 	if (ret == -1)
3001 		return got_error_from_errno("imsg_compose RAW_DELTA");
3002 
3003 	return flush_imsg(ibuf);
3004 }
3005 
3006 const struct got_error *
3007 got_privsep_recv_raw_delta(uint64_t *base_size, uint64_t *result_size,
3008     off_t *delta_size, off_t *delta_compressed_size, off_t *delta_offset,
3009     off_t *delta_out_offset, struct got_object_id **base_id, struct imsgbuf *ibuf)
3010 {
3011 	const struct got_error *err = NULL;
3012 	struct imsg imsg;
3013 	struct got_imsg_raw_delta *delta;
3014 	size_t datalen;
3015 
3016 	*base_size = 0;
3017 	*result_size = 0;
3018 	*delta_size = 0;
3019 	*delta_compressed_size = 0;
3020 	*delta_offset = 0;
3021 	*delta_out_offset = 0;
3022 	*base_id = NULL;
3023 
3024 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
3025 	if (err)
3026 		return err;
3027 
3028 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
3029 
3030 	switch (imsg.hdr.type) {
3031 	case GOT_IMSG_RAW_DELTA:
3032 		if (datalen != sizeof(*delta)) {
3033 			err = got_error(GOT_ERR_PRIVSEP_LEN);
3034 			break;
3035 		}
3036 		delta = imsg.data;
3037 		*base_size = delta->base_size;
3038 		*result_size = delta->result_size;
3039 		*delta_size = delta->delta_size;
3040 		*delta_compressed_size = delta->delta_compressed_size;
3041 		*delta_offset = delta->delta_offset;
3042 		*delta_out_offset = delta->delta_out_offset;
3043 		*base_id = calloc(1, sizeof(**base_id));
3044 		if (*base_id == NULL) {
3045 			err = got_error_from_errno("malloc");
3046 			break;
3047 		}
3048 		memcpy((*base_id)->sha1, delta->base_id, SHA1_DIGEST_LENGTH);
3049 		break;
3050 	default:
3051 		err = got_error(GOT_ERR_PRIVSEP_MSG);
3052 		break;
3053 	}
3054 
3055 	imsg_free(&imsg);
3056 
3057 	if (err) {
3058 		free(*base_id);
3059 		*base_id = NULL;
3060 	}
3061 	return err;
3062 }
3063 
3064 static const struct got_error *
3065 send_idlist(struct imsgbuf *ibuf, struct got_object_id **ids, size_t nids)
3066 {
3067 	const struct got_error *err = NULL;
3068 	struct got_imsg_object_idlist idlist;
3069 	struct ibuf *wbuf;
3070 	size_t i;
3071 
3072 	memset(&idlist, 0, sizeof(idlist));
3073 
3074 	if (nids > GOT_IMSG_OBJ_ID_LIST_MAX_NIDS)
3075 		return got_error(GOT_ERR_NO_SPACE);
3076 
3077 	wbuf = imsg_create(ibuf, GOT_IMSG_OBJ_ID_LIST, 0, 0,
3078 	    sizeof(idlist) + nids * sizeof(**ids));
3079 	if (wbuf == NULL) {
3080 		err = got_error_from_errno("imsg_create OBJ_ID_LIST");
3081 		return err;
3082 	}
3083 
3084 	idlist.nids = nids;
3085 	if (imsg_add(wbuf, &idlist, sizeof(idlist)) == -1)
3086 		return got_error_from_errno("imsg_add OBJ_ID_LIST");
3087 
3088 	for (i = 0; i < nids; i++) {
3089 		struct got_object_id *id = ids[i];
3090 		if (imsg_add(wbuf, id, sizeof(*id)) == -1)
3091 			return got_error_from_errno("imsg_add OBJ_ID_LIST");
3092 	}
3093 
3094 	wbuf->fd = -1;
3095 	imsg_close(ibuf, wbuf);
3096 
3097 	return flush_imsg(ibuf);
3098 }
3099 
3100 const struct got_error *
3101 got_privsep_send_object_idlist(struct imsgbuf *ibuf,
3102     struct got_object_id **ids, size_t nids)
3103 {
3104 	const struct got_error *err = NULL;
3105 	struct got_object_id *idlist[GOT_IMSG_OBJ_ID_LIST_MAX_NIDS];
3106 	int i, queued = 0;
3107 
3108 	for (i = 0; i < nids; i++) {
3109 		idlist[i % nitems(idlist)] = ids[i];
3110 		queued++;
3111 		if (queued >= nitems(idlist)) {
3112 			err = send_idlist(ibuf, idlist, queued);
3113 			if (err)
3114 				return err;
3115 			queued = 0;
3116 		}
3117 	}
3118 
3119 	if (queued > 0) {
3120 		err = send_idlist(ibuf, idlist, queued);
3121 		if (err)
3122 			return err;
3123 	}
3124 
3125 	return NULL;
3126 }
3127 
3128 const struct got_error *
3129 got_privsep_send_object_idlist_done(struct imsgbuf *ibuf)
3130 {
3131 	if (imsg_compose(ibuf, GOT_IMSG_OBJ_ID_LIST_DONE, 0, 0, -1, NULL, 0)
3132 	    == -1)
3133 		return got_error_from_errno("imsg_compose OBJ_ID_LIST_DONE");
3134 
3135 	return flush_imsg(ibuf);
3136 }
3137 
3138 const struct got_error *
3139 got_privsep_recv_object_idlist(int *done, struct got_object_id **ids,
3140     size_t *nids, struct imsgbuf *ibuf)
3141 {
3142 	const struct got_error *err = NULL;
3143 	struct imsg imsg;
3144 	struct got_imsg_object_idlist *idlist;
3145 	size_t datalen;
3146 
3147 	*ids = NULL;
3148 	*done = 0;
3149 	*nids = 0;
3150 
3151 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
3152 	if (err)
3153 		return err;
3154 
3155 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
3156 	switch (imsg.hdr.type) {
3157 	case GOT_IMSG_OBJ_ID_LIST:
3158 		if (datalen < sizeof(*idlist)) {
3159 			err = got_error(GOT_ERR_PRIVSEP_LEN);
3160 			break;
3161 		}
3162 		idlist = imsg.data;
3163 		if (idlist->nids > GOT_IMSG_OBJ_ID_LIST_MAX_NIDS ||
3164 		    idlist->nids * sizeof(**ids) > datalen - sizeof(*idlist)) {
3165 			err = got_error(GOT_ERR_PRIVSEP_LEN);
3166 			break;
3167 		}
3168 		*nids = idlist->nids;
3169 		*ids = calloc(*nids, sizeof(**ids));
3170 		if (*ids == NULL) {
3171 			err = got_error_from_errno("calloc");
3172 			break;
3173 		}
3174 		memcpy(*ids, (uint8_t *)imsg.data + sizeof(*idlist),
3175 		    *nids * sizeof(**ids));
3176 		break;
3177 	case GOT_IMSG_OBJ_ID_LIST_DONE:
3178 		*done = 1;
3179 		break;
3180 	default:
3181 		err = got_error(GOT_ERR_PRIVSEP_MSG);
3182 		break;
3183 	}
3184 
3185 	imsg_free(&imsg);
3186 
3187 	return err;
3188 }
3189 
3190 const struct got_error *
3191 got_privsep_send_delta_reuse_req(struct imsgbuf *ibuf)
3192 {
3193 	if (imsg_compose(ibuf, GOT_IMSG_DELTA_REUSE_REQUEST, 0, 0, -1, NULL, 0)
3194 	    == -1)
3195 		return got_error_from_errno("imsg_compose DELTA_REUSE_REQUEST");
3196 
3197 	return flush_imsg(ibuf);
3198 }
3199 
3200 const struct got_error *
3201 got_privsep_send_reused_deltas(struct imsgbuf *ibuf,
3202     struct got_imsg_reused_delta *deltas, size_t ndeltas)
3203 {
3204 	const struct got_error *err = NULL;
3205 	struct ibuf *wbuf;
3206 	struct got_imsg_reused_deltas ideltas;
3207 	size_t i;
3208 
3209 	memset(&ideltas, 0, sizeof(ideltas));
3210 
3211 	if (ndeltas > GOT_IMSG_REUSED_DELTAS_MAX_NDELTAS)
3212 		return got_error(GOT_ERR_NO_SPACE);
3213 
3214 	wbuf = imsg_create(ibuf, GOT_IMSG_REUSED_DELTAS, 0, 0,
3215 	    sizeof(ideltas) + ndeltas * sizeof(*deltas));
3216 	if (wbuf == NULL) {
3217 		err = got_error_from_errno("imsg_create REUSED_DELTAS");
3218 		return err;
3219 	}
3220 
3221 	ideltas.ndeltas = ndeltas;
3222 	if (imsg_add(wbuf, &ideltas, sizeof(ideltas)) == -1)
3223 		return got_error_from_errno("imsg_add REUSED_DELTAS");
3224 
3225 	for (i = 0; i < ndeltas; i++) {
3226 		struct got_imsg_reused_delta *delta = &deltas[i];
3227 		if (imsg_add(wbuf, delta, sizeof(*delta)) == -1)
3228 			return got_error_from_errno("imsg_add REUSED_DELTAS");
3229 	}
3230 
3231 	wbuf->fd = -1;
3232 	imsg_close(ibuf, wbuf);
3233 
3234 	return flush_imsg(ibuf);
3235 }
3236 
3237 const struct got_error *
3238 got_privsep_send_reused_deltas_done(struct imsgbuf *ibuf)
3239 {
3240 	if (imsg_compose(ibuf, GOT_IMSG_DELTA_REUSE_DONE, 0, 0, -1, NULL, 0)
3241 	    == -1)
3242 		return got_error_from_errno("imsg_compose DELTA_REUSE_DONE");
3243 
3244 	return flush_imsg(ibuf);
3245 }
3246 
3247 const struct got_error *
3248 got_privsep_recv_reused_deltas(int *done, struct got_imsg_reused_delta *deltas,
3249     size_t *ndeltas, struct imsgbuf *ibuf)
3250 {
3251 	const struct got_error *err = NULL;
3252 	struct imsg imsg;
3253 	struct got_imsg_reused_deltas *ideltas;
3254 	size_t datalen;
3255 
3256 	*done = 0;
3257 	*ndeltas = 0;
3258 
3259 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
3260 	if (err)
3261 		return err;
3262 
3263 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
3264 	switch (imsg.hdr.type) {
3265 	case GOT_IMSG_REUSED_DELTAS:
3266 		if (datalen < sizeof(*ideltas)) {
3267 			err = got_error(GOT_ERR_PRIVSEP_LEN);
3268 			break;
3269 		}
3270 		ideltas = imsg.data;
3271 		if (ideltas->ndeltas > GOT_IMSG_OBJ_ID_LIST_MAX_NIDS ||
3272 		    ideltas->ndeltas * sizeof(*deltas) >
3273 		    datalen - sizeof(*ideltas)) {
3274 			err = got_error(GOT_ERR_PRIVSEP_LEN);
3275 			break;
3276 		}
3277 		*ndeltas = ideltas->ndeltas;
3278 		memcpy(deltas, (uint8_t *)imsg.data + sizeof(*ideltas),
3279 		    *ndeltas * sizeof(*deltas));
3280 		break;
3281 	case GOT_IMSG_DELTA_REUSE_DONE:
3282 		*done = 1;
3283 		break;
3284 	default:
3285 		err = got_error(GOT_ERR_PRIVSEP_MSG);
3286 		break;
3287 	}
3288 
3289 	imsg_free(&imsg);
3290 
3291 	return err;
3292 }
3293 
3294 const struct got_error *
3295 got_privsep_init_commit_painting(struct imsgbuf *ibuf)
3296 {
3297 	if (imsg_compose(ibuf, GOT_IMSG_COMMIT_PAINTING_INIT,
3298 	    0, 0, -1, NULL, 0)
3299 	    == -1)
3300 		return got_error_from_errno("imsg_compose "
3301 		    "COMMIT_PAINTING_INIT");
3302 
3303 	return flush_imsg(ibuf);
3304 }
3305 
3306 const struct got_error *
3307 got_privsep_send_painting_request(struct imsgbuf *ibuf, int idx,
3308     struct got_object_id *id, intptr_t color)
3309 {
3310 	struct got_imsg_commit_painting_request ireq;
3311 
3312 	memset(&ireq, 0, sizeof(ireq));
3313 	memcpy(ireq.id, id->sha1, sizeof(ireq.id));
3314 	ireq.idx = idx;
3315 	ireq.color = color;
3316 
3317 	if (imsg_compose(ibuf, GOT_IMSG_COMMIT_PAINTING_REQUEST, 0, 0, -1,
3318 	    &ireq, sizeof(ireq)) == -1)
3319 		return got_error_from_errno("imsg_compose "
3320 		    "COMMIT_PAINTING_REQUEST");
3321 
3322 	return flush_imsg(ibuf);
3323 }
3324 
3325 static const struct got_error *
3326 send_painted_commits(struct got_object_id_queue *ids, int *nids,
3327     size_t remain, int present_in_pack, struct imsgbuf *ibuf)
3328 {
3329 	const struct got_error *err = NULL;
3330 	struct ibuf *wbuf = NULL;
3331 	struct got_object_qid *qid;
3332 	size_t msglen;
3333 	int ncommits;
3334 	intptr_t color;
3335 
3336 	msglen = MIN(remain, MAX_IMSGSIZE - IMSG_HEADER_SIZE);
3337 	ncommits = (msglen - sizeof(struct got_imsg_painted_commits)) /
3338 	    sizeof(struct got_imsg_painted_commit);
3339 
3340 	wbuf = imsg_create(ibuf, GOT_IMSG_PAINTED_COMMITS, 0, 0, msglen);
3341 	if (wbuf == NULL) {
3342 		err = got_error_from_errno("imsg_create PAINTED_COMMITS");
3343 		return err;
3344 	}
3345 
3346 	/* Keep in sync with struct got_imsg_painted_commits! */
3347 	if (imsg_add(wbuf, &ncommits, sizeof(ncommits)) == -1)
3348 		return got_error_from_errno("imsg_add PAINTED_COMMITS");
3349 	if (imsg_add(wbuf, &present_in_pack, sizeof(present_in_pack)) == -1)
3350 		return got_error_from_errno("imsg_add PAINTED_COMMITS");
3351 
3352 	while (ncommits > 0) {
3353 		qid = STAILQ_FIRST(ids);
3354 		STAILQ_REMOVE_HEAD(ids, entry);
3355 		ncommits--;
3356 		(*nids)--;
3357 		color = (intptr_t)qid->data;
3358 
3359 		/* Keep in sync with struct got_imsg_painted_commit! */
3360 		if (imsg_add(wbuf, qid->id.sha1, SHA1_DIGEST_LENGTH) == -1)
3361 			return got_error_from_errno("imsg_add PAINTED_COMMITS");
3362 		if (imsg_add(wbuf, &color, sizeof(color)) == -1)
3363 			return got_error_from_errno("imsg_add PAINTED_COMMITS");
3364 
3365 		got_object_qid_free(qid);
3366 	}
3367 
3368 	wbuf->fd = -1;
3369 	imsg_close(ibuf, wbuf);
3370 
3371 	return flush_imsg(ibuf);
3372 }
3373 
3374 const struct got_error *
3375 got_privsep_send_painted_commits(struct imsgbuf *ibuf,
3376     struct got_object_id_queue *ids, int *nids,
3377     int present_in_pack, int flush)
3378 {
3379 	const struct got_error *err;
3380 	size_t remain;
3381 
3382 	if (*nids <= 0)
3383 		return NULL;
3384 
3385 	do {
3386 		remain = (sizeof(struct got_imsg_painted_commits)) +
3387 		    *nids * sizeof(struct got_imsg_painted_commit);
3388 		if (flush || remain >= MAX_IMSGSIZE - IMSG_HEADER_SIZE) {
3389 			err = send_painted_commits(ids, nids, remain,
3390 			    present_in_pack, ibuf);
3391 			if (err)
3392 				return err;
3393 		}
3394 	} while (flush && *nids > 0);
3395 
3396 	return NULL;
3397 }
3398 
3399 const struct got_error *
3400 got_privsep_send_painting_commits_done(struct imsgbuf *ibuf)
3401 {
3402 	if (imsg_compose(ibuf, GOT_IMSG_COMMIT_PAINTING_DONE,
3403 	    0, 0, -1, NULL, 0)
3404 	    == -1)
3405 		return got_error_from_errno("imsg_compose "
3406 		    "COMMIT_PAINTING_DONE");
3407 
3408 	return flush_imsg(ibuf);
3409 }
3410 
3411 const struct got_error *
3412 got_privsep_recv_painted_commits(struct got_object_id_queue *new_ids,
3413     got_privsep_recv_painted_commit_cb cb, void *cb_arg, struct imsgbuf *ibuf)
3414 {
3415 	const struct got_error *err = NULL;
3416 	struct imsg imsg;
3417 	struct got_imsg_painted_commits icommits;
3418 	struct got_imsg_painted_commit icommit;
3419 	size_t datalen;
3420 	int i;
3421 
3422 	for (;;) {
3423 		err = got_privsep_recv_imsg(&imsg, ibuf, 0);
3424 		if (err)
3425 			return err;
3426 
3427 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
3428 		if (imsg.hdr.type == GOT_IMSG_COMMIT_PAINTING_DONE)
3429 			break;
3430 		if (imsg.hdr.type != GOT_IMSG_PAINTED_COMMITS)
3431 			return got_error(GOT_ERR_PRIVSEP_MSG);
3432 
3433 		if (datalen < sizeof(icommits))
3434 			return got_error(GOT_ERR_PRIVSEP_LEN);
3435 		memcpy(&icommits, imsg.data, sizeof(icommits));
3436 		if (icommits.ncommits * sizeof(icommit) < icommits.ncommits ||
3437 		    datalen < sizeof(icommits) +
3438 		    icommits.ncommits * sizeof(icommit))
3439 			return got_error(GOT_ERR_PRIVSEP_LEN);
3440 
3441 		for (i = 0; i < icommits.ncommits; i++) {
3442 			memcpy(&icommit,
3443 			    (uint8_t *)imsg.data + sizeof(icommits) + i * sizeof(icommit),
3444 			    sizeof(icommit));
3445 
3446 			if (icommits.present_in_pack) {
3447 				struct got_object_id id;
3448 				memcpy(id.sha1, icommit.id, SHA1_DIGEST_LENGTH);
3449 				err = cb(cb_arg, &id, icommit.color);
3450 				if (err)
3451 					break;
3452 			} else {
3453 				struct got_object_qid *qid;
3454 				err = got_object_qid_alloc_partial(&qid);
3455 				if (err)
3456 					break;
3457 				memcpy(qid->id.sha1, icommit.id,
3458 				    SHA1_DIGEST_LENGTH);
3459 				qid->data = (void *)icommit.color;
3460 				STAILQ_INSERT_TAIL(new_ids, qid, entry);
3461 			}
3462 		}
3463 
3464 		imsg_free(&imsg);
3465 	}
3466 
3467 	return err;
3468 }
3469 
3470 const struct got_error *
3471 got_privsep_unveil_exec_helpers(void)
3472 {
3473 	const char *helpers[] = {
3474 	    GOT_PATH_PROG_READ_PACK,
3475 	    GOT_PATH_PROG_READ_OBJECT,
3476 	    GOT_PATH_PROG_READ_COMMIT,
3477 	    GOT_PATH_PROG_READ_TREE,
3478 	    GOT_PATH_PROG_READ_BLOB,
3479 	    GOT_PATH_PROG_READ_TAG,
3480 	    GOT_PATH_PROG_READ_GITCONFIG,
3481 	    GOT_PATH_PROG_READ_GOTCONFIG,
3482 	    GOT_PATH_PROG_READ_PATCH,
3483 	    GOT_PATH_PROG_FETCH_PACK,
3484 	    GOT_PATH_PROG_INDEX_PACK,
3485 	    GOT_PATH_PROG_SEND_PACK,
3486 	};
3487 	size_t i;
3488 
3489 	for (i = 0; i < nitems(helpers); i++) {
3490 		if (unveil(helpers[i], "x") == 0)
3491 			continue;
3492 		return got_error_from_errno2("unveil", helpers[i]);
3493 	}
3494 
3495 	return NULL;
3496 }
3497 
3498 void
3499 got_privsep_exec_child(int imsg_fds[2], const char *path, const char *repo_path)
3500 {
3501 	if (close(imsg_fds[0]) == -1) {
3502 		fprintf(stderr, "%s: %s\n", getprogname(), strerror(errno));
3503 		_exit(1);
3504 	}
3505 
3506 	if (dup2(imsg_fds[1], GOT_IMSG_FD_CHILD) == -1) {
3507 		fprintf(stderr, "%s: %s\n", getprogname(), strerror(errno));
3508 		_exit(1);
3509 	}
3510 
3511 	closefrom(GOT_IMSG_FD_CHILD + 1);
3512 
3513 	if (execl(path, path, repo_path, (char *)NULL) == -1) {
3514 		fprintf(stderr, "%s: %s: %s\n", getprogname(), path,
3515 		    strerror(errno));
3516 		_exit(1);
3517 	}
3518 }