agoo 2.12.1 → 2.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90300e7360e69307918af1de597ef316750dfe9b1970c5f92ff57913bd971401
-  data.tar.gz: dba7a5bda4f9d1405d17f738e84d049a8a9d32b79336581d0b7f11f190ec11ea
+  metadata.gz: 0fbaa8a1e2f42cda657178256643bcf0161f93d9be09e90512084eb877b12aa9
+  data.tar.gz: e33135684316f9e0244f0cc2e781561f99374888c7756866e0d2ed33db1c0446
 SHA512:
-  metadata.gz: faccbdb3de3a337fd54106bacf060cac12aec30171f9401b3f672b8f3c49a0a968decdd7cf2c4726be00810f2d788ab14bdaa1479b8b148017211db78a5f2d08
-  data.tar.gz: 8fbff6ad71237aa796d00cde0eeb6a5b1600a6a188c53af7319bee74ff1f146df8e78ed2cfdff33404c3dd38de568654fe5e8dad2427e3ff780378bba2cbb74b
+  metadata.gz: 630cf6226a74119dbb5417a8a33df2893e08e61acd6037f61d6d6a1d424c22a7bb61bfa59c65420b3e4026a421764b128b36ca9ae5dc2087722f338228f2e732
+  data.tar.gz: 6798931eaa91d29ccc0e6abe701cc62cc44b129b22e34f0f0dc53e26f409ca27c7a001424197f9c4c2f02820a8a670e38609e408ca4b6e5069957c9981a6b49f

data/CHANGELOG.md

@@ -2,6 +2,48 @@
 
 All changes to the Agoo gem are documented here. Releases follow semantic versioning.
 
+## [2.14.1] - 2021-06-09
+
+### Fixed
+- Evaluating an empty GraphQL request with comments only no longer crashes.
+- JSON parser bug fixed.
+
+## [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

data/README.md

@@ -1,4 +1,4 @@
-# agoo
+# [![{}j](misc/agoo_128.svg)](http://www.ohler.com/agoo) Agoo
 
 [![Build Status](https://img.shields.io/travis/ohler55/agoo/master.svg)](http://travis-ci.org/ohler55/agoo?branch=master)
 [![Gem Version](https://badge.fury.io/rb/agoo.svg)](https://badge.fury.io/rb/agoo)
@@ -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
@@ -139,4 +164,3 @@ the develop branch. Pull requests should be made against the develop branch.
 
  - *Perfer* *repo*: https://github.com/ohler55/perfer
 
-Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announcements and news about the Agoo gem.

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

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))) {
@@ -620,7 +620,7 @@ eval_post(agooErr err, agooReq req) {
     } else {
 	result = gql_doc_eval_func(err, doc);
     }
-    if (GQL_SUBSCRIPTION == doc->op->kind) {
+    if (NULL != doc->op && GQL_SUBSCRIPTION == doc->op->kind) {
 	result = NULL;
     }
 DONE:

data/ext/agoo/gqljson.c

@@ -307,6 +307,7 @@ parse_object(agooErr err, agooDoc doc) {
     agoo_doc_skip_jwhite(doc);
     if ('}' != *doc->cur) {
 	for (; doc->cur < doc->end; doc->cur++) {
+	    agoo_doc_skip_jwhite(doc);
 	    if ('"' != *doc->cur) {
 		return return_parse_err(err, doc, "expected an object key as a string", value);
 	    }

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;