summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-13 08:31:12 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-13 08:31:12 +0000
commit1ee9cad027e910b36bd4191ef2339d02e6711a32 (patch)
treefe8f994ee21b1d14a394208c6d9c23a292b7f687
parent423d042371d0402071c309dc403ea2701600a98b (diff)
CIDR in no_proxy
* lib/uri/generic.rb (URI::Generic#find_proxy): support CIDR in no_proxy. [ruby-core:73769] [Feature#12062] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53817 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/uri/generic.rb15
-rw-r--r--test/uri/test_generic.rb8
3 files changed, 25 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 44116e0..dec603b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 13 17:30:49 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/uri/generic.rb (URI::Generic#find_proxy): support CIDR in
+ no_proxy. [ruby-core:73769] [Feature#12062]
+
Sat Feb 13 17:11:58 2016 Fabian Wiesel <fabian.wiesel@sap.com>
* lib/uri/generic.rb (find_proxy): exclude white-spaces and allow
diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
index f2a2d56..3c4cb6e 100644
--- a/lib/uri/generic.rb
+++ b/lib/uri/generic.rb
@@ -1547,9 +1547,18 @@ module URI
name = 'no_proxy'
if no_proxy = ENV[name] || ENV[name.upcase]
no_proxy.scan(/(?!\.)([^:,\s]+)(?::(\d+))?/) {|host, port|
- if /(\A|\.)#{Regexp.quote host}\z/i =~ self.host &&
- (!port || self.port == port.to_i)
- return nil
+ if (!port || self.port == port.to_i)
+ if /(\A|\.)#{Regexp.quote host}\z/i =~ self.host
+ return nil
+ else
+ require 'ipaddr'
+ return nil if
+ begin
+ IPAddr.new(host)
+ rescue IPAddr::InvalidAddressError
+ next
+ end.include?(self.host)
+ end
end
}
end
diff --git a/test/uri/test_generic.rb b/test/uri/test_generic.rb
index ad189fc..3510129 100644
--- a/test/uri/test_generic.rb
+++ b/test/uri/test_generic.rb
@@ -841,6 +841,14 @@ class URI::TestGeneric < Test::Unit::TestCase
}
end
+ def test_find_proxy_no_proxy_cidr
+ with_env('http_proxy'=>'http://127.0.0.1:8080', 'no_proxy'=>'192.0.2.0/24') {
+ assert_equal(URI('http://127.0.0.1:8080'), URI("http://192.0.1.1/").find_proxy)
+ assert_nil(URI("http://192.0.2.1/").find_proxy)
+ assert_nil(URI("http://192.0.2.2/").find_proxy)
+ }
+ end
+
def test_find_proxy_bad_value
with_env('http_proxy'=>'') {
assert_nil(URI("http://192.0.2.1/").find_proxy)