kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

uri/generic.rb: fix exception on non-IP format

Browse source 
* lib/uri/generic.rb (URI::Generic#find_proxy): match IP address
  no_proxy against resolved self IP address.  [Fix GH-1513]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57359 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-01-17 12:54:35 +00:00
parent 2a9dd6b818
commit 556e3da421
2 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/uri/generic.rb
View file

@ -1531,14 +1531,14 @@ module URI
if (!port || self.port == port.to_i)
if /(\A|\.)#{Regexp.quote host}\z/i =~ self.host
return nil
else
elsif addr
require 'ipaddr'
return nil if
begin
IPAddr.new(host)
rescue IPAddr::InvalidAddressError
next
end.include?(self.host)
end.include?(addr)
end
end
}

25
test/uri/test_generic.rb
View file

@ -839,6 +839,31 @@ class URI::TestGeneric < Test::Unit::TestCase
with_proxy_env('http_proxy'=>'http://127.0.0.1:8080', 'no_proxy'=>'192.0.2.2') {|env|
assert_equal(URI('http://127.0.0.1:8080'), URI("http://192.0.2.1/").find_proxy(env))
assert_nil(URI("http://192.0.2.2/").find_proxy(env))
getaddress = IPSocket.method(:getaddress)
begin
class << IPSocket
undef getaddress
def getaddress(host)
host == "example.org" or raise
"192.0.2.1"
end
end
assert_equal(URI('http://127.0.0.1:8080'), URI.parse("http://example.org").find_proxy(env))
class << IPSocket
undef getaddress
def getaddress(host)
host == "example.org" or raise
"192.0.2.2"
end
end
assert_nil(URI.parse("http://example.org").find_proxy(env))
ensure
IPSocket.singleton_class.class_eval do
undef getaddress
define_method(:getaddress, getaddress)
end
end
}
with_proxy_env('http_proxy'=>'http://127.0.0.1:8080', 'no_proxy'=>'example.org') {|env|
assert_nil(URI("http://example.org/").find_proxy(env))