rack-graphql 2.3.1 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96ec802b9de117754bdea93534b69eb47be05796d31ecc362d2c1ac32d4ab929
-  data.tar.gz: f87c56ccc52c047e35ebde5777e7a0ff171e61263c6e58fe1b7312be47e41561
+  metadata.gz: 7b053aa44a60a954fb34b510282d975db883c54f3e301778f601cef8cee9f82b
+  data.tar.gz: 9ef8753993d89d6a0ac98864b01dd0a89ad8552765930e7ea933e63a9d60fd92
 SHA512:
-  metadata.gz: 2637be8f7dc262397347f60d89133cbfb354c3943b7b2e16343bf2ec26cb2ffd127eedfb0a0d255cc29fadff3c02005373539e2325b300b655f000ad6f55dbac
-  data.tar.gz: 4edf965d3d98f562618479721323adffc7093bdb34efeba9e495af8157e3690855f82d3f0dbcd77b49e4cad38247fe3c43dd6dd14efd8a1282d306e1dd6ddb70
+  metadata.gz: 1745f7f487e8a06447184464f9f2b2d97ac6f35dc4224d0122f4ed1f4c3ac37aec268c016db8d36c10f379e84e94e11d9b54a1d1512db07a20ac3684c355b31b
+  data.tar.gz: 2518a9c2c8842b34f23a4323b9579276a25a45065ffe97e7a155b3344cf00aadd5b7018c70af4ab9370979bda61dfdab4c5c046e933b2cd7f42ea51a90b77c15

data/.github/workflows/auto-merge.yml

@@ -0,0 +1,19 @@
+name: automerge
+on:
+  pull_request_review:
+    types:
+      - submitted
+  check_suite:
+    types:
+      - completed
+  status: {}
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: automerge
+        uses: "pascalgn/automerge-action@v0.12.0"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_METHOD: squash
+          MERGE_DELETE_BRANCH: true

data/.travis.yml

@@ -5,6 +5,7 @@ cache: bundler
 rvm:
   - 2.6
   - 2.7
+  - 3.0
 before_install: gem install bundler
 script:
   - bundle exec rake rubocop

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## 2.6.0 - 2021-01-14
+
+- Add ability to re-raise exception (`re_raise_exceptions` option)
+
+## 2.5.1 - 2020-11-19
+
+- respond with http status `400` when UTF null byte is passed as a part of the input
+
+## 2.5.0 - 2020-11-18
+
+- make `log_exception_backtrace` false by default and allow to be controlled by `RACK_GRAPHQL_LOG_EXCEPTION_BACKTRACE` env var
+
+## 2.4.0 - 2020-09-39
+
+- Use `http_status` from `ExecutionError` for http response
+
 ## 2.3.0 - 2020-09-39
 
 - Add `error_status_code_map` option to `RackGraphql::Application`.

data/Gemfile.lock

@@ -1,23 +1,23 @@
 PATH
   remote: .
   specs:
-    rack-graphql (2.3.1)
-      graphql (~> 1.11)
+    rack-graphql (2.6.1)
+      graphql
       oj
       rack (~> 2.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
+    ast (2.4.2)
     awesome_print (1.8.0)
     coderay (1.1.3)
     diff-lcs (1.4.4)
-    graphql (1.11.4)
+    graphql (1.12.0)
     method_source (1.0.0)
-    oj (3.10.14)
-    parallel (1.19.2)
-    parser (2.7.1.5)
+    oj (3.11.1)
+    parallel (1.20.1)
+    parser (3.0.0.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -26,43 +26,43 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.8.1)
+    rake (13.0.3)
+    regexp_parser (2.0.3)
     rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.92.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
+    rubocop (1.8.1)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.5.0)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.7.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
-    rubocop-performance (1.8.1)
-      rubocop (>= 0.87.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rspec (1.43.2)
-      rubocop (~> 0.87)
-    ruby-progressbar (1.10.1)
-    unicode-display_width (1.7.0)
+    rubocop-rake (0.5.1)
+      rubocop
+    rubocop-rspec (2.1.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-20
 
 DEPENDENCIES
   awesome_print
@@ -73,8 +73,8 @@ DEPENDENCIES
   rake
   rspec
   rubocop
-  rubocop-performance
+  rubocop-rake
   rubocop-rspec
 
 BUNDLED WITH
-   2.1.4
+   2.2.4

data/README.md

@@ -23,13 +23,15 @@ Add following to your `config.ru` file:
 
 ```ruby
 run RackGraphql::Application.call(
-  schema: YourGraqphqlSchema,                      # required
-  app_name: 'your-service-name',                   # optional, used for health endpoint content
-  context_handler: YourGraphqlContextHandler,      # optional, empty `proc` by default
-  log_exception_backtrace: !A9n.env.production?,   # optional, `true` default
-  health_route: true,                              # optional, true by default
-  logger: A9n.logger,                              # optional, not set by default
+  schema: YourGraqphqlSchema,                       # required
+  app_name: 'your-service-name',                    # optional, used for health endpoint content
+  context_handler: YourGraphqlContextHandler,       # optional, empty `proc` by default
+  log_exception_backtrace: !A9n.env.production?,    # optional, `false` default
+  # `true` when `RACK_GRAPHQL_LOG_EXCEPTION_BACKTRACE` env var is set to `'1'` or `'true'`
+  health_route: true,                               # optional, true by default
+  logger: A9n.logger,                               # optional, not set by default
   error_status_code_map: { IamTeapotError => 418 }, # optional
+  re_raise_exceptions: true,                        # optional, false by default
 )
 ```
 
@@ -80,6 +82,39 @@ RackGraphql catches all errors and respond with 500 code. By default it adds exc
 RackGraphql.log_exception_backtrace = false
 ```
 
+### Error tracking/reporting
+
+To respect the graphql spec, all errors need to be returned as json and `rack-graphql` catches all exceptions and does NOT re-raise them. You can change this behavior via `re_raise_exceptions` argument.
+Because of this, using error tracking middleware (`use Sentry::Rack::CaptureExceptions`, `use Raven::Rack`) does not take any effect for graphql requests.
+
+To use Sentry or other reporting tool for graphql queries, you can use `GraphQL::Schema` middleware:
+
+```ruby
+class GraphqlErrorTrackerMiddleware
+  def self.call(parent_type, parent_object, field_definition, field_args, query_context)
+    yield
+  rescue StandardError => e
+    extra = {
+      parent_type: parent_type.inspect,
+      parent_object: parent_object.inspect,
+      field_definition: field_definition.to_s,
+      field_args: field_args&.to_h,
+      query_context: query_context&.to_h
+    }
+    Sentry.capture_exception(e, extra: extra)
+    raise
+  end
+end
+
+# MySchema.middleware GraphqlErrorTrackerMiddleware
+# or
+# GraphQL::Schema.middleware GraphqlErrorTrackerMiddleware
+# or
+# class MySchema < GraphQL::Schema
+#   middleware GraphqlErrorTrackerMiddleware
+# end
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/RenoFi/rack-graphql. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/lib/rack_graphql.rb

@@ -2,6 +2,10 @@ require 'oj'
 require 'rack'
 require 'graphql'
 
+# Timeout needs to be manually required before following fix is released:
+# https://github.com/rmosolgo/graphql-ruby/commit/56abba472dbb48a1f8445d41f928bea72b5148e9
+require 'timeout'
+
 require 'rack_graphql/version'
 require 'rack_graphql/exceptions'
 require 'rack_graphql/health_response_builder'
@@ -10,8 +14,12 @@ require 'rack_graphql/application'
 
 module RackGraphql
   class << self
-    attr_accessor :log_exception_backtrace
-  end
+    def log_exception_backtrace
+      return @log_exception_backtrace unless @log_exception_backtrace.nil?
 
-  self.log_exception_backtrace = true
+      %w[1 true].include?(ENV['RACK_GRAPHQL_LOG_EXCEPTION_BACKTRACE'].to_s)
+    end
+
+    attr_writer :log_exception_backtrace
+  end
 end

data/lib/rack_graphql/application.rb

@@ -5,6 +5,7 @@ module RackGraphql
       app_name: 'rack-graphql-service',
       logger: nil,
       context_handler: nil,
+      re_raise_exceptions: false,
       log_exception_backtrace: RackGraphql.log_exception_backtrace,
       health_route: true,
       health_response_builder: RackGraphql::HealthResponseBuilder,
@@ -17,6 +18,7 @@ module RackGraphql
             app_name: app_name,
             schema: schema,
             context_handler: context_handler,
+            re_raise_exceptions: re_raise_exceptions,
             logger: logger,
             log_exception_backtrace: log_exception_backtrace,
             error_status_code_map: error_status_code_map,

data/lib/rack_graphql/middleware.rb

@@ -1,6 +1,8 @@
 module RackGraphql
   class Middleware
+    DEFAULT_STATUS_CODE = 200
     DEFAULT_ERROR_STATUS_CODE = 500
+    NULL_BYTE = '\u0000'.freeze
 
     def initialize(
       schema:,
@@ -8,6 +10,7 @@ module RackGraphql
       context_handler: nil,
       logger: nil,
       log_exception_backtrace: RackGraphql.log_exception_backtrace,
+      re_raise_exceptions: false,
       error_status_code_map: {}
     )
 
@@ -16,6 +19,7 @@ module RackGraphql
       @context_handler = context_handler || ->(_) {}
       @logger = logger
       @log_exception_backtrace = log_exception_backtrace
+      @re_raise_exceptions = re_raise_exceptions
       @error_status_code_map = error_status_code_map
     end
 
@@ -34,7 +38,7 @@ module RackGraphql
       result = execute(params: params, operation_name: operation_name, variables: variables, context: context)
 
       [
-        200,
+        response_status(result),
         response_headers(result),
         [response_body(result)]
       ]
@@ -50,9 +54,14 @@ module RackGraphql
       ]
     rescue StandardError, LoadError, SyntaxError => e
       # To respect the graphql spec, all errors need to be returned as json.
-      # It needs to take Rack::ShowExceptions role of catching all exceptions raised by the app.
+      # By default exceptions are not re-raised,
+      # so they cannot be caught by error tracking rack middlewares.
+      # You can change this behavior via `re_raise_exceptions` argument.
       exception_string = dump_exception(e)
       log(exception_string)
+
+      raise e if re_raise_exceptions
+
       env[Rack::RACK_ERRORS].puts(exception_string)
       env[Rack::RACK_ERRORS].flush
       [
@@ -66,14 +75,18 @@ module RackGraphql
 
     private
 
-    attr_reader :schema, :app_name, :logger, :context_handler, :log_exception_backtrace, :error_status_code_map
+    attr_reader :schema, :app_name, :logger, :context_handler,
+      :log_exception_backtrace, :error_status_code_map, :re_raise_exceptions
 
     def post_request?(env)
       env['REQUEST_METHOD'] == 'POST'
     end
 
     def post_data(env)
-      ::Oj.load(env['rack.input'].gets.to_s)
+      payload = env['rack.input'].read.to_s
+      return nil if payload.index(NULL_BYTE)
+
+      ::Oj.load(payload)
     rescue Oj::ParseError
       nil
     end
@@ -136,6 +149,13 @@ module RackGraphql
       end
     end
 
+    def response_status(result)
+      return DEFAULT_STATUS_CODE if result.is_a?(Array)
+
+      errors = result.to_h["errors"] || []
+      errors.map { |e| e["http_status"] }.compact.first || DEFAULT_STATUS_CODE
+    end
+
     def response_body(result = nil)
       if result_subscription?(result)
         body = result.to_h

data/lib/rack_graphql/version.rb

@@ -1,3 +1,3 @@
 module RackGraphql
-  VERSION = '2.3.1'.freeze
+  VERSION = '2.6.1'.freeze
 end

data/rack-graphql.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.6'
 
-  spec.add_dependency 'graphql', '~> 1.11'
+  spec.add_dependency 'graphql'
   spec.add_dependency 'oj'
   spec.add_dependency 'rack', '~> 2.2'
 
@@ -36,6 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-performance'
+  spec.add_development_dependency 'rubocop-rake'
   spec.add_development_dependency 'rubocop-rspec'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-graphql
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.6.1
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -9,22 +9,22 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +152,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,6 +193,7 @@ files:
 - ".github/ISSUE_TEMPLATE/story.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/auto-approve.yml"
+- ".github/workflows/auto-merge.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -232,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Rack middleware implementing graphql endpoint.