fog-maestrodev 1.8.0.20130114204828 → 1.14.0.20130806165225

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

@@ -7,28 +7,26 @@ module Fog
 
         # Change access control list for an S3 object
         #
-        # ==== Parameters
-        # * bucket_name<~String> - name of bucket to modify
-        # * object_name<~String> - name of object to get access control list for
-        # * acl<~Hash>:
-        #   * Owner<~Hash>:
-        #     * ID<~String>: id of owner
-        #     * DisplayName<~String>: display name of owner
-        #   * AccessControlList<~Array>:
-        #     * Grantee<~Hash>:
-        #         * 'DisplayName'<~String> - Display name of grantee
-        #         * 'ID'<~String> - Id of grantee
+        # @param [String] bucket_name name of bucket to modify
+        # @param [String] object_name name of object to get access control list for
+        # @param [Hash] acl
+        #   * Owner [Hash]
+        #     * ID [String] id of owner
+        #     * DisplayName [String] display name of owner
+        #   * AccessControlList [Array]
+        #     * Grantee [Hash]
+        #       * DisplayName [String] Display name of grantee
+        #       * ID [String] Id of grantee
         #       or
-        #         * 'EmailAddress'<~String> - Email address of grantee
+        #       * EmailAddress [String] Email address of grantee
         #       or
-        #         * 'URI'<~String> - URI of group to grant access for
-        #     * Permission<~String> - Permission, in [FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP]
-        # * acl<~String> - Permissions, must be in ['private', 'public-read', 'public-read-write', 'authenticated-read']
-        # * options<~Hash>:
-        #   * 'versionId'<~String> - specify a particular version to retrieve
+        #       * URI [String] URI of group to grant access for
+        #     * Permission [String] Permission, in [FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP]
+        # @param [String] acl Permissions, must be in ['private', 'public-read', 'public-read-write', 'authenticated-read']
+        # @param [Hash] options
+        # @option options [String] versionId specify a particular version to retrieve
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectPUTacl.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectPUTacl.html
 
         def put_object_acl(bucket_name, object_name, acl, options = {})
           query = {'acl' => nil}
@@ -56,9 +54,9 @@ module Fog
             :body     => data,
             :expects  => 200,
             :headers  => headers,
-            :host     => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
+            :object_name => object_name,
             :method   => 'PUT',
-            :path       => CGI.escape(object_name),
             :query    => query
           })
         end

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

@@ -10,14 +10,12 @@ module Fog
           unless object_name
             raise ArgumentError.new('object_name is required')
           end
-          scheme_host_path_query({
-            :scheme   => options[:scheme],
-            :headers  => headers,
-            :host     => @host,
-            :port     => @port,
+          signed_url(options.merge({
+            :bucket_name => bucket_name,
+            :object_name => object_name,
             :method   => 'PUT',
-            :path     => "#{bucket_name}/#{object_name}"
-          }, expires)
+            :headers  => headers,
+          }), expires)
         end
       end
 
@@ -25,17 +23,14 @@ module Fog
 
         # Get an expiring object url from S3 for putting an object
         #
-        # ==== Parameters
-        # * bucket_name<~String> - Name of bucket containing object
-        # * object_name<~String> - Name of object to get expiring url for
-        # * expires<~Time> - An expiry time for this url
+        # @param bucket_name [String] Name of bucket containing object
+        # @param object_name [String] Name of object to get expiring url for
+        # @param expires [Time] An expiry time for this url
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~String> - url for object
+        # @return [Excon::Response] response:
+        #   * body [String] url for object
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
 
         include PutObjectUrl
 

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

@@ -5,12 +5,10 @@ module Fog
 
         # Change who pays for requests to an S3 bucket
         #
-        # ==== Parameters
-        # * bucket_name<~String> - name of bucket to modify
-        # * payer<~String> - valid values are BucketOwner or Requester
+        # @param bucket_name [String] name of bucket to modify
+        # @param payer [String] valid values are BucketOwner or Requester
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTrequestPaymentPUT.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTrequestPaymentPUT.html
 
         def put_request_payment(bucket_name, payer)
           data =
@@ -23,7 +21,7 @@ DATA
             :body     => data,
             :expects  => 200,
             :headers  => {},
-            :host     => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
             :method   => 'PUT',
             :query    => {'requestPayment' => nil}
           })

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

@@ -5,22 +5,19 @@ module Fog
 
         # Upload a part for a multipart upload
         #
-        # ==== Parameters
-        # * bucket_name<~String> - Name of bucket to add part to
-        # * object_name<~String> - Name of object to add part to
-        # * upload_id<~String> - Id of upload to add part to
-        # * part_number<~String> - Index of part in upload
-        # * data<~File||String> - Content for part
-        # * options<~Hash>:
-        #   * 'Content-MD5'<~String> - Base64 encoded 128-bit MD5 digest of message
+        # @param bucket_name [String] Name of bucket to add part to
+        # @param object_name [String] Name of object to add part to
+        # @param upload_id [String] Id of upload to add part to
+        # @param part_number [String] Index of part in upload
+        # @param data [File||String] Content for part
+        # @param options [Hash]
+        # @option options Content-MD5 [String] Base64 encoded 128-bit MD5 digest of message
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * headers<~Hash>:
-        #     * 'ETag'<~String> - etag of new object (will be needed to complete upload)
+        # @return [Excon::Response] response
+        #   * headers [Hash]:
+        #     * ETag [String] etag of new object (will be needed to complete upload)
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadUploadPart.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadUploadPart.html
         #
         def upload_part(bucket_name, object_name, upload_id, part_number, data, options = {})
           data = Fog::Storage.parse_data(data)
@@ -31,9 +28,9 @@ module Fog
             :expects    => 200,
             :idempotent => true,
             :headers    => headers,
-            :host       => "#{bucket_name}.#{@host}",
+            :bucket_name => bucket_name,
+            :object_name => object_name,
             :method     => 'PUT',
-            :path       => CGI.escape(object_name),
             :query      => {'uploadId' => upload_id, 'partNumber' => part_number}
           })
         end
@@ -41,4 +38,4 @@ module Fog
       end # Real
     end # Storage
   end # AWS
-end # Fog
+end # Fog

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

@@ -0,0 +1,46 @@
+module Fog
+  module AWS
+    class STS
+      class Real
+
+        require 'fog/aws/parsers/sts/assume_role'
+        
+        # Assume Role
+        #
+        # ==== Parameters
+        # * role_session_name<~String> - An identifier for the assumed role.
+        # * role_arn<~String> - The ARN of the role the caller is assuming.
+        # * external_id<~String> - An optional unique identifier required by the assuming role's trust identity.
+        # * policy<~String> - An optional JSON policy document
+        # * duration<~Integer> - Duration (of seconds) for the assumed role credentials to be valid (default 3600)
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'Arn'<~String>: The ARN of the assumed role/user
+        #     * 'AccessKeyId'<~String>: The AWS access key of the temporary credentials for the assumed role
+        #     * 'SecretAccessKey'<~String>: The AWS secret key of the temporary credentials for the assumed role
+        #     * 'SessionToken'<~String>: The AWS session token of the temporary credentials for the assumed role
+        #     * 'Expiration'<~Time>: The expiration time of the temporary credentials for the assumed role
+        #
+        # ==== See Also
+        # http://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html
+        #
+
+        def assume_role(role_session_name, role_arn, external_id=nil, policy=nil, duration=3600)
+          request({
+            'Action'          => 'AssumeRole',
+            'RoleSessionName' => role_session_name,
+            'RoleArn'         => role_arn,
+            'Policy'          => policy && Fog::JSON.encode(policy),
+            'DurationSeconds' => duration,
+            'ExternalId'      => external_id,
+            :idempotent       => true,
+            :parser           => Fog::Parsers::AWS::STS::AssumeRole.new
+          })
+        end
+        
+      end
+    end
+  end
+end

data/lib/fog/aws/ses.rb

@@ -5,12 +5,16 @@ module Fog
     class SES < Fog::Service
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
+      class InvalidParameterError < Fog::Errors::Error; end
+      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
 
       request_path 'fog/aws/requests/ses'
       request :delete_verified_email_address
       request :verify_email_address
+      request :verify_domain_identity
       request :get_send_quota
       request :get_send_statistics
       request :list_verified_email_addresses
@@ -102,15 +106,28 @@ module Fog
           end
           body.chop! # remove trailing '&'
 
-          response = @connection.request({
-            :body       => body,
-            :expects    => 200,
-            :headers    => headers,
-            :idempotent => idempotent,
-            :host       => @host,
-            :method     => 'POST',
-            :parser     => parser
-          })
+          begin
+            response = @connection.request({
+              :body       => body,
+              :expects    => 200,
+              :headers    => headers,
+              :idempotent => idempotent,
+              :host       => @host,
+              :method     => 'POST',
+              :parser     => parser
+            })
+          rescue Excon::Errors::HTTPStatusError => error
+            match = Fog::AWS::Errors.match_error(error)
+            raise if match.empty?
+            raise case match[:code]
+                  when 'MessageRejected'
+                    Fog::AWS::SES::MessageRejected.slurp(error, match[:message])
+                  when 'InvalidParameterValue'
+                    Fog::AWS::SES::InvalidParameterError.slurp(error, match[:message])
+                  else
+                    Fog::AWS::SES::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
+                  end
+          end
 
           response
         end

data/lib/fog/aws/storage.rb

@@ -6,8 +6,45 @@ module Fog
     class AWS < Fog::Service
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
+      COMPLIANT_BUCKET_NAMES = /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
+
+      DEFAULT_REGION = 'us-east-1'
+
+      DEFAULT_SCHEME = 'https'
+      DEFAULT_SCHEME_PORT = {
+        'http' => 80,
+        'https' => 443
+      }
+
+      VALID_QUERY_KEYS = %w[
+        acl
+        cors
+        delete
+        lifecycle
+        location
+        logging
+        notification
+        partNumber
+        policy
+        requestPayment
+        response-cache-control
+        response-content-disposition
+        response-content-encoding
+        response-content-language
+        response-content-type
+        response-expires
+        restore
+        torrent
+        uploadId
+        uploads
+        versionId
+        versioning
+        versions
+        website
+      ]
+
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
+      recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :path_style
 
       secrets    :aws_secret_access_key, :hmac
 
@@ -51,6 +88,7 @@ module Fog
       request :list_multipart_uploads
       request :list_parts
       request :post_object_hidden_fields
+      request :post_object_restore
       request :put_bucket
       request :put_bucket_acl
       request :put_bucket_cors
@@ -79,11 +117,11 @@ module Fog
         end
 
         def http_url(params, expires)
-          scheme_host_path_query(params.merge(:scheme => 'http', :port => 80), expires)
+          signed_url(params.merge(:scheme => 'http'), expires)
         end
 
         def https_url(params, expires)
-          scheme_host_path_query(params.merge(:scheme => 'https', :port => 443), expires)
+          signed_url(params.merge(:scheme => 'https'), expires)
         end
 
         def url(params, expires)
@@ -91,32 +129,122 @@ module Fog
           https_url(params, expires)
         end
 
+        def request_url(params)
+          params = request_params(params)
+          params_to_url(params)
+        end
+
+        def signed_url(params, expires)
+          expires = expires.to_i
+          signature = signature(params, expires)
+          params = request_params(params)
+
+          params[:query] = (params[:query] || {}).merge({
+            'AWSAccessKeyId' => @aws_access_key_id,
+            'Signature' => signature,
+            'Expires' => expires,
+          })
+          params[:query]['x-amz-security-token'] = @aws_session_token if @aws_session_token
+
+          params_to_url(params)
+        end
+
         private
 
-        def scheme_host_path_query(params, expires)
-          params[:scheme] ||= @scheme
-          if params[:port] == 80 && params[:scheme] == 'http'
-            params.delete(:port)
+        def region_to_host(region=nil)
+          case region.to_s
+          when DEFAULT_REGION, ''
+            's3.amazonaws.com'
+          else
+            "s3-#{region}.amazonaws.com"
           end
-          if params[:port] == 443 && params[:scheme] == 'https'
-            params.delete(:port)
+        end
+
+        def object_to_path(object_name=nil)
+          '/' + Fog::AWS.escape(object_name.to_s).gsub('%2F','/')
+        end
+
+        def bucket_to_path(bucket_name, path=nil)
+          "/#{Fog::AWS.escape(bucket_name.to_s)}#{path}"
+        end
+
+        # Transforms things like bucket_name, object_name, region
+        #
+        # Should yield the same result when called f*f
+        def request_params(params)
+          headers  = params[:headers] || {}
+
+          if params[:scheme]
+            scheme = params[:scheme]
+            port   = params[:port]
+          else
+            scheme = @scheme || DEFAULT_SCHEME
+            port   = @port
           end
-          params[:headers] ||= {}
-          params[:headers]['Date'] = expires.to_i
-          params[:path] = Fog::AWS.escape(params[:path]).gsub('%2F', '/')
-          query = []
-          params[:headers]['x-amz-security-token'] = @aws_session_token if @aws_session_token
-          if params[:query]
-            for key, value in params[:query]
-              query << "#{key}=#{Fog::AWS.escape(value)}"
+          if DEFAULT_SCHEME_PORT[scheme] == port
+            port = nil
+          end
+
+          if params[:region]
+            region = params[:region]
+            host   = params[:host] || region_to_host(region)
+          else
+            region = @region       || DEFAULT_REGION
+            host   = params[:host] || @host || region_to_host(region)
+          end
+
+          path     = params[:path] || object_to_path(params[:object_name])
+          path     = '/' + path if path[0..0] != '/'
+
+          if params[:bucket_name]
+            bucket_name = params[:bucket_name]
+
+            path_style = params.fetch(:path_style, @path_style)
+            if !path_style && COMPLIANT_BUCKET_NAMES !~ bucket_name
+              Fog::Logger.warning("fog: the specified s3 bucket name(#{bucket_name}) is not a valid dns name, which will negatively impact performance.  For details see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html")
+              path_style = true
+            end
+
+            if path_style
+              path = bucket_to_path bucket_name, path
+            else
+              host = [bucket_name, host].join('.')
             end
           end
-          query << "AWSAccessKeyId=#{@aws_access_key_id}"
-          query << "Signature=#{Fog::AWS.escape(signature(params))}"
-          query << "Expires=#{params[:headers]['Date']}"
-          query << "x-amz-security-token=#{Fog::AWS.escape(@aws_session_token)}" if @aws_session_token
-          port_part = params[:port] && ":#{params[:port]}"
-          "#{params[:scheme]}://#{params[:host]}#{port_part}/#{params[:path]}?#{query.join('&')}"
+
+          ret = params.merge({
+            :scheme       => scheme,
+            :host         => host,
+            :port         => port,
+            :path         => path,
+            :headers      => headers,
+          })
+
+          #
+          ret.delete(:path_style)
+          ret.delete(:bucket_name)
+          ret.delete(:object_name)
+          ret.delete(:region)
+
+          ret
+        end
+
+        def params_to_url(params)
+          query = params[:query] && params[:query].map do |key, value|
+            if value
+              [key, Fog::AWS.escape(value.to_s)].join('=')
+            else
+              key
+            end
+          end.join('&')
+
+          URI::Generic.build({
+            :scheme => params[:scheme],
+            :host   => params[:host],
+            :port   => params[:port],
+            :path   => params[:path],
+            :query  => query,
+          }).to_s
         end
 
       end
@@ -210,15 +338,9 @@ module Fog
           require 'mime/types'
           @use_iam_profile = options[:use_iam_profile]
           setup_credentials(options)
-          options[:region] ||= 'us-east-1'
-          @host = options[:host] || case options[:region]
-          when 'us-east-1'
-            's3.amazonaws.com'
-          else
-            "s3-#{options[:region]}.amazonaws.com"
-          end
-          @scheme = options[:scheme] || 'https'
-          @region = options[:region]
+          @region = options[:region] || DEFAULT_REGION
+          @host   = options[:host]   || region_to_host(@region)
+          @scheme = options[:scheme] || DEFAULT_SCHEME
         end
 
         def data
@@ -229,7 +351,7 @@ module Fog
           self.class.data[@region].delete(@aws_access_key_id)
         end
 
-        def signature(params)
+        def signature(params, expires)
           "foo"
         end
 
@@ -270,6 +392,7 @@ module Fog
           @use_iam_profile = options[:use_iam_profile]
           setup_credentials(options)
           @connection_options     = options[:connection_options] || {}
+          @persistent = options.fetch(:persistent, false)
 
           if @endpoint = options[:endpoint]
             endpoint = URI.parse(@endpoint)
@@ -279,22 +402,17 @@ module Fog
             else
               endpoint.path
             end
-            @port = endpoint.port
             @scheme = endpoint.scheme
+            @port = endpoint.port
           else
-            options[:region] ||= 'us-east-1'
-            @region = options[:region]
-            @host = options[:host] || case options[:region]
-            when 'us-east-1'
-              's3.amazonaws.com'
-            else
-              "s3-#{options[:region]}.amazonaws.com"
-            end
+            @region     = options[:region]      || DEFAULT_REGION
+            @host       = options[:host]        || region_to_host(@region)
             @path       = options[:path]        || '/'
-            @persistent = options.fetch(:persistent, false)
-            @port       = options[:port]        || 443
-            @scheme     = options[:scheme]      || 'https'
+            @scheme     = options[:scheme]      || DEFAULT_SCHEME
+            @port       = options[:port]        || DEFAULT_SCHEME_PORT[@scheme]
+            @path_style = options[:path_style]  || false
           end
+
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 
@@ -302,17 +420,19 @@ module Fog
           @connection.reset
         end
 
-        def signature(params)
+        def signature(params, expires)
+          headers = params[:headers] || {}
+
           string_to_sign =
 <<-DATA
 #{params[:method].to_s.upcase}
-#{params[:headers]['Content-MD5']}
-#{params[:headers]['Content-Type']}
-#{params[:headers]['Date']}
+#{headers['Content-MD5']}
+#{headers['Content-Type']}
+#{expires}
 DATA
 
           amz_headers, canonical_amz_headers = {}, ''
-          for key, value in params[:headers]
+          for key, value in headers
             if key[0..5] == 'x-amz-'
               amz_headers[key] = value
             end
@@ -323,54 +443,33 @@ DATA
           end
           string_to_sign << canonical_amz_headers
 
-          subdomain = params[:host].split(".#{@host}").first
-          unless subdomain =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
-            Fog::Logger.warning("fog: the specified s3 bucket name(#{subdomain}) is not a valid dns name, which will negatively impact performance.  For details see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html")
-            params[:host] = params[:host].split("#{subdomain}.")[-1]
-            if params[:path]
-              params[:path] = "#{subdomain}/#{params[:path]}"
-            else
-              params[:path] = subdomain
+
+          query_string = ''
+          if params[:query]
+            query_args = []
+            for key in params[:query].keys.sort
+              if VALID_QUERY_KEYS.include?(key)
+                value = params[:query][key]
+                if value
+                  query_args << "#{key}=#{value}"
+                else
+                  query_args << key
+                end
+              end
+            end
+            if query_args.any?
+              query_string = '?' + query_args.join('&')
             end
-            subdomain = nil
           end
 
-          canonical_resource  = @path.dup
-          unless subdomain.nil? || subdomain == @host
-            canonical_resource << "#{Fog::AWS.escape(subdomain).downcase}/"
-          end
-          canonical_resource << params[:path].to_s
-          canonical_resource << '?'
-          for key in (params[:query] || {}).keys.sort
-            if %w{
-              acl
-              cors
-              delete
-              lifecycle
-              location
-              logging
-              notification
-              partNumber
-              policy
-              requestPayment
-              response-cache-control
-              response-content-disposition
-              response-content-encoding
-              response-content-language
-              response-content-type
-              response-expires
-              torrent
-              uploadId
-              uploads
-              versionId
-              versioning
-              versions
-              website
-            }.include?(key)
-              canonical_resource << "#{key}#{"=#{params[:query][key]}" unless params[:query][key].nil?}&"
-            end
+          canonical_path = (params[:path] || object_to_path(params[:object_name])).to_s
+          canonical_path = '/' + canonical_path if canonical_path[0..0] != '/'
+          if params[:bucket_name]
+            canonical_resource = "/#{params[:bucket_name]}#{canonical_path}"
+          else
+            canonical_resource = canonical_path
           end
-          canonical_resource.chop!
+          canonical_resource << query_string
           string_to_sign << canonical_resource
 
           signed_string = @hmac.sign(string_to_sign)
@@ -391,16 +490,24 @@ DATA
         def request(params, &block)
           refresh_credentials_if_expired
 
-          params[:headers]['Date'] = Fog::Time.now.to_date_header
+          expires = Fog::Time.now.to_date_header
+
           params[:headers]['x-amz-security-token'] = @aws_session_token if @aws_session_token
-          params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature(params)}"
+          signature = signature(params, expires)
+
+          params = request_params(params)
+          params.delete(:port) unless params[:port]
+
+          params[:headers]['Date'] = expires
+          params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature}"
           # FIXME: ToHashParser should make this not needed
           original_params = params.dup
 
           begin
             response = @connection.request(params, &block)
           rescue Excon::Errors::TemporaryRedirect => error
-            uri = URI.parse(error.response.headers['Location'])
+            headers = (error.response.is_a?(Hash) ? error.response[:headers] : error.response.headers)
+            uri = URI.parse(headers['Location'])
             Fog::Logger.warning("fog: followed redirect to #{uri.host}, connecting to the matching region will be more performant")
             response = Fog::Connection.new("#{@scheme}://#{uri.host}:#{@port}", false, @connection_options).request(original_params, &block)
           end