nobu	2017-01-17 21:54:35 +0900 (Tue, 17 Jan 2017)

  New Revision: 57359

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57359

  Log:
    uri/generic.rb: fix exception on non-IP format
    
    * lib/uri/generic.rb (URI::Generic#find_proxy): match IP address
      no_proxy against resolved self IP address.  [Fix GH-1513]

  Modified files:
    trunk/lib/uri/generic.rb
    trunk/test/uri/test_generic.rb
Index: lib/uri/generic.rb
===================================================================
--- lib/uri/generic.rb	(revision 57358)
+++ lib/uri/generic.rb	(revision 57359)
@@ -1531,14 +1531,14 @@ module URI https://github.com/ruby/ruby/blob/trunk/lib/uri/generic.rb#L1531
           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
         }
Index: test/uri/test_generic.rb
===================================================================
--- test/uri/test_generic.rb	(revision 57358)
+++ test/uri/test_generic.rb	(revision 57359)
@@ -839,6 +839,31 @@ class URI::TestGeneric < Test::Unit::Tes https://github.com/ruby/ruby/blob/trunk/test/uri/test_generic.rb#L839
     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))

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/