agoo 2.12.3 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d0965efaeccced647216fb862b8dfbc08341340b11cf9f3844ad02d69689037
-  data.tar.gz: 28214398cdde45c6ff314cca9fef6d59c52eb4602e1589d6e0ffcb2df20dea1e
+  metadata.gz: df42da153e97e018d4984fa75be78ac86a1c8b97aed6b48d62ec7fe5047d7099
+  data.tar.gz: e83a55eed4781bbb0ab08df41203509df6ec45d06817b87c9d61d25bca8a294a
 SHA512:
-  metadata.gz: ca54ef2d81c61b6175853ddc45d14c1654c56a0aff3cb3ddfd89513c0422d6f0442e67b7fb77650b090b1ae3dd3a8784d15eb1fd8610923d5d1514873b7755a4
-  data.tar.gz: bd950219f2e91ec4bdac217c646184c883ea789c8d7d6ab9a3b9f3459aab96c149aa6701a5b705f3e86f7786b5c0a634d1c1f41dce456a35d153aaeb656f20c8
+  metadata.gz: ac6e8d86a9b545d93c9ee033950422292b4ab2f740ba692f2c24940e928c42466b895dfae6ce5263040f2b53613a6c1241f5dfe5c0be21961f1ee885970ec220
+  data.tar.gz: 9dd8414c88948198bd1a22d5aac236ef8d5bf4251020b7fcfc4b94837d8a48433aa6774ba9e13df1dc36dc1e29f1697dfcc2c21e8ef1a9dc6897d223b72eb946

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All changes to the Agoo gem are documented here. Releases follow semantic versioning.
 
+## [2.13.0] - 2020-07-05
+
+### Added
+
+- Agoo::Server.use() added. It works similar to the Rack use() function.
+
+### Fixed
+
+- Header checks are now case insensitive to comply with RFC 7230.
+
 ## [2.12.3] - 2020-03-28
 
 rb_rescue2 termination

data/bin/agoo_stubs

@@ -30,7 +30,7 @@ Example:
 @opts = OptionParser.new(usage)
 @opts.on('-h', '--help', 'show this display')                            { puts @opts.help; Process.exit!(0) }
 @opts.on('-v', '--verbose', 'verbose output')                            { @verbose = true }
-@opts.on('-s', '--single PATH', String, 'path to fiel for all stubs')    { |s| @single = s }
+@opts.on('-s', '--single PATH', String, 'path to file for all stubs')    { |s| @single = s }
 @opts.on('-d', '--dir PATH', String, 'directory to write files into')    { |d| @dir = d }
 @opts.on('-m', '--module STRING', String, 'module for the stub classes') { |m| @mod = m }
 
@@ -66,8 +66,8 @@ def write_type_stub(f, t, depth)
     next if field.args.nil?
     f.puts
     f.puts "#{indent}  # #{field.description}" unless field.description.nil?
-    args = field.args.map { |a| a.name }.join(', ')
-    f.puts "#{indent}  def #{field.name}(#{args})"
+    f.puts "#{indent}  # args: #{field.args.map { |a| a.name }.join(', ')}"
+    f.puts "#{indent}  def #{field.name}(args={})"
     f.puts "#{indent}  end"
   }
   f.puts "#{indent}end"

data/ext/agoo/bind.c

@@ -223,25 +223,25 @@ url_ssl(agooErr err, const char *url) {
 
 agooBind
 agoo_bind_url(agooErr err, const char *url) {
-    if (0 == strncmp("tcp://", url, 6)) {
+    if (0 == strncasecmp("tcp://", url, 6)) {
 	if ('[' == url[6]) {
 	    return url_tcp6(err, url + 6, "tcp");
 	}
 	return url_tcp(err, url + 6, "tcp");
     }
-    if (0 == strncmp("http://", url, 7)) {
+    if (0 == strncasecmp("http://", url, 7)) {
 	if ('[' == url[7]) {
 	    return url_tcp6(err, url + 7, "http");
 	}
 	return url_tcp(err, url + 7, "http");
     }
-    if (0 == strncmp("unix://", url, 7)) {
+    if (0 == strncasecmp("unix://", url, 7)) {
 	return url_named(err, url + 7);
     }
-    if (0 == strncmp("https://", url, 8)) {
+    if (0 == strncasecmp("https://", url, 8)) {
 	return url_ssl(err, url + 8);
     }
-    if (0 == strncmp("ssl://", url, 6)) {
+    if (0 == strncasecmp("ssl://", url, 6)) {
 	return url_ssl(err, url + 6);
     }
     // All others assume http

data/ext/agoo/con.c

@@ -173,7 +173,7 @@ agoo_con_header_value(const char *header, int hlen, const char *key, int *vlen)
     int		klen = (int)strlen(key);
 
     while (h < hend) {
-	if (0 == strncmp(key, h, klen) && ':' == h[klen]) {
+	if (0 == strncasecmp(key, h, klen) && ':' == h[klen]) {
 	    h += klen + 1;
 	    for (; ' ' == *h; h++) {
 	    }

data/ext/agoo/gqleval.c

@@ -551,11 +551,11 @@ eval_post(agooErr err, agooReq req) {
 	agoo_err_set(err, AGOO_ERR_TYPE, "required Content-Type not in the HTTP header");
 	return NULL;
     }
-    if (0 == strncmp(graphql_content_type, s, sizeof(graphql_content_type) - 1)) {
+    if (0 == strncasecmp(graphql_content_type, s, sizeof(graphql_content_type) - 1)) {
 	if (NULL == (doc = sdl_parse_doc(err, req->body.start, req->body.len, vars, GQL_QUERY))) {
 	    return NULL;
 	}
-    } else if (0 == strncmp(json_content_type, s, sizeof(json_content_type) - 1)) {
+    } else if (0 == strncasecmp(json_content_type, s, sizeof(json_content_type) - 1)) {
 	gqlLink	m;
 
 	if (NULL != (j = gql_json_parse(err, req->body.start, req->body.len))) {

data/ext/agoo/req.c

@@ -14,7 +14,7 @@ agooReq
 agoo_req_create(size_t mlen) {
     size_t	size = mlen + sizeof(struct _agooReq) - 7;
     agooReq	req = (agooReq)AGOO_MALLOC(size);
-    
+
     if (NULL != req) {
 	memset(req, 0, size);
 	req->env = agoo_server.env_nil_value;
@@ -56,7 +56,7 @@ agoo_req_port(agooReq r) {
     int		len;
     const char	*host;
     const char	*colon;
-    
+
     if (NULL == (host = agoo_con_header_value(r->header.start, r->header.len, "Host", &len))) {
 	return 0;
     }
@@ -94,7 +94,7 @@ agoo_req_query_value(agooReq r, const char *key, int klen, int *vlenp) {
 static int
 hexVal(int c) {
     int	h = -1;
-    
+
     if ('0' <= c && c <= '9') {
 	h = c - '0';
     } else if ('a' <= c && c <= 'f') {
@@ -110,12 +110,12 @@ agoo_req_query_decode(char *s, int len) {
     char	*sn = s;
     char	*so = s;
     char	*end = s + len;
-    
+
     while (so < end) {
 	if ('%' == *so) {
 	    int	n;
 	    int	c = 0;
-	    
+
 	    so++;
 	    if (0 > (c = hexVal(*so))) {
 		*sn++ = '%';
@@ -133,7 +133,7 @@ agoo_req_query_decode(char *s, int len) {
 	}
     }
     *sn = '\0';
-    
+
     return (int)(sn - s);
 }
 
@@ -145,9 +145,9 @@ agoo_req_header_value(agooReq req, const char *key, int *vlen) {
     const char	*hend = h + req->header.len;
     const char	*value;
     int		klen = (int)strlen(key);
-    
+
     while (h < hend) {
-	if (0 == strncmp(key, h, klen) && ':' == h[klen]) {
+	if (0 == strncasecmp(key, h, klen) && ':' == h[klen]) {
 	    h += klen + 1;
 	    for (; ' ' == *h; h++) {
 	    }
@@ -155,7 +155,7 @@ agoo_req_header_value(agooReq req, const char *key, int *vlen) {
 	    for (; '\r' != *h && '\0' != *h; h++) {
 	    }
 	    *vlen = (int)(h - value);
- 
+
 	    return value;
 	}
 	for (; h < hend; h++) {
@@ -167,4 +167,3 @@ agoo_req_header_value(agooReq req, const char *key, int *vlen) {
     }
     return NULL;
 }
-

data/ext/agoo/rserver.c

@@ -103,6 +103,7 @@ configure(agooErr err, int port, const char *root, VALUE options) {
     }
     agoo_server.thread_cnt = 0;
     the_rserver.worker_cnt = 1;
+    the_rserver.uses = NULL;
     atomic_init(&agoo_server.running, 0);
     agoo_server.listen_thread = 0;
     agoo_server.con_loops = NULL;
@@ -1014,6 +1015,14 @@ handle(VALUE self, VALUE method, VALUE pattern, VALUE handler) {
 	    }
 	}
     }
+    if (NULL != the_rserver.uses) {
+	RUse	u;
+
+	for (u = the_rserver.uses; NULL != u; u = u->next) {
+	    u->argv[0] = handler;
+	    handler = rb_funcall2(u->clas, rb_intern("new"), u->argc, u->argv);
+	}
+    }
     if (NULL == (hook = rhook_create(meth, pat, handler, &agoo_server.eval_queue))) {
 	rb_raise(rb_eStandardError, "out of memory.");
     } else {
@@ -1195,6 +1204,40 @@ rack_early_hints(VALUE self, VALUE on) {
     return on;
 }
 
+/* Document-method: use
+ *
+ * call-seq: use(middleware, *args)
+ *
+ * The use function must be called before the _handle_ functions. Any
+ * invocations of _use_ apply only to handlers called after the call to use.
+ */
+static VALUE
+use(int argc, VALUE *argv, VALUE self) {
+    VALUE	mc;
+    RUse	u;
+
+    if (argc < 1) { // at least the middleware class must be provided.
+	rb_raise(rb_eArgError, "no middleware class provided");
+    }
+    mc = argv[0];
+    if (T_CLASS != rb_type(mc)) {
+	rb_raise(rb_eArgError, "the first argument to use must be a class");
+    }
+    if (NULL == (u = (RUse)AGOO_MALLOC(sizeof(struct _rUse)))) {
+	rb_raise(rb_eNoMemError, "Failed to allocate memory for a middleware use.");
+    }
+    u->clas = mc;
+    u->argc = argc;
+    if (NULL == (u->argv = (VALUE*)AGOO_MALLOC(sizeof(VALUE) * u->argc))) {
+	rb_raise(rb_eNoMemError, "Failed to allocate memory for a middleware use.");
+    }
+    memcpy(u->argv, argv, argc * sizeof(VALUE));
+    u->next = the_rserver.uses;
+    the_rserver.uses = u;
+
+    return Qnil;
+}
+
 /* Document-class: Agoo::Server
  *
  * An HTTP server that support the rack API as well as some other optimized
@@ -1214,6 +1257,7 @@ server_init(VALUE mod) {
     rb_define_module_function(server_mod, "path_group", path_group, 2);
     rb_define_module_function(server_mod, "header_rule", header_rule, 4);
     rb_define_module_function(server_mod, "domain", domain, 2);
+    rb_define_module_function(server_mod, "use", use, -1);
 
     rb_define_module_function(server_mod, "rack_early_hints", rack_early_hints, 1);
 

data/ext/agoo/rserver.h

@@ -7,10 +7,18 @@
 
 #define MAX_WORKERS	32
 
+typedef struct _rUse {
+    struct _rUse	*next;
+    VALUE		clas;
+    VALUE		*argv;
+    int			argc;
+} *RUse;
+
 typedef struct _rServer {
     int		worker_cnt;
     int		worker_pids[MAX_WORKERS];
     VALUE	*eval_threads; // Qnil terminated
+    RUse	uses;
 } *RServer;
 
 extern struct _rServer	the_rserver;

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '2.12.3'
+  VERSION = '2.13.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 2.12.3
+  version: 2.13.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-28 00:00:00.000000000 Z
+date: 2020-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj