agoo 2.8.4 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a08f7cfbaf708e9ae15b2c14c67b7ad06279ffefc55d3f8cdf02bf79d23ec2a
-  data.tar.gz: cdad36a0a5599a9114509b6eff0e219b2f128851f3d95bee344140cfa9f74ba0
+  metadata.gz: c40533edbeaf9a5593680f15a5c7ad41ef5e1575b9235c10faf0ecb906bd472c
+  data.tar.gz: 81c3884669b222a050352386973bc40d79cdce7c748204d85825a684d91ecbe3
 SHA512:
-  metadata.gz: 923b3465e9b1c30e20bf627c2ef6b300574a9e475b9bef28d754845ccc5bf407fec7c48b68553189b55a26ee98a55671f9e2a571b7ba86ff2831c1fe16fb2cc5
-  data.tar.gz: 7b401ec9acc4373d18815266d312b3b30bbd2ab7d523b8be003f3a680ea57bbe4c791c6ab63bf77d2401ee01ac37a596aa785b06b26261547f38c0fe5bf4f248
+  metadata.gz: bc1b0f12bdb19c51a947fa73c981eab8e21b640448363c62d7433138f4320f39a317fc9937f5499398ab7414a15122533af23e2bcc25722bfa26844bdd9c9b7c
+  data.tar.gz: 939c1a7654f453b5d602097b0faed1010291040edddb4a67f99c0b14c50ac2944a45fc87c7e3eb758760a7ba9cf6c02f449aa54cb0daec5fe1864b331e2c1213

data/CHANGELOG.md

@@ -4,6 +4,19 @@ All changes to the Agoo gem are documented here. Releases follow semantic versio
 
 ## [Unreleased]
 
+## [2.9.0] - 2019-07-26
+
+Early hints and sub-domains
+
+### Added
+
+- Support for early hints added. This includes a server option to
+  activate and then a proposed `early_hints` member of the `env`
+  argument to the Rack `#call` method.
+
+- Sub-domains based on the host header in an HTTP request can now
+  be used to set up multiple root directories.
+
 ## [2.8.4] - 2019-06-14
 
 GraphQL with Rack

data/ext/agoo/agoo.c

@@ -9,6 +9,7 @@
 
 #include "atomic.h"
 #include "debug.h"
+#include "early_hints.h"
 #include "error_stream.h"
 #include "graphql.h"
 #include "log.h"
@@ -109,6 +110,7 @@ Init_agoo() {
     server_init(mod);
     upgraded_init(mod);
     graphql_init(mod);
+    early_hints_init(mod);
 
     rb_define_module_function(mod, "shutdown", ragoo_shutdown, 0);
     rb_define_module_function(mod, "publish", ragoo_publish, 2);

data/ext/agoo/con.c

@@ -9,6 +9,7 @@
 #include "bind.h"
 #include "con.h"
 #include "debug.h"
+#include "domain.h"
 #include "dtime.h"
 #include "hook.h"
 #include "http.h"
@@ -152,7 +153,7 @@ bad_request(agooCon c, int status, int line) {
 	}
 	c->res_tail = res;
 	res->close = true;
-	agoo_res_set_message(res, message);
+	agoo_res_message_push(res, message, true);
     }
     return HEAD_ERR;
 }
@@ -188,7 +189,7 @@ page_response(agooCon c, agooPage p, char *hend) {
     if (res->close) {
 	c->closing = true;
     }
-    agoo_res_set_message(res, p->resp);
+    agoo_res_message_push(res, p->resp, true);
 
     return false;
 }
@@ -213,7 +214,7 @@ push_error(agooUpgraded up, const char *msg, int mlen) {
 }
 
 static HeadReturn
-agoo_con_header_read(agooCon c, size_t *mlenp) {
+con_header_read(agooCon c, size_t *mlenp) {
     char		*hend = strstr(c->buf, "\r\n\r\n");
     agooMethod		method;
     struct _agooSeg	path;
@@ -326,21 +327,35 @@ agoo_con_header_read(agooCon c, size_t *mlenp) {
     *mlenp = mlen;
 
     if (AGOO_GET == method) {
-	if (NULL != (p = group_get(&err, path.start, (int)(path.end - path.start)))) {
+	char		root_buf[20148];
+	const char	*root = NULL;
+
+	if (NULL != (p = agoo_group_get(&err, path.start, (int)(path.end - path.start)))) {
 	    if (page_response(c, p, hend)) {
 		return bad_request(c, 500, __LINE__);
 	    }
 	    return HEAD_HANDLED;
 	}
+	if (agoo_domain_use()) {
+	    const char	*host;
+	    int		vlen = 0;
+
+	    if (NULL == (host = agoo_con_header_value(c->buf, (int)(hend - c->buf), "Host", &vlen))) {
+		return bad_request(c, 411, __LINE__);
+	    }
+	    ((char*)host)[vlen] = '\0';
+	    root = agoo_domain_resolve(host, root_buf, sizeof(root_buf));
+	    ((char*)host)[vlen] = '\r';
+	}
 	if (agoo_server.root_first &&
-	    NULL != (p = agoo_page_get(&err, path.start, (int)(path.end - path.start)))) {
+	    NULL != (p = agoo_page_get(&err, path.start, (int)(path.end - path.start), root))) {
 	    if (page_response(c, p, hend)) {
 		return bad_request(c, 500, __LINE__);
 	    }
 	    return HEAD_HANDLED;
 	}
 	if (NULL == (hook = agoo_hook_find(agoo_server.hooks, method, &path))) {
-	    if (NULL != (p = agoo_page_get(&err, path.start, (int)(path.end - path.start)))) {
+	    if (NULL != (p = agoo_page_get(&err, path.start, (int)(path.end - path.start), root))) {
 		if (page_response(c, p, hend)) {
 		    return bad_request(c, 500, __LINE__);
 		}
@@ -379,7 +394,11 @@ agoo_con_header_read(agooCon c, size_t *mlenp) {
     c->req->body.len = (unsigned int)clen;
     b = strstr(b, "\r\n");
     c->req->header.start = c->req->msg + (b + 2 - c->buf);
-    c->req->header.len = (unsigned int)(hend - b - 2);
+    if (b < hend) {
+	c->req->header.len = (unsigned int)(hend - b - 2);
+    } else {
+	c->req->header.len = 0;
+    }
     c->req->res = NULL;
     c->req->hook = hook;
 
@@ -443,7 +462,7 @@ agoo_con_http_read(agooCon c) {
 	if (NULL == c->req) {
 	    size_t	mlen;
 
-	    switch (agoo_con_header_read(c, &mlen)) {
+	    switch (con_header_read(c, &mlen)) {
 	    case HEAD_AGAIN:
 		// Try again the next time. Didn't read enough..
 		return false;
@@ -629,7 +648,7 @@ con_ws_read(agooCon c) {
 // return false to remove/close connection
 bool
 agoo_con_http_write(agooCon c) {
-    agooText	message = agoo_res_message(c->res_head);
+    agooText	message = agoo_res_message_peek(c->res_head);
     ssize_t	cnt;
 
     if (NULL == message) {
@@ -665,17 +684,21 @@ agoo_con_http_write(agooCon c) {
     }
     c->wcnt += cnt;
     if (c->wcnt == message->len) { // finished
-	agooRes	res = c->res_head;
-	bool	done = res->close;
+	agooRes		res = c->res_head;
+	agooText	next = agoo_res_message_next(res);
 
-	c->res_head = res->next;
-	if (res == c->res_tail) {
-	    c->res_tail = NULL;
-	}
 	c->wcnt = 0;
-	agoo_res_destroy(res);
+	if (NULL == next && res->final) {
+	    bool	done = res->close;
 
-	return !done;
+	    c->res_head = res->next;
+	    if (res == c->res_tail) {
+		c->res_tail = NULL;
+	    }
+	    agoo_res_destroy(res);
+
+	    return !done;
+	}
     }
     return true;
 }
@@ -686,7 +709,7 @@ static const char	pong_msg[] = "\x8a\x00";
 static bool
 con_ws_write(agooCon c) {
     agooRes	res = c->res_head;
-    agooText	message = agoo_res_message(res);
+    agooText	message = agoo_res_message_peek(res);
     ssize_t	cnt;
 
     if (NULL == message) {
@@ -752,7 +775,7 @@ con_ws_write(agooCon c) {
 	}
 	t = agoo_ws_expand(message);
 	if (t != message) {
-	    agoo_res_set_message(res, t);
+	    agoo_res_message_push(res, t, true);
 	    message = t;
 	}
     }
@@ -772,17 +795,21 @@ con_ws_write(agooCon c) {
     }
     c->wcnt += cnt;
     if (c->wcnt == message->len) { // finished
-	agooRes	res = c->res_head;
-	bool	done = res->close;
+	agooRes		res = c->res_head;
+	agooText	next = agoo_res_message_next(res);
 
-	c->res_head = res->next;
-	if (res == c->res_tail) {
-	    c->res_tail = NULL;
-	}
 	c->wcnt = 0;
-	agoo_res_destroy(res);
+	if (NULL == next && res->final) {
+	    bool	done = res->close;
 
-	return !done;
+	    c->res_head = res->next;
+	    if (res == c->res_tail) {
+		c->res_tail = NULL;
+	    }
+	    agoo_res_destroy(res);
+
+	    return !done;
+	}
     }
     return true;
 }
@@ -790,7 +817,7 @@ con_ws_write(agooCon c) {
 static bool
 con_sse_write(agooCon c) {
     agooRes	res = c->res_head;
-    agooText	message = agoo_res_message(res);
+    agooText	message = agoo_res_message_peek(res);
     ssize_t	cnt;
 
     if (NULL == message) {
@@ -807,7 +834,7 @@ con_sse_write(agooCon c) {
 	}
 	t = agoo_sse_expand(message);
 	if (t != message) {
-	    agoo_res_set_message(res, t);
+	    agoo_res_message_push(res, t, true);
 	    message = t;
 	}
     }
@@ -826,17 +853,21 @@ con_sse_write(agooCon c) {
     }
     c->wcnt += cnt;
     if (c->wcnt == message->len) { // finished
-	agooRes	res = c->res_head;
-	bool	done = res->close;
+	agooText	next = agoo_res_message_next(c->res_head);
 
-	c->res_head = res->next;
-	if (res == c->res_tail) {
-	    c->res_tail = NULL;
-	}
 	c->wcnt = 0;
-	agoo_res_destroy(res);
+	if (NULL == next) {
+	    agooRes	res = c->res_head;
+	    bool	done = res->close;
+
+	    c->res_head = res->next;
+	    if (res == c->res_tail) {
+		c->res_tail = NULL;
+	    }
+	    agoo_res_destroy(res);
 
-	return !done;
+	    return !done;
+	}
     }
     return true;
 }
@@ -859,7 +890,7 @@ publish_pub(agooPub pub, agooConLoop loop) {
 		}
 		up->con->res_tail = res;
 		res->con_kind = AGOO_CON_ANY;
-		agoo_res_set_message(res, agoo_text_dup(pub->msg));
+		agoo_res_message_push(res, agoo_text_dup(pub->msg), true);
 		cnt++;
 	    }
 	}
@@ -933,7 +964,7 @@ process_pub_con(agooPub pub, agooConLoop loop) {
 		}
 		up->con->res_tail = res;
 		res->con_kind = AGOO_CON_ANY;
-		agoo_res_set_message(res, pub->msg);
+		agoo_res_message_push(res, pub->msg, true);
 	    }
 	}
 	break;
@@ -962,7 +993,7 @@ short
 agoo_con_http_events(agooCon c) {
     short	events = 0;
 
-    if (NULL != c->res_head && NULL != agoo_res_message(c->res_head)) {
+    if (NULL != c->res_head && NULL != c->res_head->message) {
 	events = POLLIN | POLLOUT;
     } else if (!c->closing) {
 	events = POLLIN;
@@ -974,7 +1005,7 @@ static short
 con_ws_events(agooCon c) {
     short	events = 0;
 
-    if (NULL != c->res_head && (c->res_head->close || c->res_head->ping || NULL != agoo_res_message(c->res_head))) {
+    if (NULL != c->res_head && (c->res_head->close || c->res_head->ping || NULL != c->res_head->message)) {
 	events = POLLIN | POLLOUT;
     } else if (!c->closing) {
 	events = POLLIN;
@@ -986,7 +1017,7 @@ static short
 con_sse_events(agooCon c) {
     short	events = 0;
 
-    if (NULL != c->res_head && NULL != agoo_res_message(c->res_head)) {
+    if (NULL != c->res_head && NULL != c->res_head->message) {
 	events = POLLOUT;
     }
     return events;
@@ -997,7 +1028,7 @@ remove_dead_res(agooCon c) {
     agooRes	res;
 
     while (NULL != (res = c->res_head)) {
-	if (NULL == agoo_res_message(c->res_head) && !c->res_head->close && !c->res_head->ping) {
+	if (NULL == agoo_res_message_peek(c->res_head) && !c->res_head->close && !c->res_head->ping) {
 	    break;
 	}
 	c->res_head = res->next;

data/ext/agoo/debug.h

@@ -4,6 +4,7 @@
 #define AGOO_DEBUG_H
 
 #include <stdlib.h>
+#include <string.h>
 
 #ifdef MEM_DEBUG
 

data/ext/agoo/domain.c

@@ -0,0 +1,145 @@
+// Copyright 2019 by Peter Ohler, All Rights Reserved
+
+#include <inttypes.h>
+#include <regex.h>
+#include <stdio.h>
+
+#include "debug.h"
+#include "domain.h"
+
+#define MAX_MATCH	8
+
+typedef struct _domain {
+    struct _domain	*next;
+    char		*host;
+    char		*path;
+    regex_t		rhost;
+} *Domain;
+
+static Domain	domains = NULL;
+
+bool
+agoo_domain_use() {
+    return NULL != domains;
+}
+
+int
+agoo_domain_add(agooErr err, const char *host, const char *path) {
+    Domain	d = (Domain)AGOO_CALLOC(1, sizeof(struct _domain));
+
+    if (NULL == d) {
+	return AGOO_ERR_MEM(err, "Domain");
+    }
+    if (NULL == (d->host = AGOO_STRDUP(host))) {
+	return AGOO_ERR_MEM(err, "Domain host");
+    }
+    if (NULL == (d->path = AGOO_STRDUP(path))) {
+	return AGOO_ERR_MEM(err, "Domain path");
+    }
+    if (NULL == domains) {
+	domains = d;
+    } else {
+	Domain	last = domains;
+
+	for (; NULL != last->next; last = last->next) {
+	}
+	last->next = d;
+    }
+    return AGOO_ERR_OK;
+}
+
+int
+agoo_domain_add_regex(agooErr err, const char *host, const char *path) {
+    Domain	d = (Domain)AGOO_CALLOC(1, sizeof(struct _domain));
+
+    if (NULL == d) {
+	return AGOO_ERR_MEM(err, "Domain");
+    }
+    if (0 != regcomp(&d->rhost, host, REG_EXTENDED | REG_NEWLINE)) {
+	return agoo_err_set(err, AGOO_ERR_ARG, "invalid regex");
+    }
+    if (NULL == (d->path = AGOO_STRDUP(path))) {
+	return AGOO_ERR_MEM(err, "Domain path");
+    }
+    if (NULL == domains) {
+	domains = d;
+    } else {
+	Domain	last = domains;
+
+	for (; NULL != last->next; last = last->next) {
+	}
+	last->next = d;
+    }
+    return AGOO_ERR_OK;
+}
+
+const char*
+agoo_domain_resolve(const char *host, char *buf, size_t blen) {
+    Domain	d;
+
+    for (d = domains; NULL != d; d = d->next) {
+	if (NULL != d->host) { // simple string compare
+	    if (0 == strcmp(host, d->host)) {
+		return d->path;
+	    }
+	} else {
+	    regmatch_t	matches[MAX_MATCH];
+	    char	*bend = buf + blen - 1;
+
+	    if (0 == regexec(&d->rhost, host, MAX_MATCH, matches, 0)) {
+		char	*b = buf;
+		char	*p = d->path;
+
+		for (; '\0' != *p; p++) {
+		    if ('$' == *p && '(' == *(p + 1)) {
+			const char	*m;
+			char		*end;
+			long		i;
+			int		start;
+			int		len;
+
+			p += 2;
+			i = strtol(p, &end, 10);
+			if (')' != *end || MAX_MATCH <= i) {
+			    continue;
+			}
+			p = end;
+			if (0 > (start = (int)matches[i].rm_so)) {
+			    continue;
+			}
+			len = (int)matches[i].rm_eo - start;
+			if (bend - b <= len) {
+			    continue;
+			}
+			for (m = host + start; 0 < len; len--) {
+			    *b++ = *m++;
+			    *b = '\0';
+			}
+			// TBD
+		    } else {
+			*b++ = *p;
+		    }
+		}
+		*b = '\0';
+		return buf;
+	    }
+	}
+    }
+    return NULL;
+}
+
+void
+agoo_domain_cleanup() {
+    Domain	d;
+
+    while (NULL != (d = domains)) {
+	domains = d->next;
+	if (NULL == d->host) {
+	    regfree(&d->rhost);
+	} else {
+	    AGOO_FREE(d->host);
+	}
+	AGOO_FREE(d->path);
+	AGOO_FREE(d);
+    }
+}