6239-rate-limiting-prep

greenriver · Aug 1, 2024 · 2a03657 · 2a03657
1 parent f6c6194
commit 2a03657
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -111,7 +111,7 @@ def append_info_to_payload(payload)
     payload[:server_protocol] = request.env['SERVER_PROTOCOL']
     payload[:remote_ip] = request.remote_ip
     payload[:ip] = request.ip
-    payload[:remote_addr] = request.headers['REMOTE_ADDR']
+    payload[:remote_addr] = request.env['REMOTE_ADDR']
     payload[:x_forwarded_for] = request.headers['HTTP_X_FORWARDED_FOR']
     payload[:session_id] = request.env['rack.session.record'].try(:session_id)
     payload[:user_id] = current_user&.id

diff --git a/config/application.rb b/config/application.rb
@@ -85,9 +85,10 @@ class Application < Rails::Application
     # FIXME: required to make forms in pjax modals work
     config.action_controller.per_form_csrf_tokens = false
 
+    config.action_dispatch.trusted_proxies = ActionDispatch::RemoteIp::TRUSTED_PROXIES
     # Temporary: all of amazon
     TodoOrDie('trused proxy, only for testing', by: '2024-8-15')
-    config.action_dispatch.trusted_proxies = [IPAddr.new('44.192.0.0/11')] if Rails.env.staging?
+    config.action_dispatch.trusted_proxies += [IPAddr.new('44.192.0.0/11')] if Rails.env.staging?
 
     # Extension points
     config.sub_populations = {}