Game of Trees Repos

Blob

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