Blame

Date:
Message:
gotwebd: inline and remove IMSG_SIZE_CHECK() I always find confusing if IMSG_SIZE_CHECK() takes pointers or not, and we had at least a few instances of wrong usages, so inline (with exact size checks) and remove the macro. ok stsp@
Actions:
History | Blob | Raw File
  1 a596b957 2022-07-14 tracey /*

  2 a596b957 2022-07-14 tracey  * Copyright (c) 2020-2021 Tracey Emery <tracey@traceyemery.net>

  3 a596b957 2022-07-14 tracey  * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>

  4 a596b957 2022-07-14 tracey  *

  5 a596b957 2022-07-14 tracey  * Permission to use, copy, modify, and distribute this software for any

  6 a596b957 2022-07-14 tracey  * purpose with or without fee is hereby granted, provided that the above

  7 a596b957 2022-07-14 tracey  * copyright notice and this permission notice appear in all copies.

  8 a596b957 2022-07-14 tracey  *

  9 a596b957 2022-07-14 tracey  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 10 a596b957 2022-07-14 tracey  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 11 a596b957 2022-07-14 tracey  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 12 a596b957 2022-07-14 tracey  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 13 a596b957 2022-07-14 tracey  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 14 a596b957 2022-07-14 tracey  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 15 a596b957 2022-07-14 tracey  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 16 a596b957 2022-07-14 tracey  */

 17 a596b957 2022-07-14 tracey 

 18 a596b957 2022-07-14 tracey #include <sys/types.h>

 19 a596b957 2022-07-14 tracey #include <sys/queue.h>

 20 a596b957 2022-07-14 tracey #include <sys/time.h>

 21 a596b957 2022-07-14 tracey #include <sys/uio.h>

 22 a596b957 2022-07-14 tracey #include <sys/socket.h>

 23 a596b957 2022-07-14 tracey 

 24 a596b957 2022-07-14 tracey #include <net/if.h>

 25 a596b957 2022-07-14 tracey #include <netinet/in.h>

 26 a596b957 2022-07-14 tracey 

 27 a596b957 2022-07-14 tracey #include <stdio.h>

 28 a596b957 2022-07-14 tracey #include <stdlib.h>

 29 a596b957 2022-07-14 tracey #include <termios.h>

 30 a596b957 2022-07-14 tracey #include <unistd.h>

 31 a596b957 2022-07-14 tracey #include <limits.h>

 32 a596b957 2022-07-14 tracey #include <string.h>

 33 a596b957 2022-07-14 tracey #include <event.h>

 34 a596b957 2022-07-14 tracey #include <fcntl.h>

 35 a596b957 2022-07-14 tracey #include <util.h>

 36 a596b957 2022-07-14 tracey #include <errno.h>

 37 a596b957 2022-07-14 tracey #include <imsg.h>

 38 a596b957 2022-07-14 tracey 

 39 a596b957 2022-07-14 tracey #include "got_opentemp.h"

 40 df2d3cd2 2023-03-11 op #include "got_reference.h"

 41 a596b957 2022-07-14 tracey 

 42 a596b957 2022-07-14 tracey #include "gotwebd.h"

 43 a596b957 2022-07-14 tracey 

 44 a596b957 2022-07-14 tracey int

 45 a596b957 2022-07-14 tracey config_init(struct gotwebd *env)

 46 a596b957 2022-07-14 tracey {

 47 f4a5cef1 2023-06-15 op 	strlcpy(env->httpd_chroot, D_HTTPD_CHROOT, sizeof(env->httpd_chroot));

 48 a596b957 2022-07-14 tracey 

 49 26678add 2023-11-16 op 	env->prefork_gotwebd = GOTWEBD_NUMPROC;

 50 26678add 2023-11-16 op 	env->server_cnt = 0;

 51 26678add 2023-11-16 op 	TAILQ_INIT(&env->servers);

 52 26678add 2023-11-16 op 	TAILQ_INIT(&env->sockets);

 53 a596b957 2022-07-14 tracey 

 54 f90f59b4 2023-05-17 op 	return 0;

 55 a596b957 2022-07-14 tracey }

 56 a596b957 2022-07-14 tracey 

 57 a596b957 2022-07-14 tracey int

 58 a596b957 2022-07-14 tracey config_getcfg(struct gotwebd *env, struct imsg *imsg)

 59 a596b957 2022-07-14 tracey {

 60 a596b957 2022-07-14 tracey 	/* nothing to do but tell gotwebd configuration is done */

 61 26678add 2023-11-16 op 	if (sockets_compose_main(env, IMSG_CFG_DONE, NULL, 0) == -1)

 62 26678add 2023-11-16 op 		fatal("sockets_compose_main IMSG_CFG_DONE");

 63 f90f59b4 2023-05-17 op 	return 0;

 64 a596b957 2022-07-14 tracey }

 65 a596b957 2022-07-14 tracey 

 66 a596b957 2022-07-14 tracey int

 67 a596b957 2022-07-14 tracey config_setserver(struct gotwebd *env, struct server *srv)

 68 a596b957 2022-07-14 tracey {

 69 26678add 2023-11-16 op 	if (main_compose_sockets(env, IMSG_CFG_SRV, -1, srv, sizeof(*srv))

 70 7e0ec052 2022-09-06 op 	    == -1)

 71 26678add 2023-11-16 op 		fatal("main_compose_sockets IMSG_CFG_SRV");

 72 f90f59b4 2023-05-17 op 	return 0;

 73 a596b957 2022-07-14 tracey }

 74 a596b957 2022-07-14 tracey 

 75 a596b957 2022-07-14 tracey int

 76 a596b957 2022-07-14 tracey config_getserver(struct gotwebd *env, struct imsg *imsg)

 77 a596b957 2022-07-14 tracey {

 78 a596b957 2022-07-14 tracey 	struct server *srv;

 79 a596b957 2022-07-14 tracey 	uint8_t *p = imsg->data;

 80 a596b957 2022-07-14 tracey 

 81 a596b957 2022-07-14 tracey 	srv = calloc(1, sizeof(*srv));

 82 a596b957 2022-07-14 tracey 	if (srv == NULL)

 83 a596b957 2022-07-14 tracey 		fatalx("%s: calloc", __func__);

 84 a596b957 2022-07-14 tracey 

 85 6e0942f6 2023-11-17 op 	if (IMSG_DATA_SIZE(imsg) != sizeof(*srv))

 86 6e0942f6 2023-11-17 op 		fatalx("%s: wrong size", __func__);

 87 7e0ec052 2022-09-06 op 

 88 7e0ec052 2022-09-06 op 	memcpy(srv, p, sizeof(*srv));

 89 a596b957 2022-07-14 tracey 

 90 a596b957 2022-07-14 tracey 	/* log server info */

 91 a596b957 2022-07-14 tracey 	log_debug("%s: server=%s fcgi_socket=%s unix_socket=%s", __func__,

 92 a596b957 2022-07-14 tracey 	    srv->name, srv->fcgi_socket ? "yes" : "no", srv->unix_socket ?

 93 a596b957 2022-07-14 tracey 	    "yes" : "no");

 94 a596b957 2022-07-14 tracey 

 95 2ad48e9a 2022-08-16 stsp 	TAILQ_INSERT_TAIL(&env->servers, srv, entry);

 96 a596b957 2022-07-14 tracey 

 97 f90f59b4 2023-05-17 op 	return 0;

 98 a596b957 2022-07-14 tracey }

 99 a596b957 2022-07-14 tracey 

100 a596b957 2022-07-14 tracey int

101 a596b957 2022-07-14 tracey config_setsock(struct gotwebd *env, struct socket *sock)

102 a596b957 2022-07-14 tracey {

103 a596b957 2022-07-14 tracey 	/* open listening sockets */

104 a596b957 2022-07-14 tracey 	if (sockets_privinit(env, sock) == -1)

105 a596b957 2022-07-14 tracey 		return -1;

106 a596b957 2022-07-14 tracey 

107 26678add 2023-11-16 op 	if (main_compose_sockets(env, IMSG_CFG_SOCK, sock->fd,

108 26678add 2023-11-16 op 	    &sock->conf, sizeof(sock->conf)) == -1)

109 26678add 2023-11-16 op 		fatal("main_compose_sockets IMSG_CFG_SOCK");

110 a596b957 2022-07-14 tracey 

111 26678add 2023-11-16 op 	sock->fd = -1;

112 f90f59b4 2023-05-17 op 	return 0;

113 a596b957 2022-07-14 tracey }

114 a596b957 2022-07-14 tracey 

115 a596b957 2022-07-14 tracey int

116 a596b957 2022-07-14 tracey config_getsock(struct gotwebd *env, struct imsg *imsg)

117 a596b957 2022-07-14 tracey {

118 a596b957 2022-07-14 tracey 	struct socket *sock = NULL;

119 a596b957 2022-07-14 tracey 	struct socket_conf sock_conf;

120 a596b957 2022-07-14 tracey 	uint8_t *p = imsg->data;

121 a596b957 2022-07-14 tracey 	int i;

122 a596b957 2022-07-14 tracey 

123 6e0942f6 2023-11-17 op 	if (IMSG_DATA_SIZE(imsg) != sizeof(sock_conf))

124 6e0942f6 2023-11-17 op 		fatalx("%s: wrong size", __func__);

125 6e0942f6 2023-11-17 op 

126 a596b957 2022-07-14 tracey 	memcpy(&sock_conf, p, sizeof(sock_conf));

127 a596b957 2022-07-14 tracey 

128 a596b957 2022-07-14 tracey 	if (IMSG_DATA_SIZE(imsg) != sizeof(sock_conf)) {

129 a596b957 2022-07-14 tracey 		log_debug("%s: imsg size error", __func__);

130 a596b957 2022-07-14 tracey 		return 1;

131 a596b957 2022-07-14 tracey 	}

132 a596b957 2022-07-14 tracey 

133 a596b957 2022-07-14 tracey 	/* create a new socket */

134 a596b957 2022-07-14 tracey 	if ((sock = calloc(1, sizeof(*sock))) == NULL) {

135 a596b957 2022-07-14 tracey 		if (imsg->fd != -1)

136 a596b957 2022-07-14 tracey 			close(imsg->fd);

137 a596b957 2022-07-14 tracey 		return 1;

138 a596b957 2022-07-14 tracey 	}

139 a596b957 2022-07-14 tracey 

140 a596b957 2022-07-14 tracey 	memcpy(&sock->conf, &sock_conf, sizeof(sock->conf));

141 a596b957 2022-07-14 tracey 	sock->fd = imsg->fd;

142 a596b957 2022-07-14 tracey 

143 2ad48e9a 2022-08-16 stsp 	TAILQ_INSERT_TAIL(&env->sockets, sock, entry);

144 a596b957 2022-07-14 tracey 

145 a596b957 2022-07-14 tracey 	for (i = 0; i < PRIV_FDS__MAX; i++)

146 a596b957 2022-07-14 tracey 		sock->priv_fd[i] = -1;

147 a596b957 2022-07-14 tracey 

148 0f91044a 2022-07-22 stsp 	for (i = 0; i < GOTWEB_PACK_NUM_TEMPFILES; i++)

149 a596b957 2022-07-14 tracey 		sock->pack_fds[i] = -1;

150 a596b957 2022-07-14 tracey 

151 a596b957 2022-07-14 tracey 	/* log new socket info */

152 4fcc9f74 2022-08-16 stsp 	log_debug("%s: name=%s id=%d server=%s af_type=%s socket_path=%s",

153 a596b957 2022-07-14 tracey 	    __func__, sock->conf.name, sock->conf.id, sock->conf.srv_name,

154 4fcc9f74 2022-08-16 stsp 	    sock->conf.af_type == AF_UNIX ? "unix" :

155 4fcc9f74 2022-08-16 stsp 	    (sock->conf.af_type == AF_INET ? "inet" :

156 4fcc9f74 2022-08-16 stsp 	    (sock->conf.af_type == AF_INET6 ? "inet6" : "unknown")),

157 4448825a 2023-06-16 op 	    *sock->conf.unix_socket_name != '\0' ?

158 a596b957 2022-07-14 tracey 	    sock->conf.unix_socket_name : "none");

159 a596b957 2022-07-14 tracey 

160 f90f59b4 2023-05-17 op 	return 0;

161 a596b957 2022-07-14 tracey }

162 a596b957 2022-07-14 tracey 

163 a596b957 2022-07-14 tracey int

164 a596b957 2022-07-14 tracey config_setfd(struct gotwebd *env, struct socket *sock)

165 a596b957 2022-07-14 tracey {

166 58cdb97c 2023-11-16 op 	int i, j, ret, fd;

167 a596b957 2022-07-14 tracey 

168 a596b957 2022-07-14 tracey 	log_debug("%s: Allocating %d file descriptors",

169 0f91044a 2022-07-22 stsp 	    __func__, PRIV_FDS__MAX + GOTWEB_PACK_NUM_TEMPFILES);

170 a596b957 2022-07-14 tracey 

171 26678add 2023-11-16 op 	for (i = 0; i < PRIV_FDS__MAX + GOTWEB_PACK_NUM_TEMPFILES; i++) {

172 58cdb97c 2023-11-16 op 		for (j = 0; j < env->nserver; ++j) {

173 58cdb97c 2023-11-16 op 			fd = got_opentempfd();

174 58cdb97c 2023-11-16 op 			if (fd == -1)

175 58cdb97c 2023-11-16 op 				fatal("got_opentemp");

176 58cdb97c 2023-11-16 op 			if (imsg_compose_event(&env->iev_server[j],

177 58cdb97c 2023-11-16 op 			    IMSG_CFG_FD, 0, -1, fd, &sock->conf.id,

178 58cdb97c 2023-11-16 op 			    sizeof(sock->conf.id)) == -1)

179 58cdb97c 2023-11-16 op 				fatal("imsg_compose_event IMSG_CFG_FD");

180 58cdb97c 2023-11-16 op 

181 58cdb97c 2023-11-16 op 			do {

182 58cdb97c 2023-11-16 op 				ret = imsg_flush(&env->iev_server[j].ibuf);

183 58cdb97c 2023-11-16 op 			} while (ret == -1 && errno == EAGAIN);

184 58cdb97c 2023-11-16 op 			if (ret == -1)

185 58cdb97c 2023-11-16 op 				fatal("imsg_flush");

186 58cdb97c 2023-11-16 op 			imsg_event_add(&env->iev_server[j]);

187 58cdb97c 2023-11-16 op 		}

188 a596b957 2022-07-14 tracey 	}

189 26678add 2023-11-16 op 

190 a596b957 2022-07-14 tracey 	return 0;

191 a596b957 2022-07-14 tracey }

192 a596b957 2022-07-14 tracey 

193 a596b957 2022-07-14 tracey int

194 a596b957 2022-07-14 tracey config_getfd(struct gotwebd *env, struct imsg *imsg)

195 a596b957 2022-07-14 tracey {

196 a596b957 2022-07-14 tracey 	struct socket *sock;

197 a596b957 2022-07-14 tracey 	uint8_t *p = imsg->data;

198 a596b957 2022-07-14 tracey 	int sock_id, match = 0, i;

199 a596b957 2022-07-14 tracey 

200 6e0942f6 2023-11-17 op 	if (IMSG_DATA_SIZE(imsg) != sizeof(sock_id))

201 6e0942f6 2023-11-17 op 		fatalx("%s: wrong size", __func__);

202 6e0942f6 2023-11-17 op 

203 a596b957 2022-07-14 tracey 	memcpy(&sock_id, p, sizeof(sock_id));

204 a596b957 2022-07-14 tracey 

205 2ad48e9a 2022-08-16 stsp 	TAILQ_FOREACH(sock, &env->sockets, entry) {

206 0f91044a 2022-07-22 stsp 		const int nfds = (GOTWEB_PACK_NUM_TEMPFILES + PRIV_FDS__MAX);

207 0f91044a 2022-07-22 stsp 		for (i = 0; i < nfds; i++) {

208 a596b957 2022-07-14 tracey 			if (i < PRIV_FDS__MAX && sock->priv_fd[i] == -1) {

209 a596b957 2022-07-14 tracey 				log_debug("%s: assigning socket %d priv_fd %d",

210 a596b957 2022-07-14 tracey 				    __func__, sock_id, imsg->fd);

211 a596b957 2022-07-14 tracey 				sock->priv_fd[i] = imsg->fd;

212 a596b957 2022-07-14 tracey 				match = 1;

213 a596b957 2022-07-14 tracey 				break;

214 a596b957 2022-07-14 tracey 			}

215 a596b957 2022-07-14 tracey 			if (sock->pack_fds[i - PRIV_FDS__MAX] == -1) {

216 a596b957 2022-07-14 tracey 				log_debug("%s: assigning socket %d pack_fd %d",

217 a596b957 2022-07-14 tracey 				    __func__, sock_id, imsg->fd);

218 a596b957 2022-07-14 tracey 				sock->pack_fds[i - PRIV_FDS__MAX] = imsg->fd;

219 a596b957 2022-07-14 tracey 				match = 1;

220 a596b957 2022-07-14 tracey 				break;

221 a596b957 2022-07-14 tracey 			}

222 a596b957 2022-07-14 tracey 		}

223 a596b957 2022-07-14 tracey 	}

224 a596b957 2022-07-14 tracey 

225 a596b957 2022-07-14 tracey 	if (match)

226 f90f59b4 2023-05-17 op 		return 0;

227 a596b957 2022-07-14 tracey 	else

228 a596b957 2022-07-14 tracey 		return 1;

229 a596b957 2022-07-14 tracey }