aws-sdk-s3 1.164.0 → 1.182.0

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Aws
+  module S3
+    module Plugins
+      # @api private
+      class ChecksumAlgorithm < Seahorse::Client::Plugin
+
+        # S3 GetObject results for whole Multipart Objects contain a checksum
+        # that cannot be validated. These should be skipped by the
+        # ChecksumAlgorithm plugin.
+        class SkipWholeMultipartGetChecksumsHandler < Seahorse::Client::Handler
+          def call(context)
+            context[:http_checksum] ||= {}
+            context[:http_checksum][:skip_on_suffix] = true
+
+            @handler.call(context)
+          end
+        end
+
+        def add_handlers(handlers, _config)
+          handlers.add(
+            SkipWholeMultipartGetChecksumsHandler,
+            step: :initialize,
+            operations: [:get_object]
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -36,7 +36,7 @@ Parameter to indicate whether S3Express session auth should be disabled
       class Handler < Seahorse::Client::Handler
         def call(context)
           unless context[:discovered_endpoint]
-            params = parameters_for_operation(context)
+            params = Aws::S3::Endpoints.parameters_for_operation(context)
             endpoint = context.config.endpoint_provider.resolve_endpoint(params)
 
             context.http_request.endpoint = endpoint.url
@@ -76,209 +76,6 @@ Parameter to indicate whether S3Express session auth should be disabled
             context.http_request.headers[key] = value
           end
         end
-
-        def parameters_for_operation(context)
-          case context.operation_name
-          when :abort_multipart_upload
-            Aws::S3::Endpoints::AbortMultipartUpload.build(context)
-          when :complete_multipart_upload
-            Aws::S3::Endpoints::CompleteMultipartUpload.build(context)
-          when :copy_object
-            Aws::S3::Endpoints::CopyObject.build(context)
-          when :create_bucket
-            Aws::S3::Endpoints::CreateBucket.build(context)
-          when :create_multipart_upload
-            Aws::S3::Endpoints::CreateMultipartUpload.build(context)
-          when :create_session
-            Aws::S3::Endpoints::CreateSession.build(context)
-          when :delete_bucket
-            Aws::S3::Endpoints::DeleteBucket.build(context)
-          when :delete_bucket_analytics_configuration
-            Aws::S3::Endpoints::DeleteBucketAnalyticsConfiguration.build(context)
-          when :delete_bucket_cors
-            Aws::S3::Endpoints::DeleteBucketCors.build(context)
-          when :delete_bucket_encryption
-            Aws::S3::Endpoints::DeleteBucketEncryption.build(context)
-          when :delete_bucket_intelligent_tiering_configuration
-            Aws::S3::Endpoints::DeleteBucketIntelligentTieringConfiguration.build(context)
-          when :delete_bucket_inventory_configuration
-            Aws::S3::Endpoints::DeleteBucketInventoryConfiguration.build(context)
-          when :delete_bucket_lifecycle
-            Aws::S3::Endpoints::DeleteBucketLifecycle.build(context)
-          when :delete_bucket_metrics_configuration
-            Aws::S3::Endpoints::DeleteBucketMetricsConfiguration.build(context)
-          when :delete_bucket_ownership_controls
-            Aws::S3::Endpoints::DeleteBucketOwnershipControls.build(context)
-          when :delete_bucket_policy
-            Aws::S3::Endpoints::DeleteBucketPolicy.build(context)
-          when :delete_bucket_replication
-            Aws::S3::Endpoints::DeleteBucketReplication.build(context)
-          when :delete_bucket_tagging
-            Aws::S3::Endpoints::DeleteBucketTagging.build(context)
-          when :delete_bucket_website
-            Aws::S3::Endpoints::DeleteBucketWebsite.build(context)
-          when :delete_object
-            Aws::S3::Endpoints::DeleteObject.build(context)
-          when :delete_object_tagging
-            Aws::S3::Endpoints::DeleteObjectTagging.build(context)
-          when :delete_objects
-            Aws::S3::Endpoints::DeleteObjects.build(context)
-          when :delete_public_access_block
-            Aws::S3::Endpoints::DeletePublicAccessBlock.build(context)
-          when :get_bucket_accelerate_configuration
-            Aws::S3::Endpoints::GetBucketAccelerateConfiguration.build(context)
-          when :get_bucket_acl
-            Aws::S3::Endpoints::GetBucketAcl.build(context)
-          when :get_bucket_analytics_configuration
-            Aws::S3::Endpoints::GetBucketAnalyticsConfiguration.build(context)
-          when :get_bucket_cors
-            Aws::S3::Endpoints::GetBucketCors.build(context)
-          when :get_bucket_encryption
-            Aws::S3::Endpoints::GetBucketEncryption.build(context)
-          when :get_bucket_intelligent_tiering_configuration
-            Aws::S3::Endpoints::GetBucketIntelligentTieringConfiguration.build(context)
-          when :get_bucket_inventory_configuration
-            Aws::S3::Endpoints::GetBucketInventoryConfiguration.build(context)
-          when :get_bucket_lifecycle
-            Aws::S3::Endpoints::GetBucketLifecycle.build(context)
-          when :get_bucket_lifecycle_configuration
-            Aws::S3::Endpoints::GetBucketLifecycleConfiguration.build(context)
-          when :get_bucket_location
-            Aws::S3::Endpoints::GetBucketLocation.build(context)
-          when :get_bucket_logging
-            Aws::S3::Endpoints::GetBucketLogging.build(context)
-          when :get_bucket_metrics_configuration
-            Aws::S3::Endpoints::GetBucketMetricsConfiguration.build(context)
-          when :get_bucket_notification
-            Aws::S3::Endpoints::GetBucketNotification.build(context)
-          when :get_bucket_notification_configuration
-            Aws::S3::Endpoints::GetBucketNotificationConfiguration.build(context)
-          when :get_bucket_ownership_controls
-            Aws::S3::Endpoints::GetBucketOwnershipControls.build(context)
-          when :get_bucket_policy
-            Aws::S3::Endpoints::GetBucketPolicy.build(context)
-          when :get_bucket_policy_status
-            Aws::S3::Endpoints::GetBucketPolicyStatus.build(context)
-          when :get_bucket_replication
-            Aws::S3::Endpoints::GetBucketReplication.build(context)
-          when :get_bucket_request_payment
-            Aws::S3::Endpoints::GetBucketRequestPayment.build(context)
-          when :get_bucket_tagging
-            Aws::S3::Endpoints::GetBucketTagging.build(context)
-          when :get_bucket_versioning
-            Aws::S3::Endpoints::GetBucketVersioning.build(context)
-          when :get_bucket_website
-            Aws::S3::Endpoints::GetBucketWebsite.build(context)
-          when :get_object
-            Aws::S3::Endpoints::GetObject.build(context)
-          when :get_object_acl
-            Aws::S3::Endpoints::GetObjectAcl.build(context)
-          when :get_object_attributes
-            Aws::S3::Endpoints::GetObjectAttributes.build(context)
-          when :get_object_legal_hold
-            Aws::S3::Endpoints::GetObjectLegalHold.build(context)
-          when :get_object_lock_configuration
-            Aws::S3::Endpoints::GetObjectLockConfiguration.build(context)
-          when :get_object_retention
-            Aws::S3::Endpoints::GetObjectRetention.build(context)
-          when :get_object_tagging
-            Aws::S3::Endpoints::GetObjectTagging.build(context)
-          when :get_object_torrent
-            Aws::S3::Endpoints::GetObjectTorrent.build(context)
-          when :get_public_access_block
-            Aws::S3::Endpoints::GetPublicAccessBlock.build(context)
-          when :head_bucket
-            Aws::S3::Endpoints::HeadBucket.build(context)
-          when :head_object
-            Aws::S3::Endpoints::HeadObject.build(context)
-          when :list_bucket_analytics_configurations
-            Aws::S3::Endpoints::ListBucketAnalyticsConfigurations.build(context)
-          when :list_bucket_intelligent_tiering_configurations
-            Aws::S3::Endpoints::ListBucketIntelligentTieringConfigurations.build(context)
-          when :list_bucket_inventory_configurations
-            Aws::S3::Endpoints::ListBucketInventoryConfigurations.build(context)
-          when :list_bucket_metrics_configurations
-            Aws::S3::Endpoints::ListBucketMetricsConfigurations.build(context)
-          when :list_buckets
-            Aws::S3::Endpoints::ListBuckets.build(context)
-          when :list_directory_buckets
-            Aws::S3::Endpoints::ListDirectoryBuckets.build(context)
-          when :list_multipart_uploads
-            Aws::S3::Endpoints::ListMultipartUploads.build(context)
-          when :list_object_versions
-            Aws::S3::Endpoints::ListObjectVersions.build(context)
-          when :list_objects
-            Aws::S3::Endpoints::ListObjects.build(context)
-          when :list_objects_v2
-            Aws::S3::Endpoints::ListObjectsV2.build(context)
-          when :list_parts
-            Aws::S3::Endpoints::ListParts.build(context)
-          when :put_bucket_accelerate_configuration
-            Aws::S3::Endpoints::PutBucketAccelerateConfiguration.build(context)
-          when :put_bucket_acl
-            Aws::S3::Endpoints::PutBucketAcl.build(context)
-          when :put_bucket_analytics_configuration
-            Aws::S3::Endpoints::PutBucketAnalyticsConfiguration.build(context)
-          when :put_bucket_cors
-            Aws::S3::Endpoints::PutBucketCors.build(context)
-          when :put_bucket_encryption
-            Aws::S3::Endpoints::PutBucketEncryption.build(context)
-          when :put_bucket_intelligent_tiering_configuration
-            Aws::S3::Endpoints::PutBucketIntelligentTieringConfiguration.build(context)
-          when :put_bucket_inventory_configuration
-            Aws::S3::Endpoints::PutBucketInventoryConfiguration.build(context)
-          when :put_bucket_lifecycle
-            Aws::S3::Endpoints::PutBucketLifecycle.build(context)
-          when :put_bucket_lifecycle_configuration
-            Aws::S3::Endpoints::PutBucketLifecycleConfiguration.build(context)
-          when :put_bucket_logging
-            Aws::S3::Endpoints::PutBucketLogging.build(context)
-          when :put_bucket_metrics_configuration
-            Aws::S3::Endpoints::PutBucketMetricsConfiguration.build(context)
-          when :put_bucket_notification
-            Aws::S3::Endpoints::PutBucketNotification.build(context)
-          when :put_bucket_notification_configuration
-            Aws::S3::Endpoints::PutBucketNotificationConfiguration.build(context)
-          when :put_bucket_ownership_controls
-            Aws::S3::Endpoints::PutBucketOwnershipControls.build(context)
-          when :put_bucket_policy
-            Aws::S3::Endpoints::PutBucketPolicy.build(context)
-          when :put_bucket_replication
-            Aws::S3::Endpoints::PutBucketReplication.build(context)
-          when :put_bucket_request_payment
-            Aws::S3::Endpoints::PutBucketRequestPayment.build(context)
-          when :put_bucket_tagging
-            Aws::S3::Endpoints::PutBucketTagging.build(context)
-          when :put_bucket_versioning
-            Aws::S3::Endpoints::PutBucketVersioning.build(context)
-          when :put_bucket_website
-            Aws::S3::Endpoints::PutBucketWebsite.build(context)
-          when :put_object
-            Aws::S3::Endpoints::PutObject.build(context)
-          when :put_object_acl
-            Aws::S3::Endpoints::PutObjectAcl.build(context)
-          when :put_object_legal_hold
-            Aws::S3::Endpoints::PutObjectLegalHold.build(context)
-          when :put_object_lock_configuration
-            Aws::S3::Endpoints::PutObjectLockConfiguration.build(context)
-          when :put_object_retention
-            Aws::S3::Endpoints::PutObjectRetention.build(context)
-          when :put_object_tagging
-            Aws::S3::Endpoints::PutObjectTagging.build(context)
-          when :put_public_access_block
-            Aws::S3::Endpoints::PutPublicAccessBlock.build(context)
-          when :restore_object
-            Aws::S3::Endpoints::RestoreObject.build(context)
-          when :select_object_content
-            Aws::S3::Endpoints::SelectObjectContent.build(context)
-          when :upload_part
-            Aws::S3::Endpoints::UploadPart.build(context)
-          when :upload_part_copy
-            Aws::S3::Endpoints::UploadPartCopy.build(context)
-          when :write_get_object_response
-            Aws::S3::Endpoints::WriteGetObjectResponse.build(context)
-          end
-        end
       end
 
       def add_handlers(handlers, _config)

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

@@ -29,24 +29,17 @@ for different buckets.
         # @api private
         class Handler < Seahorse::Client::Handler
           def call(context)
-            if (props = context[:endpoint_properties])
-              # S3 Express endpoint - turn off md5 and enable crc32 default
-              if props['backend'] == 'S3Express'
-                if context.operation_name == :put_object || checksum_required?(context)
-                  context[:default_request_checksum_algorithm] = 'CRC32'
-                end
-                context[:s3_express_endpoint] = true
-              end
+            context[:s3_express_endpoint] = true if s3_express_endpoint?(context)
 
-              # if s3 express auth, use new credentials and sign additional header
-              if context[:auth_scheme]['name'] == 'sigv4-s3express' &&
-                 !context.config.disable_s3_express_session_auth
-                bucket = context.params[:bucket]
-                credentials_provider = context.config.express_credentials_provider
-                credentials = credentials_provider.express_credentials_for(bucket)
-                context[:sigv4_credentials] = credentials # Sign will use this
-              end
+            # if s3 express auth, use new credentials and sign additional header
+            if context[:auth_scheme]['name'] == 'sigv4-s3express' &&
+               !context.config.disable_s3_express_session_auth
+              bucket = context.params[:bucket]
+              credentials_provider = context.config.express_credentials_provider
+              credentials = credentials_provider.express_credentials_for(bucket)
+              context[:sigv4_credentials] = credentials # Sign will use this
             end
+
             with_metric(credentials) { @handler.call(context) }
           end
 
@@ -58,10 +51,8 @@ for different buckets.
             Aws::Plugins::UserAgent.metric('S3_EXPRESS_BUCKET', &block)
           end
 
-          def checksum_required?(context)
-            context.operation.http_checksum_required ||
-              (context.operation.http_checksum &&
-                context.operation.http_checksum['requestChecksumRequired'])
+          def s3_express_endpoint?(context)
+            context[:endpoint_properties]['backend'] == 'S3Express'
           end
         end
 

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

@@ -71,9 +71,9 @@ module Aws
 
           def check_for_error(context)
             xml = context.http_response.body_contents
-            if xml.match(/\?>\s*<Error>/)
-              error_code = xml.match(/<Code>(.+?)<\/Code>/)[1]
-              error_message = xml.match(/<Message>(.+?)<\/Message>/)[1]
+            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(

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

@@ -6,81 +6,20 @@ module Aws
   module S3
     module Plugins
       # @api private
-      # This plugin is effectively deprecated in favor of modeled
+      # This plugin is deprecated in favor of modeled
       # httpChecksumRequired traits.
       class Md5s < Seahorse::Client::Plugin
-        # These operations allow Content MD5 but are not required by
-        # httpChecksumRequired. This list should not grow.
-        OPTIONAL_OPERATIONS = [
-          :put_object,
-          :upload_part
-        ]
-
-        # @api private
-        class Handler < Seahorse::Client::Handler
-
-          CHUNK_SIZE = 1 * 1024 * 1024 # one MB
-
-          def call(context)
-            if !context[:checksum_algorithms] && # skip in favor of flexible checksum
-               !context[:s3_express_endpoint] # s3 express endpoints do not support md5
-              body = context.http_request.body
-              if body.respond_to?(:size) && body.size > 0
-                context.http_request.headers['Content-Md5'] ||= md5(body)
-              end
-            end
-            @handler.call(context)
-          end
-
-          private
-
-          # @param [File, Tempfile, IO#read, String] value
-          # @return [String<MD5>]
-          def md5(value)
-            if (File === value || Tempfile === value) && !value.path.nil? && File.exist?(value.path)
-              OpenSSL::Digest::MD5.file(value).base64digest
-            elsif value.respond_to?(:read)
-              md5 = OpenSSL::Digest::MD5.new
-              update_in_chunks(md5, value)
-              md5.base64digest
-            else
-              OpenSSL::Digest::MD5.digest(value).base64digest
-            end
-          end
-
-          def update_in_chunks(digest, io)
-            loop do
-              chunk = io.read(CHUNK_SIZE)
-              break unless chunk
-              digest.update(chunk)
-            end
-            io.rewind
-          end
-
-        end
-
         option(:compute_checksums,
-          default: true,
-          doc_type: 'Boolean',
-          docstring: <<-DOCS)
-When `true` a MD5 checksum will be computed and sent in the Content Md5
-header for :put_object and :upload_part. When `false`, MD5 checksums
-will not be computed for these operations. Checksums are still computed
-for operations requiring them. Checksum errors returned by Amazon S3 are
-automatically retried up to `:retry_limit` times.
-          DOCS
-
-        def add_handlers(handlers, config)
-          if config.compute_checksums
-            # priority set low to ensure md5 is computed AFTER the request is
-            # built but before it is signed
-            handlers.add(
-              Handler,
-              priority: 10, step: :build, operations: OPTIONAL_OPERATIONS
-            )
-          end
+               default: true,
+               doc_type: 'Boolean',
+               docstring: <<~DOCS)
+                 This option is deprecated. Please use `:request_checksum_calculation` instead.
+                 When `false`, `request_checksum_calculation` is overridden to `when_required`.
+               DOCS
+
+        def after_initialize(client)
+          client.config.request_checksum_calculation = 'when_required' unless client.config.compute_checksums
         end
-
       end
     end
   end

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

@@ -193,15 +193,14 @@ module Aws
         req, expires_in, secure, time, unsigned_headers, hoist = true
       )
         x_amz_headers = {}
-
         http_req = req.context.http_request
-
-        req.handlers.remove(Aws::S3::Plugins::S3Signer::LegacyHandler)
-        req.handlers.remove(Aws::Plugins::Sign::Handler)
         req.handlers.remove(Seahorse::Client::Plugins::ContentLength::Handler)
         req.handlers.remove(Aws::Rest::ContentTypeHandler)
+        req.handlers.remove(Aws::Plugins::ChecksumAlgorithm::OptionHandler)
+        req.handlers.remove(Aws::Plugins::ChecksumAlgorithm::ChecksumHandler)
         req.handlers.remove(Aws::Plugins::InvocationId::Handler)
-
+        req.handlers.remove(Aws::Plugins::Sign::Handler)
+        req.handlers.remove(Aws::S3::Plugins::S3Signer::LegacyHandler)
         req.handle(step: :send) do |context|
           # if an endpoint was not provided, force secure or insecure
           if context.config.regional_endpoint
@@ -238,6 +237,7 @@ module Aws
             credentials_provider: context[:sigv4_credentials] || context.config.credentials,
             signing_algorithm: scheme_name.to_sym,
             uri_escape_path: !!!auth_scheme['disableDoubleEncoding'],
+            normalize_path: !!!auth_scheme['disableNormalizePath'],
             unsigned_headers: unsigned_headers,
             apply_checksum_header: false
           )

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

@@ -41,13 +41,13 @@ module Aws::S3
     #     acl: "private", # accepts private, public-read, public-read-write, authenticated-read
     #     bucket: "BucketName", # required
     #     create_bucket_configuration: {
-    #       location_constraint: "af-south-1", # accepts af-south-1, ap-east-1, ap-northeast-1, ap-northeast-2, ap-northeast-3, ap-south-1, ap-south-2, ap-southeast-1, ap-southeast-2, ap-southeast-3, ca-central-1, cn-north-1, cn-northwest-1, EU, eu-central-1, eu-north-1, eu-south-1, eu-south-2, eu-west-1, eu-west-2, eu-west-3, me-south-1, sa-east-1, us-east-2, us-gov-east-1, us-gov-west-1, us-west-1, us-west-2
+    #       location_constraint: "af-south-1", # accepts af-south-1, ap-east-1, ap-northeast-1, ap-northeast-2, ap-northeast-3, ap-south-1, ap-south-2, ap-southeast-1, ap-southeast-2, ap-southeast-3, ap-southeast-4, ap-southeast-5, ca-central-1, cn-north-1, cn-northwest-1, EU, eu-central-1, eu-central-2, eu-north-1, eu-south-1, eu-south-2, eu-west-1, eu-west-2, eu-west-3, il-central-1, me-central-1, me-south-1, sa-east-1, us-east-2, us-gov-east-1, us-gov-west-1, us-west-1, us-west-2
     #       location: {
-    #         type: "AvailabilityZone", # accepts AvailabilityZone
+    #         type: "AvailabilityZone", # accepts AvailabilityZone, LocalZone
     #         name: "LocationNameAsString",
     #       },
     #       bucket: {
-    #         data_redundancy: "SingleAvailabilityZone", # accepts SingleAvailabilityZone
+    #         data_redundancy: "SingleAvailabilityZone", # accepts SingleAvailabilityZone, SingleLocalZone
     #         type: "Directory", # accepts Directory
     #       },
     #     },
@@ -75,13 +75,14 @@ module Aws::S3
     #
     #   <b>Directory buckets </b> - When you use this operation with a
     #   directory bucket, you must use path-style requests in the format
-    #   `https://s3express-control.region_code.amazonaws.com/bucket-name `.
+    #   `https://s3express-control.region-code.amazonaws.com/bucket-name `.
     #   Virtual-hosted-style requests aren't supported. Directory bucket
-    #   names must be unique in the chosen Availability Zone. Bucket names
-    #   must also follow the format ` bucket_base_name--az_id--x-s3` (for
-    #   example, ` DOC-EXAMPLE-BUCKET--usw2-az1--x-s3`). For information about
-    #   bucket naming restrictions, see [Directory bucket naming rules][2] in
-    #   the *Amazon S3 User Guide*
+    #   names must be unique in the chosen Zone (Availability Zone or Local
+    #   Zone). Bucket names must also follow the format `
+    #   bucket-base-name--zone-id--x-s3` (for example, `
+    #   DOC-EXAMPLE-BUCKET--usw2-az1--x-s3`). For information about bucket
+    #   naming restrictions, see [Directory bucket naming rules][2] in the
+    #   *Amazon S3 User Guide*
     #
     #
     #
@@ -188,8 +189,32 @@ module Aws::S3
 
     # @example Request syntax with placeholder values
     #
-    #   s3.buckets()
+    #   buckets = s3.buckets({
+    #     prefix: "Prefix",
+    #     bucket_region: "BucketRegion",
+    #   })
     # @param [Hash] options ({})
+    # @option options [String] :prefix
+    #   Limits the response to bucket names that begin with the specified
+    #   bucket name prefix.
+    # @option options [String] :bucket_region
+    #   Limits the response to buckets that are located in the specified
+    #   Amazon Web Services Region. The Amazon Web Services Region must be
+    #   expressed according to the Amazon Web Services Region code, such as
+    #   `us-west-2` for the US West (Oregon) Region. For a list of the valid
+    #   values for all of the Amazon Web Services Regions, see [Regions and
+    #   Endpoints][1].
+    #
+    #   <note markdown="1"> Requests made to a Regional endpoint that is different from the
+    #   `bucket-region` parameter are not supported. For example, if you want
+    #   to limit the response to your buckets in Region `us-west-2`, the
+    #   request must be made to an endpoint in Region `us-west-2`.
+    #
+    #    </note>
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
     # @return [Bucket::Collection]
     def buckets(options = {})
       batches = Enumerator.new do |y|