From 7293df319153dfc8c8b16f09612da36eb02e34fe Mon Sep 17 00:00:00 2001
From: Molly Struve <mollylbs@gmail.com>
Date: Thu, 14 May 2020 18:13:24 -0500
Subject: [PATCH] [deploy] Return if there is no ip_address from Method (#7874)

---
 config/initializers/rack/attack.rb | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/config/initializers/rack/attack.rb b/config/initializers/rack/attack.rb
index f965c80bf..2ba08070e 100644
--- a/config/initializers/rack/attack.rb
+++ b/config/initializers/rack/attack.rb
@@ -2,24 +2,18 @@ Rack::Attack.throttled_response_retry_after_header = true
 
 class Rack::Attack
   throttle("search_throttle", limit: 5, period: 1) do |request|
-    return if request.env["HTTP_FASTLY_CLIENT_IP"].blank?
-
     if request.path.starts_with?("/search/")
       track_and_return_ip(request.env["HTTP_FASTLY_CLIENT_IP"])
     end
   end
 
   throttle("api_throttle", limit: 3, period: 1) do |request|
-    return if request.env["HTTP_FASTLY_CLIENT_IP"].blank?
-
     if request.path.starts_with?("/api/") && request.get?
       track_and_return_ip(request.env["HTTP_FASTLY_CLIENT_IP"])
     end
   end
 
   throttle("api_write_throttle", limit: 1, period: 1) do |request|
-    return if request.env["HTTP_FASTLY_CLIENT_IP"].blank?
-
     if request.path.starts_with?("/api/") && (request.put? || request.post? || request.delete?)
       Honeycomb.add_field("user_api_key", request.env["HTTP_API_KEY"])
       track_and_return_ip(request.env["HTTP_FASTLY_CLIENT_IP"])
@@ -27,20 +21,18 @@ class Rack::Attack
   end
 
   throttle("site_hits", limit: 40, period: 2) do |request|
-    return if request.env["HTTP_FASTLY_CLIENT_IP"].blank?
-
     track_and_return_ip(request.env["HTTP_FASTLY_CLIENT_IP"])
   end
 
   throttle("message_throttle", limit: 2, period: 1) do |request|
-    return if request.env["HTTP_FASTLY_CLIENT_IP"].blank?
-
     if request.path.starts_with?("/messages") && request.post?
       track_and_return_ip(request.env["HTTP_FASTLY_CLIENT_IP"])
     end
   end
 
   def self.track_and_return_ip(ip_address)
+    return if ip_address.blank?
+
     Honeycomb.add_field("fastly_client_ip", ip_address)
     ip_address.to_s
   end