From 05f0e72c24725a9eafdb4dfd0ca574e9205dc829 Mon Sep 17 00:00:00 2001 From: Mac Siri Date: Wed, 31 Aug 2022 16:58:34 -0400 Subject: [PATCH] Simplify Rack::Attack (#18403) --- config/initializers/{rack_attack.rb => rack/attack.rb} | 7 ++----- .../{rack_attack_spec.rb => rack/attack_spec.rb} | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) rename config/initializers/{rack_attack.rb => rack/attack.rb} (89%) rename spec/initializers/{rack_attack_spec.rb => rack/attack_spec.rb} (99%) diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack/attack.rb similarity index 89% rename from config/initializers/rack_attack.rb rename to config/initializers/rack/attack.rb index 559676904..fd7ddaec5 100644 --- a/config/initializers/rack_attack.rb +++ b/config/initializers/rack/attack.rb @@ -43,11 +43,8 @@ module Rack end def self.track_and_return_ip(req) - ip_address = if ApplicationConfig["FASTLY_API_KEY"].present? - req.env["HTTP_FASTLY_CLIENT_IP"] - else - req.remote_ip - end + ip_address = req.env["HTTP_FASTLY_CLIENT_IP"] || req.remote_ip + return if ip_address.blank? Honeycomb.add_field("fastly_client_ip", req.env["HTTP_FASTLY_CLIENT_IP"]) diff --git a/spec/initializers/rack_attack_spec.rb b/spec/initializers/rack/attack_spec.rb similarity index 99% rename from spec/initializers/rack_attack_spec.rb rename to spec/initializers/rack/attack_spec.rb index d22c8d542..dbb286e05 100644 --- a/spec/initializers/rack_attack_spec.rb +++ b/spec/initializers/rack/attack_spec.rb @@ -1,6 +1,6 @@ require "rails_helper" -describe Rack, ".attack", type: :request, throttle: true do +describe Rack::Attack, type: :request, throttle: true do before do cache_db = ActiveSupport::Cache.lookup_store(:redis_cache_store) allow(Rails).to receive(:cache) { cache_db }