fog-aws 3.5.0 → 3.28.0

data/lib/fog/aws/requests/rds/remove_tags_from_resource.rb

@@ -11,11 +11,12 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~Hash>:
         def remove_tags_from_resource(rds_id, keys)
+          resource_name = "arn:aws:rds:#{@region}:#{owner_id}:db:#{rds_id}"
+          %w[us-gov-west-1 us-gov-east-1].include?(@region) ? resource_name.insert(7, '-us-gov') : resource_name
           request(
-            { 'Action'        => 'RemoveTagsFromResource',
-              'ResourceName'  => "arn:aws:rds:#{@region}:#{owner_id}:db:#{rds_id}",
-              :parser         => Fog::Parsers::AWS::RDS::Base.new,
-            }.merge(Fog::AWS.indexed_param('TagKeys.member.%d', keys))
+            { 'Action' => 'RemoveTagsFromResource',
+              'ResourceName' => resource_name,
+              :parser => Fog::Parsers::AWS::RDS::Base.new }.merge(Fog::AWS.indexed_param('TagKeys.member.%d', keys))
           )
         end
       end
@@ -23,15 +24,15 @@ module Fog
       class Mock
         def remove_tags_from_resource(rds_id, keys)
           response = Excon::Response.new
-          if server = self.data[:servers][rds_id]
-            keys.each {|key| self.data[:tags][rds_id].delete key}
+          if server = data[:servers][rds_id]
+            keys.each { |key| data[:tags][rds_id].delete key }
             response.status = 200
             response.body = {
-              "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id }
+              'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
             }
             response
           else
-            raise Fog::AWS::RDS::NotFound.new("DBInstance #{rds_id} not found")
+            raise Fog::AWS::RDS::NotFound, "DBInstance #{rds_id} not found"
           end
         end
       end

data/lib/fog/aws/requests/ses/send_raw_email.rb

@@ -9,7 +9,7 @@ module Fog
         # ==== Parameters
         # * RawMessage <~String> - The message to be sent.
         # * Options <~Hash>
-        #   * Source <~String> - The sender's email address. Takes precenence over Return-Path if specified in RawMessage
+        #   * Source <~String> - The sender's email address. Takes precedence over Return-Path if specified in RawMessage
         #   * Destinations <~Array> - All destinations for this email.
         #
         # ==== Returns

data/lib/fog/aws/requests/sqs/change_message_visibility.rb

@@ -8,7 +8,7 @@ module Fog
         #
         # ==== Parameters
         # * queue_url<~String> - Url of queue for message to update
-        # * receipt_handle<~String> - Token from previous recieve message
+        # * receipt_handle<~String> - Token from previous receive message
         # * visibility_timeout<~Integer> - New visibility timeout in 0..43200
         #
         # ==== See Also

data/lib/fog/aws/requests/sqs/delete_message.rb

@@ -8,7 +8,7 @@ module Fog
         #
         # ==== Parameters
         # * queue_url<~String> - Url of queue to delete message from
-        # * receipt_handle<~String> - Token from previous recieve message
+        # * receipt_handle<~String> - Token from previous receive message
         #
         # ==== See Also
         # http://docs.amazonwebservices.com/AWSSimpleQueueService/latest/APIReference/Query_QueryDeleteMessage.html

data/lib/fog/aws/requests/storage/copy_object.rb

@@ -17,7 +17,7 @@ module Fog
         # @option options [Time] x-amz-copy_source-if-modified_since Copies object it it has been modified since this time
         # @option options [String] x-amz-copy_source-if-none-match Copies object if its etag does not match this value
         # @option options [Time] x-amz-copy_source-if-unmodified-since Copies object it it has not been modified since this time
-        # @option options [String] x-amz-storage-class Default is 'STANDARD', set to 'REDUCED_REDUNDANCY' for non-critical, reproducable data
+        # @option options [String] x-amz-storage-class Default is 'STANDARD', set to 'REDUCED_REDUNDANCY' for non-critical, reproducible data
         #
         #
         # @return [Excon::Response]
@@ -34,6 +34,7 @@ module Fog
             :headers  => headers,
             :bucket_name => target_bucket_name,
             :object_name => target_object_name,
+            :idempotent => true,
             :method   => 'PUT',
             :parser   => Fog::Parsers::AWS::Storage::CopyObject.new,
           })

data/lib/fog/aws/requests/storage/delete_multiple_objects.rb

@@ -36,13 +36,20 @@ module Fog
           data << "<Quiet>true</Quiet>" if headers.delete(:quiet)
           version_ids = headers.delete('versionId')
           object_names.each do |object_name|
-            data << "<Object>"
-            data << "<Key>#{CGI.escapeHTML(object_name)}</Key>"
             object_version = version_ids.nil? ? nil : version_ids[object_name]
             if object_version
-              data << "<VersionId>#{CGI.escapeHTML(object_version)}</VersionId>"
+              object_version = object_version.is_a?(String) ? [object_version] : object_version
+              object_version.each do |version_id|
+                data << "<Object>"
+                data << "<Key>#{CGI.escapeHTML(object_name)}</Key>"
+                data << "<VersionId>#{CGI.escapeHTML(version_id)}</VersionId>"
+                data << "</Object>"
+              end
+            else
+              data << "<Object>"
+              data << "<Key>#{CGI.escapeHTML(object_name)}</Key>"
+              data << "</Object>"
             end
-            data << "</Object>"
           end
           data << "</Delete>"
 
@@ -72,10 +79,13 @@ module Fog
             response.body = { 'DeleteResult' => [] }
             version_ids = headers.delete('versionId')
             object_names.each do |object_name|
-              object_version = version_ids.nil? ? nil : version_ids[object_name]
-              response.body['DeleteResult'] << delete_object_helper(bucket,
-                                                                object_name,
-                                                                object_version)
+              object_version = version_ids.nil? ? [nil] : version_ids[object_name]
+              object_version = object_version.is_a?(String) ? [object_version] : object_version
+              object_version.each do |version_id|
+                response.body['DeleteResult'] << delete_object_helper(bucket,
+                                                                  object_name,
+                                                                  version_id)
+              end
             end
           else
             response.status = 404

data/lib/fog/aws/requests/storage/get_bucket.rb

@@ -9,7 +9,7 @@ module Fog
         # @param bucket_name [String] name of bucket to list object keys from
         # @param options [Hash] config arguments for list.  Defaults to {}.
         # @option options delimiter [String] causes keys with the same string between the prefix
-        #     value and the first occurence of delimiter to be rolled up
+        #     value and the first occurrence of delimiter to be rolled up
         # @option options marker [String] limits object keys to only those that appear
         #     lexicographically after its value.
         # @option options max-keys [Integer] limits number of object keys returned
@@ -17,7 +17,7 @@ module Fog
         #
         # @return [Excon::Response] response:
         #   * body [Hash]:
-        #     * Delimeter [String] - Delimiter specified for query
+        #     * Delimiter [String] - Delimiter specified for query
         #     * IsTruncated [Boolean] - Whether or not the listing is truncated
         #     * Marker [String]- Marker specified for query
         #     * MaxKeys [Integer] - Maximum number of keys specified for query

data/lib/fog/aws/requests/storage/get_bucket_object_versions.rb

@@ -8,7 +8,7 @@ module Fog
         #
         # @param bucket_name [String] name of bucket to list object keys from
         # @param options [Hash] config arguments for list
-        # @option options delimiter [String] causes keys with the same string between the prefix value and the first occurence of delimiter to be rolled up
+        # @option options delimiter [String] causes keys with the same string between the prefix value and the first occurrence of delimiter to be rolled up
         # @option options key-marker [String] limits object keys to only those that appear lexicographically after its value.
         # @option options max-keys [Integer] limits number of object keys returned
         # @option options prefix [String] limits object keys to those beginning with its value.
@@ -16,7 +16,7 @@ module Fog
         #
         # @return [Excon::Response] response:
         #   * body [Hash]:
-        #     * Delimeter [String] - Delimiter specified for query
+        #     * Delimiter [String] - Delimiter specified for query
         #     * KeyMarker [String] - Key marker specified for query
         #     * MaxKeys [Integer] - Maximum number of keys specified for query
         #     * Name [String] - Name of the bucket

data/lib/fog/aws/requests/storage/get_object.rb

@@ -50,7 +50,7 @@ module Fog
 
           idempotent = true
           if block_given?
-            params[:response_block] = Proc.new
+            params[:response_block] = Proc.new(&block)
             idempotent = false
           end
 

data/lib/fog/aws/requests/storage/get_object_tagging.rb

@@ -0,0 +1,41 @@
+module Fog
+  module AWS
+    class Storage
+      class Real
+        require 'fog/aws/parsers/storage/get_object_tagging'
+
+        # Get tags for an S3 object
+        #
+        # @param bucket_name [String] Name of bucket to read from
+        # @param object_name [String] Name of object to get tags for
+        #
+        # @return [Excon::Response] response:
+        #   * body [Hash]:
+        #     * ObjectTagging [Hash]:
+        #       * Key [String] - tag key
+        #       * Value [String] - tag value
+        # @see https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObjectTagging.html
+
+        def get_object_tagging(bucket_name, object_name)
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          unless object_name
+            raise ArgumentError.new('object_name is required')
+          end
+
+          request({
+            :expects => 200,
+            :headers => {},
+            :bucket_name => bucket_name,
+            :object_name => object_name,
+            :idempotent => true,
+            :method => 'GET',
+            :parser => Fog::Parsers::AWS::Storage::GetObjectTagging.new,
+            :query => {'tagging' => nil}
+          })
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/storage/get_service.rb

@@ -21,7 +21,7 @@ module Fog
           request({
             :expects  => 200,
             :headers  => {},
-            :host     => 's3.amazonaws.com',
+            :host     => @host || region_to_host(DEFAULT_REGION),
             :idempotent => true,
             :method   => 'GET',
             :parser   => Fog::Parsers::AWS::Storage::GetService.new

data/lib/fog/aws/requests/storage/list_parts.rb

@@ -21,7 +21,7 @@ module Fog
         #       * ID [String] Id of upload initiator
         #     * IsTruncated [Boolean] Whether or not the listing is truncated
         #     * Key [String] Key where multipart upload was initiated
-        #     * MaxParts [String] maximum number of replies alllowed in response
+        #     * MaxParts [String] maximum number of replies allowed in response
         #     * NextPartNumberMarker [String] last item in list, for further pagination
         #     * Part [Array]:
         #       * ETag [String] ETag of part

data/lib/fog/aws/requests/storage/put_bucket.rb

@@ -61,10 +61,6 @@ DATA
           end
           if !self.data[:buckets][bucket_name]
             self.data[:buckets][bucket_name] = bucket
-          elsif self.region != 'us-east-1'
-            response.status = 409
-            Fog::Logger.warning "Your region '#{self.region}' does not match the default region 'us-east-1'"
-            raise(Excon::Errors.status_error({:expects => 201}, response))
           end
           response
         end

data/lib/fog/aws/requests/storage/put_bucket_lifecycle.rb

@@ -47,7 +47,7 @@ module Fog
                       if rule['NoncurrentVersionExpiration']['NoncurrentDays']
                         NoncurrentVersionExpiration { NoncurrentDays rule['NoncurrentVersionExpiration']['NoncurrentDays'] }
                       elsif rule['NoncurrentVersionExpiration']['Date']
-                        NoncurrentVersoinExpiration {
+                        NoncurrentVersionExpiration {
                           if Date rule['NoncurrentVersionExpiration']['Date'].is_a?(Time)
                             rule['NoncurrentVersionExpiration']['Date'].utc.iso8601
                           else

data/lib/fog/aws/requests/storage/put_bucket_notification.rb

@@ -5,7 +5,7 @@ module Fog
         # Change notification configuration for an S3 bucket
         #
         # @param bucket_name [String] name of bucket to set notification configuration for
-        # * notications [Hash]:
+        # * notifications [Hash]:
         #   * Topics [Array] SNS topic configurations for the notification
         #     * ID [String] Unique identifier for the configuration
         #     * Topic [String] Amazon SNS topic ARN to which Amazon S3 will publish a message when it detects events of specified type

data/lib/fog/aws/requests/storage/put_object.rb

@@ -16,7 +16,7 @@ module Fog
         # @option options Content-Type [String] Standard MIME type describing contents (defaults to MIME::Types.of.first)
         # @option options Expires [String] Cache expiry
         # @option options x-amz-acl [String] Permissions, must be in ['private', 'public-read', 'public-read-write', 'authenticated-read']
-        # @option options x-amz-storage-class [String] Default is 'STANDARD', set to 'REDUCED_REDUNDANCY' for non-critical, reproducable data
+        # @option options x-amz-storage-class [String] Default is 'STANDARD', set to 'REDUCED_REDUNDANCY' for non-critical, reproducible data
         # @option options x-amz-meta-#{name} Headers to be returned with object, note total size of request without body must be less than 8 KB. Each name, value pair must conform to US-ASCII.
         # @option options x-amz-server-side-encryption [String] Sets HTTP header for server-side encryption. Set to 'AES256' for SSE-S3 and SSE-C. Set to 'aws:kms' for SSE-KMS
         # @option options x-amz-server-side​-encryption​-customer-algorithm [String] Algorithm to use to when encrypting the object for SSE-C.

data/lib/fog/aws/requests/storage/put_object_tagging.rb

@@ -0,0 +1,42 @@
+module Fog
+  module AWS
+    class Storage
+      class Real
+        # Change tag set for an S3 object
+        #
+        # @param bucket_name [String] Name of bucket to modify object in
+        # @param object_name [String] Name of object to modify
+        #
+        # @param tags [Hash]:
+        #   * Key [String]: tag key
+        #   * Value [String]: tag value
+        #
+        # @see https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObjectTagging.html
+
+        def put_object_tagging(bucket_name, object_name, tags)
+          tagging = tags.map do |k,v|
+            "<Tag><Key>#{k}</Key><Value>#{v}</Value></Tag>"
+          end.join("\n")
+          data =
+              <<-DATA
+<Tagging xmlns="http://doc.s3.amazonaws.com/2006-03-01" >
+  <TagSet>
+    #{tagging}
+  </TagSet>
+</Tagging>
+          DATA
+
+          request({
+            :body     => data,
+            :expects  => 200,
+            :headers  => {'Content-MD5' => Base64.encode64(OpenSSL::Digest::MD5.digest(data)).chomp!, 'Content-Type' => 'application/xml'},
+            :bucket_name => bucket_name,
+            :object_name => object_name,
+            :method   => 'PUT',
+            :query    => {'tagging' => nil}
+          })
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/storage/shared_mock_methods.rb

@@ -4,7 +4,7 @@ module Fog
       module SharedMockMethods
         def define_mock_acl(bucket_name, object_name, options)
           acl = options['x-amz-acl'] || 'private'
-          if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl)
+          if !['private', 'public-read', 'public-read-write', 'authenticated-read', 'bucket-owner-read', 'bucket-owner-full-control'].include?(acl)
             raise Excon::Errors::BadRequest.new('invalid x-amz-acl')
           else
             self.data[:acls][:object][bucket_name] ||= {}
@@ -15,6 +15,7 @@ module Fog
         def parse_mock_data(data)
           data = Fog::Storage.parse_data(data)
           unless data[:body].is_a?(String)
+            data[:body].rewind if data[:body].eof?
             data[:body] = data[:body].read
           end
           data

data/lib/fog/aws/requests/storage/sync_clock.rb

@@ -6,12 +6,20 @@ module Fog
         #
         def sync_clock
           response = begin
-            get_service
+            Excon.get(sync_clock_url)
           rescue Excon::Errors::HTTPStatusError => error
             error.response
           end
           Fog::Time.now = Time.parse(response.headers['Date'])
         end
+
+        private
+
+        def sync_clock_url
+          host = @acceleration ? region_to_host(@region) : @host
+
+          "#{@scheme}://#{host}:#{@port}"
+        end
       end # Real
 
       class Mock # :nodoc:all

data/lib/fog/aws/requests/storage/upload_part_copy.rb

@@ -0,0 +1,119 @@
+module Fog
+  module AWS
+    class Storage
+      # From https://docs.aws.amazon.com/AmazonS3/latest/API/API_UploadPartCopy.html
+      ALLOWED_UPLOAD_PART_OPTIONS = %i(
+        x-amz-copy-source
+        x-amz-copy-source-if-match
+        x-amz-copy-source-if-modified-since
+        x-amz-copy-source-if-none-match
+        x-amz-copy-source-if-unmodified-since
+        x-amz-copy-source-range
+        x-amz-copy-source-server-side-encryption-customer-algorithm
+        x-amz-copy-source-server-side-encryption-customer-key
+        x-amz-copy-source-server-side-encryption-customer-key-MD5
+        x-amz-expected-bucket-owner
+        x-amz-request-payer
+        x-amz-server-side-encryption-customer-algorithm
+        x-amz-server-side-encryption-customer-key
+        x-amz-server-side-encryption-customer-key-MD5
+        x-amz-source-expected-bucket-owner
+      ).freeze
+
+      class Real
+        require 'fog/aws/parsers/storage/upload_part_copy_object'
+
+        # Upload a part for a multipart copy
+        #
+        # @param target_bucket_name [String] Name of bucket to create copy in
+        # @param target_object_name [String] Name for new copy of object
+        # @param upload_id [String] Id of upload to add part to
+        # @param part_number [String] Index of part in upload
+        # @param options [Hash]:
+        # @option options [String] x-amz-metadata-directive Specifies whether to copy metadata from source or replace with data in request.  Must be in ['COPY', 'REPLACE']
+        # @option options [String] x-amz-copy_source-if-match Copies object if its etag matches this value
+        # @option options [Time] x-amz-copy_source-if-modified_since Copies object it it has been modified since this time
+        # @option options [String] x-amz-copy_source-if-none-match Copies object if its etag does not match this value
+        # @option options [Time] x-amz-copy_source-if-unmodified-since Copies object it it has not been modified since this time
+        # @option options [Time] x-amz-copy-source-range Specifies the range of bytes to copy from the source object
+        #
+        # @return [Excon::Response]
+        #   * body [Hash]:
+        #     * ETag [String] - etag of new object
+        #     * LastModified [Time] - date object was last modified
+        #
+        # @see https://docs.aws.amazon.com/AmazonS3/latest/API/API_UploadPartCopy.html
+        #
+        def upload_part_copy(target_bucket_name, target_object_name, upload_id, part_number, options = {})
+          headers = options
+          request({
+            :expects    => 200,
+            :idempotent => true,
+            :headers    => headers,
+            :bucket_name => target_bucket_name,
+            :object_name => target_object_name,
+            :method     => 'PUT',
+            :query      => {'uploadId' => upload_id, 'partNumber' => part_number},
+            :parser   => Fog::Parsers::AWS::Storage::UploadPartCopyObject.new,
+          })
+        end
+      end # Real
+
+      class Mock # :nodoc:all
+        require 'fog/aws/requests/storage/shared_mock_methods'
+        include Fog::AWS::Storage::SharedMockMethods
+
+        def upload_part_copy(target_bucket_name, target_object_name, upload_id, part_number, options = {})
+          validate_options!(options)
+
+          copy_source = options['x-amz-copy-source']
+          copy_range = options['x-amz-copy-source-range']
+
+          raise 'No x-amz-copy-source header provided' unless copy_source
+          raise 'No x-amz-copy-source-range header provided' unless copy_range
+
+          source_bucket_name, source_object_name = copy_source.split('/', 2)
+          verify_mock_bucket_exists(source_bucket_name)
+
+          source_bucket = self.data[:buckets][source_bucket_name]
+          source_object = source_bucket && source_bucket[:objects][source_object_name] && source_bucket[:objects][source_object_name].first
+          upload_info = get_upload_info(target_bucket_name, upload_id)
+
+          response = Excon::Response.new
+
+          if source_object
+            start_pos, end_pos = byte_range(copy_range, source_object[:body].length)
+            upload_info[:parts][part_number] = source_object[:body][start_pos..end_pos]
+
+            response.status = 200
+            response.body = {
+              # just use the part number as the ETag, for simplicity
+              'ETag'          => part_number.to_i,
+              'LastModified'  => Time.parse(source_object['Last-Modified'])
+            }
+            response
+          else
+            response.status = 404
+            raise(Excon::Errors.status_error({:expects => 200}, response))
+          end
+        end
+
+        def byte_range(range, size)
+          matches = range.match(/bytes=(\d*)-(\d*)/)
+
+          return nil unless matches
+
+          end_pos = [matches[2].to_i, size].min
+
+          [matches[1].to_i, end_pos]
+        end
+
+        def validate_options!(options)
+          options.keys.each do |key|
+            raise "Invalid UploadPart option: #{key}" unless ::Fog::AWS::Storage::ALLOWED_UPLOAD_PART_OPTIONS.include?(key.to_sym)
+          end
+        end
+      end # Mock
+    end # Storage
+  end # AWS
+end # Fog

data/lib/fog/aws/requests/sts/assume_role_with_web_identity.rb

@@ -6,12 +6,13 @@ module Fog
 
         def assume_role_with_web_identity(role_arn, web_identity_token, role_session_name, options={})
           request_unsigned(
-            'Action'          => 'AssumeRoleWithWebIdentity',
-            'RoleArn'         => role_arn,
-            'RoleSessionName' => role_session_name,
-            'DurationSeconds' => options[:duration] || 3600,
-            :idempotent       => true,
-            :parser           => Fog::Parsers::AWS::STS::AssumeRoleWithWebIdentity.new
+            'Action'            => 'AssumeRoleWithWebIdentity',
+            'RoleArn'           => role_arn,
+            'RoleSessionName'   => role_session_name,
+            'WebIdentityToken'  => web_identity_token,
+            'DurationSeconds'   => options[:duration] || 3600,
+            :idempotent         => true,
+            :parser             => Fog::Parsers::AWS::STS::AssumeRoleWithWebIdentity.new
           )
         end
       end

data/lib/fog/aws/ses.rb

@@ -7,7 +7,7 @@ module Fog
       class MessageRejected < Fog::Errors::Error; end
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :instrumentor, :instrumentor_name
+      recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :instrumentor, :instrumentor_name, :sts_endpoint
 
       request_path 'fog/aws/requests/ses'
       request :delete_verified_email_address
@@ -48,18 +48,21 @@ module Fog
         def initialize(options={})
 
           @use_iam_profile = options[:use_iam_profile]
-          setup_credentials(options)
 
           @instrumentor       = options[:instrumentor]
           @instrumentor_name  = options[:instrumentor_name] || 'fog.aws.ses'
           @connection_options     = options[:connection_options] || {}
           options[:region] ||= 'us-east-1'
+          @region = options[:region]
+
           @host = options[:host] || "email.#{options[:region]}.amazonaws.com"
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
           @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+
+          setup_credentials(options)
         end
 
         def reload
@@ -74,7 +77,7 @@ module Fog
           @aws_session_token     = options[:aws_session_token]
           @aws_credentials_expire_at = options[:aws_credentials_expire_at]
 
-          @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
+          @signer = Fog::AWS::SignatureV4.new(@aws_access_key_id, @aws_secret_access_key, @region, 'ses')
         end
 
         def request(params)
@@ -87,20 +90,20 @@ module Fog
             'Content-Type'  => 'application/x-www-form-urlencoded',
             'Date'          => Fog::Time.now.to_date_header,
           }
-          headers['x-amz-security-token'] = @aws_session_token if @aws_session_token
-          #AWS3-HTTPS AWSAccessKeyId=<Your AWS Access Key ID>, Algorithm=HmacSHA256, Signature=<Signature>
-          headers['X-Amzn-Authorization'] = 'AWS3-HTTPS '
-          headers['X-Amzn-Authorization'] << 'AWSAccessKeyId=' << @aws_access_key_id
-          headers['X-Amzn-Authorization'] << ', Algorithm=HmacSHA256'
-          headers['X-Amzn-Authorization'] << ', Signature=' << Base64.encode64(@hmac.sign(headers['Date'])).chomp!
-
-          body = ''
-          for key in params.keys.sort
-            unless (value = params[key]).nil?
-              body << "#{key}=#{CGI.escape(value.to_s).gsub(/\+/, '%20')}&"
-            end
-          end
-          body.chop! # remove trailing '&'
+
+          body, headers = AWS.signed_params_v4(
+            params,
+            { 'Content-Type' => 'application/x-www-form-urlencoded' },
+            {
+              :method             => 'POST',
+              :aws_session_token  => @aws_session_token,
+              :signer             => @signer,
+              :host               => @host,
+              :path               => @path,
+              :port               => @port,
+              :version            => '2010-12-01'
+            }
+          )
 
           if @instrumentor
             @instrumentor.instrument("#{@instrumentor_name}.request", params) do

data/lib/fog/aws/signaturev4.rb

@@ -106,7 +106,7 @@ DATA
       end
 
       def canonical_headers(headers)
-        canonical_headers = ''
+        canonical_headers = +''
 
         for key in headers.keys.sort_by {|k| k.to_s.downcase}
           canonical_headers << "#{key.to_s.downcase}:#{headers[key].to_s.strip}\n"

data/lib/fog/aws/simpledb.rb

@@ -4,7 +4,7 @@ module Fog
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :host, :nil_string, :path, :port, :scheme, :persistent, :region, :aws_session_token, :use_iam_profile, :aws_credentials_expire_at, :instrumentor, :instrumentor_name
+      recognizes :host, :nil_string, :path, :port, :scheme, :persistent, :region, :aws_session_token, :use_iam_profile, :aws_credentials_expire_at, :instrumentor, :instrumentor_name, :sts_endpoint
 
       request_path 'fog/aws/requests/simpledb'
       request :batch_put_attributes

data/lib/fog/aws/sns.rb

@@ -4,7 +4,7 @@ module Fog
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :host, :path, :port, :scheme, :persistent, :region, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :instrumentor, :instrumentor_name
+      recognizes :host, :path, :port, :scheme, :persistent, :region, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :instrumentor, :instrumentor_name, :sts_endpoint
 
       request_path 'fog/aws/requests/sns'
       request :add_permission

data/lib/fog/aws/sqs.rb

@@ -4,7 +4,7 @@ module Fog
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :region, :host, :path, :port, :scheme, :persistent, :aws_session_token, :use_iam_profile, :aws_credentials_expire_at, :instrumentor, :instrumentor_name
+      recognizes :region, :host, :path, :port, :scheme, :persistent, :aws_session_token, :use_iam_profile, :aws_credentials_expire_at, :instrumentor, :instrumentor_name, :sts_endpoint
 
       request_path 'fog/aws/requests/sqs'
       request :change_message_visibility