agoo 2.14.0 → 2.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f70842cac2f630e74251967ca0accfcb2dacef7b143bb3707ae74d88a0f1da36
-  data.tar.gz: 75996d57b98c1d164fa44009f1c6037deb28f22d7179b7bd3ede0296f3d9a605
+  metadata.gz: 843f3aa4a15a6ab57c7ff231930405c9ca55d3a6e33da3169a0677c420195fbe
+  data.tar.gz: 03f6b8760c6f08c0a3f9b5f75c747b77d1d4666b00af20d7db231418dfeb3c69
 SHA512:
-  metadata.gz: 39f02fdb5ab101d1414a57a7d712b6b4910b583e2509d0911d2cf5c398badfdb556c6847eaa7e108d280b590792bf3cb007514e4f6cd7c8f57ddb233299e3a0f
-  data.tar.gz: 10b2f2cc9d56d34e27dd597c5c2d0fa61bcf3921198efcbffcbfece23841656af9dc9eb6909b592e63ff30dd79aed315a55bacf97a471ac5c1c3e7acff4782f2
+  metadata.gz: '0684900cea98fbe812e5ae973ccd15dfaa054218340238dedfde382c535340945aea9857b98366fe52b2ff865129b299af541e940112200f2191b3b2247dfd58'
+  data.tar.gz: 95e68a0a7bc5a3eb8cd34b9853e8d89285ef9a1c78765bf970e80cdeb51f7f41f53db4948ca2885e29eef3fa7a6b738e015d01c4cbb25e41b2f50bac1fcb50a9

data/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All changes to the Agoo gem are documented here. Releases follow semantic versioning.
 
+## [2.14.3] - 2022-05-05
+
+### Fixed
+- Agoo now reports an error if the developer make the mistake of
+  building a schema that loops back on itself too many times using
+  fragments.
+
+## [2.14.2] - 2022-02-22
+
+### Fixed
+- Invalid SDL now raises and exception instead of crashing.
+
+## [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

data/README.md

@@ -1,6 +1,6 @@
-# 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)
+[![Build Status](https://img.shields.io/github/workflow/status/ohler55/agoo/CI?logo=github)](https://github.com/ohler55/agoo/actions/workflows/CI.yml)
 [![Gem Version](https://badge.fury.io/rb/agoo.svg)](https://badge.fury.io/rb/agoo)
 ![Gem](https://img.shields.io/gem/dt/agoo.svg) [![TideLift](https://tidelift.com/badges/github/ohler55/agoo)](https://tidelift.com/subscription/pkg/rubygems-agoo?utm_source=rubygems-agoo&utm_medium=referral&utm_campaign=readme)
 
@@ -163,5 +163,3 @@ the develop branch. Pull requests should be made against the develop branch.
  - *WABuR* *repo*: https://github.com/ohler55/wabur has an option to use Agoo
 
  - *Perfer* *repo*: https://github.com/ohler55/perfer
-
-Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announcements and news about the Agoo gem.

data/ext/agoo/extconf.rb

@@ -20,7 +20,7 @@ CONFIG['warnflags'].slice!(/ -Wdeclaration-after-statement/)
 CONFIG['warnflags'].slice!(/ -Wmissing-noreturn/)
 
 have_header('stdatomic.h')
-#have_header('sys/epoll.h')
+have_header('sys/epoll.h')
 have_header('openssl/ssl.h')
 have_library('ssl')
 

data/ext/agoo/gqleval.c

@@ -21,6 +21,7 @@
 #include "websocket.h"
 
 #define MAX_RESOLVE_ARGS	16
+#define MAX_DEPTH		100
 
 gqlRef		gql_root = NULL;
 gqlType		_gql_root_type = NULL;
@@ -273,7 +274,10 @@ gql_eval_sels(agooErr err, gqlDoc doc, gqlRef ref, gqlField field, gqlSel sels,
     gqlSel	sel;
     gqlField	sf = NULL;
 
-    // TBD if depth over max then return an error
+    if (MAX_DEPTH < depth) {
+	return agoo_err_set(err, AGOO_ERR_EVAL, "Maximum resolve depth of %d exceeded.", MAX_DEPTH);
+    }
+    depth++;
 
     for (sel = sels; NULL != sel; sel = sel->next) {
 	if (NULL != field) {
@@ -620,7 +624,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/gqlintro.c

@@ -1497,13 +1497,13 @@ gql_intro_eval(agooErr err, gqlDoc doc, gqlSel sel, gqlValue result, int depth)
     struct _gqlCobj	obj;
 
     if (0 == strcmp("__type", sel->name)) {
-	if (1 < depth) {
+	if (2 < depth) {
 	    return agoo_err_set(err, AGOO_ERR_EVAL, "__type can only be called from a query root.");
 	}
 	obj.clas = &root_class;
 	obj.ptr = NULL;
     } else if (0 == strcmp("__schema", sel->name)) {
-	if (1 < depth) {
+	if (2 < depth) {
 	    return agoo_err_set(err, AGOO_ERR_EVAL, "__scheme can only be called from a query root.");
 	}
 	obj.clas = &root_class;

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

@@ -892,8 +892,8 @@ gql_assure_nonnull(agooErr err, gqlType base) {
 
 void
 gql_type_destroy(gqlType type) {
-    type_destroy(type);
     type_remove(type);
+    type_destroy(type);
 }
 
 // If negative then there are non-simple-string characters.

data/ext/agoo/ready.c

@@ -5,7 +5,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#if HAVE_SYS_EPOLL_H
+#ifdef HAVE_SYS_EPOLL_H
 #include <sys/epoll.h>
 #else
 #include <ctype.h>
@@ -22,7 +22,7 @@
 // milliseconds
 #define MAX_WAIT		10
 
-#if HAVE_SYS_EPOLL_H
+#ifdef HAVE_SYS_EPOLL_H
 #define EPOLL_SIZE		100
 #else
 #define INITIAL_POLL_SIZE	1024
@@ -34,7 +34,7 @@ typedef struct _link {
     int			fd;
     void		*ctx;
     agooHandler		handler;
-#if HAVE_SYS_EPOLL_H
+#ifdef HAVE_SYS_EPOLL_H
     uint32_t		events; // last events set
 #else
     struct pollfd	*pp;
@@ -45,7 +45,7 @@ struct _agooReady {
     Link	links;
     int		lcnt;
     double	next_check;
-#if HAVE_SYS_EPOLL_H
+#ifdef HAVE_SYS_EPOLL_H
     int		epoll_fd;
 #else
     struct pollfd	*pa;
@@ -82,7 +82,7 @@ agoo_ready_create(agooErr err) {
 	ready->links = NULL;
 	ready->lcnt = 0;
 	ready->next_check = dtime() + CHECK_FREQ;
-#if HAVE_SYS_EPOLL_H
+#ifdef HAVE_SYS_EPOLL_H
 	if (0 > (ready->epoll_fd = epoll_create(1))) {
 	    agoo_err_no(err, "epoll create failed");
 	    return NULL;
@@ -111,7 +111,7 @@ agoo_ready_destroy(agooReady ready) {
 	}
 	AGOO_FREE(link);
     }
-#if HAVE_SYS_EPOLL_H
+#ifdef HAVE_SYS_EPOLL_H
     close(ready->epoll_fd);
 #else
     AGOO_FREE(ready->pa);
@@ -137,7 +137,7 @@ agoo_ready_add(agooErr		err,
     ready->links = link;
     ready->lcnt++;
 
-#if HAVE_SYS_EPOLL_H
+#ifdef HAVE_SYS_EPOLL_H
     link->events = EPOLLIN;
     {
 	struct epoll_event	event = {
@@ -181,7 +181,7 @@ ready_remove(agooReady ready, Link link) {
     if (NULL != link->next) {
 	link->next->prev = link->prev;
     }
-#if HAVE_SYS_EPOLL_H
+#ifdef HAVE_SYS_EPOLL_H
     {
 	struct epoll_event	event = {
 	    .events = 0,
@@ -214,7 +214,7 @@ agoo_ready_go(agooErr err, agooReady ready) {
     Link	link;
     Link	next;
 
-#if HAVE_SYS_EPOLL_H
+#ifdef HAVE_SYS_EPOLL_H
     struct epoll_event	events[EPOLL_SIZE];
     struct epoll_event	*ep;
     int			cnt;

data/ext/agoo/rserver.c

@@ -523,14 +523,14 @@ handle_rack_inner(VALUE x) {
 		if (Qnil != body) {
 		    body = rb_ivar_get(body, rb_intern("@body"));
 		}
-		if (rb_respond_to(body, rb_intern("each"))) {
-		    rb_iterate(rb_each, body, body_len_cb, (VALUE)&bsize);
+		if (rb_respond_to(body, each_id)) {
+		    rb_block_call(body, each_id, 0, 0, body_len_cb, (VALUE)&bsize);
 		}
 	    } else {
-		rb_iterate(rb_each, bv, body_len_cb, (VALUE)&bsize);
+		rb_block_call(bv, each_id, 0, 0, body_len_cb, (VALUE)&bsize);
 	    }
 	} else {
-	    rb_iterate(rb_each, bv, body_len_cb, (VALUE)&bsize);
+	    rb_block_call(bv, each_id, 0, 0, body_len_cb, (VALUE)&bsize);
 	}
     }
     switch (code) {
@@ -587,7 +587,7 @@ handle_rack_inner(VALUE x) {
 	if (T_HASH == rb_type(hv)) {
 	    rb_hash_foreach(hv, header_cb, (VALUE)&t);
 	} else {
-	    rb_iterate(rb_each, hv, header_each_cb, (VALUE)&t);
+	    rb_block_call(hv, each_id, 0, 0, header_each_cb, (VALUE)&t);
 	}
     }
     t = agoo_text_append(t, "\r\n", 2);
@@ -602,7 +602,7 @@ handle_rack_inner(VALUE x) {
 		t = agoo_text_append(t, StringValuePtr(v), (int)RSTRING_LEN(v));
 	    }
 	} else {
-	    rb_iterate(rb_each, bv, body_append_cb, (VALUE)&t);
+	    rb_block_call(bv, each_id, 0, 0, body_append_cb, (VALUE)&t);
 	}
     }
     agoo_res_message_push(req->res, t);

data/lib/agoo/version.rb

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

data/test/graphql_error_test.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+
+$: << File.dirname(__FILE__)
+$root_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
+%w(lib ext).each do |dir|
+  $: << File.join($root_dir, dir)
+end
+
+require 'minitest'
+require 'minitest/autorun'
+
+require 'agoo'
+
+class Schema
+  attr_reader :query
+
+  def initialize()
+  end
+end
+
+class GraphQLErrTest < Minitest::Test
+
+  def test_bad_sdl
+    bad_sdl = %^
+type Query @ruby(class: "Query" {
+}
+^
+    Agoo::GraphQL.schema(Schema.new) {
+      assert_raises(StandardError) {
+	Agoo::GraphQL.load(bad_sdl)
+      }
+    }
+  end
+
+end

data/test/graphql_test.rb

@@ -79,6 +79,7 @@ end
 $songs_sdl = %^
 type Query @ruby(class: "Query") {
   artist(name: String!): Artist
+  artists: [Artist!]
 }
 
 type Mutation {
@@ -120,26 +121,30 @@ type Song {
 ^
 
 class Query
-  attr_reader :artists
+  attr_reader :artistHash
 
   def initialize(artists)
-    @artists = artists
+    @artistHash = artists
   end
 
   def artist(args)
-    @artists[args['name']]
+    @artistHash[args['name']]
+  end
+
+  def artists(args)
+    @artistHash.values
   end
 end
 
 class Mutation
-  attr_reader :artists
+  attr_reader :artistHash
 
   def initialize(artists)
-    @artists = artists
+    @artistHash = artists
   end
 
   def like(args)
-    artist = @artists[args['artist']]
+    artist = @artistHash[args['artist']]
     artist.like
     artist
   end
@@ -187,6 +192,7 @@ type Mutation @ruby(class: "Mutation") {
 
 type Query @ruby(class: "Query") {
   artist(name: String!): Artist
+  artists: [Artist!]
 }
 
 type Song @ruby(class: "Song") {
@@ -452,6 +458,56 @@ fragment basic on Artist {
     post_test(uri, body, 'application/graphql', expect)
   end
 
+  def test_post_fragment_loop
+    uri = URI('http://localhost:6472/graphql?indent=2')
+    body = %^
+{
+  artist(name:"Fazerdaze") {
+    ...loop
+  }
+}
+
+fragment loop on Artist {
+  name
+  ...loop
+}
+^
+    expect = %^{
+  "errors":[
+    {
+      "message":"Maximum resolve depth of 100 exceeded.",
+      "code":"eval error"
+    }
+  ]
+}
+^
+    post_test(uri, body, 'application/graphql', expect, 'errors.0.timestamp')
+  end
+
+  def test_post_json_fragment
+    uri = URI('http://localhost:6472/graphql?indent=2')
+    body = %^{
+  "query": "fragment basic on Artist {name origin} query list($filter: String) {artists {...basic}}",
+  "operationName": "list",
+  "variables": {"filters": {}}
+}^
+    expect = %^{
+  "data":{
+    "artists":[
+      {
+        "name":"Fazerdaze",
+        "origin":[
+          "Morningside",
+          "Auckland",
+          "New Zealand"
+        ]
+      }
+    ]
+  }
+}^
+    post_test(uri, body, 'application/json', expect)
+  end
+
   def test_post_inline
     uri = URI('http://localhost:6472/graphql?indent=2')
     body = %^
@@ -1014,7 +1070,7 @@ mutation {
     assert_equal(expect, content)
   end
 
-  def post_test(uri, body, content_type, expect)
+  def post_test(uri, body, content_type, expect, ignore=nil)
     uri = URI(uri)
     req = Net::HTTP::Post.new(uri)
     req['Accept-Encoding'] = '*'
@@ -1025,6 +1081,11 @@ mutation {
     }
     content = res.body
     assert_equal('application/json', res['Content-Type'])
+    unless ignore.nil?
+      result = Oj.load(content, mode: :strict)
+      deep_delete(result, ignore.split('.'))
+      content = Oj.dump(result, indent: 2)
+    end
     assert_equal(expect, content)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.14.3
 platform: ruby
 authors:
 - Peter Ohler
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-07 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -154,6 +154,7 @@ files:
 - test/bind_test.rb
 - test/domain_test.rb
 - test/early_hints_test.rb
+- test/graphql_error_test.rb
 - test/graphql_test.rb
 - test/hijack_test.rb
 - test/log_test.rb
@@ -163,7 +164,7 @@ homepage: https://github.com/ohler55/agoo
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "-t"
 - Agoo
@@ -189,17 +190,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Linux or macOS
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: An HTTP server
 test_files:
-- test/graphql_test.rb
-- test/hijack_test.rb
-- test/rack_handler_test.rb
 - test/base_handler_test.rb
-- test/log_test.rb
+- test/bind_test.rb
 - test/domain_test.rb
 - test/early_hints_test.rb
-- test/bind_test.rb
+- test/graphql_error_test.rb
+- test/graphql_test.rb
+- test/hijack_test.rb
+- test/log_test.rb
+- test/rack_handler_test.rb
 - test/static_test.rb