]> cat aescling's git repositories - mastodon.git/commitdiff
Support multiple trusted proxy ip addresses (#3639)
authornullkal <nullkal@users.noreply.github.com>
Thu, 8 Jun 2017 12:33:28 +0000 (21:33 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Thu, 8 Jun 2017 12:33:28 +0000 (14:33 +0200)
* Support multiple trusted proxy ip addresses

* correct coding style

config/environments/production.rb

index f253ab5c742255946ebad99e434c68fd68250093..bd87d79a7856362534b4c92123c544f6fcb9f85c 100644 (file)
@@ -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.