rack-attack 5.3.1 → 5.4.0

data/spec/acceptance/stores/{mem_cache_store_spec.rb → active_support_memory_store_spec.rb}

@@ -3,13 +3,13 @@ require_relative "../../support/cache_store_helper"
 
 require "timecop"
 
-describe "MemCacheStore as a cache backend" do
+describe "ActiveSupport::Cache::MemoryStore as a cache backend" do
   before do
-    Rack::Attack.cache.store = ActiveSupport::Cache::MemCacheStore.new
+    Rack::Attack.cache.store = ActiveSupport::Cache::MemoryStore.new
   end
 
   after do
-    Rack::Attack.cache.store.flush_all
+    Rack::Attack.cache.store.clear
   end
 
   it_works_for_cache_backed_features
@@ -29,10 +29,10 @@ describe "MemCacheStore as a cache backend" do
       get "/", {}, "REMOTE_ADDR" => "1.2.3.4"
     end
 
-    assert Rack::Attack.cache.store.get(key)
+    assert Rack::Attack.cache.store.fetch(key)
 
     sleep 2.1
 
-    assert_nil Rack::Attack.cache.store.get(key)
+    assert_nil Rack::Attack.cache.store.fetch(key)
   end
 end

data/spec/acceptance/stores/{redis_cache_store_pooled_spec.rb → active_support_redis_cache_store_pooled_spec.rb}

@@ -1,10 +1,10 @@
 require_relative "../../spec_helper"
-require_relative "../../support/cache_store_helper"
 
-require "timecop"
+if defined?(::ConnectionPool) && defined?(::Redis) && defined?(::ActiveSupport::Cache::RedisCacheStore)
+  require_relative "../../support/cache_store_helper"
+  require "timecop"
 
-if ActiveSupport.version >= Gem::Version.new("5.2.0")
-  describe "RedisCacheStore (pooled) as a cache backend" do
+  describe "ActiveSupport::Cache::RedisCacheStore (pooled) as a cache backend" do
     before do
       Rack::Attack.cache.store = ActiveSupport::Cache::RedisCacheStore.new(pool_size: 2)
     end

data/spec/acceptance/stores/{redis_cache_store_spec.rb → active_support_redis_cache_store_spec.rb}

@@ -1,10 +1,10 @@
 require_relative "../../spec_helper"
-require_relative "../../support/cache_store_helper"
 
-require "timecop"
+if defined?(::Redis) && defined?(::ActiveSupport::Cache::RedisCacheStore)
+  require_relative "../../support/cache_store_helper"
+  require "timecop"
 
-if ActiveSupport.version >= Gem::Version.new("5.2.0")
-  describe "RedisCacheStore as a cache backend" do
+  describe "ActiveSupport::Cache::RedisCacheStore as a cache backend" do
     before do
       Rack::Attack.cache.store = ActiveSupport::Cache::RedisCacheStore.new
     end

data/spec/acceptance/stores/active_support_redis_store_spec.rb

@@ -0,0 +1,40 @@
+require_relative "../../spec_helper"
+
+if defined?(::ActiveSupport::Cache::RedisStore)
+  require_relative "../../support/cache_store_helper"
+  require "timecop"
+
+  describe "ActiveSupport::Cache::RedisStore as a cache backend" do
+    before do
+      Rack::Attack.cache.store = ActiveSupport::Cache::RedisStore.new
+    end
+
+    after do
+      Rack::Attack.cache.store.flushdb
+    end
+
+    it_works_for_cache_backed_features
+
+    it "doesn't leak keys" do
+      Rack::Attack.throttle("by ip", limit: 1, period: 1) do |request|
+        request.ip
+      end
+
+      key = nil
+
+      # Freeze time during these statement to be sure that the key used by rack attack is the same
+      # we pre-calculate in local variable `key`
+      Timecop.freeze do
+        key = "rack::attack:#{Time.now.to_i}:by ip:1.2.3.4"
+
+        get "/", {}, "REMOTE_ADDR" => "1.2.3.4"
+      end
+
+      assert Rack::Attack.cache.store.read(key)
+
+      sleep 2.1
+
+      assert_nil Rack::Attack.cache.store.read(key)
+    end
+  end
+end

data/spec/acceptance/stores/connection_pool_dalli_client_spec.rb

@@ -0,0 +1,42 @@
+require_relative "../../spec_helper"
+
+if defined?(::Dalli) && defined?(::ConnectionPool)
+  require_relative "../../support/cache_store_helper"
+  require "connection_pool"
+  require "dalli"
+  require "timecop"
+
+  describe "ConnectionPool with Dalli::Client as a cache backend" do
+    before do
+      Rack::Attack.cache.store = ConnectionPool.new { Dalli::Client.new }
+    end
+
+    after do
+      Rack::Attack.cache.store.with { |client| client.flush_all }
+    end
+
+    it_works_for_cache_backed_features
+
+    it "doesn't leak keys" do
+      Rack::Attack.throttle("by ip", limit: 1, period: 1) do |request|
+        request.ip
+      end
+
+      key = nil
+
+      # Freeze time during these statement to be sure that the key used by rack attack is the same
+      # we pre-calculate in local variable `key`
+      Timecop.freeze do
+        key = "rack::attack:#{Time.now.to_i}:by ip:1.2.3.4"
+
+        get "/", {}, "REMOTE_ADDR" => "1.2.3.4"
+      end
+
+      assert(Rack::Attack.cache.store.with { |client| client.fetch(key) })
+
+      sleep 2.1
+
+      assert_nil(Rack::Attack.cache.store.with { |client| client.fetch(key) })
+    end
+  end
+end

data/spec/acceptance/stores/dalli_client_spec.rb

@@ -0,0 +1,41 @@
+require_relative "../../spec_helper"
+
+if defined?(::Dalli)
+  require_relative "../../support/cache_store_helper"
+  require "dalli"
+  require "timecop"
+
+  describe "Dalli::Client as a cache backend" do
+    before do
+      Rack::Attack.cache.store = Dalli::Client.new
+    end
+
+    after do
+      Rack::Attack.cache.store.flush_all
+    end
+
+    it_works_for_cache_backed_features
+
+    it "doesn't leak keys" do
+      Rack::Attack.throttle("by ip", limit: 1, period: 1) do |request|
+        request.ip
+      end
+
+      key = nil
+
+      # Freeze time during these statement to be sure that the key used by rack attack is the same
+      # we pre-calculate in local variable `key`
+      Timecop.freeze do
+        key = "rack::attack:#{Time.now.to_i}:by ip:1.2.3.4"
+
+        get "/", {}, "REMOTE_ADDR" => "1.2.3.4"
+      end
+
+      assert Rack::Attack.cache.store.fetch(key)
+
+      sleep 2.1
+
+      assert_nil Rack::Attack.cache.store.fetch(key)
+    end
+  end
+end

data/spec/acceptance/stores/redis_spec.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require_relative "../../spec_helper"
+
+if defined?(::Redis)
+  require_relative "../../support/cache_store_helper"
+  require "timecop"
+
+  describe "Plain redis as a cache backend" do
+    before do
+      Rack::Attack.cache.store = Redis.new
+    end
+
+    after do
+      Rack::Attack.cache.store.flushdb
+    end
+
+    it_works_for_cache_backed_features
+
+    it "doesn't leak keys" do
+      Rack::Attack.throttle("by ip", limit: 1, period: 1) do |request|
+        request.ip
+      end
+
+      key = nil
+
+      # Freeze time during these statement to be sure that the key used by rack attack is the same
+      # we pre-calculate in local variable `key`
+      Timecop.freeze do
+        key = "rack::attack:#{Time.now.to_i}:by ip:1.2.3.4"
+
+        get "/", {}, "REMOTE_ADDR" => "1.2.3.4"
+      end
+
+      assert Rack::Attack.cache.store.get(key)
+
+      sleep 2.1
+
+      assert_nil Rack::Attack.cache.store.get(key)
+    end
+  end
+end

data/spec/acceptance/stores/redis_store_spec.rb

@@ -0,0 +1,40 @@
+require_relative "../../spec_helper"
+require_relative "../../support/cache_store_helper"
+
+if defined?(::Redis::Store)
+  require "timecop"
+
+  describe "ActiveSupport::Cache::RedisStore as a cache backend" do
+    before do
+      Rack::Attack.cache.store = ::Redis::Store.new
+    end
+
+    after do
+      Rack::Attack.cache.store.flushdb
+    end
+
+    it_works_for_cache_backed_features
+
+    it "doesn't leak keys" do
+      Rack::Attack.throttle("by ip", limit: 1, period: 1) do |request|
+        request.ip
+      end
+
+      key = nil
+
+      # Freeze time during these statement to be sure that the key used by rack attack is the same
+      # we pre-calculate in local variable `key`
+      Timecop.freeze do
+        key = "rack::attack:#{Time.now.to_i}:by ip:1.2.3.4"
+
+        get "/", {}, "REMOTE_ADDR" => "1.2.3.4"
+      end
+
+      assert Rack::Attack.cache.store.read(key)
+
+      sleep 2.1
+
+      assert_nil Rack::Attack.cache.store.read(key)
+    end
+  end
+end

data/spec/integration/offline_spec.rb

@@ -1,6 +1,4 @@
 require 'active_support/cache'
-require 'redis-activesupport'
-require 'dalli'
 require_relative '../spec_helper'
 
 OfflineExamples = Minitest::SharedExamples.new do
@@ -17,27 +15,31 @@ OfflineExamples = Minitest::SharedExamples.new do
   end
 end
 
-describe 'when Redis is offline' do
-  include OfflineExamples
+if defined?(::ActiveSupport::Cache::RedisStore)
+  describe 'when Redis is offline' do
+    include OfflineExamples
 
-  before {
-    @cache = Rack::Attack::Cache.new
-    # Use presumably unused port for Redis client
-    @cache.store = ActiveSupport::Cache::RedisStore.new(:host => '127.0.0.1', :port => 3333)
-  }
+    before do
+      @cache = Rack::Attack::Cache.new
+      # Use presumably unused port for Redis client
+      @cache.store = ActiveSupport::Cache::RedisStore.new(:host => '127.0.0.1', :port => 3333)
+    end
+  end
 end
 
-describe 'when Memcached is offline' do
-  include OfflineExamples
+if defined?(::Dalli)
+  describe 'when Memcached is offline' do
+    include OfflineExamples
 
-  before {
-    Dalli.logger.level = Logger::FATAL
+    before do
+      Dalli.logger.level = Logger::FATAL
 
-    @cache = Rack::Attack::Cache.new
-    @cache.store = Dalli::Client.new('127.0.0.1:22122')
-  }
+      @cache = Rack::Attack::Cache.new
+      @cache.store = Dalli::Client.new('127.0.0.1:22122')
+    end
 
-  after {
-    Dalli.logger.level = Logger::INFO
-  }
+    after do
+      Dalli.logger.level = Logger::INFO
+    end
+  end
 end

data/spec/rack_attack_throttle_spec.rb

@@ -20,7 +20,7 @@ describe 'Rack::Attack.throttle' do
     end
 
     it 'should populate throttle data' do
-      data = { :count => 1, :limit => 1, :period => @period }
+      data = { :count => 1, :limit => 1, :period => @period, epoch_time: Rack::Attack.cache.last_epoch_time.to_i }
       last_request.env['rack.attack.throttle_data']['ip/sec'].must_equal data
     end
   end
@@ -37,7 +37,7 @@ describe 'Rack::Attack.throttle' do
     it 'should tag the env' do
       last_request.env['rack.attack.matched'].must_equal 'ip/sec'
       last_request.env['rack.attack.match_type'].must_equal :throttle
-      last_request.env['rack.attack.match_data'].must_equal(:count => 2, :limit => 1, :period => @period)
+      last_request.env['rack.attack.match_data'].must_equal(:count => 2, :limit => 1, :period => @period, epoch_time: Rack::Attack.cache.last_epoch_time.to_i)
       last_request.env['rack.attack.match_discriminator'].must_equal('1.2.3.4')
     end
 
@@ -65,7 +65,7 @@ describe 'Rack::Attack.throttle with limit as proc' do
     end
 
     it 'should populate throttle data' do
-      data = { :count => 1, :limit => 1, :period => @period }
+      data = { :count => 1, :limit => 1, :period => @period, epoch_time: Rack::Attack.cache.last_epoch_time.to_i }
       last_request.env['rack.attack.throttle_data']['ip/sec'].must_equal data
     end
   end
@@ -89,7 +89,7 @@ describe 'Rack::Attack.throttle with period as proc' do
     end
 
     it 'should populate throttle data' do
-      data = { :count => 1, :limit => 1, :period => @period }
+      data = { :count => 1, :limit => 1, :period => @period, epoch_time: Rack::Attack.cache.last_epoch_time.to_i }
       last_request.env['rack.attack.throttle_data']['ip/sec'].must_equal data
     end
   end

data/spec/rack_attack_track_spec.rb

@@ -47,15 +47,15 @@ describe 'Rack::Attack.track' do
 
   describe "without limit and period options" do
     it "should assign the track filter to a Check instance" do
-      tracker = Rack::Attack.track("homepage") { |req| req.path == "/" }
-      tracker.filter.class.must_equal Rack::Attack::Check
+      track = Rack::Attack.track("homepage") { |req| req.path == "/" }
+      track.filter.class.must_equal Rack::Attack::Check
     end
   end
 
   describe "with limit and period options" do
     it "should assign the track filter to a Throttle instance" do
-      tracker = Rack::Attack.track("homepage", :limit => 10, :period => 10) { |req| req.path == "/" }
-      tracker.filter.class.must_equal Rack::Attack::Throttle
+      track = Rack::Attack.track("homepage", :limit => 10, :period => 10) { |req| req.path == "/" }
+      track.filter.class.must_equal Rack::Attack::Throttle
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require "rubygems"
 require "bundler/setup"
 
 require "minitest/autorun"
@@ -9,16 +8,23 @@ require 'action_dispatch'
 
 require "rack/attack"
 
-begin
-  require 'pry'
-rescue LoadError
-  # nothing to do here
-end
-
 if RUBY_ENGINE == "ruby"
   require "byebug"
 end
 
+def safe_require(name)
+  begin
+    require name
+  rescue LoadError
+  end
+end
+
+safe_require "connection_pool"
+safe_require "dalli"
+safe_require "redis"
+safe_require "redis-activesupport"
+safe_require "redis-store"
+
 class MiniTest::Spec
   include Rack::Test::Methods
 
@@ -36,14 +42,14 @@ class MiniTest::Spec
   end
 
   def app
-    Rack::Builder.new {
+    Rack::Builder.new do
       # Use Rack::Lint to test that rack-attack is complying with the rack spec
       use Rack::Lint
       use Rack::Attack
       use Rack::Lint
 
       run lambda { |_env| [200, {}, ['Hello World']] }
-    }.to_app
+    end.to_app
   end
 
   def self.it_allows_ok_requests

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-attack
 version: !ruby/object:Gem::Version
-  version: 5.3.1
+  version: 5.4.0
 platform: ruby
 authors:
 - Aaron Suggs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2018-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,252 +16,174 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
+        version: '3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: appraisal
   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'
-- !ruby/object:Gem::Dependency
-  name: connection_pool
-  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'
-- !ruby/object:Gem::Dependency
-  name: dalli
-  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'
-- !ruby/object:Gem::Dependency
-  name: guard-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: memcache-client
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: minitest-stub-const
   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'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: redis-activesupport
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.57.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.57.2
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.2
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.2
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.2'
 description: A rack middleware for throttling and blocking abusive requests
 email: aaron@ktheory.com
 executables: []
@@ -283,6 +205,7 @@ files:
 - lib/rack/attack/store_proxy/dalli_proxy.rb
 - lib/rack/attack/store_proxy/mem_cache_proxy.rb
 - lib/rack/attack/store_proxy/redis_cache_store_proxy.rb
+- lib/rack/attack/store_proxy/redis_proxy.rb
 - lib/rack/attack/store_proxy/redis_store_proxy.rb
 - lib/rack/attack/throttle.rb
 - lib/rack/attack/track.rb
@@ -302,16 +225,22 @@ files:
 - spec/acceptance/safelisting_ip_spec.rb
 - spec/acceptance/safelisting_spec.rb
 - spec/acceptance/safelisting_subnet_spec.rb
-- spec/acceptance/stores/mem_cache_store_spec.rb
-- spec/acceptance/stores/redis_cache_store_pooled_spec.rb
-- spec/acceptance/stores/redis_cache_store_spec.rb
+- spec/acceptance/stores/active_support_dalli_store_spec.rb
+- spec/acceptance/stores/active_support_mem_cache_store_spec.rb
+- spec/acceptance/stores/active_support_memory_store_spec.rb
+- spec/acceptance/stores/active_support_redis_cache_store_pooled_spec.rb
+- spec/acceptance/stores/active_support_redis_cache_store_spec.rb
+- spec/acceptance/stores/active_support_redis_store_spec.rb
+- spec/acceptance/stores/connection_pool_dalli_client_spec.rb
+- spec/acceptance/stores/dalli_client_spec.rb
+- spec/acceptance/stores/redis_spec.rb
+- spec/acceptance/stores/redis_store_spec.rb
 - spec/acceptance/throttling_spec.rb
 - spec/acceptance/track_spec.rb
 - spec/acceptance/track_throttle_spec.rb
 - spec/allow2ban_spec.rb
 - spec/fail2ban_spec.rb
 - spec/integration/offline_spec.rb
-- spec/integration/rack_attack_cache_spec.rb
 - spec/rack_attack_dalli_proxy_spec.rb
 - spec/rack_attack_path_normalizer_spec.rb
 - spec/rack_attack_request_spec.rb
@@ -323,7 +252,10 @@ files:
 homepage: https://github.com/kickstarter/rack-attack
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/kickstarter/rack-attack/issues
+  changelog_uri: https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/kickstarter/rack-attack
 post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
@@ -347,7 +279,6 @@ specification_version: 4
 summary: Block & throttle abusive requests
 test_files:
 - spec/integration/offline_spec.rb
-- spec/integration/rack_attack_cache_spec.rb
 - spec/rack_attack_path_normalizer_spec.rb
 - spec/acceptance/safelisting_subnet_spec.rb
 - spec/acceptance/track_throttle_spec.rb
@@ -366,9 +297,16 @@ test_files:
 - spec/acceptance/safelisting_spec.rb
 - spec/acceptance/cache_store_config_for_throttle_spec.rb
 - spec/acceptance/fail2ban_spec.rb
-- spec/acceptance/stores/mem_cache_store_spec.rb
-- spec/acceptance/stores/redis_cache_store_spec.rb
-- spec/acceptance/stores/redis_cache_store_pooled_spec.rb
+- spec/acceptance/stores/active_support_redis_cache_store_spec.rb
+- spec/acceptance/stores/active_support_memory_store_spec.rb
+- spec/acceptance/stores/active_support_redis_store_spec.rb
+- spec/acceptance/stores/active_support_mem_cache_store_spec.rb
+- spec/acceptance/stores/active_support_redis_cache_store_pooled_spec.rb
+- spec/acceptance/stores/connection_pool_dalli_client_spec.rb
+- spec/acceptance/stores/active_support_dalli_store_spec.rb
+- spec/acceptance/stores/redis_store_spec.rb
+- spec/acceptance/stores/dalli_client_spec.rb
+- spec/acceptance/stores/redis_spec.rb
 - spec/acceptance/customizing_blocked_response_spec.rb
 - spec/spec_helper.rb
 - spec/allow2ban_spec.rb