Blame

Date:
Message:
portable: add back sys/queue.h Now that the handling of including sys/queue.h is better, there's no need to remove those lines from the source. Copy the location of those original sys/queue.h lines from upstream at the same line number, so as to avoid any conflicts in the future.
Actions:
History | Blob | Raw File
  1 28714985 2018-11-17 stsp /*

  2 28714985 2018-11-17 stsp  * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>

  3 28714985 2018-11-17 stsp  *

  4 28714985 2018-11-17 stsp  * Permission to use, copy, modify, and distribute this software for any

  5 28714985 2018-11-17 stsp  * purpose with or without fee is hereby granted, provided that the above

  6 28714985 2018-11-17 stsp  * copyright notice and this permission notice appear in all copies.

  7 28714985 2018-11-17 stsp  *

  8 28714985 2018-11-17 stsp  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

  9 28714985 2018-11-17 stsp  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 10 28714985 2018-11-17 stsp  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 11 28714985 2018-11-17 stsp  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 12 28714985 2018-11-17 stsp  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 13 28714985 2018-11-17 stsp  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 14 28714985 2018-11-17 stsp  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 15 28714985 2018-11-17 stsp  */

 16 28714985 2018-11-17 stsp 

 17 28714985 2018-11-17 stsp #include <sys/types.h>

 18 8b925c6c 2022-07-16 thomas #include <sys/queue.h>

 19 28714985 2018-11-17 stsp #include <sys/uio.h>

 20 28714985 2018-11-17 stsp #include <sys/time.h>

 21 28714985 2018-11-17 stsp 

 22 28714985 2018-11-17 stsp #include <stdint.h>

 23 12ce7a6c 2019-08-12 stsp #include <limits.h>

 24 28714985 2018-11-17 stsp #include <signal.h>

 25 28714985 2018-11-17 stsp #include <stdio.h>

 26 28714985 2018-11-17 stsp #include <stdlib.h>

 27 28714985 2018-11-17 stsp #include <string.h>

 28 81a12da5 2020-09-09 naddy #include <unistd.h>

 29 28714985 2018-11-17 stsp #include <zlib.h>

 30 28714985 2018-11-17 stsp 

 31 dd038bc6 2021-09-21 thomas.ad #include "got_compat.h"

 32 dd038bc6 2021-09-21 thomas.ad 

 33 28714985 2018-11-17 stsp #include "got_error.h"

 34 28714985 2018-11-17 stsp #include "got_object.h"

 35 28714985 2018-11-17 stsp 

 36 28714985 2018-11-17 stsp #include "got_lib_delta.h"

 37 28714985 2018-11-17 stsp #include "got_lib_inflate.h"

 38 28714985 2018-11-17 stsp #include "got_lib_object.h"

 39 28714985 2018-11-17 stsp #include "got_lib_object_parse.h"

 40 28714985 2018-11-17 stsp #include "got_lib_privsep.h"

 41 d5c81d44 2021-07-08 stsp #include "got_lib_sha1.h"

 42 28714985 2018-11-17 stsp 

 43 28714985 2018-11-17 stsp static volatile sig_atomic_t sigint_received;

 44 28714985 2018-11-17 stsp 

 45 28714985 2018-11-17 stsp static void

 46 28714985 2018-11-17 stsp catch_sigint(int signo)

 47 28714985 2018-11-17 stsp {

 48 28714985 2018-11-17 stsp 	sigint_received = 1;

 49 28714985 2018-11-17 stsp }

 50 28714985 2018-11-17 stsp 

 51 28714985 2018-11-17 stsp static const struct got_error *

 52 d5c81d44 2021-07-08 stsp read_tag_object(struct got_tag_object **tag, FILE *f,

 53 d5c81d44 2021-07-08 stsp     struct got_object_id *expected_id)

 54 28714985 2018-11-17 stsp {

 55 28714985 2018-11-17 stsp 	const struct got_error *err = NULL;

 56 d5c81d44 2021-07-08 stsp 	struct got_object *obj = NULL;

 57 28714985 2018-11-17 stsp 	size_t len;

 58 28714985 2018-11-17 stsp 	uint8_t *p;

 59 d5c81d44 2021-07-08 stsp 	struct got_inflate_checksum csum;

 60 d5c81d44 2021-07-08 stsp 	SHA1_CTX sha1_ctx;

 61 d5c81d44 2021-07-08 stsp 	struct got_object_id id;

 62 28714985 2018-11-17 stsp 

 63 d5c81d44 2021-07-08 stsp 	SHA1Init(&sha1_ctx);

 64 d5c81d44 2021-07-08 stsp 	memset(&csum, 0, sizeof(csum));

 65 d5c81d44 2021-07-08 stsp 	csum.output_sha1 = &sha1_ctx;

 66 d5c81d44 2021-07-08 stsp 

 67 d5c81d44 2021-07-08 stsp 	err = got_inflate_to_mem(&p, &len, NULL, &csum, f);

 68 28714985 2018-11-17 stsp 	if (err)

 69 28714985 2018-11-17 stsp 		return err;

 70 28714985 2018-11-17 stsp 

 71 d5c81d44 2021-07-08 stsp 	SHA1Final(id.sha1, &sha1_ctx);

 72 d5c81d44 2021-07-08 stsp 	if (memcmp(expected_id->sha1, id.sha1, SHA1_DIGEST_LENGTH) != 0) {

 73 d5c81d44 2021-07-08 stsp 		char buf[SHA1_DIGEST_STRING_LENGTH];

 74 d5c81d44 2021-07-08 stsp 		err = got_error_fmt(GOT_ERR_OBJ_CSUM,

 75 d5c81d44 2021-07-08 stsp 		    "checksum failure for object %s",

 76 d5c81d44 2021-07-08 stsp 		    got_sha1_digest_to_str(expected_id->sha1, buf,

 77 d5c81d44 2021-07-08 stsp 		    sizeof(buf)));

 78 d5c81d44 2021-07-08 stsp 		goto done;

 79 d5c81d44 2021-07-08 stsp 	}

 80 d5c81d44 2021-07-08 stsp 

 81 268f7291 2018-12-24 stsp 	err = got_object_parse_header(&obj, p, len);

 82 268f7291 2018-12-24 stsp 	if (err)

 83 d5c81d44 2021-07-08 stsp 		goto done;

 84 268f7291 2018-12-24 stsp 

 85 28714985 2018-11-17 stsp 	if (len < obj->hdrlen + obj->size) {

 86 28714985 2018-11-17 stsp 		err = got_error(GOT_ERR_BAD_OBJ_DATA);

 87 28714985 2018-11-17 stsp 		goto done;

 88 28714985 2018-11-17 stsp 	}

 89 28714985 2018-11-17 stsp 

 90 28714985 2018-11-17 stsp 	/* Skip object header. */

 91 28714985 2018-11-17 stsp 	len -= obj->hdrlen;

 92 28714985 2018-11-17 stsp 	err = got_object_parse_tag(tag, p + obj->hdrlen, len);

 93 28714985 2018-11-17 stsp done:

 94 268f7291 2018-12-24 stsp 	free(p);

 95 d5c81d44 2021-07-08 stsp 	if (obj)

 96 d5c81d44 2021-07-08 stsp 		got_object_close(obj);

 97 28714985 2018-11-17 stsp 	return err;

 98 28714985 2018-11-17 stsp }

 99 28714985 2018-11-17 stsp 

100 28714985 2018-11-17 stsp int

101 28714985 2018-11-17 stsp main(int argc, char *argv[])

102 28714985 2018-11-17 stsp {

103 28714985 2018-11-17 stsp 	const struct got_error *err = NULL;

104 28714985 2018-11-17 stsp 	struct imsgbuf ibuf;

105 d5c81d44 2021-07-08 stsp 	size_t datalen;

106 28714985 2018-11-17 stsp 

107 28714985 2018-11-17 stsp 	signal(SIGINT, catch_sigint);

108 28714985 2018-11-17 stsp 

109 28714985 2018-11-17 stsp 	imsg_init(&ibuf, GOT_IMSG_FD_CHILD);

110 28714985 2018-11-17 stsp 

111 28714985 2018-11-17 stsp #ifndef PROFILE

112 28714985 2018-11-17 stsp 	/* revoke access to most system calls */

113 28714985 2018-11-17 stsp 	if (pledge("stdio recvfd", NULL) == -1) {

114 638f9024 2019-05-13 stsp 		err = got_error_from_errno("pledge");

115 28714985 2018-11-17 stsp 		got_privsep_send_error(&ibuf, err);

116 28714985 2018-11-17 stsp 		return 1;

117 28714985 2018-11-17 stsp 	}

118 97799ccd 2022-02-06 thomas 

119 97799ccd 2022-02-06 thomas 	/* revoke fs access */

120 97799ccd 2022-02-06 thomas 	if (landlock_no_fs() == -1) {

121 97799ccd 2022-02-06 thomas 		err = got_error_from_errno("landlock_no_fs");

122 97799ccd 2022-02-06 thomas 		got_privsep_send_error(&ibuf, err);

123 97799ccd 2022-02-06 thomas 		return 1;

124 97799ccd 2022-02-06 thomas 	}

125 5d120ea8 2022-06-23 op 	if (cap_enter() == -1) {

126 5d120ea8 2022-06-23 op 		err = got_error_from_errno("cap_enter");

127 5d120ea8 2022-06-23 op 		got_privsep_send_error(&ibuf, err);

128 5d120ea8 2022-06-23 op 		return 1;

129 5d120ea8 2022-06-23 op 	}

130 28714985 2018-11-17 stsp #endif

131 28714985 2018-11-17 stsp 

132 656b1f76 2019-05-11 jcs 	for (;;) {

133 28714985 2018-11-17 stsp 		struct imsg imsg;

134 28714985 2018-11-17 stsp 		FILE *f = NULL;

135 268f7291 2018-12-24 stsp 		struct got_tag_object *tag = NULL;

136 d5c81d44 2021-07-08 stsp 		struct got_object_id expected_id;

137 28714985 2018-11-17 stsp 

138 28714985 2018-11-17 stsp 		if (sigint_received) {

139 28714985 2018-11-17 stsp 			err = got_error(GOT_ERR_CANCELLED);

140 28714985 2018-11-17 stsp 			break;

141 28714985 2018-11-17 stsp 		}

142 28714985 2018-11-17 stsp 

143 28714985 2018-11-17 stsp 		err = got_privsep_recv_imsg(&imsg, &ibuf, 0);

144 28714985 2018-11-17 stsp 		if (err) {

145 28714985 2018-11-17 stsp 			if (err->code == GOT_ERR_PRIVSEP_PIPE)

146 28714985 2018-11-17 stsp 				err = NULL;

147 28714985 2018-11-17 stsp 			break;

148 28714985 2018-11-17 stsp 		}

149 28714985 2018-11-17 stsp 

150 28714985 2018-11-17 stsp 		if (imsg.hdr.type == GOT_IMSG_STOP)

151 28714985 2018-11-17 stsp 			break;

152 28714985 2018-11-17 stsp 

153 28714985 2018-11-17 stsp 		if (imsg.hdr.type != GOT_IMSG_TAG_REQUEST) {

154 28714985 2018-11-17 stsp 			err = got_error(GOT_ERR_PRIVSEP_MSG);

155 28714985 2018-11-17 stsp 			goto done;

156 28714985 2018-11-17 stsp 		}

157 28714985 2018-11-17 stsp 

158 d5c81d44 2021-07-08 stsp 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;

159 d5c81d44 2021-07-08 stsp 		if (datalen != sizeof(expected_id)) {

160 d5c81d44 2021-07-08 stsp 			err = got_error(GOT_ERR_PRIVSEP_LEN);

161 d5c81d44 2021-07-08 stsp 			goto done;

162 d5c81d44 2021-07-08 stsp 		}

163 d5c81d44 2021-07-08 stsp 		memcpy(&expected_id, imsg.data, sizeof(expected_id));

164 d5c81d44 2021-07-08 stsp 

165 28714985 2018-11-17 stsp 		if (imsg.fd == -1) {

166 28714985 2018-11-17 stsp 			err = got_error(GOT_ERR_PRIVSEP_NO_FD);

167 28714985 2018-11-17 stsp 			goto done;

168 28714985 2018-11-17 stsp 		}

169 28714985 2018-11-17 stsp 

170 28714985 2018-11-17 stsp 		/* Always assume file offset zero. */

171 28714985 2018-11-17 stsp 		f = fdopen(imsg.fd, "rb");

172 28714985 2018-11-17 stsp 		if (f == NULL) {

173 638f9024 2019-05-13 stsp 			err = got_error_from_errno("fdopen");

174 28714985 2018-11-17 stsp 			goto done;

175 28714985 2018-11-17 stsp 		}

176 28714985 2018-11-17 stsp 

177 d5c81d44 2021-07-08 stsp 		err = read_tag_object(&tag, f, &expected_id);

178 28714985 2018-11-17 stsp 		if (err)

179 28714985 2018-11-17 stsp 			goto done;

180 28714985 2018-11-17 stsp 

181 28714985 2018-11-17 stsp 		err = got_privsep_send_tag(&ibuf, tag);

182 28714985 2018-11-17 stsp done:

183 fb43ecf1 2019-02-11 stsp 		if (f) {

184 56b63ca4 2021-01-22 stsp 			if (fclose(f) == EOF && err == NULL)

185 638f9024 2019-05-13 stsp 				err = got_error_from_errno("fclose");

186 3a6ce05a 2019-02-11 stsp 		} else if (imsg.fd != -1) {

187 08578a35 2021-01-22 stsp 			if (close(imsg.fd) == -1 && err == NULL)

188 638f9024 2019-05-13 stsp 				err = got_error_from_errno("close");

189 3a6ce05a 2019-02-11 stsp 		}

190 28714985 2018-11-17 stsp 		imsg_free(&imsg);

191 28714985 2018-11-17 stsp 		if (err)

192 28714985 2018-11-17 stsp 			break;

193 28714985 2018-11-17 stsp 	}

194 28714985 2018-11-17 stsp 

195 28714985 2018-11-17 stsp 	imsg_clear(&ibuf);

196 28714985 2018-11-17 stsp 	if (err) {

197 28714985 2018-11-17 stsp 		if (!sigint_received && err->code != GOT_ERR_PRIVSEP_PIPE) {

198 28714985 2018-11-17 stsp 			fprintf(stderr, "%s: %s\n", getprogname(), err->msg);

199 28714985 2018-11-17 stsp 			got_privsep_send_error(&ibuf, err);

200 28714985 2018-11-17 stsp 		}

201 28714985 2018-11-17 stsp 	}

202 08578a35 2021-01-22 stsp 	if (close(GOT_IMSG_FD_CHILD) == -1 && err == NULL)

203 638f9024 2019-05-13 stsp 		err = got_error_from_errno("close");

204 28714985 2018-11-17 stsp 	return err ? 1 : 0;

205 28714985 2018-11-17 stsp }