aws-sdk-s3 1.210.0 → 1.210.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 001f68c0fd317a05aecab1cd12673833d3321e9fdbf7f96bd0daf4e02030f305
-  data.tar.gz: 27da581457ae45f288dec7f06ec74f088cf6593fa2eb788c2821ec3ee53574ea
+  metadata.gz: 0e35a4e9d931cc6326d6e11fe2e73d571a4ca8cf0b24060ec73793144dfd9e8c
+  data.tar.gz: 5b80f94ff3edaf8de3728282dd2220cbadfe3eb58c2c29bb0f4f0730f0c4a7a5
 SHA512:
-  metadata.gz: 79e664dd1704d0bfe1c45cbddc72790e1d38ccd1d2b567b8442709feb07872eeafcb2160ecbd976d5e037a8c8ecdf904e5fbbd02295685ca43b192c2d4d7b3de
-  data.tar.gz: 1e9dfe900fcc03eb10a8b63a8393890a6b281bf469fc3e0e8c661c9318171726a6fd8edd871376455b8754df9aba636dc1f58f1b1bb1b9b322ddc693af2f20c0
+  metadata.gz: 6107bf342199aee13b8a9b1fc13562c955a2efce427b8c57d34ed1fc98e7dc22ec16e2fc7e0480531141ff1e413f17fb63ec419f1068516624598758d783fb38
+  data.tar.gz: 0f2c903871fc55b830ee17ff090d831142d9d699220d93eae6005eedf2edb2a86519471803753af2e036e29795fdb928cf18271fddf229079940f4345a630106

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Unreleased Changes
 ------------------
 
+1.210.1 (2026-01-06)
+------------------
+
+* Issue - Normalize response encoding to UTF-8 for proper XML error parsing in HTTP 200 responses.
+
 1.210.0 (2026-01-05)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.210.0
+1.210.1

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

@@ -22283,7 +22283,7 @@ module Aws::S3
         tracer: tracer
       )
       context[:gem_name] = 'aws-sdk-s3'
-      context[:gem_version] = '1.210.0'
+      context[:gem_version] = '1.210.1'
       Seahorse::Client::Request.new(handlers, context)
     end
 

data/lib/aws-sdk-s3/plugins/http_200_errors.rb

@@ -3,15 +3,28 @@
 module Aws
   module S3
     module Plugins
-
       # A handful of Amazon S3 operations will respond with a 200 status
       # code but will send an error in the response body. This plugin
       # injects a handler that will parse 200 response bodies for potential
       # errors, allowing them to be retried.
       # @api private
       class Http200Errors < Seahorse::Client::Plugin
-
         class Handler < Seahorse::Client::Handler
+          # A regular expression to match error codes in the response body
+          CODE_PATTERN = %r{<Code>(.+?)</Code>}.freeze
+          private_constant :CODE_PATTERN
+
+          # A list of encodings we force into UTF-8
+          ENCODINGS_TO_FIX = [Encoding::US_ASCII, Encoding::ASCII_8BIT].freeze
+          private_constant :ENCODINGS_TO_FIX
+
+          # A regular expression to match detect errors in the response body
+          ERROR_PATTERN = /<\?xml\s[^>]*\?>\s*<Error>/.freeze
+          private_constant :ERROR_PATTERN
+
+          # A regular expression to match an error message in the response body
+          MESSAGE_PATTERN = %r{<Message>(.+?)</Message>}.freeze
+          private_constant :MESSAGE_PATTERN
 
           def call(context)
             @handler.call(context).on(200) do |response|
@@ -28,29 +41,37 @@ module Aws
 
           private
 
-          # Streaming outputs are not subject to 200 errors.
-          def streaming_output?(output)
-            if (payload = output[:payload_member])
-              # checking ref and shape
-              payload['streaming'] || payload.shape['streaming'] ||
-                payload.eventstream
-            else
-              false
+          def build_error(context, code, message)
+            S3::Errors.error_class(code).new(context, message)
+          end
+
+          def check_for_error(context)
+            xml = normalize_encoding(context.http_response.body_contents)
+
+            if xml.match?(ERROR_PATTERN)
+              error_code = xml.match(CODE_PATTERN)[1]
+              error_message = xml.match(MESSAGE_PATTERN)[1]
+              build_error(context, error_code, error_message)
+            elsif incomplete_xml_body?(xml, context.operation.output)
+              Seahorse::Client::NetworkingError.new(
+                build_error(context, 'InternalError', 'Empty or incomplete response body')
+              )
             end
           end
 
+          # Must have a member in the body and have the start of an XML Tag.
+          # Other incomplete xml bodies will result in an XML ParsingError.
+          def incomplete_xml_body?(xml, output)
+            members_in_body?(output) && !xml.match(/<\w/)
+          end
+
           # Checks if the output shape is a structure shape and has members that
           # are in the body for the case of a payload and a normal structure. A
           # non-structure shape will not have members in the body. In the case
           # of a string or blob, the body contents would have been checked first
           # before this method is called in incomplete_xml_body?.
           def members_in_body?(output)
-            shape =
-              if output[:payload_member]
-                output[:payload_member].shape
-              else
-                output.shape
-              end
+            shape = resolve_shape(output)
 
             if structure_shape?(shape)
               shape.members.any? { |_, k| k.location.nil? }
@@ -59,30 +80,33 @@ module Aws
             end
           end
 
-          def structure_shape?(shape)
-            shape.is_a?(Seahorse::Model::Shapes::StructureShape)
+          # Fixes encoding issues when S3 returns UTF-8 content with missing charset in Content-Type header or omits
+          # Content-Type header entirely.  Net::HTTP defaults to US-ASCII or ASCII-8BIT when charset is unspecified.
+          def normalize_encoding(xml)
+            return xml unless xml.is_a?(String) && ENCODINGS_TO_FIX.include?(xml.encoding)
+
+            xml.force_encoding('UTF-8')
           end
 
-          # Must have a member in the body and have the start of an XML Tag.
-          # Other incomplete xml bodies will result in an XML ParsingError.
-          def incomplete_xml_body?(xml, output)
-            members_in_body?(output) && !xml.match(/<\w/)
+          def resolve_shape(output)
+            return output.shape unless output[:payload_member]
+
+            output[:payload_member].shape
           end
 
-          def check_for_error(context)
-            xml = context.http_response.body_contents
-            if xml.match(/<\?xml\s[^>]*\?>\s*<Error>/)
-              error_code = xml.match(%r{<Code>(.+?)</Code>})[1]
-              error_message = xml.match(%r{<Message>(.+?)</Message>})[1]
-              S3::Errors.error_class(error_code).new(context, error_message)
-            elsif incomplete_xml_body?(xml, context.operation.output)
-              Seahorse::Client::NetworkingError.new(
-                S3::Errors
-                  .error_class('InternalError')
-                  .new(context, 'Empty or incomplete response body')
-              )
+          # Streaming outputs are not subject to 200 errors.
+          def streaming_output?(output)
+            if (payload = output[:payload_member])
+              # checking ref and shape
+              payload['streaming'] || payload.shape['streaming'] || payload.eventstream
+            else
+              false
             end
           end
+
+          def structure_shape?(shape)
+            shape.is_a?(Seahorse::Model::Shapes::StructureShape)
+          end
         end
 
         handler(Handler, step: :sign)

data/lib/aws-sdk-s3.rb

@@ -75,7 +75,7 @@ module Aws::S3
   autoload :ObjectVersion, 'aws-sdk-s3/object_version'
   autoload :EventStreams, 'aws-sdk-s3/event_streams'
 
-  GEM_VERSION = '1.210.0'
+  GEM_VERSION = '1.210.1'
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-s3
 version: !ruby/object:Gem::Version
-  version: 1.210.0
+  version: 1.210.1
 platform: ruby
 authors:
 - Amazon Web Services