rack-attack 4.3.1 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62911565ba358aadd130a8edf862d1f3ca57786d
-  data.tar.gz: 55876d8afb3bed309bb09a5b1fae357c8d5cdf10
+  metadata.gz: 7d06cf65c8cfce9d8611003c5da19f1384273d6d
+  data.tar.gz: 4e8e0064ab9087fc7503e9e1cb850f6dd10c8838
 SHA512:
-  metadata.gz: b54245dad4b5101ce8364da45654d650bfe86c2f4e3c85d48e3923b7ca8a31ad5ec61e3938745dedefba3fd117447e522a4207145b086eccf86bf14ba1696643
-  data.tar.gz: 57063639a9c9d6e3884b1a89cbfce044fefebe7dcb4a95f1e025e260db75490a05447d4e7294060aa55531b55d567b9763101debb2119a690c8760b0b94787ec
+  metadata.gz: d66f18bf9e4f6058c2f40339392e38a62f71afd6852eb0f3f30075fe1eb233b5a355b61bcac39dcf109644987c1ae41fb4831d6c0ed206827258f59a06c4883e
+  data.tar.gz: b5f72dc5abf4c6b27d89b38dfea3ba85cdbed807bf9aced9388c69707f5e8115aa06a32204bd6fc7c49263ea73dff8fbf2914fcb3868b8965b36e0b63729d10c

data/README.md

@@ -83,7 +83,7 @@ def call(env)
 end
 ```
 
-Note: `Rack::Attack::Request` is just a subclass of `Rack::Attack` so that you
+Note: `Rack::Attack::Request` is just a subclass of `Rack::Request` so that you
 can cleanly monkey patch helper methods onto the
 [request object](https://github.com/kickstarter/rack-attack/blob/master/lib/rack/attack/request.rb).
 

data/lib/rack/attack.rb

@@ -11,6 +11,7 @@ class Rack::Attack
   autoload :Track,           'rack/attack/track'
   autoload :StoreProxy,      'rack/attack/store_proxy'
   autoload :DalliProxy,      'rack/attack/store_proxy/dalli_proxy'
+  autoload :MemCacheProxy,   'rack/attack/store_proxy/mem_cache_proxy'
   autoload :RedisStoreProxy, 'rack/attack/store_proxy/redis_store_proxy'
   autoload :Fail2Ban,        'rack/attack/fail2ban'
   autoload :Allow2Ban,       'rack/attack/allow2ban'

data/lib/rack/attack/store_proxy.rb

@@ -1,19 +1,25 @@
 module Rack
   class Attack
     module StoreProxy
-      PROXIES = [DalliProxy, RedisStoreProxy]
+      PROXIES = [DalliProxy, MemCacheProxy, RedisStoreProxy]
 
       def self.build(store)
         # RedisStore#increment needs different behavior, so detect that
         # (method has an arity of 2; must call #expire separately
-        if defined?(::ActiveSupport::Cache::RedisStore) && store.is_a?(::ActiveSupport::Cache::RedisStore)
+        if (defined?(::ActiveSupport::Cache::RedisStore) && store.is_a?(::ActiveSupport::Cache::RedisStore)) ||
+          (defined?(::ActiveSupport::Cache::MemCacheStore) && store.is_a?(::ActiveSupport::Cache::MemCacheStore))
+
           # ActiveSupport::Cache::RedisStore doesn't expose any way to set an expiry,
-          # so use the raw Redis::Store instead
-          store = store.instance_variable_get(:@data)
+          # so use the raw Redis::Store instead.
+          # We also want to use the underlying Dalli client instead of ::ActiveSupport::Cache::MemCacheStore,
+          # and the MemCache client if using Rails 3.x
+          client = store.instance_variable_get(:@data)
+          if (defined?(::Redis::Store) && client.is_a?(Redis::Store)) ||
+            (defined?(Dalli::Client) && client.is_a?(Dalli::Client)) || (defined?(MemCache) && client.is_a?(MemCache))
+            store = store.instance_variable_get(:@data)
+          end
         end
-
         klass = PROXIES.find { |proxy| proxy.handle?(store) }
-
         klass ? klass.new(store) : store
       end
 

data/lib/rack/attack/store_proxy/mem_cache_proxy.rb

@@ -0,0 +1,51 @@
+module Rack
+  class Attack
+    module StoreProxy
+      class MemCacheProxy < SimpleDelegator
+        def self.handle?(store)
+          defined?(::MemCache) && store.is_a?(::MemCache)
+        end
+
+        def initialize(store)
+          super(store)
+          stub_with_if_missing
+        end
+
+        def read(key)
+          # Second argument: reading raw value
+          get(key, true)
+          rescue MemCache::MemCacheError
+        end
+
+        def write(key, value, options={})
+          # Third argument: writing raw value
+          set(key, value, options.fetch(:expires_in, 0), true)
+        rescue MemCache::MemCacheError
+        end
+
+        def increment(key, amount, options={})
+          incr(key, amount)
+        rescue MemCache::MemCacheError
+        end
+
+        def delete(key, options={})
+          with do |client|
+            client.delete(key)
+          end
+        rescue MemCache::MemCacheError
+        end
+
+        private
+
+        def stub_with_if_missing
+          unless __getobj__.respond_to?(:with)
+            class << self
+              def with; yield __getobj__; end
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/rack/attack/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Attack
-    VERSION = '4.3.1'
+    VERSION = '4.4.0'
   end
 end

data/spec/integration/rack_attack_cache_spec.rb

@@ -17,12 +17,14 @@ describe Rack::Attack::Cache do
   end
 
   require 'active_support/cache/dalli_store'
+  require 'active_support/cache/mem_cache_store'
   require 'active_support/cache/redis_store'
   require 'connection_pool'
   cache_stores = [
     ActiveSupport::Cache::MemoryStore.new,
     ActiveSupport::Cache::DalliStore.new("127.0.0.1"),
     ActiveSupport::Cache::RedisStore.new("127.0.0.1"),
+    ActiveSupport::Cache::MemCacheStore.new("127.0.0.1"),
     Dalli::Client.new,
     ConnectionPool.new { Dalli::Client.new },
     Redis::Store.new
@@ -54,6 +56,7 @@ describe Rack::Attack::Cache do
           @cache.send(:do_count, @key, @expires_in).must_equal 2
         end
       end
+
       describe "do_count after expires_in" do
         it "must be 1" do
           @cache.send(:do_count, @key, @expires_in)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-attack
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.4.0
 platform: ruby
 authors:
 - Aaron Suggs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: memcache-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A rack middleware for throttling and blocking abusive requests
 email: aaron@ktheory.com
 executables: []
@@ -168,6 +182,7 @@ files:
 - lib/rack/attack/request.rb
 - lib/rack/attack/store_proxy.rb
 - lib/rack/attack/store_proxy/dalli_proxy.rb
+- lib/rack/attack/store_proxy/mem_cache_proxy.rb
 - lib/rack/attack/store_proxy/redis_store_proxy.rb
 - lib/rack/attack/throttle.rb
 - lib/rack/attack/track.rb
@@ -205,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Block & throttle abusive requests