op public repos

Blame

Date:: Tue Feb 23 12:43:33 2021 UTC
Message:: move vhost_should_log call to server.c log.o is linked to some regress/ stuff. Calling from there a vhost_* function means that we should link the regress/stuff to server.o too (and that would pull in other stuff...). Moving the call is easier, and also probably better.
Actions:: History | Blob | Raw File
  1 7e9b7812 2021-02-07 op /*
  2 7e9b7812 2021-02-07 op  * Copyright (c) 2021 Omar Polo <op@omarpolo.com>
  3 7e9b7812 2021-02-07 op  *
  4 7e9b7812 2021-02-07 op  * Permission to use, copy, modify, and distribute this software for any
  5 7e9b7812 2021-02-07 op  * purpose with or without fee is hereby granted, provided that the above
  6 7e9b7812 2021-02-07 op  * copyright notice and this permission notice appear in all copies.
  7 7e9b7812 2021-02-07 op  *
  8 7e9b7812 2021-02-07 op  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  9 7e9b7812 2021-02-07 op  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 10 7e9b7812 2021-02-07 op  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 11 7e9b7812 2021-02-07 op  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 12 7e9b7812 2021-02-07 op  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 13 7e9b7812 2021-02-07 op  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 14 7e9b7812 2021-02-07 op  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 15 7e9b7812 2021-02-07 op  */
 16 7e9b7812 2021-02-07 op 
 17 52418c8d 2021-02-12 op #include "gmid.h"
 18 52418c8d 2021-02-12 op 
 19 d278a0c3 2021-02-23 op #include <sys/types.h>
 20 d278a0c3 2021-02-23 op #include <sys/uio.h>
 21 d278a0c3 2021-02-23 op 
 22 7e9b7812 2021-02-07 op #include <errno.h>
 23 d278a0c3 2021-02-23 op #include <event.h>
 24 d278a0c3 2021-02-23 op #include <imsg.h>
 25 7e9b7812 2021-02-07 op #include <netdb.h>
 26 7e9b7812 2021-02-07 op #include <stdarg.h>
 27 7e9b7812 2021-02-07 op #include <stdio.h>
 28 7e9b7812 2021-02-07 op #include <string.h>
 29 7e9b7812 2021-02-07 op #include <syslog.h>
 30 7e9b7812 2021-02-07 op 
 31 6b191ed5 2021-02-23 op static struct imsgbuf parent_ibuf, child_ibuf;
 32 6b191ed5 2021-02-23 op static struct event inlog;
 33 6b191ed5 2021-02-23 op static int logfd;
 34 d278a0c3 2021-02-23 op 
 35 d278a0c3 2021-02-23 op static void handle_log(int, short, void*);
 36 d278a0c3 2021-02-23 op static int logger_main(int, struct imsgbuf*);
 37 d278a0c3 2021-02-23 op 
 38 7e9b7812 2021-02-07 op void
 39 7e9b7812 2021-02-07 op fatal(const char *fmt, ...)
 40 7e9b7812 2021-02-07 op {
 41 7e9b7812 2021-02-07 op 	va_list ap;
 42 7e9b7812 2021-02-07 op 
 43 7e9b7812 2021-02-07 op 	va_start(ap, fmt);
 44 7e9b7812 2021-02-07 op 
 45 7e9b7812 2021-02-07 op 	if (conf.foreground) {
 46 7e9b7812 2021-02-07 op 		vfprintf(stderr, fmt, ap);
 47 7e9b7812 2021-02-07 op 		fprintf(stderr, "\n");
 48 7e9b7812 2021-02-07 op 	} else
 49 7e9b7812 2021-02-07 op 		vsyslog(LOG_DAEMON | LOG_CRIT, fmt, ap);
 50 7e9b7812 2021-02-07 op 
 51 7e9b7812 2021-02-07 op 	va_end(ap);
 52 7e9b7812 2021-02-07 op 	exit(1);
 53 7e9b7812 2021-02-07 op }
 54 7e9b7812 2021-02-07 op 
 55 7e9b7812 2021-02-07 op static inline int
 56 7e9b7812 2021-02-07 op should_log(int priority)
 57 7e9b7812 2021-02-07 op {
 58 7e9b7812 2021-02-07 op 	switch (priority) {
 59 7e9b7812 2021-02-07 op 	case LOG_ERR:
 60 7e9b7812 2021-02-07 op 		return 1;
 61 7e9b7812 2021-02-07 op 	case LOG_WARNING:
 62 7e9b7812 2021-02-07 op 		return 1;
 63 7e9b7812 2021-02-07 op 	case LOG_NOTICE:
 64 7e9b7812 2021-02-07 op 		return conf.verbose >= 1;
 65 7e9b7812 2021-02-07 op 	case LOG_INFO:
 66 7e9b7812 2021-02-07 op 		return conf.verbose >= 2;
 67 7e9b7812 2021-02-07 op 	case LOG_DEBUG:
 68 7e9b7812 2021-02-07 op 		return conf.verbose >= 3;
 69 7e9b7812 2021-02-07 op 	default:
 70 7e9b7812 2021-02-07 op 		return 0;
 71 7e9b7812 2021-02-07 op 	}
 72 7e9b7812 2021-02-07 op }
 73 7e9b7812 2021-02-07 op 
 74 d278a0c3 2021-02-23 op static inline void
 75 d278a0c3 2021-02-23 op send_log(const char *msg, size_t len)
 76 d278a0c3 2021-02-23 op {
 77 d278a0c3 2021-02-23 op 	imsg_compose(&parent_ibuf, 0, 0, 0, -1, msg, len);
 78 d278a0c3 2021-02-23 op 	/* XXX: use event_once() */
 79 d278a0c3 2021-02-23 op 	imsg_flush(&parent_ibuf);
 80 d278a0c3 2021-02-23 op }
 81 d278a0c3 2021-02-23 op 
 82 d278a0c3 2021-02-23 op static inline void
 83 d278a0c3 2021-02-23 op vlog(int priority, struct client *c,
 84 7e9b7812 2021-02-07 op     const char *fmt, va_list ap)
 85 7e9b7812 2021-02-07 op {
 86 7e9b7812 2021-02-07 op 	char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];
 87 7e9b7812 2021-02-07 op 	char *fmted, *s;
 88 7e9b7812 2021-02-07 op 	size_t len;
 89 7e9b7812 2021-02-07 op 	int ec;
 90 7e9b7812 2021-02-07 op 
 91 7e9b7812 2021-02-07 op 	if (!should_log(priority))
 92 7e9b7812 2021-02-07 op 		return;
 93 7e9b7812 2021-02-07 op 
 94 d278a0c3 2021-02-23 op 	if (c != NULL) {
 95 7e9b7812 2021-02-07 op 		len = sizeof(c->addr);
 96 7e9b7812 2021-02-07 op 		ec = getnameinfo((struct sockaddr*)&c->addr, len,
 97 7e9b7812 2021-02-07 op 		    hbuf, sizeof(hbuf),
 98 7e9b7812 2021-02-07 op 		    sbuf, sizeof(sbuf),
 99 7e9b7812 2021-02-07 op 		    NI_NUMERICHOST | NI_NUMERICSERV);
100 7e9b7812 2021-02-07 op 		if (ec != 0)
101 7e9b7812 2021-02-07 op 			fatal("getnameinfo: %s", gai_strerror(ec));
102 7e9b7812 2021-02-07 op 	}
103 7e9b7812 2021-02-07 op 
104 7e9b7812 2021-02-07 op 	if (vasprintf(&fmted, fmt, ap) == -1)
105 7e9b7812 2021-02-07 op 		fatal("vasprintf: %s", strerror(errno));
106 7e9b7812 2021-02-07 op 
107 d278a0c3 2021-02-23 op         if (c == NULL)
108 d278a0c3 2021-02-23 op 		ec = asprintf(&s, "internal: %s", fmted);
109 d278a0c3 2021-02-23 op 	else
110 d278a0c3 2021-02-23 op 		ec = asprintf(&s, "%s:%s %s", hbuf, sbuf, fmted);
111 7e9b7812 2021-02-07 op 
112 d278a0c3 2021-02-23 op 	if (ec < 0)
113 d278a0c3 2021-02-23 op 		fatal("asprintf: %s", strerror(errno));
114 d278a0c3 2021-02-23 op 
115 d278a0c3 2021-02-23 op 	send_log(s, ec+1);
116 d278a0c3 2021-02-23 op 
117 7e9b7812 2021-02-07 op 	free(fmted);
118 d278a0c3 2021-02-23 op 	free(s);
119 7e9b7812 2021-02-07 op }
120 7e9b7812 2021-02-07 op 
121 7e9b7812 2021-02-07 op void
122 7e9b7812 2021-02-07 op log_err(struct client *c, const char *fmt, ...)
123 7e9b7812 2021-02-07 op {
124 7e9b7812 2021-02-07 op 	va_list ap;
125 7e9b7812 2021-02-07 op 
126 7e9b7812 2021-02-07 op 	va_start(ap, fmt);
127 d278a0c3 2021-02-23 op 	vlog(LOG_ERR, c, fmt, ap);
128 7e9b7812 2021-02-07 op 	va_end(ap);
129 7e9b7812 2021-02-07 op }
130 7e9b7812 2021-02-07 op 
131 7e9b7812 2021-02-07 op void
132 7e9b7812 2021-02-07 op log_warn(struct client *c, const char *fmt, ...)
133 7e9b7812 2021-02-07 op {
134 7e9b7812 2021-02-07 op 	va_list ap;
135 7e9b7812 2021-02-07 op 
136 7e9b7812 2021-02-07 op 	va_start(ap, fmt);
137 d278a0c3 2021-02-23 op 	vlog(LOG_WARNING, c, fmt, ap);
138 7e9b7812 2021-02-07 op 	va_end(ap);
139 7e9b7812 2021-02-07 op }
140 7e9b7812 2021-02-07 op 
141 7e9b7812 2021-02-07 op void
142 7e9b7812 2021-02-07 op log_notice(struct client *c, const char *fmt, ...)
143 7e9b7812 2021-02-07 op {
144 7e9b7812 2021-02-07 op 	va_list ap;
145 7e9b7812 2021-02-07 op 
146 7e9b7812 2021-02-07 op 	va_start(ap, fmt);
147 d278a0c3 2021-02-23 op 	vlog(LOG_NOTICE, c, fmt, ap);
148 7e9b7812 2021-02-07 op 	va_end(ap);
149 7e9b7812 2021-02-07 op }
150 7e9b7812 2021-02-07 op 
151 7e9b7812 2021-02-07 op void
152 7e9b7812 2021-02-07 op log_info(struct client *c, const char *fmt, ...)
153 7e9b7812 2021-02-07 op {
154 7e9b7812 2021-02-07 op 	va_list ap;
155 7e9b7812 2021-02-07 op 
156 7e9b7812 2021-02-07 op 	va_start(ap, fmt);
157 d278a0c3 2021-02-23 op 	vlog(LOG_INFO, c, fmt, ap);
158 7e9b7812 2021-02-07 op 	va_end(ap);
159 7e9b7812 2021-02-07 op }
160 7e9b7812 2021-02-07 op 
161 7e9b7812 2021-02-07 op void
162 7e9b7812 2021-02-07 op log_debug(struct client *c, const char *fmt, ...)
163 7e9b7812 2021-02-07 op {
164 7e9b7812 2021-02-07 op 	va_list ap;
165 7e9b7812 2021-02-07 op 
166 7e9b7812 2021-02-07 op 	va_start(ap, fmt);
167 d278a0c3 2021-02-23 op 	vlog(LOG_DEBUG, c, fmt, ap);
168 7e9b7812 2021-02-07 op 	va_end(ap);
169 7e9b7812 2021-02-07 op }
170 7e9b7812 2021-02-07 op 
171 7e9b7812 2021-02-07 op /* strchr, but with a bound */
172 7e9b7812 2021-02-07 op static char *
173 7e9b7812 2021-02-07 op gmid_strnchr(char *s, int c, size_t len)
174 7e9b7812 2021-02-07 op {
175 7e9b7812 2021-02-07 op 	size_t i;
176 7e9b7812 2021-02-07 op 
177 7e9b7812 2021-02-07 op 	for (i = 0; i < len; ++i)
178 7e9b7812 2021-02-07 op 		if (s[i] == c)
179 7e9b7812 2021-02-07 op 			return &s[i];
180 7e9b7812 2021-02-07 op 	return NULL;
181 7e9b7812 2021-02-07 op }
182 7e9b7812 2021-02-07 op 
183 7e9b7812 2021-02-07 op void
184 7e9b7812 2021-02-07 op log_request(struct client *c, char *meta, size_t l)
185 7e9b7812 2021-02-07 op {
186 7e9b7812 2021-02-07 op 	char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV], b[GEMINI_URL_LEN];
187 d278a0c3 2021-02-23 op 	char *t, *fmted;
188 7e9b7812 2021-02-07 op 	size_t len;
189 7e9b7812 2021-02-07 op 	int ec;
190 7e9b7812 2021-02-07 op 
191 7e9b7812 2021-02-07 op 	len = sizeof(c->addr);
192 7e9b7812 2021-02-07 op 	ec = getnameinfo((struct sockaddr*)&c->addr, len,
193 7e9b7812 2021-02-07 op 	    hbuf, sizeof(hbuf),
194 7e9b7812 2021-02-07 op 	    sbuf, sizeof(sbuf),
195 7e9b7812 2021-02-07 op 	    NI_NUMERICHOST | NI_NUMERICSERV);
196 7e9b7812 2021-02-07 op 	if (ec != 0)
197 7e9b7812 2021-02-07 op 		fatal("getnameinfo: %s", gai_strerror(ec));
198 7e9b7812 2021-02-07 op 
199 7e9b7812 2021-02-07 op 	if (c->iri.schema != NULL) {
200 7e9b7812 2021-02-07 op 		/* serialize the IRI */
201 7e9b7812 2021-02-07 op 		strlcpy(b, c->iri.schema, sizeof(b));
202 7e9b7812 2021-02-07 op 		strlcat(b, "://", sizeof(b));
203 7e9b7812 2021-02-07 op 
204 7e9b7812 2021-02-07 op 		/* log the decoded host name, but if it was invalid
205 7e9b7812 2021-02-07 op 		 * use the raw one. */
206 7e9b7812 2021-02-07 op 		if (*c->domain != '\0')
207 7e9b7812 2021-02-07 op 			strlcat(b, c->domain, sizeof(b));
208 7e9b7812 2021-02-07 op 		else
209 7e9b7812 2021-02-07 op 			strlcat(b, c->iri.host, sizeof(b));
210 7e9b7812 2021-02-07 op 
211 7e9b7812 2021-02-07 op 		strlcat(b, "/", sizeof(b));
212 7e9b7812 2021-02-07 op 		strlcat(b, c->iri.path, sizeof(b)); /* TODO: sanitize UTF8 */
213 7e9b7812 2021-02-07 op 		if (*c->iri.query != '\0') {	    /* TODO: sanitize UTF8 */
214 7e9b7812 2021-02-07 op 			strlcat(b, "?", sizeof(b));
215 7e9b7812 2021-02-07 op 			strlcat(b, c->iri.query, sizeof(b));
216 7e9b7812 2021-02-07 op 		}
217 7e9b7812 2021-02-07 op 	} else {
218 7e9b7812 2021-02-07 op 		strlcpy(b, c->req, sizeof(b));
219 7e9b7812 2021-02-07 op 	}
220 7e9b7812 2021-02-07 op 
221 7e9b7812 2021-02-07 op 	if ((t = gmid_strnchr(meta, '\r', l)) == NULL)
222 7e9b7812 2021-02-07 op 		t = meta + len;
223 7e9b7812 2021-02-07 op 
224 d278a0c3 2021-02-23 op 	ec = asprintf(&fmted, "%s:%s GET %s %.*s", hbuf, sbuf, b,
225 d278a0c3 2021-02-23 op 	    (int)(t-meta), meta);
226 d278a0c3 2021-02-23 op 	if (ec < 0)
227 d278a0c3 2021-02-23 op 		err(1, "asprintf");
228 d278a0c3 2021-02-23 op 	send_log(fmted, ec+1);
229 d278a0c3 2021-02-23 op 	free(fmted);
230 d278a0c3 2021-02-23 op }
231 d278a0c3 2021-02-23 op 
232 d278a0c3 2021-02-23 op 
233 d278a0c3 2021-02-23 op 
234 d278a0c3 2021-02-23 op static void
235 d278a0c3 2021-02-23 op handle_log(int fd, short ev, void *d)
236 d278a0c3 2021-02-23 op {
237 d278a0c3 2021-02-23 op 	struct imsgbuf	*ibuf = d;
238 d278a0c3 2021-02-23 op 	struct imsg	 imsg;
239 d278a0c3 2021-02-23 op 	ssize_t		 n, datalen;
240 d278a0c3 2021-02-23 op 	char		*msg;
241 d278a0c3 2021-02-23 op 
242 d278a0c3 2021-02-23 op 	if ((n = imsg_read(ibuf)) == -1) {
243 d278a0c3 2021-02-23 op 		if (errno == EAGAIN || errno == EWOULDBLOCK)
244 d278a0c3 2021-02-23 op 			return;
245 d278a0c3 2021-02-23 op                 err(1, "imsg_read");
246 d278a0c3 2021-02-23 op 	}
247 d278a0c3 2021-02-23 op 	if (n == 0)
248 d278a0c3 2021-02-23 op 		errx(1, "connection lost?");
249 d278a0c3 2021-02-23 op 
250 d278a0c3 2021-02-23 op 	for (;;) {
251 d278a0c3 2021-02-23 op 		if ((n = imsg_get(ibuf, &imsg)) == -1)
252 d278a0c3 2021-02-23 op 			err(1, "read error");
253 d278a0c3 2021-02-23 op 		if (n == 0)
254 d278a0c3 2021-02-23 op 			return;
255 d278a0c3 2021-02-23 op 
256 d278a0c3 2021-02-23 op 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
257 d278a0c3 2021-02-23 op 		msg = imsg.data;
258 d278a0c3 2021-02-23 op 		msg[datalen] = '\0';
259 d278a0c3 2021-02-23 op 
260 d278a0c3 2021-02-23 op 		/* ignore imsg.hdr.type for now */
261 d278a0c3 2021-02-23 op 		if (conf.foreground)
262 d278a0c3 2021-02-23 op 			fprintf(stderr, "%s\n", msg);
263 d278a0c3 2021-02-23 op 		else
264 d278a0c3 2021-02-23 op 			syslog(LOG_DAEMON, "%s", msg);
265 d278a0c3 2021-02-23 op 
266 d278a0c3 2021-02-23 op 		imsg_free(&imsg);
267 d278a0c3 2021-02-23 op 	}
268 7e9b7812 2021-02-07 op }
269 d278a0c3 2021-02-23 op 
270 d278a0c3 2021-02-23 op static int
271 d278a0c3 2021-02-23 op logger_main(int fd, struct imsgbuf *ibuf)
272 d278a0c3 2021-02-23 op {
273 d278a0c3 2021-02-23 op 	event_init();
274 d278a0c3 2021-02-23 op 
275 d278a0c3 2021-02-23 op 	event_set(&inlog, fd, EV_READ | EV_PERSIST, &handle_log, ibuf);
276 d278a0c3 2021-02-23 op 	event_add(&inlog, NULL);
277 d278a0c3 2021-02-23 op 
278 d278a0c3 2021-02-23 op #ifdef __OpenBSD__
279 d278a0c3 2021-02-23 op 	if (pledge("stdio", NULL) == -1)
280 d278a0c3 2021-02-23 op 		err(1, "pledge");
281 d278a0c3 2021-02-23 op #endif
282 d278a0c3 2021-02-23 op 
283 d278a0c3 2021-02-23 op 	event_dispatch();
284 d278a0c3 2021-02-23 op 
285 d278a0c3 2021-02-23 op 	return 0;
286 d278a0c3 2021-02-23 op }
287 d278a0c3 2021-02-23 op 
288 d278a0c3 2021-02-23 op void
289 d278a0c3 2021-02-23 op logger_init(void)
290 d278a0c3 2021-02-23 op {
291 d278a0c3 2021-02-23 op 	int p[2];
292 d278a0c3 2021-02-23 op 
293 d278a0c3 2021-02-23 op 	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, p) == -1)
294 d278a0c3 2021-02-23 op 		err(1, "socketpair");
295 d278a0c3 2021-02-23 op 
296 d278a0c3 2021-02-23 op 	switch (fork()) {
297 d278a0c3 2021-02-23 op 	case -1:
298 d278a0c3 2021-02-23 op 		err(1, "fork");
299 d278a0c3 2021-02-23 op 	case 0:
300 d278a0c3 2021-02-23 op 		logfd = p[1];
301 d278a0c3 2021-02-23 op 		close(p[0]);
302 d278a0c3 2021-02-23 op 		setproctitle("logger");
303 d278a0c3 2021-02-23 op 		imsg_init(&child_ibuf, p[1]);
304 d278a0c3 2021-02-23 op 		drop_priv();
305 d278a0c3 2021-02-23 op 		_exit(logger_main(p[1], &child_ibuf));
306 d278a0c3 2021-02-23 op 	default:
307 d278a0c3 2021-02-23 op 		logfd = p[0];
308 d278a0c3 2021-02-23 op 		close(p[1]);
309 d278a0c3 2021-02-23 op 		imsg_init(&parent_ibuf, p[0]);
310 d278a0c3 2021-02-23 op 		return;
311 d278a0c3 2021-02-23 op 	}
312 d278a0c3 2021-02-23 op }