Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/gitlab/rack_attack.rb b/lib/gitlab/rack_attack.rb
index bedbe9c0bff..b647965bb22 100644
--- a/lib/gitlab/rack_attack.rb
+++ b/lib/gitlab/rack_attack.rb
@@ -19,7 +19,7 @@ module Gitlab
         [429, { 'Content-Type' => 'text/plain' }.merge(throttled_headers), [Gitlab::Throttle.rate_limiting_response_text]]
       end
 
-      rack_attack.cache.store = Gitlab::RackAttack::InstrumentedCacheStore.new
+      rack_attack.cache.store = cache_store
 
       # Configure the throttles
       configure_throttles(rack_attack)
@@ -27,6 +27,14 @@ module Gitlab
       configure_user_allowlist
     end
 
+    def self.cache_store
+      if ENV['GITLAB_RACK_ATTACK_NEW_STORE'] == '1'
+        Gitlab::RackAttack::Store.new
+      else
+        Gitlab::RackAttack::InstrumentedCacheStore.new
+      end
+    end
+
     # Rate Limit HTTP headers are not standardized anywhere. This is the latest
     # draft submitted to IETF:
     # https://github.com/ietf-wg-httpapi/ratelimit-headers/blob/main/draft-ietf-httpapi-ratelimit-headers.md