agoo 2.12.0 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad6f1d492f68755c2012b61062a79fe3351a1b80546838d19eb4315789f4585c
-  data.tar.gz: 6a1a949bdf6fb76d1228e9e7e61ded57d76ca414a21529eec46ae1275e624277
+  metadata.gz: f70842cac2f630e74251967ca0accfcb2dacef7b143bb3707ae74d88a0f1da36
+  data.tar.gz: 75996d57b98c1d164fa44009f1c6037deb28f22d7179b7bd3ede0296f3d9a605
 SHA512:
-  metadata.gz: b43da3e33ef225b675164ad4793b4304bc42db3c0a0803b84584250e58713d4026b10e9a450b3de8bbe18814a3ce102438fd1448658919e5a345fafe8583bc64
-  data.tar.gz: fbe407798233527d8ce736bac219224b00714ca8a902b5110a5c15fd2f88a2962d04fdb6945517377c1cebdde623c2d7a0162fd414c2f17dfdb23ac01dc86779
+  metadata.gz: 39f02fdb5ab101d1414a57a7d712b6b4910b583e2509d0911d2cf5c398badfdb556c6847eaa7e108d280b590792bf3cb007514e4f6cd7c8f57ddb233299e3a0f
+  data.tar.gz: 10b2f2cc9d56d34e27dd597c5c2d0fa61bcf3921198efcbffcbfece23841656af9dc9eb6909b592e63ff30dd79aed315a55bacf97a471ac5c1c3e7acff4782f2

data/CHANGELOG.md

@@ -2,6 +2,50 @@
 
 All changes to the Agoo gem are documented here. Releases follow semantic versioning.
 
+## [2.14.0] - 2020-11-07
+
+### Added
+
+- REMOTE_ADDR element added to requests/env argument to `call()`.
+
+- Added check for multiple Content-Length headers.
+
+- Multiple occurrances of a header are now passed to the Rack `call()` method as an array.
+
+## [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
+
+### Fixed
+
+- rb_rescue2 must be terminated by a (VALUE)0 and not simply 0.
+
+## [2.12.2] - 2020-03-22
+
+Stub generator
+
+### Added
+
+- GraphQL stub generator to generate Ruby class file corresponding to GraphQL schema type. The generator is `bin/agoo_stubs`.
+
+## [2.12.1] - 2020-03-17
+
+Check SO_REUSEPORT
+
+### Fixed
+
+- Verifiy SO_REUSEPORT is define for older OS versions.
+
 ## [2.12.0] - 2020-01-19
 
 Request GraphQL access and GraphiQL support

data/README.md

@@ -68,6 +68,31 @@ sleep
 gem install agoo
 ```
 
+## Using agoo as server for rails
+
+As agoo supports rack compatible apps you can use it for rails applications:
+
+Add agoo to the Gemfile:
+
+```
+# Gemfile
+gem 'agoo'
+```
+
+Install bundle:
+
+```
+$ bundle install
+```
+
+Start rails with agoo as server:
+
+```
+$ rails server -u agoo
+```
+
+Enjoy the increased performance!
+
 ## What Is This?
 
 Agoo is Japanese for a type of flying fish. This gem flies. It is a high

data/bin/agoo_stubs

@@ -0,0 +1,166 @@
+#!/usr/bin/env ruby
+
+while (index = ARGV.index('-I'))
+  _, path = ARGV.slice!(index, 2)
+  $LOAD_PATH << path
+end
+
+require 'optparse'
+
+require 'agoo'
+
+usage = %{
+Usage: agoo_stubs [options] <graphql_schema>
+
+version #{Agoo::VERSION}
+
+Generates Ruby files that match the types in the GraphQL schema file specified.
+
+Example:
+
+  agoo_stubs --module Data --dir lib schema.graphql
+
+}
+
+@verbose = false
+@single = nil
+@dir = nil
+@mod = nil
+
+@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 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 }
+
+@files = @opts.parse(ARGV)
+
+if @files.empty?
+  puts "A schema file must be specified."
+  puts @opts.help
+  Process.exit!(0)
+elsif 1 < @files.size
+  puts "Only one schema file can be specified."
+  puts @opts.help
+  Process.exit!(0)
+end
+
+Agoo::GraphQL.schema(nil) {
+  Agoo::GraphQL.load_file(@files[0])
+}
+
+def write_type_stub(f, t, depth)
+  indent = '  ' * depth
+  f.puts "#{indent}# #{t.description}" unless t.description.nil?
+  f.puts "#{indent}class #{t.name}"
+  t.fields.each { |field|
+    next unless field.args.nil?
+    f.puts "#{indent}  # #{field.description}" unless field.description.nil?
+    f.puts "#{indent}  attr_accessor :#{field.name}"
+  }
+  f.puts
+  f.puts "#{indent}  def initialize"
+  f.puts "#{indent}  end"
+  t.fields.each { |field|
+    next if field.args.nil?
+    f.puts
+    f.puts "#{indent}  # #{field.description}" unless field.description.nil?
+    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"
+end
+
+def calc_filepath(t)
+  path = @dir
+  path += '/' + @mod.split('::').map { |m| m.downcase }.join('/') unless @mod.nil?
+  path + '/' + t.name.downcase + '.rb'
+end
+
+def assure_parent_dir(path)
+  dirs = path.split('/')[0..-2]
+  dirs.each_index { |i|
+    path = dirs[0..i].join('/')
+    Dir.mkdir(path) unless Dir.exist?(path)
+  }
+end
+
+def write_type_stub_file(t)
+  path = calc_filepath(t)
+  assure_parent_dir(path)
+  File.open(path, 'w') { |f|
+    f.puts "# #{t.name} class for schema file #{@files[0]}"
+    f.puts
+    depth = 0
+    unless @mod.nil?
+      @mod.split('::').each { |m|
+	f.puts("#{'  ' * depth}module #{m}")
+	depth += 1
+      }
+      f.puts
+    end
+    write_type_stub(f, t, depth)
+    f.puts
+    unless @mod.nil?
+      @mod.split('::').size.times {
+	depth -= 1
+	f.puts("#{'  ' * depth}end")
+      }
+    end
+  }
+end
+
+@out = nil
+
+if @dir.nil?
+  if @single.nil?
+    @out = STDOUT
+  else @single
+    @out = File.new(@single, 'w')
+  end
+end
+
+unless @out.nil?
+  @out.puts "# Classes for schema file #{@files[0]}"
+  @out.puts
+  depth = 0
+  unless @mod.nil?
+    @mod.split('::').each { |m|
+      @out.puts("#{'  ' * depth}module #{m}")
+      depth += 1
+    }
+    @out.puts
+  end
+  Agoo::GraphQL.sdl_types.sort { |a,b| a.name <=> b.name }.each { |t|
+    write_type_stub(@out, t, depth)
+    @out.puts
+  }
+  unless @mod.nil?
+    @mod.split('::').size.times {
+      depth -= 1
+      @out.puts("#{'  ' * depth}end")
+    }
+  end
+  @out.close unless STDOUT == @out
+else
+  Agoo::GraphQL.sdl_types.each { |t|
+    write_type_stub_file(t)
+  }
+  unless @mod.nil?
+    path = @dir
+    path += '/' + @mod.split('::').map { |m| m.downcase }.join('/')
+    assure_parent_dir(path)
+    m = path.split('/')[-1]
+    path += '.rb'
+
+    File.open(path, 'w') { |f|
+      f.puts "# Classes for schema file #{@files[0]}"
+      f.puts
+      Agoo::GraphQL.sdl_types.sort { |a,b| a.name <=> b.name }.each { |t|
+	f.puts "require_relative '#{m}/#{t.name.downcase}'"
+      }
+    }
+  end
+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
@@ -286,7 +286,9 @@ usual_listen(agooErr err, agooBind b) {
 #ifdef OSX_OS
     setsockopt(b->fd, SOL_SOCKET, SO_NOSIGPIPE, &optval, sizeof(optval));
 #endif
+#ifdef SO_REUSEPORT
     setsockopt(b->fd, SOL_SOCKET, SO_REUSEPORT, &optval, sizeof(optval));
+#endif
     setsockopt(b->fd, IPPROTO_TCP, TCP_NODELAY, &optval, sizeof(optval));
     if (AF_INET6 == b->family) {
 	struct sockaddr_in6	addr;

data/ext/agoo/con.c

@@ -63,6 +63,22 @@ agoo_con_create(agooErr err, int sock, uint64_t id, agooBind b) {
     if (NULL == (c = (agooCon)AGOO_CALLOC(1, sizeof(struct _agooCon)))) {
 	AGOO_ERR_MEM(err, "Connection");
     } else {
+	// It would be better to get this information in server.c after
+	// accept() but that does not work on macOS so instead a call to
+	// getpeername() is used instead.
+	struct sockaddr_storage	addr;
+	socklen_t		len = sizeof(addr);
+
+	getpeername(sock, (struct sockaddr*)&addr, &len);
+	if (addr.ss_family == AF_INET) {
+	    struct sockaddr_in	*s = (struct sockaddr_in*)&addr;
+
+	    inet_ntop(AF_INET, &s->sin_addr, c->remote, sizeof(c->remote));
+	} else {
+	    struct sockaddr_in6	*s = (struct sockaddr_in6*)&addr;
+
+	    inet_ntop(AF_INET6, &s->sin6_addr, c->remote, sizeof(c->remote));
+	}
 	c->sock = sock;
 	c->id = id;
 	c->timeout = dtime() + CON_TIMEOUT;
@@ -173,7 +189,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++) {
 	    }
@@ -437,6 +453,7 @@ con_header_read(agooCon c, size_t *mlenp) {
     c->req->method = method;
     c->req->upgrade = AGOO_UP_NONE;
     c->req->up = NULL;
+    memcpy(c->req->remote, c->remote, sizeof(c->remote));
     c->req->path.start = c->req->msg + (path.start - c->buf);
     c->req->path.len = (int)(path.end - path.start);
     c->req->query.start = c->req->msg + (query - c->buf);

data/ext/agoo/con.h

@@ -3,6 +3,7 @@
 #ifndef AGOO_CON_H
 #define AGOO_CON_H
 
+#include <arpa/inet.h>
 #include <poll.h>
 #include <pthread.h>
 #include <stdbool.h>
@@ -45,6 +46,7 @@ typedef struct _agooCon {
     struct _agooBind		*bind;
     struct pollfd		*pp;
     uint64_t			id;
+    char			remote[INET6_ADDRSTRLEN];
     char			buf[MAX_HEADER_SIZE];
     size_t			bcnt;
 

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/http.c

@@ -26,7 +26,7 @@ typedef struct _cache {
 struct _cache		key_cache;
 
 // The rack spec indicates the characters (),/:;<=>?@[]{} are invalid which
-// clearly is not consisten with RFC7230 so stick with the RFC.
+// clearly is not consistent with RFC7230 so stick with the RFC.
 static char		header_value_chars[256] = "\
 xxxxxxxxxxoxxxxxxxxxxxxxxxxxxxxx\
 oooooooooooooooooooooooooooooooo\
@@ -50,7 +50,6 @@ static const char	*header_keys[] = {
     "Accept-Encoding",
     "Accept-Features",
     "Accept-Language",
-    "Accept-Language",
     "Accept-Patch",
     "Accept-Post",
     "Accept-Ranges",
@@ -74,7 +73,6 @@ static const char	*header_keys[] = {
     "Approved",
     "Archive",
     "Archived-At",
-    "Archived-At",
     "Article-Names",
     "Article-Updates",
     "Authentication-Control",
@@ -99,36 +97,27 @@ static const char	*header_keys[] = {
     "Cc",
     "Close",
     "Comments",
-    "Comments",
     "Compliance",
     "Connection",
     "Content-Alternative",
     "Content-Base",
-    "Content-Base",
     "Content-Description",
     "Content-Disposition",
-    "Content-Disposition",
     "Content-Duration",
     "Content-Encoding",
     "Content-ID",
-    "Content-ID",
     "Content-Identifier",
     "Content-Language",
-    "Content-Language",
     "Content-Length",
     "Content-Location",
-    "Content-Location",
-    "Content-MD5",
     "Content-MD5",
     "Content-Range",
     "Content-Return",
     "Content-Script-Type",
     "Content-Style-Type",
     "Content-Transfer-Encoding",
-    "Content-Transfer-Encoding",
     "Content-Translation-Type",
     "Content-Type",
-    "Content-Type",
     "Content-Version",
     "Content-features",
     "Control",
@@ -141,8 +130,7 @@ static const char	*header_keys[] = {
     "DAV",
     "DKIM-Signature",
     "DL-Expansion-History",
-    "Date",
-    "Date",
+    "DNT",
     "Date",
     "Date-Received",
     "Default-Style",
@@ -182,7 +170,6 @@ static const char	*header_keys[] = {
     "Downgraded-Sender",
     "Downgraded-To",
     "EDIINT-Features",
-    "EDIINT-Features",
     "ETag",
     "Eesst-Version",
     "Encoding",
@@ -190,16 +177,13 @@ static const char	*header_keys[] = {
     "Errors-To",
     "Expect",
     "Expires",
-    "Expires",
-    "Expires",
     "Expiry-Date",
     "Ext",
     "Followup-To",
     "Form-Sub",
     "Forwarded",
     "From",
-    "From",
-    "From",
+    "Front-End-Https",
     "Generate-Delivery-Report",
     "GetProfile",
     "HTTP2-Settings",
@@ -219,10 +203,8 @@ static const char	*header_keys[] = {
     "Injection-Date",
     "Injection-Info",
     "Jabber-ID",
-    "Jabber-ID",
     "Keep-Alive",
     "Keywords",
-    "Keywords",
     "Label",
     "Language",
     "Last-Modified",
@@ -240,7 +222,6 @@ static const char	*header_keys[] = {
     "Location",
     "Lock-Token",
     "MIME-Version",
-    "MIME-Version",
     "MMHS-Acp127-Message-Identifier",
     "MMHS-Authorizing-Users",
     "MMHS-Codress-Message-Indicator",
@@ -262,8 +243,6 @@ static const char	*header_keys[] = {
     "Memento-Datetime",
     "Message-Context",
     "Message-ID",
-    "Message-ID",
-    "Message-ID",
     "Message-Type",
     "Meter",
     "Method-Check",
@@ -279,7 +258,6 @@ static const char	*header_keys[] = {
     "Optional-WWW-Authenticate",
     "Ordering-Type",
     "Organization",
-    "Organization",
     "Origin",
     "Original-Encoded-Information-Types",
     "Original-From",
@@ -292,7 +270,6 @@ static const char	*header_keys[] = {
     "P3P",
     "PEP",
     "PICS-Label",
-    "PICS-Label",
     "Path",
     "Pep-Info",
     "Position",
@@ -311,6 +288,7 @@ static const char	*header_keys[] = {
     "Proxy-Authenticate",
     "Proxy-Authentication-Info",
     "Proxy-Authorization",
+    "Proxy-Connection",
     "Proxy-Features",
     "Proxy-Instruction",
     "Public",
@@ -321,13 +299,11 @@ static const char	*header_keys[] = {
     "Received-SPF",
     "Redirect-Ref",
     "References",
-    "References",
     "Referer",
     "Referer-Root",
     "Relay-Version",
     "Reply-By",
     "Reply-To",
-    "Reply-To",
     "Require-Recipient-Valid-Since",
     "Resent-Bcc",
     "Resent-Cc",
@@ -345,6 +321,7 @@ static const char	*header_keys[] = {
     "SIO-Label-History",
     "SLUG",
     "Safe",
+    "Save-Data",
     "Schedule-Reply",
     "Schedule-Tag",
     "Sec-WebSocket-Accept",
@@ -367,11 +344,9 @@ static const char	*header_keys[] = {
     "Strict-Transport-Security",
     "SubOK",
     "Subject",
-    "Subject",
     "Subst",
     "Summary",
     "Supersedes",
-    "Supersedes",
     "Surrogate-Capability",
     "Surrogate-Control",
     "TCN",
@@ -390,9 +365,9 @@ static const char	*header_keys[] = {
     "UA-Windowpixels",
     "URI",
     "Upgrade",
+    "Upgrade-Insecure-Requests",
     "Urgency",
     "User-Agent",
-    "User-Agent",
     "VBR-Info",
     "Variant-Vary",
     "Vary",
@@ -401,22 +376,32 @@ static const char	*header_keys[] = {
     "WWW-Authenticate",
     "Want-Digest",
     "Warning",
-    "X-Archived-At",
+    "X-ATT-DeviceId",
     "X-Archived-At",
     "X-Content-Type-Options",
+    "X-Correlation-ID",
+    "X-Csrf-Token",
     "X-Device-Accept",
     "X-Device-Accept-Charset",
     "X-Device-Accept-Encoding",
     "X-Device-Accept-Language",
     "X-Device-User-Agent",
+    "X-Forwarded-For",
+    "X-Forwarded-Host",
+    "X-Forwarded-Proto",
     "X-Frame-Options",
+    "X-Http-Method-Override",
     "X-Mittente",
     "X-PGP-Sig",
+    "X-Request-ID",
+    "X-Requested-With",
     "X-Ricevuta",
     "X-Riferimento-Message-ID",
     "X-TipoRicevuta",
     "X-Trasporto",
+    "X-UIDH",
     "X-VerificaSicurezza",
+    "X-Wap-Profile",
     "X-XSS-Protection",
     "X400-Content-Identifier",
     "X400-Content-Return",
@@ -469,7 +454,7 @@ key_set(const char *key) {
     int64_t	h = calc_hash(key, &len);
     Slot	*bucket = get_bucketp(h);
     Slot	s;
-    
+
     if (NULL != (s = (Slot)AGOO_MALLOC(sizeof(struct _slot)))) {
 	s->hash = h;
 	s->klen = len;
@@ -482,7 +467,7 @@ key_set(const char *key) {
 void
 agoo_http_init() {
     const char	**kp = header_keys;
-    
+
     memset(&key_cache, 0, sizeof(struct _cache));
     for (; NULL != *kp; kp++) {
 	key_set(*kp);
@@ -550,7 +535,7 @@ agoo_http_header_ok(agooErr err, const char *key, int klen, const char *value, i
 const char*
 agoo_http_code_message(int code) {
     const char	*msg = "";
-    
+
     switch (code) {
     case 100:	msg = "Continue";				break;
     case 101:	msg = "Switching Protocols";			break;

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/req.h

@@ -3,6 +3,7 @@
 #ifndef AGOO_REQ_H
 #define AGOO_REQ_H
 
+#include <arpa/inet.h>
 #include <stdint.h>
 
 #include "hook.h"
@@ -32,6 +33,7 @@ typedef struct _agooReq {
     struct _agooStr		query;
     struct _agooStr		header;
     struct _agooStr		body;
+    char			remote[INET6_ADDRSTRLEN];
     void			*env;
     agooHook			hook;
     size_t			mlen;   // allocated msg length

data/ext/agoo/request.c

@@ -43,6 +43,7 @@ static VALUE	rack_upgrade_val = Qundef;
 static VALUE	rack_url_scheme_val = Qundef;
 static VALUE	rack_version_val = Qundef;
 static VALUE	rack_version_val_val = Qundef;
+static VALUE	remote_addr_val = Qundef;
 static VALUE	request_method_val = Qundef;
 static VALUE	script_name_val = Qundef;
 static VALUE	server_name_val = Qundef;
@@ -96,6 +97,27 @@ method(VALUE self) {
     return req_method((agooReq)DATA_PTR(self));
 }
 
+static VALUE
+req_remote_addr(agooReq r) {
+
+    if (NULL == r) {
+	rb_raise(rb_eArgError, "Request is no longer valid.");
+    }
+    return rb_str_new(r->remote, strlen(r->remote));
+}
+
+/* Document-method: remote_addr
+ *
+ * call-seq: remote_addr()
+ *
+ * Returns the remote address.
+ */
+static VALUE
+remote_addr(VALUE self) {
+    return req_remote_addr((agooReq)DATA_PTR(self));
+}
+
+
 static VALUE
 req_script_name(agooReq r) {
     // The logic is a bit tricky here and for path_info. If the HTTP path is /
@@ -366,14 +388,29 @@ rack_run_once(VALUE self) {
 
 static void
 add_header_value(VALUE hh, const char *key, int klen, const char *val, int vlen) {
+    VALUE	v;
+
     if (sizeof(content_type) - 1 == klen && 0 == strncasecmp(key, content_type, sizeof(content_type) - 1)) {
-	rb_hash_aset(hh, content_type_val, rb_str_new(val, vlen));
+	if (Qnil == (v = rb_hash_lookup2(hh, content_type_val, Qnil))) {
+	    rb_hash_aset(hh, content_type_val, rb_str_new(val, vlen));
+	} else {
+	    volatile VALUE	a = rb_ary_new();
+
+	    rb_ary_push(a, v);
+	    rb_ary_push(a, rb_str_new(val, vlen));
+	    rb_hash_aset(hh, content_type_val, a);
+	}
     } else if (sizeof(content_length) - 1 == klen && 0 == strncasecmp(key, content_length, sizeof(content_length) - 1)) {
-	rb_hash_aset(hh, content_length_val, rb_str_new(val, vlen));
+	if (Qnil == (v = rb_hash_lookup2(hh, content_length_val, Qnil))) {
+	    rb_hash_aset(hh, content_length_val, rb_str_new(val, vlen));
+	} else {
+	    rb_raise(rb_eArgError, "Multiple Content-Length headers.");
+	}
     } else {
 	char		hkey[1024];
 	char		*k = hkey;
 	volatile VALUE	sval = rb_str_new(val, vlen);
+	volatile VALUE	kval;
 
 	strcpy(hkey, "HTTP_");
 	k = hkey + 5;
@@ -392,7 +429,16 @@ add_header_value(VALUE hh, const char *key, int klen, const char *val, int vlen)
 		*k = toupper(*k);
 	    }
 	}
-	rb_hash_aset(hh, rb_str_new(hkey, klen + 5), sval);
+	kval = rb_str_new(hkey, klen + 5);
+	if (Qnil == (v = rb_hash_lookup2(hh, kval, Qnil))) {
+	    rb_hash_aset(hh, kval, sval);
+	} else {
+	    volatile VALUE	a = rb_ary_new();
+
+	    rb_ary_push(a, v);
+	    rb_ary_push(a, sval);
+	    rb_hash_aset(hh, kval, a);
+	}
     }
 }
 
@@ -545,8 +591,9 @@ request_env(agooReq req, VALUE self) {
 	rb_hash_aset(env, script_name_val, req_script_name(req));
 	rb_hash_aset(env, path_info_val, req_path_info(req));
 	rb_hash_aset(env, query_string_val, req_query_string(req));
-	rb_hash_aset(env, server_name_val, req_server_name(req));
+	rb_hash_aset(env, remote_addr_val, req_remote_addr(req));
 	rb_hash_aset(env, server_port_val, req_server_port(req));
+	rb_hash_aset(env, server_name_val, req_server_name(req));
 	fill_headers(req, env);
 	rb_hash_aset(env, rack_version_val, rack_version_val_val);
 	rb_hash_aset(env, rack_url_scheme_val, req_rack_url_scheme(req));
@@ -663,6 +710,7 @@ request_init(VALUE mod) {
     rb_define_method(req_class, "query_string", query_string, 0);
     rb_define_method(req_class, "server_name", server_name, 0);
     rb_define_method(req_class, "server_port", server_port, 0);
+    rb_define_method(req_class, "remote_addr", remote_addr, 0);
     rb_define_method(req_class, "rack_version", rack_version, 0);
     rb_define_method(req_class, "rack_url_scheme", rack_url_scheme, 0);
     rb_define_method(req_class, "rack_input", rack_input, 0);
@@ -713,6 +761,7 @@ request_init(VALUE mod) {
     rack_upgrade_val = rb_str_new_cstr("rack.upgrade?");	rb_gc_register_address(&rack_upgrade_val);
     rack_url_scheme_val = rb_str_new_cstr("rack.url_scheme");	rb_gc_register_address(&rack_url_scheme_val);
     rack_version_val = rb_str_new_cstr("rack.version");		rb_gc_register_address(&rack_version_val);
+    remote_addr_val = rb_str_new_cstr("REMOTE_ADDR");		rb_gc_register_address(&remote_addr_val);
     request_method_val = rb_str_new_cstr("REQUEST_METHOD");	rb_gc_register_address(&request_method_val);
     script_name_val = rb_str_new_cstr("SCRIPT_NAME");		rb_gc_register_address(&script_name_val);
     server_name_val = rb_str_new_cstr("SERVER_NAME");		rb_gc_register_address(&server_name_val);

data/ext/agoo/rgraphql.c

@@ -37,6 +37,9 @@ typedef struct _bhArgs {
 static VALUE		graphql_class = Qundef;
 static VALUE		vroot = Qnil;
 static VALUE		build_headers_func = Qnil;
+static VALUE		arg_clas = Qnil;
+static VALUE		field_clas = Qnil;
+static VALUE		type_clas = Qnil;
 
 static ID		call_id;
 
@@ -101,7 +104,7 @@ call_eval(VALUE x) {
 
 static void*
 protect_eval(void *x) {
-    rb_rescue2(call_eval, (VALUE)x, rescue_error, (VALUE)x, rb_eException, 0);
+    rb_rescue2(call_eval, (VALUE)x, rescue_error, (VALUE)x, rb_eException, (VALUE)0);
 
     return NULL;
 }
@@ -679,7 +682,7 @@ graphql_schema(VALUE self, VALUE root) {
 	printf("*-*-* %s\n", err.msg);
 	exit(6);
     }
-    rb_rescue2(rescue_yield, Qnil, rescue_yield_error, (VALUE)&err, rb_eException, 0);
+    rb_rescue2(rescue_yield, Qnil, rescue_yield_error, (VALUE)&err, rb_eException, (VALUE)0);
     if (AGOO_ERR_OK != err.code) {
 	printf("*-*-* %s\n", err.msg);
 	exit(7);
@@ -774,16 +777,16 @@ graphql_load_file(VALUE self, VALUE path) {
     return Qnil;
 }
 
-/* Document-method: dump_sdl
+/* Document-method: sdl_dump
  *
- * call-seq: dump_sdl()
+ * call-seq: sdl_dump()
  *
  * The preferred method of inspecting a GraphQL schema is to use introspection
  * queries but for debugging and for reviewing the schema a dump of the schema
- * as SDL can be helpful. The _#dump_sdl_ method returns the schema as an SDL
+ * as SDL can be helpful. The _#sdl_dump_ method returns the schema as an SDL
  * string.
  *
- * - *options* [_Hash_] server options
+ * - *options* [_Hash_] options
  *
  *   - *:with_description* [_true_|_false_] if true the description strings are included. If false they are not included.
  *
@@ -817,6 +820,79 @@ graphql_sdl_dump(VALUE self, VALUE options) {
     return dump;
 }
 
+static void
+type_cb(gqlType type, void *ctx) {
+    VALUE	rtypes = (VALUE)ctx;
+    VALUE	t;
+
+    if (GQL_OBJECT != type->kind || type->core) {
+	return;
+    }
+    t = rb_obj_alloc(type_clas);
+    rb_ivar_set(t, rb_intern("@name"), rb_str_new_cstr(type->name));
+    if (NULL != type->desc) {
+	rb_ivar_set(t, rb_intern("@description"), rb_str_new_cstr(type->desc));
+    }
+    if (NULL != type->fields) {
+	VALUE		fields = rb_ary_new();
+	VALUE		field;
+	gqlField	f;
+
+	rb_ivar_set(t, rb_intern("@fields"), fields);
+	for (f = type->fields; NULL != f; f = f->next) {
+	    field = rb_obj_alloc(field_clas);
+	    rb_ary_push(fields, field);
+	    rb_ivar_set(field, rb_intern("@name"), rb_str_new_cstr(f->name));
+	    if (NULL != f->desc) {
+		rb_ivar_set(field, rb_intern("@description"), rb_str_new_cstr(f->desc));
+	    }
+	    if (NULL != f->type) {
+		rb_ivar_set(field, rb_intern("@type_name"), rb_str_new_cstr(f->type->name));
+	    }
+	    if (NULL != f->default_value) {
+		rb_ivar_set(field, rb_intern("@default_value"), gval_to_ruby(f->default_value));
+	    }
+	    if (NULL != f->args) {
+		VALUE	args = rb_ary_new();
+		VALUE	arg;
+		gqlArg	a;
+
+		rb_ivar_set(field, rb_intern("@args"), args);
+		for (a = f->args; NULL != a; a = a->next) {
+		    arg = rb_obj_alloc(arg_clas);
+		    rb_ary_push(args, arg);
+		    rb_ivar_set(arg, rb_intern("@name"), rb_str_new_cstr(a->name));
+		    if (NULL != a->desc) {
+			rb_ivar_set(arg, rb_intern("@description"), rb_str_new_cstr(a->desc));
+		    }
+		    if (NULL != a->type) {
+			rb_ivar_set(arg, rb_intern("@type_name"), rb_str_new_cstr(a->type->name));
+		    }
+		    if (NULL != a->default_value) {
+			rb_ivar_set(arg, rb_intern("@default_value"), gval_to_ruby(a->default_value));
+		    }
+		}
+	    }
+	}
+    }
+    rb_ary_push(rtypes, t);
+}
+
+/* Document-method: sdl_types
+ *
+ * call-seq: sdl_types()
+ *
+ * Returns an array of all SDL types as Ruby objects.
+ */
+static VALUE
+graphql_sdl_types(VALUE self) {
+    VALUE	rtypes = rb_ary_new();
+
+    gql_type_iterate(type_cb, (void*)rtypes);
+
+    return rtypes;
+}
+
 /* Document-method: publish
  *
  * call-seq: publish(subject, event)
@@ -876,7 +952,7 @@ inner_build_headers(VALUE x) {
 
 static void*
 protected_build_headers(void *x) {
-    return (void*)rb_rescue2(inner_build_headers, (VALUE)x, rescue_build_header, (VALUE)x, rb_eException, 0);
+    return (void*)rb_rescue2(inner_build_headers, (VALUE)x, rescue_build_header, (VALUE)x, rb_eException, (VALUE)0);
 }
 
 static agooText
@@ -963,10 +1039,16 @@ graphql_init(VALUE mod) {
 
     rb_define_module_function(graphql_class, "sdl_dump", graphql_sdl_dump, 1);
 
+    rb_define_module_function(graphql_class, "sdl_types", graphql_sdl_types, 0);
+
     rb_define_module_function(graphql_class, "publish", graphql_publish, 2);
 
     rb_define_module_function(graphql_class, "build_headers=", graphql_build_headers, 1);
     rb_define_module_function(graphql_class, "headers", graphql_headers, 1);
 
+    arg_clas = rb_const_get_at(graphql_class, rb_intern("Arg"));
+    field_clas = rb_const_get_at(graphql_class, rb_intern("Field"));
+    type_clas = rb_const_get_at(graphql_class, rb_intern("Type"));
+
     call_id = rb_intern("call");
 }

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;
@@ -384,7 +385,7 @@ handle_base_inner(VALUE x) {
 
 static void*
 handle_base(void *x) {
-    rb_rescue2(handle_base_inner, (VALUE)x, rescue_error, (VALUE)x, rb_eException, 0);
+    rb_rescue2(handle_base_inner, (VALUE)x, rescue_error, (VALUE)x, rb_eException, (VALUE)0);
 
     return NULL;
 }
@@ -613,7 +614,7 @@ handle_rack_inner(VALUE x) {
 static void*
 handle_rack(void *x) {
     //rb_gc_disable();
-    rb_rescue2(handle_rack_inner, (VALUE)x, rescue_error, (VALUE)x, rb_eException, 0);
+    rb_rescue2(handle_rack_inner, (VALUE)x, rescue_error, (VALUE)x, rb_eException, (VALUE)0);
     //rb_gc_enable();
     //rb_gc();
 
@@ -638,7 +639,7 @@ handle_wab_inner(VALUE x) {
 
 static void*
 handle_wab(void *x) {
-    rb_rescue2(handle_wab_inner, (VALUE)x, rescue_error, (VALUE)x, rb_eException, 0);
+    rb_rescue2(handle_wab_inner, (VALUE)x, rescue_error, (VALUE)x, rb_eException, (VALUE)0);
 
     return NULL;
 }
@@ -696,7 +697,7 @@ handle_push_inner(VALUE x) {
 
 static void*
 handle_push(void *x) {
-    rb_rescue2(handle_push_inner, (VALUE)x, rescue_error, (VALUE)x, rb_eException, 0);
+    rb_rescue2(handle_push_inner, (VALUE)x, rescue_error, (VALUE)x, rb_eException, (VALUE)0);
     return 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/ext/agoo/server.c

@@ -160,8 +160,8 @@ listen_loop(void *x) {
 		    //fcntl(client_sock, F_SETFL, FNDELAY);
 		    setsockopt(client_sock, SOL_SOCKET, SO_KEEPALIVE, &optval, sizeof(optval));
 		    setsockopt(client_sock, IPPROTO_TCP, TCP_NODELAY, &optval, sizeof(optval));
-		    agoo_log_cat(&agoo_con_cat, "Server with pid %d accepted connection %llu on %s [%d]",
-				 getpid(), (unsigned long long)cnt, b->id, con->sock);
+		    agoo_log_cat(&agoo_con_cat, "Server with pid %d accepted connection %llu on %s [%d] from %s",
+				 getpid(), (unsigned long long)cnt, b->id, con->sock, con->remote);
 
 		    con_cnt = atomic_fetch_add(&agoo_server.con_cnt, 1);
 		    if (agoo_server.loop_max > agoo_server.loop_cnt && agoo_server.loop_cnt * LOOP_UP < con_cnt) {

data/ext/agoo/websocket.c

@@ -189,6 +189,7 @@ agoo_ws_create_req(agooCon c, long mlen) {
     c->req->method = (AGOO_WS_OP_BIN == op) ? AGOO_ON_BIN : AGOO_ON_MSG;
     c->req->upgrade = AGOO_UP_NONE;
     c->req->up = c->up;
+    memcpy(c->req->remote, c->remote, sizeof(c->remote));
     c->req->res = NULL;
     if (c->up->on_msg) {
 	c->req->hook = agoo_hook_create(AGOO_NONE, NULL, c->up->ctx, PUSH_HOOK, &agoo_server.eval_queue);

data/lib/agoo.rb

@@ -4,6 +4,7 @@ end
 
 require 'stringio' # needed for Ruby 2.7
 require 'agoo/version'
+require 'agoo/graphql'
 require 'rack/handler/agoo'
 require 'agoo/agoo' # C extension
 

data/lib/agoo/graphql.rb

@@ -0,0 +1,9 @@
+
+module Agoo
+  class GraphQL
+  end
+end
+
+require 'agoo/graphql/arg'
+require 'agoo/graphql/field'
+require 'agoo/graphql/type'

data/lib/agoo/graphql/arg.rb

@@ -0,0 +1,13 @@
+
+module Agoo
+  class GraphQL
+
+    class Arg
+      attr_accessor :name
+      attr_accessor :description
+      attr_accessor :type_name
+      attr_accessor :default_value
+    end
+
+  end
+end

data/lib/agoo/graphql/field.rb

@@ -0,0 +1,14 @@
+
+module Agoo
+  class GraphQL
+
+    class Field
+      attr_accessor :name
+      attr_accessor :description
+      attr_accessor :type_name
+      attr_accessor :args
+      attr_accessor :default_value
+    end
+
+  end
+end

data/lib/agoo/graphql/type.rb

@@ -0,0 +1,12 @@
+
+module Agoo
+  class GraphQL
+
+    class Type
+      attr_accessor :name
+      attr_accessor :description
+      attr_accessor :fields
+    end
+
+  end
+end

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '2.12.0'
+  VERSION = '2.14.0'
 end

data/test/base_handler_test.rb

@@ -82,7 +82,7 @@ class BaseHandlerTest < Minitest::Test
     GC.start
     Agoo::shutdown
   }
-  
+
   def test_eval
     uri = URI('http://localhost:6470/tellme?a=1')
     req = Net::HTTP::Get.new(uri)
@@ -132,13 +132,13 @@ class BaseHandlerTest < Minitest::Test
     req['Accept-Encoding'] = '*'
     req['Accept'] = 'application/json'
     req['User-Agent'] = 'Ruby'
-    
+
     res = Net::HTTP.start(uri.hostname, uri.port) { |h|
       h.request(req)
     }
     assert_equal(Net::HTTPNoContent, res.class)
   end
-  
+
   def test_put
     uri = URI('http://localhost:6470/makeme')
     req = Net::HTTP::Put.new(uri)
@@ -147,7 +147,7 @@ class BaseHandlerTest < Minitest::Test
     req['Accept'] = 'application/json'
     req['User-Agent'] = 'Ruby'
     req.body = 'hello'
-    
+
     res = Net::HTTP.start(uri.hostname, uri.port) { |h|
       h.request(req)
     }

data/test/rack_handler_test.rb

@@ -105,6 +105,7 @@ size=big
       "PATH_INFO" => "/tellme",
       "QUERY_STRING" => "a=1",
       "REQUEST_METHOD" => "GET",
+      "REMOTE_ADDR" => "127.0.0.1",
       "SCRIPT_NAME" => "",
       "SERVER_NAME" => "localhost",
       "SERVER_PORT" => "6467",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.14.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-19 00:00:00.000000000 Z
+date: 2020-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -34,6 +34,7 @@ description: A fast HTTP server supporting rack.
 email: peter@ohler.com
 executables:
 - agoo
+- agoo_stubs
 extensions:
 - ext/agoo/extconf.rb
 extra_rdoc_files:
@@ -45,6 +46,7 @@ files:
 - LICENSE
 - README.md
 - bin/agoo
+- bin/agoo_stubs
 - ext/agoo/agoo.c
 - ext/agoo/atomic.h
 - ext/agoo/base64.c
@@ -142,6 +144,10 @@ files:
 - ext/agoo/websocket.c
 - ext/agoo/websocket.h
 - lib/agoo.rb
+- lib/agoo/graphql.rb
+- lib/agoo/graphql/arg.rb
+- lib/agoo/graphql/field.rb
+- lib/agoo/graphql/type.rb
 - lib/agoo/version.rb
 - lib/rack/handler/agoo.rb
 - test/base_handler_test.rb