op public repos

Blame

Date:: Wed Mar 3 17:22:01 2021 UTC
Message:: give each server process its own socket for the executor this fixes a bug introduced with the prefork mechanics: every server process shared the same socket, and this would cause a race condition when multiple server processes asked for a script cgi being executed. This gives each server process its own socket to talk to the executor, so the race cannot happen.
Actions:: History | Blob | Raw File
  1 d5aba4c7 2020-12-24 op /*
  2 d5aba4c7 2020-12-24 op  * Copyright (c) 2020 Omar Polo <op@omarpolo.com>
  3 d5aba4c7 2020-12-24 op  *
  4 d5aba4c7 2020-12-24 op  * Permission to use, copy, modify, and distribute this software for any
  5 d5aba4c7 2020-12-24 op  * purpose with or without fee is hereby granted, provided that the above
  6 d5aba4c7 2020-12-24 op  * copyright notice and this permission notice appear in all copies.
  7 d5aba4c7 2020-12-24 op  *
  8 d5aba4c7 2020-12-24 op  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  9 d5aba4c7 2020-12-24 op  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 10 d5aba4c7 2020-12-24 op  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 11 d5aba4c7 2020-12-24 op  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 12 d5aba4c7 2020-12-24 op  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 13 d5aba4c7 2020-12-24 op  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 14 d5aba4c7 2020-12-24 op  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 15 d5aba4c7 2020-12-24 op  */
 16 d5aba4c7 2020-12-24 op 
 17 488f059a 2020-12-24 op #ifndef GMID_H
 18 488f059a 2020-12-24 op #define GMID_H
 19 52418c8d 2021-02-12 op 
 20 52418c8d 2021-02-12 op #include "config.h"
 21 488f059a 2020-12-24 op 
 22 252908e6 2021-01-24 op #include <sys/socket.h>
 23 252908e6 2021-01-24 op #include <sys/types.h>
 24 252908e6 2021-01-24 op 
 25 488f059a 2020-12-24 op #include <arpa/inet.h>
 26 488f059a 2020-12-24 op #include <netinet/in.h>
 27 488f059a 2020-12-24 op 
 28 252908e6 2021-01-24 op #include <dirent.h>
 29 ca21e100 2021-02-04 op #include <signal.h>
 30 488f059a 2020-12-24 op #include <stdio.h>
 31 488f059a 2020-12-24 op #include <stdlib.h>
 32 b63e30ff 2021-02-07 op #include <time.h>
 33 488f059a 2020-12-24 op #include <tls.h>
 34 488f059a 2020-12-24 op #include <unistd.h>
 35 488f059a 2020-12-24 op 
 36 02be96c6 2021-02-09 op #include <openssl/x509.h>
 37 02be96c6 2021-02-09 op 
 38 488f059a 2020-12-24 op #define GEMINI_URL_LEN (1024+3)	/* URL max len + \r\n + \0 */
 39 488f059a 2020-12-24 op 
 40 488f059a 2020-12-24 op #define SUCCESS		20
 41 0be51733 2021-01-20 op #define TEMP_REDIRECT	30
 42 488f059a 2020-12-24 op #define TEMP_FAILURE	40
 43 35744950 2021-02-01 op #define CGI_ERROR	42
 44 488f059a 2020-12-24 op #define NOT_FOUND	51
 45 7b1d9790 2021-01-11 op #define PROXY_REFUSED	53
 46 488f059a 2020-12-24 op #define BAD_REQUEST	59
 47 02be96c6 2021-02-09 op #define CLIENT_CERT_REQ	60
 48 02be96c6 2021-02-09 op #define CERT_NOT_AUTH	61
 49 488f059a 2020-12-24 op 
 50 488f059a 2020-12-24 op #define MAX_USERS	64
 51 488f059a 2020-12-24 op 
 52 15902770 2021-01-15 op #define HOSTSLEN	64
 53 c8b74339 2021-01-24 op #define LOCLEN		32
 54 15902770 2021-01-15 op 
 55 35cf19e3 2021-01-28 op /* maximum hostname and label length, +1 for the NUL-terminator */
 56 35cf19e3 2021-01-28 op #define DOMAIN_NAME_LEN	(253+1)
 57 35cf19e3 2021-01-28 op #define LABEL_LEN	(63+1)
 58 2c3e53da 2021-03-03 op 
 59 2c3e53da 2021-03-03 op #define PROC_MAX	16
 60 3300cbe0 2021-01-27 op 
 61 c8b74339 2021-01-24 op struct location {
 62 fe5967cd 2021-01-27 op 	const char	*match;
 63 fe5967cd 2021-01-27 op 	const char	*lang;
 64 fe5967cd 2021-01-27 op 	const char	*default_mime;
 65 fe5967cd 2021-01-27 op 	const char	*index;
 66 252908e6 2021-01-24 op 	int		 auto_index; /* 0 auto, -1 off, 1 on */
 67 6abda252 2021-02-06 op 	int		 block_code;
 68 6abda252 2021-02-06 op 	const char	*block_fmt;
 69 6abda252 2021-02-06 op 	int		 strip;
 70 02be96c6 2021-02-09 op 	X509_STORE	*reqca;
 71 793835cb 2021-02-23 op 	int		 disable_log;
 72 c8b74339 2021-01-24 op };
 73 c8b74339 2021-01-24 op 
 74 15902770 2021-01-15 op struct vhost {
 75 15902770 2021-01-15 op 	const char	*domain;
 76 15902770 2021-01-15 op 	const char	*cert;
 77 15902770 2021-01-15 op 	const char	*key;
 78 15902770 2021-01-15 op 	const char	*dir;
 79 15902770 2021-01-15 op 	const char	*cgi;
 80 e3ddf390 2021-02-06 op 	const char	*entrypoint;
 81 15902770 2021-01-15 op 	int		 dirfd;
 82 6016a593 2021-01-30 op 
 83 6016a593 2021-01-30 op 	/* the first location rule is always '*' and holds the default
 84 6016a593 2021-01-30 op 	 * settings for the vhost, from locations[1] onwards there are
 85 6016a593 2021-01-30 op 	 * the "real" location rules specified in the configuration. */
 86 c8b74339 2021-01-24 op 	struct location	 locations[LOCLEN];
 87 15902770 2021-01-15 op };
 88 15902770 2021-01-15 op 
 89 15902770 2021-01-15 op extern struct vhost hosts[HOSTSLEN];
 90 15902770 2021-01-15 op 
 91 a010b0dd 2021-01-18 op struct etm {			/* extension to mime */
 92 a010b0dd 2021-01-18 op 	const char	*mime;
 93 a010b0dd 2021-01-18 op 	const char	*ext;
 94 a010b0dd 2021-01-18 op };
 95 a010b0dd 2021-01-18 op 
 96 b2a6b613 2021-01-21 op struct mime {
 97 a010b0dd 2021-01-18 op 	struct etm	*t;
 98 a010b0dd 2021-01-18 op 	size_t		len;
 99 a010b0dd 2021-01-18 op 	size_t		cap;
100 a010b0dd 2021-01-18 op };
101 a010b0dd 2021-01-18 op 
102 15902770 2021-01-15 op struct conf {
103 3abf91b0 2021-02-07 op 	/* from command line */
104 3abf91b0 2021-02-07 op 	int		 foreground;
105 3abf91b0 2021-02-07 op 	int		 verbose;
106 3abf91b0 2021-02-07 op 
107 3abf91b0 2021-02-07 op 	/* in the config */
108 ae08ec7d 2021-01-25 op 	int		 port;
109 ae08ec7d 2021-01-25 op 	int		 ipv6;
110 ae08ec7d 2021-01-25 op 	uint32_t	 protos;
111 ae08ec7d 2021-01-25 op 	struct mime	 mime;
112 ae08ec7d 2021-01-25 op 	char		*chroot;
113 ae08ec7d 2021-01-25 op 	char		*user;
114 a709ddf5 2021-02-07 op 	int		 prefork;
115 15902770 2021-01-15 op };
116 15902770 2021-01-15 op 
117 d090dc84 2021-02-08 op extern const char *config_path;
118 15902770 2021-01-15 op extern struct conf conf;
119 376a5407 2021-02-23 op extern int exfd, logfd;
120 376a5407 2021-02-23 op 
121 376a5407 2021-02-23 op extern struct imsgbuf logpibuf, logcibuf;
122 15902770 2021-01-15 op 
123 ca21e100 2021-02-04 op extern volatile sig_atomic_t hupped;
124 ca21e100 2021-02-04 op 
125 2c3e53da 2021-03-03 op extern int servpipes[PROC_MAX];
126 2c3e53da 2021-03-03 op 
127 0be51733 2021-01-20 op struct iri {
128 0be51733 2021-01-20 op 	char		*schema;
129 0be51733 2021-01-20 op 	char		*host;
130 0be51733 2021-01-20 op 	char		*port;
131 0be51733 2021-01-20 op 	uint16_t	 port_no;
132 0be51733 2021-01-20 op 	char		*path;
133 0be51733 2021-01-20 op 	char		*query;
134 0be51733 2021-01-20 op 	char		*fragment;
135 0be51733 2021-01-20 op };
136 0be51733 2021-01-20 op 
137 0be51733 2021-01-20 op struct parser {
138 0be51733 2021-01-20 op 	char		*iri;
139 0be51733 2021-01-20 op 	struct iri	*parsed;
140 0be51733 2021-01-20 op 	const char	*err;
141 0be51733 2021-01-20 op };
142 0be51733 2021-01-20 op 
143 112802ea 2021-02-01 op struct client;
144 488f059a 2020-12-24 op 
145 abc007d2 2021-02-08 op typedef void (*statefn)(int, short, void*);
146 112802ea 2021-02-01 op 
147 92da8285 2021-02-01 op /*
148 92da8285 2021-02-01 op  * DFA: handle_handshake is the initial state, close_conn the final.
149 5f715ce4 2021-02-02 op  * Sometimes we have an enter_* function to handle the state switch.
150 92da8285 2021-02-01 op  *
151 92da8285 2021-02-01 op  * handle_handshake -> handle_open_conn
152 92da8285 2021-02-01 op  * handle_handshake -> close_conn		// on err
153 92da8285 2021-02-01 op  *
154 35744950 2021-02-01 op  * handle_open_conn -> handle_cgi_reply		// via open_file/dir/...
155 5f715ce4 2021-02-02 op  * handle_open_conn -> handle_dirlist		// ...same
156 92da8285 2021-02-01 op  * handle_open_conn -> send_file		// ...same
157 35744950 2021-02-01 op  * handle_open_conn -> start_reply		// on error
158 92da8285 2021-02-01 op  *
159 35744950 2021-02-01 op  * handle_cgi_reply -> handle_cgi	// after logging the CGI reply
160 35744950 2021-02-01 op  * handle_cgi_reply -> start_reply	// on error
161 35744950 2021-02-01 op  *
162 92da8285 2021-02-01 op  * handle_cgi -> close_conn
163 5f715ce4 2021-02-02 op  *
164 5f715ce4 2021-02-02 op  * handle_dirlist -> send_directory_listing
165 5f715ce4 2021-02-02 op  * handle_dirlist -> close_conn			// on error
166 92da8285 2021-02-01 op  *
167 92da8285 2021-02-01 op  * send_directory_listing -> close_conn
168 92da8285 2021-02-01 op  *
169 92da8285 2021-02-01 op  * send_file -> close_conn
170 92da8285 2021-02-01 op  */
171 488f059a 2020-12-24 op struct client {
172 488f059a 2020-12-24 op 	struct tls	*ctx;
173 0be51733 2021-01-20 op 	char		 req[GEMINI_URL_LEN];
174 0be51733 2021-01-20 op 	struct iri	 iri;
175 3300cbe0 2021-01-27 op 	char		 domain[DOMAIN_NAME_LEN];
176 abc007d2 2021-02-08 op 	statefn		 next;
177 488f059a 2020-12-24 op 	int		 code;
178 488f059a 2020-12-24 op 	const char	*meta;
179 abc007d2 2021-02-08 op 	int		 fd, pfd;
180 abc007d2 2021-02-08 op 	DIR		*dir;
181 9356f61a 2021-02-12 op 	char		 sbuf[1024];
182 27b2fa9a 2021-02-12 op 	ssize_t		 len, off;
183 709d6e5e 2021-01-10 op 	struct sockaddr_storage	 addr;
184 f7b816dc 2021-01-15 op 	struct vhost	*host;	/* host she's talking to */
185 488f059a 2020-12-24 op };
186 488f059a 2020-12-24 op 
187 488f059a 2020-12-24 op enum {
188 488f059a 2020-12-24 op 	FILE_EXISTS,
189 488f059a 2020-12-24 op 	FILE_EXECUTABLE,
190 488f059a 2020-12-24 op 	FILE_DIRECTORY,
191 488f059a 2020-12-24 op 	FILE_MISSING,
192 488f059a 2020-12-24 op };
193 488f059a 2020-12-24 op 
194 33d32d1f 2020-12-25 op /* gmid.c */
195 4a28dd01 2020-12-28 op void		 sig_handler(int);
196 8443bff7 2021-01-25 op void		 mkdirs(const char*);
197 8443bff7 2021-01-25 op char		*data_dir(void);
198 8443bff7 2021-01-25 op void		 load_local_cert(const char*, const char*);
199 ae08ec7d 2021-01-25 op void		 load_vhosts(void);
200 33ac26a0 2021-01-21 op int		 make_socket(int, int);
201 ae08ec7d 2021-01-25 op void		 setup_tls(void);
202 c8b74339 2021-01-24 op void		 init_config(void);
203 ca21e100 2021-02-04 op void		 free_config(void);
204 ae08ec7d 2021-01-25 op void		 drop_priv(void);
205 488f059a 2020-12-24 op 
206 f7b816dc 2021-01-15 op /* provided by lex/yacc */
207 15902770 2021-01-15 op extern FILE *yyin;
208 15902770 2021-01-15 op extern int yylineno;
209 15902770 2021-01-15 op extern int yyparse(void);
210 15902770 2021-01-15 op extern int yylex(void);
211 15902770 2021-01-15 op 
212 6abda252 2021-02-06 op void		 yyerror(const char*, ...);
213 13ed2fb6 2021-01-27 op int		 parse_portno(const char*);
214 13ed2fb6 2021-01-27 op void		 parse_conf(const char*);
215 13ed2fb6 2021-01-27 op 
216 3abf91b0 2021-02-07 op /* log.c */
217 3abf91b0 2021-02-07 op void		 fatal(const char*, ...)
218 3abf91b0 2021-02-07 op 	__attribute__((format (printf, 1, 2)))
219 3abf91b0 2021-02-07 op 	__attribute__((__noreturn__));
220 3abf91b0 2021-02-07 op 
221 3abf91b0 2021-02-07 op #define LOG_ATTR_FMT __attribute__((format (printf, 2, 3)))
222 3abf91b0 2021-02-07 op void		 log_err(struct client*, const char*, ...)	LOG_ATTR_FMT;
223 3abf91b0 2021-02-07 op void		 log_warn(struct client*, const char*, ...)	LOG_ATTR_FMT;
224 3abf91b0 2021-02-07 op void		 log_notice(struct client*, const char*, ...)	LOG_ATTR_FMT;
225 3abf91b0 2021-02-07 op void		 log_info(struct client*, const char*, ...)	LOG_ATTR_FMT;
226 3abf91b0 2021-02-07 op void		 log_debug(struct client*, const char*, ...)	LOG_ATTR_FMT;
227 3abf91b0 2021-02-07 op void		 log_request(struct client*, char*, size_t);
228 376a5407 2021-02-23 op int		 logger_main(int, struct imsgbuf*);
229 3abf91b0 2021-02-07 op 
230 0fbe79b3 2021-01-18 op /* mime.c */
231 b2a6b613 2021-01-21 op void		 init_mime(struct mime*);
232 b2a6b613 2021-01-21 op void		 add_mime(struct mime*, const char*, const char*);
233 b2a6b613 2021-01-21 op void		 load_default_mime(struct mime*);
234 6119e13e 2021-01-19 op const char	*mime(struct vhost*, const char*);
235 0fbe79b3 2021-01-18 op 
236 d3a08f4d 2021-01-17 op /* server.c */
237 c8b74339 2021-01-24 op const char	*vhost_lang(struct vhost*, const char*);
238 c8b74339 2021-01-24 op const char	*vhost_default_mime(struct vhost*, const char*);
239 c8b74339 2021-01-24 op const char	*vhost_index(struct vhost*, const char*);
240 252908e6 2021-01-24 op int		 vhost_auto_index(struct vhost*, const char*);
241 6abda252 2021-02-06 op int		 vhost_block_return(struct vhost*, const char*, int*, const char**);
242 6abda252 2021-02-06 op int		 vhost_strip(struct vhost*, const char*);
243 02be96c6 2021-02-09 op X509_STORE	*vhost_require_ca(struct vhost*, const char*);
244 793835cb 2021-02-23 op int		 vhost_disable_log(struct vhost*, const char*);
245 9b8f5ed2 2021-02-03 op void		 mark_nonblock(int);
246 d3a08f4d 2021-01-17 op void		 loop(struct tls*, int, int);
247 d3a08f4d 2021-01-17 op 
248 881a9dd9 2021-01-16 op /* ex.c */
249 881a9dd9 2021-01-16 op int		 send_string(int, const char*);
250 881a9dd9 2021-01-16 op int		 recv_string(int, char**);
251 2fafa2d2 2021-02-01 op int		 send_iri(int, struct iri*);
252 2fafa2d2 2021-02-01 op int		 recv_iri(int, struct iri*);
253 2fafa2d2 2021-02-01 op void		 free_recvd_iri(struct iri*);
254 881a9dd9 2021-01-16 op int		 send_vhost(int, struct vhost*);
255 881a9dd9 2021-01-16 op int		 recv_vhost(int, struct vhost**);
256 b63e30ff 2021-02-07 op int		 send_time(int, time_t);
257 b63e30ff 2021-02-07 op int		 recv_time(int, time_t*);
258 881a9dd9 2021-01-16 op int		 send_fd(int, int);
259 881a9dd9 2021-01-16 op int		 recv_fd(int);
260 4e2e2ab1 2021-02-03 op int		 executor_main(void);
261 881a9dd9 2021-01-16 op 
262 dafb57b8 2021-01-15 op /* sandbox.c */
263 33ac26a0 2021-01-21 op void		 sandbox(void);
264 dafb57b8 2021-01-15 op 
265 ef04b551 2021-01-09 op /* utf8.c */
266 ef04b551 2021-01-09 op int		 valid_multibyte_utf8(struct parser*);
267 3300cbe0 2021-01-27 op char		*utf8_nth(char*, size_t);
268 ef04b551 2021-01-09 op 
269 3c1cf9d0 2021-01-11 op /* iri.c */
270 3c1cf9d0 2021-01-11 op int		 parse_iri(char*, struct iri*, const char**);
271 c4f682f8 2021-01-27 op int		 trim_req_iri(char*, const char **);
272 2fafa2d2 2021-02-01 op int		 serialize_iri(struct iri*, char*, size_t);
273 9f006a21 2021-02-07 op char		*pct_decode_str(char *);
274 33d32d1f 2020-12-25 op 
275 3300cbe0 2021-01-27 op /* puny.c */
276 a2fd8013 2021-01-29 op int		 puny_decode(const char*, char*, size_t, const char**);
277 3300cbe0 2021-01-27 op 
278 44ee1bac 2021-01-27 op /* utils.c */
279 ca21e100 2021-02-04 op void		 block_signals(void);
280 ca21e100 2021-02-04 op void		 unblock_signals(void);
281 44ee1bac 2021-01-27 op int		 starts_with(const char*, const char*);
282 44ee1bac 2021-01-27 op int		 ends_with(const char*, const char*);
283 44ee1bac 2021-01-27 op ssize_t		 filesize(int);
284 2fafa2d2 2021-02-01 op char		*absolutify_path(const char*);
285 ca21e100 2021-02-04 op char		*xstrdup(const char*);
286 3abf91b0 2021-02-07 op void		 gen_certificate(const char*, const char*, const char*);
287 02be96c6 2021-02-09 op X509_STORE	*load_ca(const char*);
288 02be96c6 2021-02-09 op int		 validate_against_ca(X509_STORE*, const uint8_t*, size_t);
289 44ee1bac 2021-01-27 op 
290 488f059a 2020-12-24 op #endif