graph_attack 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de17498105231eb4dd5b5135cf8e7683680cafc409a66acf6fddbaa6f6735b36
-  data.tar.gz: 60308e8ccff6fb80b4b5013975f9ea4903cb037b16997030635ace4557211f17
+  metadata.gz: 8e7c2758ed10d1304e998ecdfb980897aec795513e69eaef79cfcc7b0d42b76f
+  data.tar.gz: 286c11e9c2dea795607c3c35d4b662254609ae71b89f3e6d6a17729578900132
 SHA512:
-  metadata.gz: 41706b8ea7768bf2d3220c6803f91c29a20640b177c8c443cf64a3462310dd939d4dfa92ffd2fd9f874bd6f256e50031ffbf893f5f4a58846fd7299191e12169
-  data.tar.gz: 873abb6b86cb16f3575cff878cd2be3d0c47723b472b2949a6f4c0f9c6164996fa3b72142ce3e74a71952c5da89eac400a346a43607f174fa2e28862c5dd8d57
+  metadata.gz: 0ffe6fd28792ec03d9592ac3caf36268dba9c4710cefbe1ab9f4f3913eaf45f610beebaa6a7a183e4593b1e447ae69fd93df4094815231d15dae1b72c6fa1e59
+  data.tar.gz: 4e38c3c995f9efe86991d237d27c1b1c0ccc984d4b7870acb3fbd24f204e80881edd337211f47d705919556a3467db08836581982a68b5345f7edd4a2fc2e5d4

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 unreleased
 ----------
 
+v2.2.0
+------
+
+Feature:
+- Skip throttling when rate limited field is nil (#19)
+
 v2.1.0
 ------
 

data/README.md

@@ -58,6 +58,8 @@ class GraphqlController < ApplicationController
 end
 ```
 
+If that key is `nil`, throttling will be disabled.
+
 ## Configuration
 
 ### Custom context key

data/lib/graph_attack/rate_limit.rb

@@ -4,12 +4,13 @@ module GraphAttack
   class RateLimit < GraphQL::Schema::FieldExtension
     def resolve(object:, arguments:, **_rest)
       rate_limited_field = object.context[rate_limited_key]
-      unless rate_limited_field
+
+      unless object.context.key?(rate_limited_key)
         raise GraphAttack::Error,
-              "Missing :#{rate_limited_key} value on the GraphQL context"
+              "Missing :#{rate_limited_key} key on the GraphQL context"
       end
 
-      if calls_exceeded_on_query?(rate_limited_field)
+      if rate_limited_field && calls_exceeded_on_query?(rate_limited_field)
         return RateLimited.new('Query rate limit exceeded')
       end
 
@@ -20,17 +21,15 @@ module GraphAttack
 
     def key
       on = "-#{options[:on]}" if options[:on]
+
       "graphql-query-#{field.name}#{on}"
     end
 
     def calls_exceeded_on_query?(rate_limited_field)
       rate_limit = Ratelimit.new(rate_limited_field, redis: redis_client)
       rate_limit.add(key)
-      rate_limit.exceeded?(
-        key,
-        threshold: threshold,
-        interval: interval,
-      )
+
+      rate_limit.exceeded?(key, threshold: threshold, interval: interval)
     end
 
     def threshold
@@ -50,7 +49,7 @@ module GraphAttack
     end
 
     def redis_client
-      options[:redis_client] || Redis.current
+      options[:redis_client] || Redis.new
     end
 
     def rate_limited_key

data/lib/graph_attack/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GraphAttack
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graph_attack
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Fanny Cheung
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-07 00:00:00.000000000 Z
+date: 2022-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql