TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Revert "Merge pull request #3640 from indirect/remote_ip"

Browse Source 
This reverts commit 6491aadc525b8703708e0fd0fbf05bd436a47801, reversing
changes made to 83bf0b626cf2134260903e57d74f67de57384073.

See https://github.com/rails/rails/pull/3640#issuecomment-2752761 for
explanation.
This commit is contained in:
Jon Leighton 2011-11-15 22:47:18 +00:00
parent 6491aadc52
commit 8d1a2b3ecd
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
actionpack/lib/action_dispatch/http/request.rb
View File

@ -155,9 +155,10 @@ def ip
@ip ||= super
end
# Originating IP address from the RemoteIp middleware.
# Originating IP address, usually set by the RemoteIp middleware.
def remote_ip
@remote_ip ||= @env["action_dispatch.remote_ip"]
# Coerce the remote_ip object into a string, because to_s could return nil
@remote_ip ||= @env["action_dispatch.remote_ip"].to_s || ip
end
# Returns the unique request id, which is based off either the X-Request-Id header that can

9
actionpack/lib/action_dispatch/middleware/remote_ip.rb
View File

@ -55,10 +55,7 @@ def calculate_ip
"HTTP_X_FORWARDED_FOR=#{@env['HTTP_X_FORWARDED_FOR'].inspect}"
end
not_proxy = client_ip || forwarded_ips.last || remote_addrs.first
# Return first REMOTE_ADDR if there are no other options
not_proxy || ips_from('REMOTE_ADDR', :all).first
client_ip || forwarded_ips.last || remote_addrs.first
end
def to_s
@ -69,9 +66,9 @@ def to_s
protected
def ips_from(header, allow_proxies = false)
def ips_from(header)
ips = @env[header] ? @env[header].strip.split(/[,\s]+/) : []
allow_proxies ? ips : ips.reject{|ip| ip =~ @middleware.proxies }
ips.reject{|ip| ip =~ @middleware.proxies }
end
end