diff options
| author | John <john.mccrae@progress.com> | 2023-03-07 12:24:41 -0800 |
|---|---|---|
| committer | John <john.mccrae@progress.com> | 2023-03-07 12:24:41 -0800 |
| commit | 673e116d419ab064e8d9a9a128d2664d6fb7c146 (patch) | |
| tree | b1efdc35607c0ec404d0abc9ede13a4677c34eb1 | |
| parent | f151c4dc6a9357fc43e9f675e46b6d0bdf671cc3 (diff) | |
| download | chef-673e116d419ab064e8d9a9a128d2664d6fb7c146.tar.gz | |
Updating proxy code and forcing Proxifier2 by putting it in the chef.gemspec. Let's see what breaks now
Signed-off-by: John <john.mccrae@progress.com>
| -rw-r--r-- | chef.gemspec | 2 | ||||
| -rw-r--r-- | lib/chef/mixin/proxified_socket.rb | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/chef.gemspec b/chef.gemspec index f5b476d465..907dd1b544 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -49,12 +49,12 @@ Gem::Specification.new do |s| s.add_dependency "net-ftp" # remote_file resource s.add_dependency "erubis", "~> 2.7" # template resource / cookbook syntax check s.add_dependency "diff-lcs", ">= 1.2.4", "!= 1.4.0", "< 1.6.0" # 1.4 breaks output. Used in lib/chef/util/diff - # s.add_dependency "ffi-libarchive", "~> 1.0", ">= 1.0.3" # archive_file resource s.add_dependency "ffi-libarchive", "~> 1.1", ">= 1.1.3" s.add_dependency "chef-zero", ">= 14.0.11" s.add_dependency "chef-vault" # chef-vault resources and helpers s.add_dependency "plist", "~> 3.2" # launchd, dscl/mac user, macos_userdefaults, osx_profile and plist resources + s.add_dependency "proxifier2", , '~> 1.1' s.add_dependency "iniparse", "~> 1.4" # systemd_unit resource s.add_dependency "addressable" s.add_dependency "syslog-logger", "~> 1.6" diff --git a/lib/chef/mixin/proxified_socket.rb b/lib/chef/mixin/proxified_socket.rb index 08e0828100..a1a3eb4161 100644 --- a/lib/chef/mixin/proxified_socket.rb +++ b/lib/chef/mixin/proxified_socket.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "proxifier2" +require "proxifier/proxy" require "chef-config/mixin/fuzzy_hostname_matcher" class Chef @@ -31,7 +31,8 @@ class Chef proxy = ENV["https_proxy"] || ENV["http_proxy"] || false if proxy && !fuzzy_hostname_match_any?(host, ENV["no_proxy"]) - Proxifier.Proxy(proxy).open(host, port) + Proxifier::Proxy(proxy).open(host, port) + # Proxifier.Proxy(proxy).open(host, port) else TCPSocket.new(host, port) end @@ -40,3 +41,9 @@ class Chef end end end + + +# require "proxifier/proxy" + +# proxy = Proxifier::Proxy("socks://localhost") +# socket = proxy.open("www.google.com", 80)
\ No newline at end of file |