From 18d614040a709918ce97b9ef49781b0db78ed0cd Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 25 Nov 2004 16:39:18 +0000 Subject: Fixed AbstractRequest#remote_ip for users going through proxies - Patch #228 [Eric Hodel] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@12 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/request.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb index f54a00dd86..d58cf58543 100755 --- a/actionpack/lib/action_controller/request.rb +++ b/actionpack/lib/action_controller/request.rb @@ -33,17 +33,17 @@ module ActionController # delimited list in the case of multiple chained proxies; the first is # the originating IP. def remote_ip - if env['HTTP_CLIENT_IP'] - env['HTTP_CLIENT_IP'] - elsif env['HTTP_X_FORWARDED_FOR'] - remote_ip = env['HTTP_X_FORWARDED_FOR'].split(',').reject { |ip| + return env['HTTP_CLIENT_IP'] if env.include? 'HTTP_CLIENT_IP' + + if env.include? 'HTTP_X_FORWARDED_FOR' then + remote_ips = env['HTTP_X_FORWARDED_FOR'].split(',').reject do |ip| ip =~ /^unknown$|^(10|172\.16|192\.168)\./i - }.first - - remote_ip ? remote_ip.strip : env['REMOTE_ADDR'] - else - env['REMOTE_ADDR'] + end + + return remote_ips.first.strip unless remote_ips.empty? end + + return env['REMOTE_ADDR'] end def request_uri -- cgit v1.2.3