aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorCaleb Spare <cespare@gmail.com>2013-10-25 14:16:42 -0700
committerCaleb Spare <cespare@gmail.com>2013-10-26 12:28:44 -0700
commitcd78d725263b24ba33c1a5ec7b82f9576419f5d1 (patch)
tree87f9c2c3260bca24822f34a302d40d7e25e3b6a3 /actionpack/test
parent52199d1fd41ffc439357c16a7873fb04444175cd (diff)
downloadrails-cd78d725263b24ba33c1a5ec7b82f9576419f5d1.tar.gz
rails-cd78d725263b24ba33c1a5ec7b82f9576419f5d1.tar.bz2
rails-cd78d725263b24ba33c1a5ec7b82f9576419f5d1.zip
Make remote_ip detection properly handle private IPv6 addresses
Fixes #12638.
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/dispatch/request_test.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index f6de9748ca..44e7f04bc3 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -120,9 +120,12 @@ class RequestTest < ActiveSupport::TestCase
request = stub_request 'HTTP_X_FORWARDED_FOR' => 'unknown,::1'
assert_equal nil, request.remote_ip
- request = stub_request 'HTTP_X_FORWARDED_FOR' => '2001:0db8:85a3:0000:0000:8a2e:0370:7334, fe80:0000:0000:0000:0202:b3ff:fe1e:8329, ::1, fc00::'
+ request = stub_request 'HTTP_X_FORWARDED_FOR' => '2001:0db8:85a3:0000:0000:8a2e:0370:7334, fe80:0000:0000:0000:0202:b3ff:fe1e:8329, ::1, fc00::, fc01::, fdff'
assert_equal 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329', request.remote_ip
+ request = stub_request 'HTTP_X_FORWARDED_FOR' => 'FE00::, FDFF::'
+ assert_equal 'FE00::', request.remote_ip
+
request = stub_request 'HTTP_X_FORWARDED_FOR' => 'not_ip_address'
assert_equal nil, request.remote_ip
end