Blame

Date:
Message:
fix various compilation errors Include gmid.h as first header in every file, as it then includes config.h (that defines _GNU_SOURCE for instance). Fix also a warning about unsigned vs signed const char pointers in openssl.
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 3300cbe0 2021-01-27 op 

 59 c8b74339 2021-01-24 op struct location {

 60 fe5967cd 2021-01-27 op 	const char	*match;

 61 fe5967cd 2021-01-27 op 	const char	*lang;

 62 fe5967cd 2021-01-27 op 	const char	*default_mime;

 63 fe5967cd 2021-01-27 op 	const char	*index;

 64 252908e6 2021-01-24 op 	int		 auto_index; /* 0 auto, -1 off, 1 on */

 65 6abda252 2021-02-06 op 	int		 block_code;

 66 6abda252 2021-02-06 op 	const char	*block_fmt;

 67 6abda252 2021-02-06 op 	int		 strip;

 68 02be96c6 2021-02-09 op 	X509_STORE	*reqca;

 69 c8b74339 2021-01-24 op };

 70 c8b74339 2021-01-24 op 

 71 15902770 2021-01-15 op struct vhost {

 72 15902770 2021-01-15 op 	const char	*domain;

 73 15902770 2021-01-15 op 	const char	*cert;

 74 15902770 2021-01-15 op 	const char	*key;

 75 15902770 2021-01-15 op 	const char	*dir;

 76 15902770 2021-01-15 op 	const char	*cgi;

 77 e3ddf390 2021-02-06 op 	const char	*entrypoint;

 78 15902770 2021-01-15 op 	int		 dirfd;

 79 6016a593 2021-01-30 op 

 80 6016a593 2021-01-30 op 	/* the first location rule is always '*' and holds the default

 81 6016a593 2021-01-30 op 	 * settings for the vhost, from locations[1] onwards there are

 82 6016a593 2021-01-30 op 	 * the "real" location rules specified in the configuration. */

 83 c8b74339 2021-01-24 op 	struct location	 locations[LOCLEN];

 84 15902770 2021-01-15 op };

 85 15902770 2021-01-15 op 

 86 15902770 2021-01-15 op extern struct vhost hosts[HOSTSLEN];

 87 15902770 2021-01-15 op 

 88 a010b0dd 2021-01-18 op struct etm {			/* extension to mime */

 89 a010b0dd 2021-01-18 op 	const char	*mime;

 90 a010b0dd 2021-01-18 op 	const char	*ext;

 91 a010b0dd 2021-01-18 op };

 92 a010b0dd 2021-01-18 op 

 93 b2a6b613 2021-01-21 op struct mime {

 94 a010b0dd 2021-01-18 op 	struct etm	*t;

 95 a010b0dd 2021-01-18 op 	size_t		len;

 96 a010b0dd 2021-01-18 op 	size_t		cap;

 97 a010b0dd 2021-01-18 op };

 98 a010b0dd 2021-01-18 op 

 99 15902770 2021-01-15 op struct conf {

100 3abf91b0 2021-02-07 op 	/* from command line */

101 3abf91b0 2021-02-07 op 	int		 foreground;

102 3abf91b0 2021-02-07 op 	int		 verbose;

103 3abf91b0 2021-02-07 op 

104 3abf91b0 2021-02-07 op 	/* in the config */

105 ae08ec7d 2021-01-25 op 	int		 port;

106 ae08ec7d 2021-01-25 op 	int		 ipv6;

107 ae08ec7d 2021-01-25 op 	uint32_t	 protos;

108 ae08ec7d 2021-01-25 op 	struct mime	 mime;

109 ae08ec7d 2021-01-25 op 	char		*chroot;

110 ae08ec7d 2021-01-25 op 	char		*user;

111 a709ddf5 2021-02-07 op 	int		 prefork;

112 15902770 2021-01-15 op };

113 15902770 2021-01-15 op 

114 d090dc84 2021-02-08 op extern const char *config_path;

115 15902770 2021-01-15 op extern struct conf conf;

116 881a9dd9 2021-01-16 op extern int exfd;

117 15902770 2021-01-15 op 

118 ca21e100 2021-02-04 op extern volatile sig_atomic_t hupped;

119 ca21e100 2021-02-04 op 

120 0be51733 2021-01-20 op struct iri {

121 0be51733 2021-01-20 op 	char		*schema;

122 0be51733 2021-01-20 op 	char		*host;

123 0be51733 2021-01-20 op 	char		*port;

124 0be51733 2021-01-20 op 	uint16_t	 port_no;

125 0be51733 2021-01-20 op 	char		*path;

126 0be51733 2021-01-20 op 	char		*query;

127 0be51733 2021-01-20 op 	char		*fragment;

128 0be51733 2021-01-20 op };

129 0be51733 2021-01-20 op 

130 0be51733 2021-01-20 op struct parser {

131 0be51733 2021-01-20 op 	char		*iri;

132 0be51733 2021-01-20 op 	struct iri	*parsed;

133 0be51733 2021-01-20 op 	const char	*err;

134 0be51733 2021-01-20 op };

135 0be51733 2021-01-20 op 

136 112802ea 2021-02-01 op struct client;

137 488f059a 2020-12-24 op 

138 abc007d2 2021-02-08 op typedef void (*statefn)(int, short, void*);

139 112802ea 2021-02-01 op 

140 92da8285 2021-02-01 op /*

141 92da8285 2021-02-01 op  * DFA: handle_handshake is the initial state, close_conn the final.

142 5f715ce4 2021-02-02 op  * Sometimes we have an enter_* function to handle the state switch.

143 92da8285 2021-02-01 op  *

144 92da8285 2021-02-01 op  * handle_handshake -> handle_open_conn

145 92da8285 2021-02-01 op  * handle_handshake -> close_conn		// on err

146 92da8285 2021-02-01 op  *

147 35744950 2021-02-01 op  * handle_open_conn -> handle_cgi_reply		// via open_file/dir/...

148 5f715ce4 2021-02-02 op  * handle_open_conn -> handle_dirlist		// ...same

149 92da8285 2021-02-01 op  * handle_open_conn -> send_file		// ...same

150 35744950 2021-02-01 op  * handle_open_conn -> start_reply		// on error

151 92da8285 2021-02-01 op  *

152 35744950 2021-02-01 op  * handle_cgi_reply -> handle_cgi	// after logging the CGI reply

153 35744950 2021-02-01 op  * handle_cgi_reply -> start_reply	// on error

154 35744950 2021-02-01 op  *

155 92da8285 2021-02-01 op  * handle_cgi -> close_conn

156 5f715ce4 2021-02-02 op  *

157 5f715ce4 2021-02-02 op  * handle_dirlist -> send_directory_listing

158 5f715ce4 2021-02-02 op  * handle_dirlist -> close_conn			// on error

159 92da8285 2021-02-01 op  *

160 92da8285 2021-02-01 op  * send_directory_listing -> close_conn

161 92da8285 2021-02-01 op  *

162 92da8285 2021-02-01 op  * send_file -> close_conn

163 92da8285 2021-02-01 op  */

164 488f059a 2020-12-24 op struct client {

165 488f059a 2020-12-24 op 	struct tls	*ctx;

166 0be51733 2021-01-20 op 	char		 req[GEMINI_URL_LEN];

167 0be51733 2021-01-20 op 	struct iri	 iri;

168 3300cbe0 2021-01-27 op 	char		 domain[DOMAIN_NAME_LEN];

169 abc007d2 2021-02-08 op 	statefn		 next;

170 488f059a 2020-12-24 op 	int		 code;

171 488f059a 2020-12-24 op 	const char	*meta;

172 abc007d2 2021-02-08 op 	int		 fd, pfd;

173 abc007d2 2021-02-08 op 	DIR		*dir;

174 9356f61a 2021-02-12 op 	char		 sbuf[1024];

175 27b2fa9a 2021-02-12 op 	ssize_t		 len, off;

176 709d6e5e 2021-01-10 op 	struct sockaddr_storage	 addr;

177 f7b816dc 2021-01-15 op 	struct vhost	*host;	/* host she's talking to */

178 488f059a 2020-12-24 op };

179 488f059a 2020-12-24 op 

180 488f059a 2020-12-24 op enum {

181 488f059a 2020-12-24 op 	FILE_EXISTS,

182 488f059a 2020-12-24 op 	FILE_EXECUTABLE,

183 488f059a 2020-12-24 op 	FILE_DIRECTORY,

184 488f059a 2020-12-24 op 	FILE_MISSING,

185 488f059a 2020-12-24 op };

186 488f059a 2020-12-24 op 

187 33d32d1f 2020-12-25 op /* gmid.c */

188 4a28dd01 2020-12-28 op void		 sig_handler(int);

189 8443bff7 2021-01-25 op void		 mkdirs(const char*);

190 8443bff7 2021-01-25 op char		*data_dir(void);

191 8443bff7 2021-01-25 op void		 load_local_cert(const char*, const char*);

192 ae08ec7d 2021-01-25 op void		 load_vhosts(void);

193 33ac26a0 2021-01-21 op int		 make_socket(int, int);

194 ae08ec7d 2021-01-25 op void		 setup_tls(void);

195 c8b74339 2021-01-24 op void		 init_config(void);

196 ca21e100 2021-02-04 op void		 free_config(void);

197 ae08ec7d 2021-01-25 op void		 drop_priv(void);

198 488f059a 2020-12-24 op 

199 f7b816dc 2021-01-15 op /* provided by lex/yacc */

200 15902770 2021-01-15 op extern FILE *yyin;

201 15902770 2021-01-15 op extern int yylineno;

202 15902770 2021-01-15 op extern int yyparse(void);

203 15902770 2021-01-15 op extern int yylex(void);

204 15902770 2021-01-15 op 

205 6abda252 2021-02-06 op void		 yyerror(const char*, ...);

206 13ed2fb6 2021-01-27 op int		 parse_portno(const char*);

207 13ed2fb6 2021-01-27 op void		 parse_conf(const char*);

208 13ed2fb6 2021-01-27 op 

209 3abf91b0 2021-02-07 op /* log.c */

210 3abf91b0 2021-02-07 op void		 fatal(const char*, ...)

211 3abf91b0 2021-02-07 op 	__attribute__((format (printf, 1, 2)))

212 3abf91b0 2021-02-07 op 	__attribute__((__noreturn__));

213 3abf91b0 2021-02-07 op 

214 3abf91b0 2021-02-07 op #define LOG_ATTR_FMT __attribute__((format (printf, 2, 3)))

215 3abf91b0 2021-02-07 op void		 log_err(struct client*, const char*, ...)	LOG_ATTR_FMT;

216 3abf91b0 2021-02-07 op void		 log_warn(struct client*, const char*, ...)	LOG_ATTR_FMT;

217 3abf91b0 2021-02-07 op void		 log_notice(struct client*, const char*, ...)	LOG_ATTR_FMT;

218 3abf91b0 2021-02-07 op void		 log_info(struct client*, const char*, ...)	LOG_ATTR_FMT;

219 3abf91b0 2021-02-07 op void		 log_debug(struct client*, const char*, ...)	LOG_ATTR_FMT;

220 3abf91b0 2021-02-07 op void		 log_request(struct client*, char*, size_t);

221 3abf91b0 2021-02-07 op 

222 0fbe79b3 2021-01-18 op /* mime.c */

223 b2a6b613 2021-01-21 op void		 init_mime(struct mime*);

224 b2a6b613 2021-01-21 op void		 add_mime(struct mime*, const char*, const char*);

225 b2a6b613 2021-01-21 op void		 load_default_mime(struct mime*);

226 6119e13e 2021-01-19 op const char	*mime(struct vhost*, const char*);

227 0fbe79b3 2021-01-18 op 

228 d3a08f4d 2021-01-17 op /* server.c */

229 c8b74339 2021-01-24 op const char	*vhost_lang(struct vhost*, const char*);

230 c8b74339 2021-01-24 op const char	*vhost_default_mime(struct vhost*, const char*);

231 c8b74339 2021-01-24 op const char	*vhost_index(struct vhost*, const char*);

232 252908e6 2021-01-24 op int		 vhost_auto_index(struct vhost*, const char*);

233 6abda252 2021-02-06 op int		 vhost_block_return(struct vhost*, const char*, int*, const char**);

234 6abda252 2021-02-06 op int		 vhost_strip(struct vhost*, const char*);

235 02be96c6 2021-02-09 op X509_STORE	*vhost_require_ca(struct vhost*, const char*);

236 9b8f5ed2 2021-02-03 op void		 mark_nonblock(int);

237 d3a08f4d 2021-01-17 op void		 loop(struct tls*, int, int);

238 d3a08f4d 2021-01-17 op 

239 881a9dd9 2021-01-16 op /* ex.c */

240 881a9dd9 2021-01-16 op int		 send_string(int, const char*);

241 881a9dd9 2021-01-16 op int		 recv_string(int, char**);

242 2fafa2d2 2021-02-01 op int		 send_iri(int, struct iri*);

243 2fafa2d2 2021-02-01 op int		 recv_iri(int, struct iri*);

244 2fafa2d2 2021-02-01 op void		 free_recvd_iri(struct iri*);

245 881a9dd9 2021-01-16 op int		 send_vhost(int, struct vhost*);

246 881a9dd9 2021-01-16 op int		 recv_vhost(int, struct vhost**);

247 b63e30ff 2021-02-07 op int		 send_time(int, time_t);

248 b63e30ff 2021-02-07 op int		 recv_time(int, time_t*);

249 881a9dd9 2021-01-16 op int		 send_fd(int, int);

250 881a9dd9 2021-01-16 op int		 recv_fd(int);

251 4e2e2ab1 2021-02-03 op int		 executor_main(void);

252 881a9dd9 2021-01-16 op 

253 dafb57b8 2021-01-15 op /* sandbox.c */

254 33ac26a0 2021-01-21 op void		 sandbox(void);

255 dafb57b8 2021-01-15 op 

256 ef04b551 2021-01-09 op /* utf8.c */

257 ef04b551 2021-01-09 op int		 valid_multibyte_utf8(struct parser*);

258 3300cbe0 2021-01-27 op char		*utf8_nth(char*, size_t);

259 ef04b551 2021-01-09 op 

260 3c1cf9d0 2021-01-11 op /* iri.c */

261 3c1cf9d0 2021-01-11 op int		 parse_iri(char*, struct iri*, const char**);

262 c4f682f8 2021-01-27 op int		 trim_req_iri(char*, const char **);

263 2fafa2d2 2021-02-01 op int		 serialize_iri(struct iri*, char*, size_t);

264 9f006a21 2021-02-07 op char		*pct_decode_str(char *);

265 33d32d1f 2020-12-25 op 

266 3300cbe0 2021-01-27 op /* puny.c */

267 a2fd8013 2021-01-29 op int		 puny_decode(const char*, char*, size_t, const char**);

268 3300cbe0 2021-01-27 op 

269 44ee1bac 2021-01-27 op /* utils.c */

270 ca21e100 2021-02-04 op void		 block_signals(void);

271 ca21e100 2021-02-04 op void		 unblock_signals(void);

272 44ee1bac 2021-01-27 op int		 starts_with(const char*, const char*);

273 44ee1bac 2021-01-27 op int		 ends_with(const char*, const char*);

274 44ee1bac 2021-01-27 op ssize_t		 filesize(int);

275 2fafa2d2 2021-02-01 op char		*absolutify_path(const char*);

276 ca21e100 2021-02-04 op char		*xstrdup(const char*);

277 3abf91b0 2021-02-07 op void		 gen_certificate(const char*, const char*, const char*);

278 02be96c6 2021-02-09 op X509_STORE	*load_ca(const char*);

279 02be96c6 2021-02-09 op int		 validate_against_ca(X509_STORE*, const uint8_t*, size_t);

280 44ee1bac 2021-01-27 op 

281 488f059a 2020-12-24 op #endif