aws-sdk-core 3.121.1 → 3.121.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6045e01344ede12d88ef25ca9815ce3b267a0b08335e9f97753e5fd357f05a83
-  data.tar.gz: f0e783887c602e49acfa7837f0434a39936b786325846553e5db075f4c48b416
+  metadata.gz: 4b9f3fb30de8f9941d6f38fba87b19a9a68885fa51f28604481686e9dac1848c
+  data.tar.gz: 258e63026024946722a4bbdaaf34d91b633857a9b0310d735547e1cadfbefd51
 SHA512:
-  metadata.gz: 9ffa8d2716f3ecc99d5d52139811ef43d82250350be7b8db687bfa9cc25c8d046be6102f62dce196e9b85394c0b0c1db9df8356ff106c793ab232118e26682b2
-  data.tar.gz: 3c14caf81ef5425d0d5ee7f1b1d3f1dab3df5dfdb5673cbbe023120cef954fde6cdbf26e52cfcf74a62ef3863d14cf5d3dad6105007fc15960f8e60ab5b2a1a9
+  metadata.gz: 6706b957d3f7649d5886e388fefb261b6863168ac64c1b3e86e2e912dc1d692e60c0349d9c8109afbe9dc594e612e8a4f3f0cd00ab68b7dbfedf1812dd608570
+  data.tar.gz: 67fd627aabe9d7ccb53aec0d5c161d6ce255d51427166e0dfd3370210e1bb08bb242ec4d8632a73bcce006e13288057077e20b148b72092f60720ecd54d00291

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 Unreleased Changes
 ------------------
 
+3.121.2 (2021-10-18)
+------------------
+
+* Issue - Fix an issue where Rest JSON services do not have a `Content-Type` header.
+
+* Issue - Remove blank `Content-Type` header from Net::HTTP handler, and prevent a default from being set.
+
+* Issue - Set `Content-Length` only for HTTP methods that take a body.
+
 3.121.1 (2021-09-24)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-3.121.1
+3.121.2

data/lib/aws-sdk-core/plugins/protocols/api_gateway.rb

@@ -4,9 +4,26 @@ module Aws
   module Plugins
     module Protocols
       class ApiGateway < Seahorse::Client::Plugin
+
+        class ContentTypeHandler < Seahorse::Client::Handler
+          def call(context)
+            body = context.http_request.body
+            # Rest::Handler will set a default JSON body, so size can be checked
+            # if this handler is run after serialization.
+            if !body.respond_to?(:size) ||
+               (body.respond_to?(:size) && body.size > 0)
+               context.http_request.headers['Content-Type'] ||=
+                 'application/json'
+            end
+            @handler.call(context)
+          end
+        end
+
         handler(Rest::Handler)
+        handler(ContentTypeHandler, priority: 30)
         handler(Json::ErrorHandler, step: :sign)
       end
+
     end
   end
 end

data/lib/aws-sdk-core/plugins/protocols/rest_json.rb

@@ -5,10 +5,25 @@ module Aws
     module Protocols
       class RestJson < Seahorse::Client::Plugin
 
+        class ContentTypeHandler < Seahorse::Client::Handler
+          def call(context)
+            body = context.http_request.body
+            # Rest::Handler will set a default JSON body, so size can be checked
+            # if this handler is run after serialization.
+            if !body.respond_to?(:size) ||
+               (body.respond_to?(:size) && body.size > 0)
+              context.http_request.headers['Content-Type'] ||=
+                'application/json'
+            end
+            @handler.call(context)
+          end
+        end
+
         handler(Rest::Handler)
+        handler(ContentTypeHandler, priority: 30)
         handler(Json::ErrorHandler, step: :sign)
-
       end
+
     end
   end
 end

data/lib/aws-sdk-core/rest/request/body.rb

@@ -17,11 +17,29 @@ module Aws
         # @param [Seahorse::Client::Http::Request] http_req
         # @param [Hash] params
         def apply(http_req, params)
-          http_req.body = build_body(params)
+          body = build_body(params)
+          # for rest-json, ensure we send at least an empty object
+          # don't send an empty object for streaming? case.
+          if body.nil? && @serializer_class == Json::Builder &&
+             modeled_body? && !streaming?
+            body = '{}'
+          end
+          http_req.body = body
         end
 
         private
 
+        # operation is modeled for body when it is modeled for a payload
+        # either with payload trait or normal members.
+        def modeled_body?
+          return true if @rules[:payload]
+          @rules.shape.members.each do |member|
+            _name, shape = member
+            return true if shape.location.nil?
+          end
+          false
+        end
+
         def build_body(params)
           if streaming?
             params[@rules[:payload]]

data/lib/aws-sdk-sso/client.rb

@@ -29,7 +29,6 @@ require 'aws-sdk-core/plugins/transfer_encoding.rb'
 require 'aws-sdk-core/plugins/http_checksum.rb'
 require 'aws-sdk-core/plugins/signature_v4.rb'
 require 'aws-sdk-core/plugins/protocols/rest_json.rb'
-require 'aws-sdk-sso/plugins/content_type.rb'
 
 Aws::Plugins::GlobalConfiguration.add_identifier(:sso)
 
@@ -76,7 +75,6 @@ module Aws::SSO
     add_plugin(Aws::Plugins::HttpChecksum)
     add_plugin(Aws::Plugins::SignatureV4)
     add_plugin(Aws::Plugins::Protocols::RestJson)
-    add_plugin(Aws::SSO::Plugins::ContentType)
 
     # @overload initialize(options)
     #   @param [Hash] options
@@ -523,7 +521,7 @@ module Aws::SSO
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-core'
-      context[:gem_version] = '3.121.1'
+      context[:gem_version] = '3.121.2'
       Seahorse::Client::Request.new(handlers, context)
     end
 

data/lib/aws-sdk-sso.rb

@@ -50,6 +50,6 @@ require_relative 'aws-sdk-sso/customizations'
 # @!group service
 module Aws::SSO
 
-  GEM_VERSION = '3.121.1'
+  GEM_VERSION = '3.121.2'
 
 end

data/lib/aws-sdk-sts/client.rb

@@ -2303,7 +2303,7 @@ module Aws::STS
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-core'
-      context[:gem_version] = '3.121.1'
+      context[:gem_version] = '3.121.2'
       Seahorse::Client::Request.new(handlers, context)
     end
 

data/lib/aws-sdk-sts.rb

@@ -50,6 +50,6 @@ require_relative 'aws-sdk-sts/customizations'
 # @!group service
 module Aws::STS
 
-  GEM_VERSION = '3.121.1'
+  GEM_VERSION = '3.121.2'
 
 end

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

@@ -74,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)
 
@@ -96,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)
@@ -147,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
 
@@ -166,14 +175,13 @@ module Seahorse
         # @return [Hash] Returns a vanilla hash of headers to send with the
         #   HTTP request.
         def headers(request)
-          # Net::HTTP adds default headers for content-type to POSTs (1.8.7+)
-          # and accept-encoding (2.0.0+). Setting a default empty value defeats
-          # this.
+          # Net::HTTP adds a default header for accept-encoding (2.0.0+).
+          # Setting a default empty value defeats this.
           #
-          # Removing these are necessary for most services to not break request
+          # 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 = { 'content-type' => '', 'accept-encoding' => '' }
+          headers = { 'accept-encoding' => '' }
           request.headers.each_pair do |key, value|
             headers[key] = value
           end

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

@@ -11,10 +11,26 @@ module Seahorse
       module Patches
 
         def self.apply!
+          Net::HTTPGenericRequest.prepend(PatchDefaultContentType)
           return unless RUBY_VERSION < '2.5'
+
           Net::HTTP::IDEMPOTENT_METHODS_.clear
         end
 
+        # 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
+
       end
     end
   end

data/lib/seahorse/client/plugins/content_length.rb

@@ -7,16 +7,22 @@ module Seahorse
 
         # @api private
         class Handler < Client::Handler
+          # https://github.com/ruby/net-http/blob/master/lib/net/http/requests.rb
+          # Methods without body are forwards compatible, because content-length
+          # may be set for requests without body but is technically incorrect.
+          METHODS_WITHOUT_BODY = Set.new(
+            %w[GET HEAD DELETE OPTIONS TRACE COPY MOVE]
+          )
 
           def call(context)
-            # If it's an IO object and not a File / String / String IO
-            if context.http_request.body.respond_to?(:size)
-              length = context.http_request.body.size
-              context.http_request.headers['Content-Length'] = length
+            body = context.http_request.body
+            method = context.http_request.http_method
+            # We use Net::HTTP with body_stream which doesn't do this by default
+            if body.respond_to?(:size) && !METHODS_WITHOUT_BODY.include?(method)
+              context.http_request.headers['Content-Length'] = body.size
             end
             @handler.call(context)
           end
-
         end
 
         handler(Handler, step: :sign, priority: 0)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 3.121.1
+  version: 3.121.2
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jmespath
@@ -230,7 +230,6 @@ files:
 - lib/aws-sdk-sso/client_api.rb
 - lib/aws-sdk-sso/customizations.rb
 - lib/aws-sdk-sso/errors.rb
-- lib/aws-sdk-sso/plugins/content_type.rb
 - lib/aws-sdk-sso/resource.rb
 - lib/aws-sdk-sso/types.rb
 - lib/aws-sdk-sts.rb

data/lib/aws-sdk-sso/plugins/content_type.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Aws
-  module SSO
-    module Plugins
-      class ContentType < Seahorse::Client::Plugin
-
-        def add_handlers(handlers, config)
-          handlers.add(Handler)
-        end
-
-        class Handler < Seahorse::Client::Handler
-          def call(context)
-            # Some operations break when given an empty content-type header.
-            # The SDK adds this blank content-type header
-            # since Net::HTTP provides a default that can break services.
-            # We're setting one here even though it's not used or necessary.
-            context.http_request.headers['content-type'] = 'application/json'
-            @handler.call(context)
-          end
-        end
-      end
-    end
-  end
-end