From dd6c09e58111fc30b67f8ddff131133c0753540a Mon Sep 17 00:00:00 2001
From: Cristian Greco <cristian@gocardless.com>
Date: Sun, 7 Jul 2019 22:10:17 +0100
Subject: [PATCH 1/2] Failsafe on Redis error replies in RedisCacheStoreProxy.

RedisCacheStoreProxy will blow up when RedisCacheStore raises a
CommandError exception. In fact, by default the proxied store only
handles BaseConnectionError exceptions, but will let bubble up any other
type of exception from the underlying client.

This pull request uses the same approach from RedisProxy, where store
operations are wrapped in a `rescuing` block that rescues and ignores
BaseError exceptions (the most generic exception class that can be
raised by the Redis client).
---
 .../store_proxy/redis_cache_store_proxy.rb    | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/lib/rack/attack/store_proxy/redis_cache_store_proxy.rb b/lib/rack/attack/store_proxy/redis_cache_store_proxy.rb
index 78807f8..f4081be 100644
--- a/lib/rack/attack/store_proxy/redis_cache_store_proxy.rb
+++ b/lib/rack/attack/store_proxy/redis_cache_store_proxy.rb
@@ -15,17 +15,33 @@ module Rack
           #
           # So in order to workaround this we use RedisCacheStore#write (which sets expiration) to initialize
           # the counter. After that we continue using the original RedisCacheStore#increment.
-          if options[:expires_in] && !read(name)
-            write(name, amount, options)
+          rescuing do
+            if options[:expires_in] && !read(name)
+              write(name, amount, options)
 
-            amount
-          else
-            super
+              amount
+            else
+              super
+            end
           end
         end
 
+        def read(*_args)
+          rescuing { super }
+        end
+
         def write(name, value, options = {})
-          super(name, value, options.merge!(raw: true))
+          rescuing do
+            super(name, value, options.merge!(raw: true))
+          end
+        end
+
+        private
+
+        def rescuing
+          yield
+        rescue Redis::BaseError
+          nil
         end
       end
     end

From c16eba61fb19c56ac106e50c7d24c6e176b7d1b2 Mon Sep 17 00:00:00 2001
From: Maxime <maxime.menigoz@gmail.com>
Date: Tue, 16 Jul 2019 14:12:22 +0200
Subject: [PATCH 2/2] Fix typo in CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce6d683..cae5b87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
-- Changed `ActiveSupport::Notifications` event naming to comply with the recommneded format.
+- Changed `ActiveSupport::Notifications` event naming to comply with the recommended format.
 - Changed `ActiveSupport::Notifications` event so that the 5th yielded argument to the `#subscribe` method is now a
   `Hash` instead of a `Rack::Attack::Request`, to comply with `ActiveSupport`s spec. The original request object is
   still accessible, being the value of the hash's `:request` key.