diff options
| author | Jon Morrow <jon@morrowmail.com> | 2015-04-14 10:51:26 -0700 |
|---|---|---|
| committer | Jon Morrow <jon@morrowmail.com> | 2015-04-14 10:51:26 -0700 |
| commit | 1c1b28cf494db36bc12838219d5170437b3c7b86 (patch) | |
| tree | b00c12f8025e9f7d4436d6c3e6514748a8401dac | |
| parent | 93849a4526a36617e9a9381f4aed81cefcae3ebb (diff) | |
| download | chef-2140/jm/support_username_password.tar.gz | |
Add support for no_proxy.2140/jm/support_username_password
| -rw-r--r-- | lib/chef/http/basic_client.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef/http/basic_client.rb b/lib/chef/http/basic_client.rb index 6c05dd6bbf..3477459216 100644 --- a/lib/chef/http/basic_client.rb +++ b/lib/chef/http/basic_client.rb @@ -107,7 +107,8 @@ class Chef else URI.parse("#{url.scheme}://#{proxy}") end if String === proxy - excludes = Chef::Config[:no_proxy].to_s.split(/\s*,\s*/).compact + no_proxy = Chef::Config[:no_proxy] || ENV['NO_PROXY'] || ENV['no_proxy'] + excludes = no_proxy.to_s.split(/\s*,\s*/).compact excludes = excludes.map { |exclude| exclude =~ /:\d+$/ ? exclude : "#{exclude}:*" } return proxy unless excludes.any? { |exclude| File.fnmatch(exclude, "#{host}:#{port}") } end |