aws-sdk-s3 1.228.1 → 1.228.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 707edfd91b8b1c3422d80e345a544b90757ca353b282ffa6df8856de6afd263e
-  data.tar.gz: b2fe82651b7ca955e7c6cadfb19d4f70a8b01e76005ac12f904fd6bc71f4c811
+  metadata.gz: 5957df832c6080c73dbf559974579e122f334320e4ce7c81a780f08e3b73b820
+  data.tar.gz: 4e3921416a74055d610ca07144e6e21aa846fe153fce09b065cc8e62f4ee5294
 SHA512:
-  metadata.gz: e332ec84f826bbb1d50c457b61b05b52b660bca9723121231c58f8d9d11621ac53b09fd989a1e97734440e5e836bc5c1e267203164357a10d205ff16d458e6d1
-  data.tar.gz: 20425c6e9ecdfa528eeae37b322b7d32ad82a20ccb0c3bb94f109643995f718498103371892fc6bd47425021ea81017e542981a153c110a2b351e0d1be289af2
+  metadata.gz: adc68f9009d30922126bed8afd6fe8ba849ce29f4aa623331f42d867341076e78a85a9b2784334657c0763f7d86a66d41dac7601a522bfa7fdfb8bebd261da76
+  data.tar.gz: e850c4122c4fb0304cd2b7c3cac882cc9e64883a43913a7c936f68bb21831f88c5f74936f092977c17b4d653a900438ff31fc47463c758973cd2477bb5593d62

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Unreleased Changes
 ------------------
 
+1.228.2 (2026-07-30)
+------------------
+
+* Issue - S3 Encryption Client, encryptionV2 and encryptionV3, returns a decryption error for a malformed material description.
+
 1.228.1 (2026-07-23)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.228.1
+1.228.2

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

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

data/lib/aws-sdk-s3/encryptionV2/kms_cipher_provider.rb

@@ -50,7 +50,7 @@ module Aws
         # @return [Cipher] Given an encryption envelope, returns a
         #   decryption cipher.
         def decryption_cipher(envelope, options = {})
-          encryption_context = Json.load(envelope['x-amz-matdesc'])
+          encryption_context = extract_encryption_context(envelope['x-amz-matdesc'])
           cek_alg = envelope['x-amz-cek-alg']
 
           case envelope['x-amz-wrap-alg']
@@ -115,6 +115,19 @@ module Aws
 
         private
 
+        # Raise a decryption error for a malformed material description. A
+        # material description must be a JSON object.
+        def extract_encryption_context(matdesc)
+          context = Json.load(matdesc) if matdesc.is_a?(String)
+          unless context.is_a?(Hash)
+            raise Errors::DecryptionError, 'Malformed material description'
+          end
+
+          context
+        rescue Aws::Json::ParseError, EncodingError
+          raise Errors::DecryptionError, 'Malformed material description'
+        end
+
         def validate_key_wrap(key_wrap_schema)
           case key_wrap_schema
           when :kms_context then 'kms+context'

data/lib/aws-sdk-s3/encryptionV3/kms_cipher_provider.rb

@@ -54,7 +54,7 @@ module Aws
             cek_alg = envelope['x-amz-c']
             encryption_context =
               if !envelope['x-amz-t'].nil?
-                Json.load(envelope['x-amz-t'])
+                extract_encryption_context(envelope['x-amz-t'])
               else
                 ##= ../specification/s3-encryption/data-format/content-metadata.md#v3-only
                 ##% If the mapkey x-amz-t is not present, the default Material Description value MUST be set to an empty map (`{}`).
@@ -102,6 +102,18 @@ module Aws
 
         private
 
+        # Raise a decryption error for a malformed material description.
+        def extract_encryption_context(matdesc)
+          context = Json.load(matdesc) if matdesc.is_a?(String)
+          unless context.is_a?(Hash)
+            raise Errors::DecryptionError, 'Malformed material description'
+          end
+
+          context
+        rescue Aws::Json::ParseError, EncodingError
+          raise Errors::DecryptionError, 'Malformed material description'
+        end
+
         def validate_key_wrap(key_wrap_schema)
           case key_wrap_schema
           when :kms_context then '12'

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.228.1'
+  GEM_VERSION = '1.228.2'
 
 end
 

metadata

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