rack-attack 6.2.1 → 6.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55b137d5d1174ac14bcbc494ba7c6753652c23348fef73c5ac712884e299a8d0
-  data.tar.gz: 9aae493ec090c669ea43f7a5f9bc8a10e6786266477a4dd65b05495c7559e469
+  metadata.gz: 5479926deb14a57eebadf44bc0450c119c10c57844e6e887a6536a0dd79ddcc3
+  data.tar.gz: a7c6d3162887c8d7e29b7ba390c281be9757c7f9a022c7e705e2029f3d51d091
 SHA512:
-  metadata.gz: 2e283d8c8b2e5ffcd99435561230c6019a7a1f9637927d4ca29e0df2c9af9522cb84e60dddd040ab3429b1cc697213d80adb4a9b4cb7587933060ad6e426fabd
-  data.tar.gz: 1ef81c28f633e8c146a54a0930c706a3158aab568328743e0a3b0953bcbcba0bfb4a32a3e589ea1292c001ec6fd8d52a9c6de3cc4063b466045b692e92d27318
+  metadata.gz: 1ff52d16e17933058af32dbe0aeeb704914fb28331f9df3b2bd90fc1820f32f7cd60c9f254506fea6bf1845f850fa72f77dff57fb4a5ecaf4ce619497688bb00
+  data.tar.gz: 6f9a3f5adfddc7cd55274c24a7c9a4ff5e498324421abd3ef43cc5707f478a79824c0a5fb14d2a189128a22f42ffc1b144e06bd3bfbfb9e35de60f406edf6793

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

@@ -31,16 +31,12 @@ module Rack
         end
 
         def increment(key, amount, options = {})
-          count = nil
-
           rescuing do
             pipelined do
-              count = incrby(key, amount)
+              incrby(key, amount)
               expire(key, options[:expires_in]) if options[:expires_in]
-            end
+            end.first
           end
-
-          count.value if count
         end
 
         def delete(key, _options = {})

data/lib/rack/attack/version.rb

@@ -2,6 +2,6 @@
 
 module Rack
   class Attack
-    VERSION = '6.2.1'
+    VERSION = '6.2.2'
   end
 end

data/spec/integration/offline_spec.rb

@@ -45,3 +45,15 @@ if defined?(::Dalli)
     end
   end
 end
+
+if defined?(Redis)
+  describe 'when Redis is offline' do
+    include OfflineExamples
+
+    before do
+      @cache = Rack::Attack::Cache.new
+      # Use presumably unused port for Redis client
+      @cache.store = Redis.new(host: '127.0.0.1', port: 3333)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-attack
 version: !ruby/object:Gem::Version
-  version: 6.2.1
+  version: 6.2.2
 platform: ruby
 authors:
 - Aaron Suggs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2019-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -204,7 +204,6 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- bin/setup
 - lib/rack/attack.rb
 - lib/rack/attack/allow2ban.rb
 - lib/rack/attack/blocklist.rb
@@ -290,50 +289,50 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.1
 signing_key: 
 specification_version: 4
 summary: Block & throttle abusive requests
 test_files:
+- spec/rack_attack_spec.rb
+- spec/fail2ban_spec.rb
+- spec/allow2ban_spec.rb
+- spec/support/cache_store_helper.rb
+- spec/rack_attack_instrumentation_spec.rb
+- spec/rack_attack_throttle_spec.rb
 - spec/integration/offline_spec.rb
-- spec/rack_attack_path_normalizer_spec.rb
-- spec/acceptance/safelisting_subnet_spec.rb
+- spec/rack_attack_dalli_proxy_spec.rb
+- spec/acceptance/fail2ban_spec.rb
+- spec/acceptance/allow2ban_spec.rb
 - spec/acceptance/rails_middleware_spec.rb
+- spec/acceptance/throttling_spec.rb
 - spec/acceptance/track_throttle_spec.rb
-- spec/acceptance/cache_store_config_for_fail2ban_spec.rb
-- spec/acceptance/cache_store_config_with_rails_spec.rb
-- spec/acceptance/cache_store_config_for_allow2ban_spec.rb
-- spec/acceptance/safelisting_ip_spec.rb
-- spec/acceptance/track_spec.rb
 - spec/acceptance/blocking_subnet_spec.rb
 - spec/acceptance/blocking_ip_spec.rb
-- spec/acceptance/allow2ban_spec.rb
-- spec/acceptance/throttling_spec.rb
-- spec/acceptance/blocking_spec.rb
-- spec/acceptance/customizing_throttled_response_spec.rb
+- spec/acceptance/cache_store_config_with_rails_spec.rb
+- spec/acceptance/cache_store_config_for_fail2ban_spec.rb
+- spec/acceptance/safelisting_subnet_spec.rb
 - spec/acceptance/extending_request_object_spec.rb
 - spec/acceptance/safelisting_spec.rb
+- spec/acceptance/customizing_throttled_response_spec.rb
+- spec/acceptance/safelisting_ip_spec.rb
+- spec/acceptance/cache_store_config_for_allow2ban_spec.rb
+- spec/acceptance/customizing_blocked_response_spec.rb
 - spec/acceptance/cache_store_config_for_throttle_spec.rb
-- spec/acceptance/fail2ban_spec.rb
-- spec/acceptance/stores/active_support_mem_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/blocking_spec.rb
+- spec/acceptance/stores/redis_spec.rb
 - spec/acceptance/stores/active_support_redis_cache_store_pooled_spec.rb
+- spec/acceptance/stores/active_support_memory_store_spec.rb
 - spec/acceptance/stores/connection_pool_dalli_client_spec.rb
+- spec/acceptance/stores/active_support_redis_cache_store_spec.rb
 - spec/acceptance/stores/active_support_dalli_store_spec.rb
-- spec/acceptance/stores/redis_store_spec.rb
+- spec/acceptance/stores/active_support_mem_cache_store_pooled_spec.rb
+- spec/acceptance/stores/active_support_mem_cache_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
-- spec/rack_attack_instrumentation_spec.rb
-- spec/rack_attack_dalli_proxy_spec.rb
-- spec/rack_attack_spec.rb
-- spec/rack_attack_throttle_spec.rb
+- spec/acceptance/stores/redis_store_spec.rb
+- spec/acceptance/stores/active_support_redis_store_spec.rb
+- spec/acceptance/track_spec.rb
+- spec/rack_attack_path_normalizer_spec.rb
 - spec/rack_attack_request_spec.rb
-- spec/fail2ban_spec.rb
 - spec/rack_attack_track_spec.rb
-- spec/support/cache_store_helper.rb
+- spec/spec_helper.rb

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here