better_rate_limit 0.1.7 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05720aabc13993c0e8fc708415d4464b6db86b9cdcffab16e9f32b6dabfaa935
-  data.tar.gz: 4e2c18b7928c45e3276e92d87eb080d977bcde352abe3f55c482afa815806808
+  metadata.gz: 454211c4744fb1f5ade5342a54ac4817ae535c7e70ba523152315ca1c2bd0440
+  data.tar.gz: d3146d311894d5f6f0cc7d69738e7b1ab2c0794fbc681660ce368d0e798e90e1
 SHA512:
-  metadata.gz: a081b16c393cc95387701e41eba68c5109aa8fcb574324042f55830828879d06f14c87a859f667b90b3df56108cb92b2e5d5954272e4169aa2e35d1517da69f8
-  data.tar.gz: 0db7a65a4135753ebe34fc6c0f34126ede4f41360fb4a3cab4999b2934c244423f9d46cd23c2b31cd18412826399462d256ddc9d41abc89d0feaf64541a64f0c
+  metadata.gz: 1f3137c0c5c9b5f8f69eb6c8d7823d0b968597aef3cf0fe89c068b50196d9ea34b247d6988fb9666be23efcf8e43e83f7c19a919c659c7c07c36cb39ffab9bba
+  data.tar.gz: 122491394a2ca936a6d0b8f9d45964ce3a948086eebaef777b09121ac5032145d0f64288a5b1219a11f97d6da244112f7bf9782bb533061112fce27f6cbd2788

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    better_rate_limit (0.1.6)
+    better_rate_limit (0.1.10)
       actionpack (>= 5.0)
       redis (>= 3.3)
 
@@ -29,6 +29,7 @@ GEM
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
+    connection_pool (2.2.5)
     crass (1.0.6)
     erubi (1.10.0)
     i18n (1.9.1)
@@ -59,7 +60,10 @@ GEM
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
     rake (12.3.3)
-    redis (4.3.1)
+    redis (5.0.4)
+      redis-client (>= 0.7.4)
+    redis-client (0.8.0)
+      connection_pool
     thread_safe (0.3.6)
     timecop (0.9.1)
     tzinfo (1.2.9)

data/lib/action_controller/better_rate_limit.rb

@@ -9,15 +9,15 @@ module ActionController
     module ClassMethods
       def rate_limit(max, options)
         rate_limits << Limit.build(max, controller_path, {
-                                        if: options[:if],
-                                        unless: options[:unless],
-                                        every: options[:every],
-                                        name: options[:name] || controller_path,
-                                        scope: options[:scope] || -> { real_ip },
-                                        only: options[:only] || [],
-                                        except: options[:except] || [],
-                                        clear_if: options[:clear_if]
-                                      })
+                                     if: options[:if],
+                                     unless: options[:unless],
+                                     every: options[:every],
+                                     name: options[:name] || controller_path,
+                                     scope: options[:scope] || -> { real_ip },
+                                     only: options[:only] || [],
+                                     except: options[:except] || [],
+                                     clear_if: options[:clear_if]
+                                   })
 
         before_action :perform_rate_limiting
         after_action :clear_keys
@@ -61,11 +61,12 @@ module ActionController
     private
 
     def json?
-      request.xhr? || request.format === :json
+      request.xhr? || request.format == :json
     end
 
     def real_ip
-      request.headers['X-Forwarded-For'].try(:split, ',').try(:[], -2..-2).try(:first).try(:strip)
+      request.headers['X-Forwarded-For'].try(:split, ',').try(:last,
+                                                              ::BetterRateLimit.configuration.proxies_to_trust).try(:first).try(:strip)
     end
 
     def under_rate_limit?(limit)

data/lib/better_rate_limit/configuration.rb

@@ -2,7 +2,7 @@
 
 module BetterRateLimit
   class Configuration
-    attr_accessor :ignore, :redis_client
+    attr_accessor :ignore, :redis_client, :proxies_to_trust
 
     def initialize
       @ignore = false

data/lib/better_rate_limit/throttle.rb

@@ -10,8 +10,8 @@ module BetterRateLimit
 
     class << self
       def throttle(key, limit:, time_window:)
-        raise MissingRedisConfigError unless redis_client
         return true if BetterRateLimit.configuration.ignore
+        raise MissingRedisConfigError unless redis_client
 
         now = Time.now.utc
         timestamps_count = redis_client.llen key
@@ -35,7 +35,7 @@ module BetterRateLimit
           passing = first.to_time(:utc) < time_window.ago
 
           unless passing
-            notify(key) unless redis_client.exists('failing-rate-limits:' + key)
+            notify(key) unless redis_client.exists?('failing-rate-limits:' + key)
             redis_client.setex('failing-rate-limits:' + key, time_window.to_i, '1')
           end
 

data/lib/better_rate_limit/version.rb

@@ -1,3 +1,3 @@
 module BetterRateLimit
-  VERSION = "0.1.7"
+  VERSION = '0.1.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_rate_limit
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.10
 platform: ruby
 authors:
 - Pablo Fonseca
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-15 00:00:00.000000000 Z
+date: 2022-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Rate limit requests