aws-sdk-core 3.46.2 → 3.126.2

data/lib/seahorse/client/handler_list_entry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Seahorse
   module Client
 
@@ -77,8 +79,8 @@ module Seahorse
         if options.key?(name)
           options[name]
         else
-          msg = "invalid :priority `%s', must be between 0 and 99"
-          raise ArgumentError, msg % priority.inspect
+          msg = "missing option: `%s'"
+          raise ArgumentError, msg % name.inspect
         end
       end
 
@@ -86,8 +88,8 @@ module Seahorse
         if STEPS.key?(step)
           @step = step
         else
-          msg = "invalid :step `%s', must be one of :initialize, :validate, "
-          msg << ":build, :sign or :send"
+          msg = "invalid :step `%s', must be one of :initialize, :validate, "\
+                ':build, :sign or :send'
           raise ArgumentError, msg % step.inspect
         end
       end

data/lib/seahorse/client/http/async_response.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Seahorse
+  module Client
+    module Http
+      class AsyncResponse < Seahorse::Client::Http::Response
+
+        def initialize(options = {})
+          super
+        end
+
+        def signal_headers(headers)
+          # H2 headers arrive as array of pair
+          hash = headers.inject({}) do |h, pair|
+            key, value = pair
+            h[key] = value
+            h
+          end
+          @status_code = hash[":status"].to_i
+          @headers = Headers.new(hash)
+          emit(:headers, @status_code, @headers)
+        end
+
+        def signal_done(options = {})
+          # H2 only has header and body
+          # ':status' header will be sent back
+          if options.keys.sort == [:body, :headers]
+            signal_headers(options[:headers])
+            signal_data(options[:body])
+            signal_done
+          elsif options.empty?
+            @body.rewind if @body.respond_to?(:rewind)
+            @done = true
+            emit(:done)
+          else
+            msg = "options must be empty or must contain :headers and :body"
+            raise ArgumentError, msg
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/seahorse/client/http/headers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Seahorse
   module Client
     module Http

data/lib/seahorse/client/http/request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'stringio'
 require 'uri'
 
@@ -34,8 +36,8 @@ module Seahorse
           if endpoint.nil? or URI::HTTP === endpoint or URI::HTTPS === endpoint
             @endpoint = endpoint
           else
-            msg = "invalid endpoint, expected URI::HTTP, URI::HTTPS, or nil, "
-            msg << "got #{endpoint.inspect}"
+            msg = 'invalid endpoint, expected URI::HTTP, URI::HTTPS, or nil, '\
+                  "got #{endpoint.inspect}"
             raise ArgumentError, msg
           end
         end
@@ -55,7 +57,7 @@ module Seahorse
 
         # @param [#read, #size, #rewind] io
         def body=(io)
-          @body =case io
+          @body = case io
             when nil then StringIO.new('')
             when String then StringIO.new(io)
             else io

data/lib/seahorse/client/http/response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Seahorse
   module Client
     module Http
@@ -40,12 +42,17 @@ module Seahorse
           end
         end
 
-        # @return [String]
+        # @return [String|Array]
         def body_contents
-          body.rewind
-          contents = body.read
-          body.rewind
-          contents
+          if body.is_a?(Array)
+            # an array of parsed events
+            body
+          else
+            body.rewind
+            contents = body.read
+            body.rewind
+            contents
+          end
         end
 
         # @param [Integer] status_code
@@ -66,7 +73,7 @@ module Seahorse
 
         # Completes the http response.
         #
-        # @example Completing the response in a singal call
+        # @example Completing the response in a single call
         #
         #     http_response.signal_done(
         #       status_code: 200,
@@ -104,8 +111,8 @@ module Seahorse
             @done = true
             emit(:done)
           else
-            msg = "options must be empty or must contain :status_code, :headers, "
-            msg << "and :body"
+            msg = 'options must be empty or must contain :status_code, :headers, '\
+                  'and :body'
             raise ArgumentError, msg
           end
         end
@@ -117,15 +124,15 @@ module Seahorse
         end
 
         def on_headers(status_code_range = nil, &block)
-          @listeners[:headers] << listener(status_code_range, Proc.new)
+          @listeners[:headers] << listener(status_code_range, block)
         end
 
         def on_data(&callback)
-          @listeners[:data] << Proc.new
+          @listeners[:data] << callback
         end
 
         def on_done(status_code_range = nil, &callback)
-          listener = listener(status_code_range, Proc.new)
+          listener = listener(status_code_range, callback)
           if @done
             listener.call
           else

data/lib/seahorse/client/logging/formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
 module Seahorse
@@ -173,9 +175,11 @@ module Seahorse
         end
 
         def _http_response_body(response)
-          response.context.http_response.body.respond_to?(:rewind) ?
-            summarize_value(response.context.http_response.body_contents) :
+          if response.context.http_response.body.respond_to?(:rewind)
+            summarize_value(response.context.http_response.body_contents)
+          else
             ''
+          end
         end
 
         def _error_class(response)

data/lib/seahorse/client/logging/handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Seahorse
   module Client
     # @deprecated Use Aws::Logging instead.

data/lib/seahorse/client/managed_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Seahorse
   module Client
     # This utility class is used to track files opened by Seahorse.

data/lib/seahorse/client/net_http/connection_pool.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cgi'
 require 'net/http'
 require 'net/https'
@@ -18,6 +20,7 @@ module Seahorse
 
         @pools_mutex = Mutex.new
         @pools = {}
+        @default_logger = Logger.new($stdout)
 
         OPTIONS = {
           http_proxy: nil,
@@ -31,6 +34,7 @@ module Seahorse
           ssl_ca_bundle: nil,
           ssl_ca_directory: nil,
           ssl_ca_store: nil,
+          ssl_timeout: nil
         }
 
         # @api private
@@ -52,14 +56,14 @@ module Seahorse
 
         # Makes an HTTP request, yielding a Net::HTTPResponse object.
         #
-        #   pool.request('http://domain', Net::HTTP::Get.new('/')) do |resp|
+        #   pool.request(URI.parse('http://domain'), Net::HTTP::Get.new('/')) do |resp|
         #     puts resp.code # status code
         #     puts resp.to_h.inspect # dump the headers
         #     puts resp.body
         #   end
         #
-        # @param [String] endpoint The HTTP(S) endpoint to
-        #    connect to (e.g. 'https://domain.com').
+        # @param [URI::HTTP, URI::HTTPS] endpoint The HTTP(S) endpoint
+        #    to connect to (e.g. 'https://domain.com').
         #
         # @param [Net::HTTPRequest] request The request to make.  This can be
         #   any request object from Net::HTTP (e.g. Net::HTTP::Get,
@@ -131,7 +135,7 @@ module Seahorse
           nil
         end
 
-        # Closes and removes removes all sessions from the pool.
+        # Closes and removes all sessions from the pool.
         # If empty! is called while there are outstanding requests they may
         # get checked back into the pool, leaving the pool in a non-empty
         # state.
@@ -165,16 +169,15 @@ module Seahorse
           #   requests through.  Formatted like 'http://proxy.com:123'.
           #
           # @option options [Float] :http_open_timeout (15) The number of
-          #   seconds to wait when opening a HTTP session before rasing a
+          #   seconds to wait when opening an HTTP session before raising a
           #   `Timeout::Error`.
           #
-          # @option options [Integer] :http_read_timeout (60) The default
-          #   number of seconds to wait for response data.  This value can
-          #   safely be set
-          #   per-request on the session yeidled by {#session_for}.
+          # @option options [Float] :http_read_timeout (60) The default
+          #   number of seconds to wait for response data. This value can be
+          #   safely set per-request on the session yielded by {#session_for}.
           #
           # @option options [Float] :http_idle_timeout (5) The number of
-          #   seconds a connection is allowed to sit idble before it is
+          #   seconds a connection is allowed to sit idle before it is
           #   considered stale.  Stale connections are closed and removed
           #   from the pool before making a request.
           #
@@ -183,7 +186,10 @@ module Seahorse
           #   request body.  This option has no effect unless the request has
           #   "Expect" header set to "100-continue".  Defaults to `nil` which
           #   disables this behaviour.  This value can safely be set per
-          #   request on the session yeidled by {#session_for}.
+          #   request on the session yielded by {#session_for}.
+          #
+          # @option options [Float] :ssl_timeout (nil) Sets the SSL timeout
+          #   in seconds.
           #
           # @option options [Boolean] :http_wire_trace (false) When `true`,
           #   HTTP debug output will be sent to the `:logger`.
@@ -200,13 +206,13 @@ module Seahorse
           # @option options [String] :ssl_ca_bundle Full path to the SSL
           #   certificate authority bundle file that should be used when
           #   verifying peer certificates.  If you do not pass
-          #   `:ssl_ca_bundle` or `:ssl_ca_directory` the the system default
+          #   `:ssl_ca_bundle` or `:ssl_ca_directory` the system default
           #   will be used if available.
           #
           # @option options [String] :ssl_ca_directory Full path of the
           #   directory that contains the unbundled SSL certificate
           #   authority files for verifying peer certificates.  If you do
-          #   not pass `:ssl_ca_bundle` or `:ssl_ca_directory` the the
+          #   not pass `:ssl_ca_bundle` or `:ssl_ca_directory` the
           #   system default will be used if available.
           #
           # @return [ConnectionPool]
@@ -217,7 +223,7 @@ module Seahorse
             end
           end
 
-          # @return [Array<ConnectionPool>] Returns a list of of the
+          # @return [Array<ConnectionPool>] Returns a list of the
           #   constructed connection pools.
           def pools
             @pools_mutex.synchronize do
@@ -231,7 +237,7 @@ module Seahorse
           # @return [Hash]
           def pool_options options
             wire_trace = !!options[:http_wire_trace]
-            logger = options[:logger] || Logger.new($stdout) if wire_trace
+            logger = options[:logger] || @default_logger if wire_trace
             verify_peer = options.key?(:ssl_verify_peer) ?
               !!options[:ssl_verify_peer] : true
             {
@@ -246,6 +252,7 @@ module Seahorse
               :ssl_ca_bundle => options[:ssl_ca_bundle],
               :ssl_ca_directory => options[:ssl_ca_directory],
               :ssl_ca_store => options[:ssl_ca_store],
+              :ssl_timeout => options[:ssl_timeout]
             }
           end
 
@@ -279,9 +286,12 @@ module Seahorse
           http = ExtendedSession.new(Net::HTTP.new(*args.compact))
           http.set_debug_output(logger) if http_wire_trace?
           http.open_timeout = http_open_timeout
+          http.keep_alive_timeout = http_idle_timeout if http.respond_to?(:keep_alive_timeout=)
 
           if endpoint.scheme == 'https'
             http.use_ssl = true
+            http.ssl_timeout = ssl_timeout
+
             if ssl_verify_peer?
               http.verify_mode = OpenSSL::SSL::VERIFY_PEER
               http.ca_file = ssl_ca_bundle if ssl_ca_bundle
@@ -301,13 +311,10 @@ module Seahorse
         # Removes stale sessions from the pool.  This method *must* be called
         # @note **Must** be called behind a `@pool_mutex` synchronize block.
         def _clean
-          now = Time.now
+          now = Aws::Util.monotonic_milliseconds
           @pool.each_pair do |endpoint,sessions|
             sessions.delete_if do |session|
-              if
-                session.last_used.nil? or
-                now - session.last_used > http_idle_timeout
-              then
+              if session.last_used.nil? or now - session.last_used > http_idle_timeout * 1000
                 session.finish
                 true
               end
@@ -315,7 +322,7 @@ module Seahorse
           end
         end
 
-        # Helper methods extended onto Net::HTTPSession objects opend by the
+        # Helper methods extended onto Net::HTTPSession objects opened by the
         # connection pool.
         # @api private
         class ExtendedSession < Delegator
@@ -325,7 +332,7 @@ module Seahorse
             @http = http
           end
 
-          # @return [Time,nil]
+          # @return [Integer,nil]
           attr_reader :last_used
 
           def __getobj__
@@ -338,8 +345,8 @@ module Seahorse
 
           # Sends the request and tracks that this session has been used.
           def request(*args, &block)
-            @last_used = Time.now
             @http.request(*args, &block)
+            @last_used = Aws::Util.monotonic_milliseconds
           end
 
           # Attempts to close/finish the session without raising an error.

data/lib/seahorse/client/net_http/handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'net/https'
 require 'openssl'
 
@@ -13,8 +15,8 @@ module Seahorse
         # @api private
         class TruncatedBodyError < IOError
           def initialize(bytes_expected, bytes_received)
-            msg = "http response body truncated, expected #{bytes_expected} "
-            msg << "bytes, received #{bytes_received} bytes"
+            msg = "http response body truncated, expected #{bytes_expected} "\
+                  "bytes, received #{bytes_received} bytes"
             super(msg)
           end
         end
@@ -23,7 +25,8 @@ module Seahorse
           SocketError, EOFError, IOError, Timeout::Error,
           Errno::ECONNABORTED, Errno::ECONNRESET, Errno::EPIPE,
           Errno::EINVAL, Errno::ETIMEDOUT, OpenSSL::SSL::SSLError,
-          Errno::EHOSTUNREACH, Errno::ECONNREFUSED
+          Errno::EHOSTUNREACH, Errno::ECONNREFUSED,
+          Net::HTTPFatalError # for proxy connection failures
         ]
 
         # does not exist in Ruby 1.9.3
@@ -71,8 +74,9 @@ module Seahorse
         # @return [void]
         def transmit(config, req, resp)
           session(config, req) do |http|
+            # Monkey patch default content-type set by Net::HTTP
+            Thread.current[:net_http_skip_default_content_type] = true
             http.request(build_net_request(req)) do |net_resp|
-
               status_code = net_resp.code.to_i
               headers = extract_headers(net_resp)
 
@@ -93,6 +97,9 @@ module Seahorse
         rescue => error
           # not retryable
           resp.signal_error(error)
+        ensure
+          # ensure we turn off monkey patch in case of error
+          Thread.current[:net_http_skip_default_content_type] = nil
         end
 
         def complete_response(req, resp, bytes_received)
@@ -144,7 +151,12 @@ module Seahorse
         def build_net_request(request)
           request_class = net_http_request_class(request)
           req = request_class.new(request.endpoint.request_uri, headers(request))
-          req.body_stream = request.body
+          # Net::HTTP adds a default Content-Type when a body is present.
+          # Set the body stream when it has an unknown size or when it is > 0.
+          if !request.body.respond_to?(:size) ||
+             (request.body.respond_to?(:size) && request.body.size > 0)
+            req.body_stream = request.body
+          end
           req
         end
 
@@ -163,8 +175,13 @@ module Seahorse
         # @return [Hash] Returns a vanilla hash of headers to send with the
         #   HTTP request.
         def headers(request)
-          # setting these to stop net/http from providing defaults
-          headers = { 'content-type' => '', 'accept-encoding' => '' }
+          # Net::HTTP adds a default header for accept-encoding (2.0.0+).
+          # Setting a default empty value defeats this.
+          #
+          # Removing this is necessary for most services to not break request
+          # signatures as well as dynamodb crc32 checks (these fail if the
+          # response is gzipped).
+          headers = { 'accept-encoding' => '' }
           request.headers.each_pair do |key, value|
             headers[key] = value
           end

data/lib/seahorse/client/net_http/patches.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'net/http'
 
 module Seahorse
@@ -9,97 +11,26 @@ module Seahorse
       module Patches
 
         def self.apply!
+          Net::HTTPGenericRequest.prepend(PatchDefaultContentType)
           return unless RUBY_VERSION < '2.5'
-          if RUBY_VERSION >= '2.3'
-            Net::HTTP::IDEMPOTENT_METHODS_.clear
-            return
-          end
-          # no further patches needed for above versions
 
-          if RUBY_VERSION >= '2.0'
-            Net::HTTP.send(:include, Ruby_2)
-            Net::HTTP::IDEMPOTENT_METHODS_.clear
-          elsif RUBY_VERSION >= '1.9.3'
-            Net::HTTP.send(:include, Ruby_1_9_3)
-          end
-          Net::HTTP.send(:alias_method, :old_transport_request, :transport_request)
-          Net::HTTP.send(:alias_method, :transport_request, :new_transport_request)
+          Net::HTTP::IDEMPOTENT_METHODS_.clear
         end
 
-        module Ruby_2
-          def new_transport_request(req)
-            count = 0
-            begin
-              begin_transport req
-              res = catch(:response) {
-                req.exec @socket, @curr_http_version, edit_path(req.path)
-                begin
-                  res = Net::HTTPResponse.read_new(@socket)
-                  res.decode_content = req.decode_content
-                end while res.kind_of?(Net::HTTPInformation)
-
-                res.uri = req.uri
-
-                res
-              }
-              res.reading_body(@socket, req.response_body_permitted?) {
-                yield res if block_given?
-              }
-            rescue Net::OpenTimeout
-              raise
-            rescue Net::ReadTimeout, IOError, EOFError,
-                   Errno::ECONNRESET, Errno::ECONNABORTED, Errno::EPIPE,
-                   # avoid a dependency on OpenSSL
-                   defined?(OpenSSL::SSL) ? OpenSSL::SSL::SSLError : IOError,
-                   Timeout::Error => exception
-              if count == 0 && Net::HTTP::IDEMPOTENT_METHODS_.include?(req.method)
-                count += 1
-                @socket.close if @socket and not @socket.closed?
-                D "Conn close because of error #{exception}, and retry"
-                if req.body_stream
-                  if req.body_stream.respond_to?(:rewind)
-                    req.body_stream.rewind
-                  else
-                    raise
-                  end
-                end
-                retry
-              end
-              D "Conn close because of error #{exception}"
-              @socket.close if @socket and not @socket.closed?
-              raise
-            end
-
-            end_transport req, res
-            res
-          rescue => exception
-            D "Conn close because of error #{exception}"
-            @socket.close if @socket and not @socket.closed?
-            raise exception
+        # For requests with bodys, Net::HTTP sets a default content type of:
+        #   'application/x-www-form-urlencoded'
+        # There are cases where we should not send content type at all.
+        # Even when no body is supplied, Net::HTTP uses a default empty body
+        # and sets it anyway. This patch disables the behavior when a Thread
+        # local variable is set.
+        module PatchDefaultContentType
+          def supply_default_content_type
+            return if Thread.current[:net_http_skip_default_content_type]
+
+            super
           end
         end
 
-        module Ruby_1_9_3
-          def new_transport_request(req)
-            begin_transport req
-            res = catch(:response) {
-              req.exec @socket, @curr_http_version, edit_path(req.path)
-              begin
-                res = Net::HTTPResponse.read_new(@socket)
-              end while res.kind_of?(Net::HTTPContinue)
-              res
-            }
-            res.reading_body(@socket, req.response_body_permitted?) {
-              yield res if block_given?
-            }
-            end_transport req, res
-            res
-          rescue => exception
-            D "Conn close because of error #{exception}"
-            @socket.close if @socket and not @socket.closed?
-            raise exception
-          end
-        end
       end
     end
   end

data/lib/seahorse/client/networking_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Seahorse
   module Client
     class NetworkingError < StandardError
@@ -11,5 +13,33 @@ module Seahorse
       attr_reader :original_error
 
     end
+
+    # Raised when sending initial headers and data failed
+    # for event stream requests over Http2
+    class Http2InitialRequestError < StandardError
+
+      def initialize(error)
+        @original_error = error
+      end
+
+      # @return [HTTP2::Error]
+      attr_reader :original_error
+
+    end
+
+    # Raised when connection failed to initialize a new stream
+    class Http2StreamInitializeError < StandardError
+
+      def initialize(error)
+        @original_error = error
+      end
+
+      # @return [HTTP2::Error]
+      attr_reader :original_error
+
+    end
+
+    # Rasied when trying to use an closed connection
+    class Http2ConnectionClosedError < StandardError; end
   end
 end

data/lib/seahorse/client/plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Seahorse
   module Client
     class Plugin
@@ -53,12 +55,12 @@ module Seahorse
           # For backwards-compat reasons, the default value can be passed as 2nd
           # positional argument (before the options hash) or as the `:default` option
           # in the options hash.
-          if Hash === default
+          if default.is_a? Hash
             options = default
           else
             options[:default] = default
           end
-          options[:default_block] = Proc.new if block_given?
+          options[:default_block] = block if block_given?
           self.options << PluginOption.new(name, options)
         end
 
@@ -109,6 +111,7 @@ module Seahorse
 
         def initialize(name, options = {})
           @name = name
+          @doc_default = nil
           options.each_pair do |opt_name, opt_value|
             self.send("#{opt_name}=", opt_value)
           end
@@ -119,14 +122,14 @@ module Seahorse
         attr_accessor :default_block
         attr_accessor :required
         attr_accessor :doc_type
-        attr_accessor :doc_default
+        attr_writer :doc_default
         attr_accessor :docstring
 
-        def doc_default
-          if @doc_default.nil?
-            Proc === default ? nil : default
+        def doc_default(options)
+          if @doc_default.nil? && !default.is_a?(Proc)
+            default
           else
-            @doc_default
+            @doc_default.respond_to?(:call) ? @doc_default.call(options) : @doc_default
           end
         end
 

data/lib/seahorse/client/plugin_list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'set'
 require 'thread'