From: nullkal <nullkal@users.noreply.github.com>
Date: Thu, 8 Jun 2017 12:33:28 +0000 (+0900)
Subject: Support multiple trusted proxy ip addresses (#3639)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b8ea28d6d0bd5701cf35d6f633b0aa36ceb5ca9c;p=mastodon.git

Support multiple trusted proxy ip addresses (#3639)

* Support multiple trusted proxy ip addresses

* correct coding style
---

diff --git a/config/environments/production.rb b/config/environments/production.rb
index f253ab5c7..bd87d79a7 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -38,7 +38,7 @@ Rails.application.configure do
   config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Allow to specify public IP of reverse proxy if it's needed
-  config.action_dispatch.trusted_proxies = [IPAddr.new(ENV['TRUSTED_PROXY_IP'])] unless ENV['TRUSTED_PROXY_IP'].blank?
+  config.action_dispatch.trusted_proxies = ENV['TRUSTED_PROXY_IP'].split.map { |item| IPAddr.new(item) } unless ENV['TRUSTED_PROXY_IP'].blank?
 
   # Use the lowest log level to ensure availability of diagnostic information
   # when problems arise.