fog-aws 3.5.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e5ec1bf418676b65d208530359ea42646043759948957785d93f49766803490
-  data.tar.gz: d01633914ad453baeeb3b5da1eaa21880276f4a534a3dd00d28c20cd0c9c1b4f
+  metadata.gz: d5fc7b96fe4f26c5af84de803e8af393cee43b14b070a70be68b910da92cb61a
+  data.tar.gz: 2002ebf924fb5108475c69fbde9a0861455bb2087a237135781ae9e217adbe40
 SHA512:
-  metadata.gz: a1bf1567ddbcaff60e4cf8041586807f055fc28a1d010a373d7038fa1eb83ab84feb42e2595ebeef5b8508fa61ea6a76e9ad22592d0be0ba865b3908ab8633b8
-  data.tar.gz: 145c2544d2a240f66dd7e85385509812e12b475fccbbb33563321db519584ed18eb35bb9509ddaef2a397ac545578d5f9ebe6202cb4c19fdaa0122cb5267a351
+  metadata.gz: 76ee4f98fea0588666c18c65060d063b8a86215c2abcab505ad891411fd0639f449e54806d198973b6d117fc15be2b921b2e8932bc42d57ea11e89068f66b818
+  data.tar.gz: 005214de385e9474d415bb3780fbffddce311a552b81c60f3fcbaa67dc7116720d099e76cd69ffa6a41284d021e9b2cb53b14d129ecdc9be735a7128ca7295f6

data/lib/fog/aws.rb

@@ -218,6 +218,7 @@ module Fog
 
     def self.regions
       @regions ||= [
+        'ap-east-1',
         'ap-northeast-1', 'ap-northeast-2', 'ap-northeast-3',
         'ap-south-1',
         'ap-southeast-1', 'ap-southeast-2',

data/lib/fog/aws/dns.rb

@@ -25,7 +25,10 @@ module Fog
       request :list_resource_record_sets
       request :get_change
 
+
       class Mock
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
+
         def self.data
           @data ||= Hash.new do |hash, region|
             hash[region] = Hash.new do |region_hash, key|
@@ -70,6 +73,7 @@ module Fog
 
       class Real
         include Fog::AWS::CredentialFetcher::ConnectionMethods
+
         # Initialize connection to Route 53 DNS service
         #
         # ==== Notes
@@ -160,6 +164,138 @@ module Fog
           Base64.encode64(signed_string).chomp!
         end
       end
+
+      def self.hosted_zone_for_alias_target(dns_name)
+        hosted_zones = if dns_name.match(/^dualstack\./)
+          elb_dualstack_hosted_zone_mapping
+        else
+          elb_hosted_zone_mapping
+        end
+
+        Hash[hosted_zones.select { |k, _|
+          dns_name =~ /\A.+\.#{k}\.elb\.amazonaws\.com\.?\z/
+        }].values.last
+      end
+
+      def self.elb_hosted_zone_mapping
+        @elb_hosted_zone_mapping ||= {
+          "ap-northeast-1" => "Z2YN17T5R711GT",
+          "ap-southeast-1" => "Z1WI8VXHPB1R38",
+          "ap-southeast-2" => "Z2999QAZ9SRTIC",
+          "eu-west-1"      => "Z3NF1Z3NOM5OY2",
+          "eu-central-1"   => "Z215JYRZR1TBD5",
+          "sa-east-1"      => "Z2ES78Y61JGQKS",
+          "us-east-1"      => "Z3DZXE0Q79N41H",
+          "us-west-1"      => "Z1M58G0W56PQJA",
+          "us-west-2"      => "Z33MTJ483KN6FU",
+        }
+      end
+
+      # See https://docs.aws.amazon.com/general/latest/gr/rande.html#elb_region
+      # This needs to be kept in sync manually sadly for now as seemingly this data is not available via an API
+      def self.elb_dualstack_hosted_zone_mapping
+        @elb_dualstack_hosted_zone_mapping ||= {
+          "ap-northeast-1" => "Z14GRHDCWA56QT",
+          "ap-northeast-2" => "ZWKZPGTI48KDX",
+          "ap-northeast-3" => "Z5LXEXXYW11ES",
+          "ap-south-1" => "ZP97RAFLXTNZK",
+          "ap-southeast-1" => "Z1LMS91P8CMLE5",
+          "ap-southeast-2" => "Z1GM3OXH4ZPM65",
+          "ca-central-1" => "ZQSVJUPU6J1EY",
+          "eu-central-1" => "Z215JYRZR1TBD5",
+          "eu-west-1" => "Z32O12XQLNTSW2",
+          "eu-west-2" => "ZHURV8PSTC4K8",
+          "eu-west-3" => "Z3Q77PNBQS71R4",
+          "us-east-1" => "Z35SXDOTRQ7X7K",
+          "us-east-2" => "Z3AADJGX6KTTL2",
+          "us-west-1" => "Z368ELLRRE2KJ0",
+          "us-west-2" => "Z1H1FL5HABSF5",
+          "sa-east-1" => "Z2P70J7HTTTPLU",
+        }
+      end
+
+      # Returns the xml request for a given changeset
+      def self.change_resource_record_sets_data(zone_id, change_batch, version, options = {})
+        # AWS methods return zone_ids that looks like '/hostedzone/id'.  Let the caller either use
+        # that form or just the actual id (which is what this request needs)
+        zone_id = zone_id.sub('/hostedzone/', '')
+
+        optional_tags = ''
+        options.each do |option, value|
+          case option
+          when :comment
+            optional_tags += "<Comment>#{value}</Comment>"
+          end
+        end
+
+        #build XML
+        if change_batch.count > 0
+
+          changes = "<ChangeBatch>#{optional_tags}<Changes>"
+
+          change_batch.each do |change_item|
+            action_tag = %Q{<Action>#{change_item[:action]}</Action>}
+            name_tag   = %Q{<Name>#{change_item[:name]}</Name>}
+            type_tag   = %Q{<Type>#{change_item[:type]}</Type>}
+
+            # TTL must be omitted if using an alias record
+            ttl_tag = ''
+            ttl_tag += %Q{<TTL>#{change_item[:ttl]}</TTL>} unless change_item[:alias_target]
+
+            weight_tag = ''
+            set_identifier_tag = ''
+            region_tag = ''
+            if change_item[:set_identifier]
+              set_identifier_tag += %Q{<SetIdentifier>#{change_item[:set_identifier]}</SetIdentifier>}
+              if change_item[:weight] # Weighted Record
+                weight_tag += %Q{<Weight>#{change_item[:weight]}</Weight>}
+              elsif change_item[:region] # Latency record
+                region_tag += %Q{<Region>#{change_item[:region]}</Region>}
+              end
+            end
+
+            failover_tag = if change_item[:failover]
+                             %Q{<Failover>#{change_item[:failover]}</Failover>}
+                           end
+
+            geolocation_tag = if change_item[:geo_location]
+                                xml_geo = change_item[:geo_location].map { |k,v| "<#{k}>#{v}</#{k}>" }.join
+                                %Q{<GeoLocation>#{xml_geo}</GeoLocation>}
+                              end
+
+            resource_records = change_item[:resource_records] || []
+            resource_record_tags = ''
+            resource_records.each do |record|
+              resource_record_tags += %Q{<ResourceRecord><Value>#{record}</Value></ResourceRecord>}
+            end
+
+            # ResourceRecords must be omitted if using an alias record
+            resource_tag = ''
+            resource_tag += %Q{<ResourceRecords>#{resource_record_tags}</ResourceRecords>} if resource_records.any?
+
+            alias_target_tag = ''
+            if change_item[:alias_target]
+              # Accept either underscore or camel case for hash keys.
+              dns_name = change_item[:alias_target][:dns_name] || change_item[:alias_target][:DNSName]
+              hosted_zone_id = change_item[:alias_target][:hosted_zone_id] || change_item[:alias_target][:HostedZoneId] || AWS.hosted_zone_for_alias_target(dns_name)
+              evaluate_target_health = change_item[:alias_target][:evaluate_target_health] || change_item[:alias_target][:EvaluateTargetHealth] || false
+              evaluate_target_health_xml = !evaluate_target_health.nil? ? %Q{<EvaluateTargetHealth>#{evaluate_target_health}</EvaluateTargetHealth>} : ''
+              alias_target_tag += %Q{<AliasTarget><HostedZoneId>#{hosted_zone_id}</HostedZoneId><DNSName>#{dns_name}</DNSName>#{evaluate_target_health_xml}</AliasTarget>}
+            end
+
+            health_check_id_tag = if change_item[:health_check_id]
+                                    %Q{<HealthCheckId>#{change_item[:health_check_id]}</HealthCheckId>}
+                                  end
+
+            change_tags = %Q{<Change>#{action_tag}<ResourceRecordSet>#{name_tag}#{type_tag}#{set_identifier_tag}#{weight_tag}#{region_tag}#{failover_tag}#{geolocation_tag}#{ttl_tag}#{resource_tag}#{alias_target_tag}#{health_check_id_tag}</ResourceRecordSet></Change>}
+            changes += change_tags
+          end
+
+          changes += '</Changes></ChangeBatch>'
+        end
+
+        %Q{<?xml version="1.0" encoding="UTF-8"?><ChangeResourceRecordSetsRequest xmlns="https://route53.amazonaws.com/doc/#{version}/">#{changes}</ChangeResourceRecordSetsRequest>}
+      end
     end
   end
 

data/lib/fog/aws/requests/dns/change_resource_record_sets.rb

@@ -1,139 +1,6 @@
 module Fog
   module AWS
     class DNS
-
-      def self.hosted_zone_for_alias_target(dns_name)
-        hosted_zones = if dns_name.match(/^dualstack\./)
-          elb_dualstack_hosted_zone_mapping
-        else
-          elb_hosted_zone_mapping
-        end
-
-        Hash[hosted_zones.select { |k, _|
-          dns_name =~ /\A.+\.#{k}\.elb\.amazonaws\.com\.?\z/
-        }].values.last
-      end
-
-      def self.elb_hosted_zone_mapping
-        @elb_hosted_zone_mapping ||= {
-          "ap-northeast-1" => "Z2YN17T5R711GT",
-          "ap-southeast-1" => "Z1WI8VXHPB1R38",
-          "ap-southeast-2" => "Z2999QAZ9SRTIC",
-          "eu-west-1"      => "Z3NF1Z3NOM5OY2",
-          "eu-central-1"   => "Z215JYRZR1TBD5",
-          "sa-east-1"      => "Z2ES78Y61JGQKS",
-          "us-east-1"      => "Z3DZXE0Q79N41H",
-          "us-west-1"      => "Z1M58G0W56PQJA",
-          "us-west-2"      => "Z33MTJ483KN6FU",
-        }
-      end
-
-      # See https://docs.aws.amazon.com/general/latest/gr/rande.html#elb_region
-      # This needs to be kept in sync manually sadly for now as seemingly this data is not available via an API
-      def self.elb_dualstack_hosted_zone_mapping
-        @elb_dualstack_hosted_zone_mapping ||= {
-          "ap-northeast-1" => "Z14GRHDCWA56QT",
-          "ap-northeast-2" => "ZWKZPGTI48KDX",
-          "ap-northeast-3" => "Z5LXEXXYW11ES",
-          "ap-south-1" => "ZP97RAFLXTNZK",
-          "ap-southeast-1" => "Z1LMS91P8CMLE5",
-          "ap-southeast-2" => "Z1GM3OXH4ZPM65",
-          "ca-central-1" => "ZQSVJUPU6J1EY",
-          "eu-central-1" => "Z215JYRZR1TBD5",
-          "eu-west-1" => "Z32O12XQLNTSW2",
-          "eu-west-2" => "ZHURV8PSTC4K8",
-          "eu-west-3" => "Z3Q77PNBQS71R4",
-          "us-east-1" => "Z35SXDOTRQ7X7K",
-          "us-east-2" => "Z3AADJGX6KTTL2",
-          "us-west-1" => "Z368ELLRRE2KJ0",
-          "us-west-2" => "Z1H1FL5HABSF5",
-          "sa-east-1" => "Z2P70J7HTTTPLU",
-        }
-      end
-
-      # Returns the xml request for a given changeset
-      def self.change_resource_record_sets_data(zone_id, change_batch, version, options = {})
-        # AWS methods return zone_ids that looks like '/hostedzone/id'.  Let the caller either use
-        # that form or just the actual id (which is what this request needs)
-        zone_id = zone_id.sub('/hostedzone/', '')
-
-        optional_tags = ''
-        options.each do |option, value|
-          case option
-          when :comment
-            optional_tags += "<Comment>#{value}</Comment>"
-          end
-        end
-
-        #build XML
-        if change_batch.count > 0
-
-          changes = "<ChangeBatch>#{optional_tags}<Changes>"
-
-          change_batch.each do |change_item|
-            action_tag = %Q{<Action>#{change_item[:action]}</Action>}
-            name_tag   = %Q{<Name>#{change_item[:name]}</Name>}
-            type_tag   = %Q{<Type>#{change_item[:type]}</Type>}
-
-            # TTL must be omitted if using an alias record
-            ttl_tag = ''
-            ttl_tag += %Q{<TTL>#{change_item[:ttl]}</TTL>} unless change_item[:alias_target]
-
-            weight_tag = ''
-            set_identifier_tag = ''
-            region_tag = ''
-            if change_item[:set_identifier]
-              set_identifier_tag += %Q{<SetIdentifier>#{change_item[:set_identifier]}</SetIdentifier>}
-              if change_item[:weight] # Weighted Record
-                weight_tag += %Q{<Weight>#{change_item[:weight]}</Weight>}
-              elsif change_item[:region] # Latency record
-                region_tag += %Q{<Region>#{change_item[:region]}</Region>}
-              end
-            end
-
-            failover_tag = if change_item[:failover]
-                             %Q{<Failover>#{change_item[:failover]}</Failover>}
-                           end
-
-            geolocation_tag = if change_item[:geo_location]
-                                xml_geo = change_item[:geo_location].map { |k,v| "<#{k}>#{v}</#{k}>" }.join
-                                %Q{<GeoLocation>#{xml_geo}</GeoLocation>}
-                              end
-
-            resource_records = change_item[:resource_records] || []
-            resource_record_tags = ''
-            resource_records.each do |record|
-              resource_record_tags += %Q{<ResourceRecord><Value>#{record}</Value></ResourceRecord>}
-            end
-
-            # ResourceRecords must be omitted if using an alias record
-            resource_tag = ''
-            resource_tag += %Q{<ResourceRecords>#{resource_record_tags}</ResourceRecords>} if resource_records.any?
-
-            alias_target_tag = ''
-            if change_item[:alias_target]
-              # Accept either underscore or camel case for hash keys.
-              dns_name = change_item[:alias_target][:dns_name] || change_item[:alias_target][:DNSName]
-              hosted_zone_id = change_item[:alias_target][:hosted_zone_id] || change_item[:alias_target][:HostedZoneId] || AWS.hosted_zone_for_alias_target(dns_name)
-              evaluate_target_health = change_item[:alias_target][:evaluate_target_health] || change_item[:alias_target][:EvaluateTargetHealth] || false
-              evaluate_target_health_xml = !evaluate_target_health.nil? ? %Q{<EvaluateTargetHealth>#{evaluate_target_health}</EvaluateTargetHealth>} : ''
-              alias_target_tag += %Q{<AliasTarget><HostedZoneId>#{hosted_zone_id}</HostedZoneId><DNSName>#{dns_name}</DNSName>#{evaluate_target_health_xml}</AliasTarget>}
-            end
-
-            health_check_id_tag = if change_item[:health_check_id]
-                                    %Q{<HealthCheckId>#{change_item[:health_check_id]}</HealthCheckId>}
-                                  end
-
-            change_tags = %Q{<Change>#{action_tag}<ResourceRecordSet>#{name_tag}#{type_tag}#{set_identifier_tag}#{weight_tag}#{region_tag}#{failover_tag}#{geolocation_tag}#{ttl_tag}#{resource_tag}#{alias_target_tag}#{health_check_id_tag}</ResourceRecordSet></Change>}
-            changes += change_tags
-          end
-
-          changes += '</Changes></ChangeBatch>'
-        end
-
-        %Q{<?xml version="1.0" encoding="UTF-8"?><ChangeResourceRecordSetsRequest xmlns="https://route53.amazonaws.com/doc/#{version}/">#{changes}</ChangeResourceRecordSetsRequest>}
-      end
-
       class Real
         require 'fog/aws/parsers/dns/change_resource_record_sets'
 

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] ||= {}

data/lib/fog/aws/storage.rb

@@ -43,7 +43,7 @@ module Fog
       ]
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :endpoint, :region, :host, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :path_style, :acceleration, :instrumentor, :instrumentor_name, :aws_signature_version, :virtual_host, :cname
+      recognizes :endpoint, :region, :host, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :path_style, :acceleration, :instrumentor, :instrumentor_name, :aws_signature_version, :enable_signature_v4_streaming, :virtual_host, :cname
 
       secrets    :aws_secret_access_key, :hmac
 
@@ -506,6 +506,7 @@ module Fog
           @persistent = options.fetch(:persistent, false)
           @acceleration = options.fetch(:acceleration, false)
           @signature_version = options.fetch(:aws_signature_version, 4)
+          @enable_signature_v4_streaming = options.fetch(:enable_signature_v4_streaming, true)
           validate_signature_version!
           @path_style = options[:path_style]  || false
 
@@ -587,20 +588,24 @@ module Fog
           if @signature_version == 4
             params[:headers]['x-amz-date'] = date.to_iso8601_basic
             if params[:body].respond_to?(:read)
-              # See http://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-streaming.html
-              # We ignore the bit about setting the content-encoding to aws-chunked because
-              # this can cause s3 to serve files with a blank content encoding which causes problems with some CDNs
-              # AWS have confirmed that s3 can infer that the content-encoding is aws-chunked from the x-amz-content-sha256 header
-              #
-              params[:headers]['x-amz-content-sha256'] = 'STREAMING-AWS4-HMAC-SHA256-PAYLOAD'
-              params[:headers]['x-amz-decoded-content-length'] = params[:headers].delete 'Content-Length'
+              if @enable_signature_v4_streaming
+                # See http://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-streaming.html
+                # We ignore the bit about setting the content-encoding to aws-chunked because
+                # this can cause s3 to serve files with a blank content encoding which causes problems with some CDNs
+                # AWS have confirmed that s3 can infer that the content-encoding is aws-chunked from the x-amz-content-sha256 header
+                #
+                params[:headers]['x-amz-content-sha256'] = 'STREAMING-AWS4-HMAC-SHA256-PAYLOAD'
+                params[:headers]['x-amz-decoded-content-length'] = params[:headers].delete 'Content-Length'
+              else
+                params[:headers]['x-amz-content-sha256'] = 'UNSIGNED-PAYLOAD'
+              end
             else
               params[:headers]['x-amz-content-sha256'] ||= OpenSSL::Digest::SHA256.hexdigest(params[:body] || '')
             end
             signature_components = @signer.signature_components(params, date, params[:headers]['x-amz-content-sha256'])
             params[:headers]['Authorization'] = @signer.components_to_header(signature_components)
 
-            if params[:body].respond_to?(:read)
+            if params[:body].respond_to?(:read) && @enable_signature_v4_streaming
               body = params.delete :body
               params[:request_block] = S3Streamer.new(body, signature_components['X-Amz-Signature'], @signer, date)
             end

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "3.5.1"
+    VERSION = "3.5.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.2
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2019-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -1718,7 +1718,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Amazon Web Services.