better_rate_limit 0.1.6 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd081be677a01d7f69d7e6e6ada8a3172d84d6ee74fbf7ccab5d5fbecb89ee58
-  data.tar.gz: 2817642bfee1165564273b8b36ae434e02e7135c6e63a887a4c178c4558d3752
+  metadata.gz: 7501160c6bba347fbc8eb40116c5a46c9d500b01d77116ed49e98c8985fb79da
+  data.tar.gz: 5ab03fac755181baffa23f4f876bcd331e71295ce56902d11b5d476ac1797ce6
 SHA512:
-  metadata.gz: bdd3fda987a39c8027d47ddec7b6112e089a609aaabd3a924e71a76417619b69284416183d68744ea05fa55b47e1cead0d04cb99ddb33937e6db97f578d784db
-  data.tar.gz: 7b03b579af9be74f8669af5531d254580b0f384232dc5cb295f6d4cbcea7ca3525d42ee41105f0c08dd121c6a68d91544e06dd38a7044bd0b4062cc6007077c5
+  metadata.gz: 35dabbd3e4cf261c6edc4e87e4ed55793ce492f7992b4dc4fa7ce32d41478fd8c2da7557f4ce19f394dd2e24005a979c211ae5adb23a1d20eadf177f38033778
+  data.tar.gz: 92f051eb2ecbe4ab682757ca066ecc2c53680a8f7cb8a938a9772f0dc30c2fe92cdee7d27c1d8deb81c1862ebd43bbc63c1a68c19d23f3228bfce285d4b7ddc7

data/Gemfile.lock

@@ -1,44 +1,45 @@
 PATH
   remote: .
   specs:
-    better_rate_limit (0.1.5)
+    better_rate_limit (0.1.9)
       actionpack (>= 5.0)
       redis (>= 3.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.4.3)
-      actionview (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    actionpack (5.2.6.2)
+      actionview (= 5.2.6.2)
+      activesupport (= 5.2.6.2)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.3)
-      activesupport (= 5.2.4.3)
+    actionview (5.2.6.2)
+      activesupport (= 5.2.6.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.2.4.3)
+    activesupport (5.2.6.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.9)
+    connection_pool (2.2.5)
     crass (1.0.6)
-    erubi (1.9.0)
-    i18n (1.8.5)
+    erubi (1.10.0)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
-    loofah (2.6.0)
+    loofah (2.14.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
     mini_portile2 (2.4.0)
-    minitest (5.14.1)
+    minitest (5.15.0)
     mocha (1.11.2)
     mock_redis (0.25.0)
     nokogiri (1.10.10)
@@ -47,8 +48,8 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     rack (2.2.3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -56,13 +57,16 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
     rake (12.3.3)
-    redis (4.2.5)
+    redis (5.0.3)
+      redis-client (>= 0.7.4)
+    redis-client (0.8.0)
+      connection_pool
     thread_safe (0.3.6)
     timecop (0.9.1)
-    tzinfo (1.2.7)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
 
 PLATFORMS

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
+    attr_accessor :ignore, :redis_client, :proxies_to_trust
 
     def initialize
       @ignore = false

data/lib/better_rate_limit/redis_connection.rb

@@ -2,6 +2,12 @@
 
 require 'redis'
 
+class MissingRedisConfigError < StandardError
+  def initialize
+    super 'Redis client not set'
+  end
+end
+
 module BetterRateLimit
   module RedisConnection
     def self.included(host)
@@ -10,7 +16,7 @@ module BetterRateLimit
 
     module ClassMethods
       def redis_client
-        @redis_client ||= Redis.new(url: ENV.fetch('REDIS_URL', 'redis://localhost:6379'))
+        @redis_client ||= BetterRateLimit.configuration.redis_client
       end
     end
   end

data/lib/better_rate_limit/throttle.rb

@@ -11,22 +11,23 @@ module BetterRateLimit
     class << self
       def throttle(key, limit:, time_window:)
         return true if BetterRateLimit.configuration.ignore
+        raise MissingRedisConfigError unless redis_client
 
         now = Time.now.utc
         timestamps_count = redis_client.llen key
 
         if timestamps_count < limit
-          redis_client.multi do
-            redis_client.rpush key, now
-            redis_client.expire key, time_window.to_i
+          redis_client.multi do |pipeline|
+            pipeline.rpush key, now
+            pipeline.expire key, time_window.to_i
           end
           true
         else
           first = redis_client.lpop(key)
 
-          redis_client.multi do
-            redis_client.rpush key, now
-            redis_client.expire key, time_window.to_i
+          redis_client.multi do |pipeline|
+            pipeline.rpush key, now
+            pipeline.expire key, time_window.to_i
           end
 
           return false unless first

data/lib/better_rate_limit/version.rb

@@ -1,3 +1,3 @@
 module BetterRateLimit
-  VERSION = "0.1.6"
+  VERSION = '0.1.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_rate_limit
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.9
 platform: ruby
 authors:
 - Pablo Fonseca
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2022-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis