chef 14.3.37-universal-mingw32 → 14.4.56-universal-mingw32

data/lib/chef/http/decompressor.rb

@@ -1,142 +1,142 @@
-#--
-# Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "zlib"
-require "chef/http/http_request"
-
-class Chef
-  class HTTP
-
-    # Middleware-esque class for handling compression in HTTP responses.
-    class Decompressor
-      class NoopInflater
-        def inflate(chunk)
-          chunk
-        end
-        alias :handle_chunk :inflate
-      end
-
-      class GzipInflater < Zlib::Inflate
-        def initialize
-          super(Zlib::MAX_WBITS + 16)
-        end
-        alias :handle_chunk :inflate
-      end
-
-      class DeflateInflater < Zlib::Inflate
-        def initialize
-          super
-        end
-        alias :handle_chunk :inflate
-      end
-
-      CONTENT_ENCODING  = "content-encoding".freeze
-      GZIP              = "gzip".freeze
-      DEFLATE           = "deflate".freeze
-      IDENTITY          = "identity".freeze
-
-      def initialize(opts = {})
-        @disable_gzip = false
-        handle_options(opts)
-      end
-
-      def handle_request(method, url, headers = {}, data = false)
-        headers[HTTPRequest::ACCEPT_ENCODING] = HTTPRequest::ENCODING_GZIP_DEFLATE unless gzip_disabled?
-        [method, url, headers, data]
-      end
-
-      def handle_response(http_response, rest_request, return_value)
-        # temporary hack, skip processing if return_value is false
-        # needed to keep conditional get stuff working correctly.
-        return [http_response, rest_request, return_value] if return_value == false
-        response_body = decompress_body(http_response)
-        http_response.body.replace(response_body) if http_response.body.respond_to?(:replace)
-        [http_response, rest_request, return_value]
-      end
-
-      def handle_stream_complete(http_response, rest_request, return_value)
-        [http_response, rest_request, return_value]
-      end
-
-      def decompress_body(response)
-        if gzip_disabled? || response.body.nil?
-          response.body
-        else
-          case response[CONTENT_ENCODING]
-          when GZIP
-            Chef::Log.trace "Decompressing gzip response"
-            Zlib::Inflate.new(Zlib::MAX_WBITS + 16).inflate(response.body)
-          when DEFLATE
-            Chef::Log.trace "Decompressing deflate response"
-            Zlib::Inflate.inflate(response.body)
-          else
-            response.body
-          end
-        end
-      end
-
-      # This isn't used when this class is used as middleware; it returns an
-      # object you can use to unzip/inflate a streaming response.
-      def stream_response_handler(response)
-        if gzip_disabled?
-          Chef::Log.trace "disable_gzip is set. \
-            Not using #{response[CONTENT_ENCODING]} \
-            and initializing noop stream deflator."
-          NoopInflater.new
-        else
-          case response[CONTENT_ENCODING]
-          when GZIP
-            Chef::Log.trace "Initializing gzip stream deflator"
-            GzipInflater.new
-          when DEFLATE
-            Chef::Log.trace "Initializing deflate stream deflator"
-            DeflateInflater.new
-          else
-            Chef::Log.trace "content_encoding = '#{response[CONTENT_ENCODING]}' \
-              initializing noop stream deflator."
-            NoopInflater.new
-          end
-        end
-      end
-
-      # gzip is disabled using the disable_gzip => true option in the
-      # constructor. When gzip is disabled, no 'Accept-Encoding' header will be
-      # set, and the response will not be decompressed, no matter what the
-      # Content-Encoding header of the response is. The intended use case for
-      # this is to work around situations where you request +file.tar.gz+, but
-      # the server responds with a content type of tar and a content encoding of
-      # gzip, tricking the client into decompressing the response so you end up
-      # with a tar archive (no gzip) named file.tar.gz
-      def gzip_disabled?
-        @disable_gzip
-      end
-
-      private
-
-      def handle_options(opts)
-        opts.each do |name, value|
-          case name.to_s
-          when "disable_gzip"
-            @disable_gzip = value
-          end
-        end
-      end
-
-    end
-  end
-end
+#--
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "zlib"
+require "chef/http/http_request"
+
+class Chef
+  class HTTP
+
+    # Middleware-esque class for handling compression in HTTP responses.
+    class Decompressor
+      class NoopInflater
+        def inflate(chunk)
+          chunk
+        end
+        alias :handle_chunk :inflate
+      end
+
+      class GzipInflater < Zlib::Inflate
+        def initialize
+          super(Zlib::MAX_WBITS + 16)
+        end
+        alias :handle_chunk :inflate
+      end
+
+      class DeflateInflater < Zlib::Inflate
+        def initialize
+          super
+        end
+        alias :handle_chunk :inflate
+      end
+
+      CONTENT_ENCODING  = "content-encoding".freeze
+      GZIP              = "gzip".freeze
+      DEFLATE           = "deflate".freeze
+      IDENTITY          = "identity".freeze
+
+      def initialize(opts = {})
+        @disable_gzip = false
+        handle_options(opts)
+      end
+
+      def handle_request(method, url, headers = {}, data = false)
+        headers[HTTPRequest::ACCEPT_ENCODING] = HTTPRequest::ENCODING_GZIP_DEFLATE unless gzip_disabled?
+        [method, url, headers, data]
+      end
+
+      def handle_response(http_response, rest_request, return_value)
+        # temporary hack, skip processing if return_value is false
+        # needed to keep conditional get stuff working correctly.
+        return [http_response, rest_request, return_value] if return_value == false
+        response_body = decompress_body(http_response)
+        http_response.body.replace(response_body) if http_response.body.respond_to?(:replace)
+        [http_response, rest_request, return_value]
+      end
+
+      def handle_stream_complete(http_response, rest_request, return_value)
+        [http_response, rest_request, return_value]
+      end
+
+      def decompress_body(response)
+        if gzip_disabled? || response.body.nil?
+          response.body
+        else
+          case response[CONTENT_ENCODING]
+          when GZIP
+            Chef::Log.trace "Decompressing gzip response"
+            Zlib::Inflate.new(Zlib::MAX_WBITS + 16).inflate(response.body)
+          when DEFLATE
+            Chef::Log.trace "Decompressing deflate response"
+            Zlib::Inflate.inflate(response.body)
+          else
+            response.body
+          end
+        end
+      end
+
+      # This isn't used when this class is used as middleware; it returns an
+      # object you can use to unzip/inflate a streaming response.
+      def stream_response_handler(response)
+        if gzip_disabled?
+          Chef::Log.trace "disable_gzip is set. \
+            Not using #{response[CONTENT_ENCODING]} \
+            and initializing noop stream deflator."
+          NoopInflater.new
+        else
+          case response[CONTENT_ENCODING]
+          when GZIP
+            Chef::Log.trace "Initializing gzip stream deflator"
+            GzipInflater.new
+          when DEFLATE
+            Chef::Log.trace "Initializing deflate stream deflator"
+            DeflateInflater.new
+          else
+            Chef::Log.trace "content_encoding = '#{response[CONTENT_ENCODING]}' \
+              initializing noop stream deflator."
+            NoopInflater.new
+          end
+        end
+      end
+
+      # gzip is disabled using the disable_gzip => true option in the
+      # constructor. When gzip is disabled, no 'Accept-Encoding' header will be
+      # set, and the response will not be decompressed, no matter what the
+      # Content-Encoding header of the response is. The intended use case for
+      # this is to work around situations where you request +file.tar.gz+, but
+      # the server responds with a content type of tar and a content encoding of
+      # gzip, tricking the client into decompressing the response so you end up
+      # with a tar archive (no gzip) named file.tar.gz
+      def gzip_disabled?
+        @disable_gzip
+      end
+
+      private
+
+      def handle_options(opts)
+        opts.each do |name, value|
+          case name.to_s
+          when "disable_gzip"
+            @disable_gzip = value
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/chef/http/http_request.rb

@@ -1,189 +1,189 @@
-#--
-# Author:: Adam Jacob (<adam@chef.io>)
-# Author:: Thom May (<thom@clearairturbulence.org>)
-# Author:: Nuo Yan (<nuo@chef.io>)
-# Author:: Christopher Brown (<cb@chef.io>)
-# Author:: Christopher Walters (<cw@chef.io>)
-# Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2009-2016, 2010-2018, Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-require "uri"
-require "net/http"
-
-# To load faster, we only want ohai's version string.
-# However, in ohai before 0.6.0, the version is defined
-# in ohai, not ohai/version
-begin
-  require "ohai/version" # used in user agent string.
-rescue LoadError
-  require "ohai"
-end
-
-require "chef/version"
-
-class Chef
-  class HTTP
-    class HTTPRequest
-
-      engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
-
-      UA_COMMON = "/#{::Chef::VERSION} (#{engine}-#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}; ohai-#{Ohai::VERSION}; #{RUBY_PLATFORM}; +https://chef.io)".freeze
-      DEFAULT_UA = "Chef Client" << UA_COMMON
-
-      USER_AGENT = "User-Agent".freeze
-
-      ACCEPT_ENCODING = "Accept-Encoding".freeze
-      ENCODING_GZIP_DEFLATE = "gzip;q=1.0,deflate;q=0.6,identity;q=0.3".freeze
-
-      GET     = "get".freeze
-      PATCH   = "patch".freeze
-      PUT     = "put".freeze
-      POST    = "post".freeze
-      DELETE  = "delete".freeze
-      HEAD    = "head".freeze
-
-      HTTPS = "https".freeze
-
-      SLASH = "/".freeze
-
-      HOST_LOWER = "host".freeze
-
-      URI_SCHEME_DEFAULT_PORT = { "http" => 80, "https" => 443 }.freeze
-
-      def self.user_agent=(ua)
-        @user_agent = ua
-      end
-
-      def self.user_agent
-        @user_agent ||= DEFAULT_UA
-      end
-
-      attr_reader :method, :url, :headers, :http_request
-
-      def initialize(method, url, req_body, base_headers = {})
-        @method, @url = method, url
-        @request_body = nil
-        build_headers(base_headers)
-        configure_http_request(req_body)
-      end
-
-      def host
-        @url.hostname
-      end
-
-      def uri_safe_host
-        @url.host
-      end
-
-      def port
-        @url.port
-      end
-
-      def query
-        @url.query
-      end
-
-      def path
-        @url.path.empty? ? SLASH : @url.path
-      end
-
-      # DEPRECATED. Call request on an HTTP client object instead.
-      def call
-        hide_net_http_bug do
-          http_client.request(http_request) do |response|
-            yield response if block_given?
-            response
-          end
-        end
-      end
-
-      def config
-        Chef::Config
-      end
-
-      # DEPRECATED. Call request on an HTTP client object instead.
-      def http_client
-        @http_client ||= BasicClient.new(url).http_client
-      end
-
-      private
-
-      def hide_net_http_bug
-        yield
-      rescue NoMethodError => e
-        # http://redmine.ruby-lang.org/issues/show/2708
-        # http://redmine.ruby-lang.org/issues/show/2758
-        if e.to_s =~ /#{Regexp.escape(%q{undefined method `closed?' for nil:NilClass})}/
-          Chef::Log.trace("Rescued error in http connect, re-raising as Errno::ECONNREFUSED to hide bug in net/http")
-          Chef::Log.trace("#{e.class.name}: #{e}")
-          Chef::Log.trace(e.backtrace.join("\n"))
-          raise Errno::ECONNREFUSED, "Connection refused attempting to contact #{url.scheme}://#{host}:#{port}"
-        else
-          raise
-        end
-      end
-
-      def build_headers(headers)
-        @headers = headers.dup
-        # No response compression unless we asked for it explicitly:
-        @headers[HTTPRequest::ACCEPT_ENCODING] ||= "identity"
-        @headers["X-Chef-Version"] = ::Chef::VERSION
-
-        # Only include port in Host header when it is not the default port
-        # for the url scheme (80;443) - Fixes CHEF-5355
-        host_header = uri_safe_host.dup
-        host_header << ":#{port}" unless URI_SCHEME_DEFAULT_PORT[@url.scheme] == port.to_i
-        @headers["Host"] = host_header unless @headers.keys.any? { |k| k.downcase.to_s == HOST_LOWER }
-
-        @headers
-      end
-
-      def configure_http_request(request_body = nil)
-        req_path = (path).to_s
-        req_path << "?#{query}" if query
-
-        @http_request = case method.to_s.downcase
-                        when GET
-                          Net::HTTP::Get.new(req_path, headers)
-                        when POST
-                          Net::HTTP::Post.new(req_path, headers)
-                        when PUT
-                          Net::HTTP::Put.new(req_path, headers)
-                        when PATCH
-                          Net::HTTP::Patch.new(req_path, headers)
-                        when DELETE
-                          Net::HTTP::Delete.new(req_path, headers)
-                        when HEAD
-                          Net::HTTP::Head.new(req_path, headers)
-                        else
-                          raise ArgumentError, "You must provide :GET, :PUT, :POST, :DELETE or :HEAD as the method"
-                        end
-
-        @http_request.body = request_body if request_body && @http_request.request_body_permitted?
-        # Optionally handle HTTP Basic Authentication
-        if url.user
-          user = URI.unescape(url.user)
-          password = URI.unescape(url.password) if url.password
-          @http_request.basic_auth(user, password)
-        end
-
-        # Overwrite default UA
-        @http_request[USER_AGENT] = self.class.user_agent
-      end
-
-    end
-  end
-end
+#--
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Thom May (<thom@clearairturbulence.org>)
+# Author:: Nuo Yan (<nuo@chef.io>)
+# Author:: Christopher Brown (<cb@chef.io>)
+# Author:: Christopher Walters (<cw@chef.io>)
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Copyright:: Copyright 2009-2016, 2010-2018, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require "uri"
+require "net/http"
+
+# To load faster, we only want ohai's version string.
+# However, in ohai before 0.6.0, the version is defined
+# in ohai, not ohai/version
+begin
+  require "ohai/version" # used in user agent string.
+rescue LoadError
+  require "ohai"
+end
+
+require "chef/version"
+
+class Chef
+  class HTTP
+    class HTTPRequest
+
+      engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
+
+      UA_COMMON = "/#{::Chef::VERSION} (#{engine}-#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}; ohai-#{Ohai::VERSION}; #{RUBY_PLATFORM}; +https://chef.io)".freeze
+      DEFAULT_UA = "Chef Client" << UA_COMMON
+
+      USER_AGENT = "User-Agent".freeze
+
+      ACCEPT_ENCODING = "Accept-Encoding".freeze
+      ENCODING_GZIP_DEFLATE = "gzip;q=1.0,deflate;q=0.6,identity;q=0.3".freeze
+
+      GET     = "get".freeze
+      PATCH   = "patch".freeze
+      PUT     = "put".freeze
+      POST    = "post".freeze
+      DELETE  = "delete".freeze
+      HEAD    = "head".freeze
+
+      HTTPS = "https".freeze
+
+      SLASH = "/".freeze
+
+      HOST_LOWER = "host".freeze
+
+      URI_SCHEME_DEFAULT_PORT = { "http" => 80, "https" => 443 }.freeze
+
+      def self.user_agent=(ua)
+        @user_agent = ua
+      end
+
+      def self.user_agent
+        @user_agent ||= DEFAULT_UA
+      end
+
+      attr_reader :method, :url, :headers, :http_request
+
+      def initialize(method, url, req_body, base_headers = {})
+        @method, @url = method, url
+        @request_body = nil
+        build_headers(base_headers)
+        configure_http_request(req_body)
+      end
+
+      def host
+        @url.hostname
+      end
+
+      def uri_safe_host
+        @url.host
+      end
+
+      def port
+        @url.port
+      end
+
+      def query
+        @url.query
+      end
+
+      def path
+        @url.path.empty? ? SLASH : @url.path
+      end
+
+      # @deprecated Call request on an HTTP client object instead.
+      def call
+        hide_net_http_bug do
+          http_client.request(http_request) do |response|
+            yield response if block_given?
+            response
+          end
+        end
+      end
+
+      def config
+        Chef::Config
+      end
+
+      # @deprecated Call request on an HTTP client object instead.
+      def http_client
+        @http_client ||= BasicClient.new(url).http_client
+      end
+
+      private
+
+      def hide_net_http_bug
+        yield
+      rescue NoMethodError => e
+        # http://redmine.ruby-lang.org/issues/show/2708
+        # http://redmine.ruby-lang.org/issues/show/2758
+        if e.to_s =~ /#{Regexp.escape(%q{undefined method `closed?' for nil:NilClass})}/
+          Chef::Log.trace("Rescued error in http connect, re-raising as Errno::ECONNREFUSED to hide bug in net/http")
+          Chef::Log.trace("#{e.class.name}: #{e}")
+          Chef::Log.trace(e.backtrace.join("\n"))
+          raise Errno::ECONNREFUSED, "Connection refused attempting to contact #{url.scheme}://#{host}:#{port}"
+        else
+          raise
+        end
+      end
+
+      def build_headers(headers)
+        @headers = headers.dup
+        # No response compression unless we asked for it explicitly:
+        @headers[HTTPRequest::ACCEPT_ENCODING] ||= "identity"
+        @headers["X-Chef-Version"] = ::Chef::VERSION
+
+        # Only include port in Host header when it is not the default port
+        # for the url scheme (80;443) - Fixes CHEF-5355
+        host_header = uri_safe_host.dup
+        host_header << ":#{port}" unless URI_SCHEME_DEFAULT_PORT[@url.scheme] == port.to_i
+        @headers["Host"] = host_header unless @headers.keys.any? { |k| k.downcase.to_s == HOST_LOWER }
+
+        @headers
+      end
+
+      def configure_http_request(request_body = nil)
+        req_path = path.to_s.dup
+        req_path << "?#{query}" if query
+
+        @http_request = case method.to_s.downcase
+                        when GET
+                          Net::HTTP::Get.new(req_path, headers)
+                        when POST
+                          Net::HTTP::Post.new(req_path, headers)
+                        when PUT
+                          Net::HTTP::Put.new(req_path, headers)
+                        when PATCH
+                          Net::HTTP::Patch.new(req_path, headers)
+                        when DELETE
+                          Net::HTTP::Delete.new(req_path, headers)
+                        when HEAD
+                          Net::HTTP::Head.new(req_path, headers)
+                        else
+                          raise ArgumentError, "You must provide :GET, :PUT, :POST, :DELETE or :HEAD as the method"
+                        end
+
+        @http_request.body = request_body if request_body && @http_request.request_body_permitted?
+        # Optionally handle HTTP Basic Authentication
+        if url.user
+          user = URI.unescape(url.user)
+          password = URI.unescape(url.password) if url.password
+          @http_request.basic_auth(user, password)
+        end
+
+        # Overwrite default UA
+        @http_request[USER_AGENT] = self.class.user_agent
+      end
+
+    end
+  end
+end