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

no_proxy with whitespaces and leading dots

Browse source 
* lib/uri/generic.rb (find_proxy): exclude white-spaces and allow
  for a leading dot in the domain name in no_proxy.
  [ruby-core:54542] [Feature #8317]

The previous implementation wouldn't allow for white-spaces nor a leading dot
in the domain name. The latter is described in the wget documentation as a valid case.

By being more strict on the characters, which are counted to a domainname,
we allow for white-spaces.
Also, a possible leading dot will be handled gracefully.

[Fix GH-285]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53816 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-02-13 08:12:21 +00:00
parent 1b6684f878
commit 423d042371
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sat Feb 13 17:11:58 2016 Fabian Wiesel <fabian.wiesel@sap.com>
* lib/uri/generic.rb (find_proxy): exclude white-spaces and allow
for a leading dot in the domain name in no_proxy.
[ruby-core:54542] [Feature #8317]
Fri Feb 12 12:20:56 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* error.c (name_err_initialize, nometh_err_initialize): [DOC] fix

2
lib/uri/generic.rb
View file

@ -1546,7 +1546,7 @@ module URI
name = 'no_proxy'
if no_proxy = ENV[name] || ENV[name.upcase]
no_proxy.scan(/([^:,]*)(?::(\d+))?/) {|host, port|
no_proxy.scan(/(?!\.)([^:,\s]+)(?::(\d+))?/) {|host, port|
if /(\A|\.)#{Regexp.quote host}\z/i =~ self.host &&
(!port || self.port == port.to_i)
return nil

4
test/uri/test_generic.rb
View file

@ -835,6 +835,10 @@ class URI::TestGeneric < Test::Unit::TestCase
assert_nil(URI("http://example.org/").find_proxy)
assert_nil(URI("http://www.example.org/").find_proxy)
}
with_env('http_proxy'=>'http://127.0.0.1:8080', 'no_proxy'=>'.example.org') {
assert_nil(URI("http://example.org/").find_proxy)
assert_nil(URI("http://www.example.org/").find_proxy)
}
end
def test_find_proxy_bad_value