diff options
author | José Valim <jose.valim@gmail.com> | 2011-11-13 04:53:51 -0800 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-11-13 04:53:51 -0800 |
commit | 2591cc66924d3e625ed0dc755751ac0f7c1db2d3 (patch) | |
tree | a8bf021923ac4a6cba5f33e761d0383a36a425c5 /actionpack/lib/action_dispatch/http | |
parent | df300a754bf64d0c350fdc8c69408c5bd04b80a3 (diff) | |
parent | 317f4e22365e2d9b8200aefbda943798e8f85a82 (diff) | |
download | rails-2591cc66924d3e625ed0dc755751ac0f7c1db2d3.tar.gz rails-2591cc66924d3e625ed0dc755751ac0f7c1db2d3.tar.bz2 rails-2591cc66924d3e625ed0dc755751ac0f7c1db2d3.zip |
Merge pull request #3617 from indirect/remote_ip
refactor RemoteIp middleware
Diffstat (limited to 'actionpack/lib/action_dispatch/http')
-rw-r--r-- | actionpack/lib/action_dispatch/http/request.rb | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index 7a5237dcf3..69ca050d0c 100644 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -155,24 +155,7 @@ module ActionDispatch @ip ||= super end - # Which IP addresses are "trusted proxies" that can be stripped from - # the right-hand-side of X-Forwarded-For. - # - # http://en.wikipedia.org/wiki/Private_network#Private_IPv4_address_spaces. - TRUSTED_PROXIES = %r{ - ^127\.0\.0\.1$ | # localhost - ^(10 | # private IP 10.x.x.x - 172\.(1[6-9]|2[0-9]|3[0-1]) | # private IP in the range 172.16.0.0 .. 172.31.255.255 - 192\.168 # private IP 192.168.x.x - )\. - }x - - # Determines originating IP address. REMOTE_ADDR is the standard - # but will fail if the user is behind a proxy. HTTP_CLIENT_IP and/or - # HTTP_X_FORWARDED_FOR are set by proxies so check for these if - # REMOTE_ADDR is a proxy. HTTP_X_FORWARDED_FOR may be a comma- - # delimited list in the case of multiple chained proxies; the last - # address which is not trusted is the originating IP. + # Originating IP address, usually set by the RemoteIp middleware. def remote_ip @remote_ip ||= (@env["action_dispatch.remote_ip"] || ip).to_s end |