feat: clear custom response when clearing configuration

lib/rack/attack/configuration.rb

@@ -3,6 +3,20 @@
 module Rack
   class Attack
     class Configuration
+      DEFAULT_BLOCKLISTED_RESPONSE = lambda { |_env| [403, { 'Content-Type' => 'text/plain' }, ["Forbidden\n"]] }
+
+      DEFAULT_THROTTLED_RESPONSE = lambda do |env|
+        if Rack::Attack.configuration.throttled_response_retry_after_header
+          match_data = env['rack.attack.match_data']
+          now = match_data[:epoch_time]
+          retry_after = match_data[:period] - (now % match_data[:period])
+
+          [429, { 'Content-Type' => 'text/plain', 'Retry-After' => retry_after.to_s }, ["Retry later\n"]]
+        else
+          [429, { 'Content-Type' => 'text/plain' }, ["Retry later\n"]]
+        end
+      end
+
       attr_reader :safelists, :blocklists, :throttles, :anonymous_blocklists, :anonymous_safelists
       attr_accessor :blocklisted_response, :throttled_response, :throttled_response_retry_after_header
 
@@ -15,17 +29,8 @@ module Rack
         @anonymous_safelists = []
         @throttled_response_retry_after_header = false
 
-        @blocklisted_response = lambda { |_env| [403, { 'Content-Type' => 'text/plain' }, ["Forbidden\n"]] }
+        @blocklisted_response = DEFAULT_BLOCKLISTED_RESPONSE
-        @throttled_response   = lambda do |env|
+        @throttled_response = DEFAULT_THROTTLED_RESPONSE
-          if throttled_response_retry_after_header
-            match_data = env['rack.attack.match_data']
-            now = match_data[:epoch_time]
-            retry_after = match_data[:period] - (now % match_data[:period])
-            [429, { 'Content-Type' => 'text/plain', 'Retry-After' => retry_after.to_s }, ["Retry later\n"]]
-          else
-            [429, { 'Content-Type' => 'text/plain' }, ["Retry later\n"]]
-          end
-        end
       end
 
       def safelist(name = nil, &block)
@@ -94,6 +99,9 @@ module Rack
         @anonymous_blocklists = []
         @anonymous_safelists = []
         @throttled_response_retry_after_header = false
+
+        @blocklisted_response = DEFAULT_BLOCKLISTED_RESPONSE
+        @throttled_response = DEFAULT_THROTTLED_RESPONSE
       end
     end
   end

spec/spec_helper.rb

@@ -30,16 +30,11 @@ class MiniTest::Spec
 
   before do
     Rails.cache = nil
-    @_original_throttled_response = Rack::Attack.throttled_response
-    @_original_blocklisted_response = Rack::Attack.blocklisted_response
   end
 
   after do
     Rack::Attack.clear_configuration
     Rack::Attack.instance_variable_set(:@cache, nil)
-
-    Rack::Attack.throttled_response = @_original_throttled_response
-    Rack::Attack.blocklisted_response = @_original_blocklisted_response
   end
 
   def app