aws-sdk-core 2.1.10 → 2.1.11

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

@@ -31,53 +31,73 @@ module Aws
       # @option params [Boolean] :secure (true) When `false`, a HTTP URL
       #   is returned instead of the default HTTPS URL.
       #
+      # @option params [Boolean] :virtual_host (false) When `true`, the
+      #   {#bucket} name will be used as the hostname. This will cause
+      #   the returned URL to be 'http' and not 'https'.
+      #
       # @raise [ArgumentError] Raises an ArgumentError if `:expires_in`
       #   exceeds one week.
       #
       def presigned_url(method, params = {})
-        expires_in = params.delete(:expires_in) || FIFTEEN_MINUTES
-        scheme = params.delete(:secure) == false ? 'http' : 'https'
-
-        request = @client.build_request(method, params)
-        request.handle(PresignHandler, step: :sign, priority: 99)
-        validate_expires_in_header(expires_in)
-        request.context[:presigned_expires_in] = expires_in
+        virtual_host = !!params.delete(:virtual_host)
+        scheme = http_scheme(params, virtual_host)
 
-        url = URI.parse(request.send_request.data)
-        url.scheme = scheme
-        url.to_s
+        req = @client.build_request(method, params)
+        use_bucket_as_hostname(req) if virtual_host
+        sign_but_dont_send(req, expires_in(params), scheme)
+        req.send_request.data
       end
 
       private
-      def validate_expires_in_header(expires_in)
-        if(expires_in > ONE_WEEK)
-          raise ArgumentError.new(
-            "expires_in value of #{expires_in} exceeds one-week maximum"
-          )
+
+      def http_scheme(params, virtual_host)
+        if params.delete(:secure) == false || virtual_host
+          'http'
+        else
+          'https'
         end
       end
 
-      # @api private
-      class PresignHandler < Seahorse::Client::Handler
-        def call(context)
-          Seahorse::Client::Response.new(
-            context: context,
-            data: presigned_url(context)
-          )
+      def expires_in(params)
+        if expires_in = params.delete(:expires_in)
+          if expires_in > ONE_WEEK
+            msg = "expires_in value of #{expires_in} exceeds one-week maximum"
+            raise ArgumentError, msg
+          end
+          expires_in
+        else
+          FIFTEEN_MINUTES
         end
+      end
 
-        def presigned_url(context)
+      def use_bucket_as_hostname(req)
+        req.handlers.remove(Plugins::S3BucketDns::Handler)
+        req.handle do |context|
+          uri = context.http_request.endpoint
+          uri.host = context.params[:bucket]
+          uri.path = uri.path.sub("/#{context.params[:bucket]}", '')
+          @handler.call(context)
+        end
+      end
+
+      def sign_but_dont_send(req, expires_in, scheme)
+        req.handlers.remove(Plugins::S3RequestSigner::SigningHandler)
+        req.handlers.remove(Seahorse::Client::Plugins::ContentLength::Handler)
+        req.handle(step: :send) do |context|
+          context.http_request.endpoint.scheme = scheme
           signer = Signers::V4.new(
             context.config.credentials, 's3',
             context.config.region
           )
-          signer.presigned_url(
+          url = signer.presigned_url(
             context.http_request,
-            expires_in: context[:presigned_expires_in],
+            expires_in: expires_in,
             body_digest: "UNSIGNED-PAYLOAD"
           )
+          Seahorse::Client::Response.new(context: context, data: url)
         end
       end
+
     end
   end
 end

data/lib/aws-sdk-core/signers/v4.rb

@@ -31,7 +31,7 @@ module Aws
         datetime = Time.now.utc.strftime("%Y%m%dT%H%M%SZ")
         body_digest = req.headers['X-Amz-Content-Sha256'] || hexdigest(req.body)
         req.headers['X-Amz-Date'] = datetime
-        req.headers['Host'] = req.endpoint.host
+        req.headers['Host'] = host(req.endpoint)
         req.headers['X-Amz-Security-Token'] = @credentials.session_token if
           @credentials.session_token
         req.headers['X-Amz-Content-Sha256'] ||= body_digest
@@ -45,13 +45,13 @@ module Aws
       # @option options [optional, String] :body_digest The SHA256 hexdigest of
       #   the payload to sign.  For S3, this should be the string literal
       #   `UNSIGNED-PAYLOAD`.
-      # @return [Seahorse::Client::Http::Request] the signed request.
+      # @return [String]
       # @api private
       def presigned_url(request, options = {})
         now = Time.now.utc.strftime("%Y%m%dT%H%M%SZ")
         body_digest = options[:body_digest] || hexdigest(request.body)
 
-        request.headers['Host'] = request.endpoint.host
+        request.headers['Host'] = host(request.endpoint)
         request.headers.delete('User-Agent')
 
         params = Aws::Query::ParamList.new
@@ -179,6 +179,19 @@ module Aws
         value.match(/^".*"$/) ? value : value.gsub(/\s+/, ' ').strip
       end
 
+      def host(uri)
+        if standard_port?(uri)
+          uri.host
+        else
+          "#{uri.host}:#{uri.port}"
+        end
+      end
+
+      def standard_port?(uri)
+        (uri.scheme == 'http' && uri.port == 80) ||
+        (uri.scheme == 'https' && uri.port == 443)
+      end
+
       def hexdigest(value)
         digest = OpenSSL::Digest::SHA256.new
         if value.respond_to?(:read)

data/lib/aws-sdk-core/version.rb

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = '2.1.10'
+  VERSION = '2.1.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 2.1.10
+  version: 2.1.11
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jmespath