aws-sdk-core 2.3.12 → 2.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4805e173533b14e5f4239b29770c645b0ae096a3
-  data.tar.gz: 2e74b0ebed2c6887b2ca22f764e98461a8aa06f3
+  metadata.gz: 824789d9b05e226344a7369f43a1a0c31052c0fc
+  data.tar.gz: 932e136986cb354d8da7f6fd565aa111d93ccc5d
 SHA512:
-  metadata.gz: b5a1ae6c878d24fbceb69be8ca6e920153ed95d139859b04737fb913cf0c30559490282d68f941de3d1372d7f9f8301351aa8e72e5c29364297a34765c18592c
-  data.tar.gz: 8761e64cae17f2f0e45a5c24e9b30d1303c5a9a24cc153204ea161c5d75d298e2fb061e472b467744b49ccbf57132371f59b0d7d3fb47b15a2185b446337ea7b
+  metadata.gz: 8482776c328cfdff143cc1919a91e6b1025bb0bffe9f541e38b9b01f3b9a6756e4f830fa0844cf764fcda2e498a90b5daf7a8da477c740ad3ba1dfacdf473585
+  data.tar.gz: b4bb03463ff83bf2e46b7a87f07511c769076c601a8854edfd924ccd57710af03f709c749978b49be538679136b57fdfe2ae53a98198bf99c68b654bba9cc722

data/apis/s3/2006-03-01/api-2.json

@@ -963,7 +963,7 @@
     "ContentDisposition":{"type":"string"},
     "ContentEncoding":{"type":"string"},
     "ContentLanguage":{"type":"string"},
-    "ContentLength":{"type":"integer"},
+    "ContentLength":{"type":"long"},
     "ContentMD5":{"type":"string"},
     "ContentRange":{"type":"string"},
     "ContentType":{"type":"string"},
@@ -2913,7 +2913,7 @@
         "StartAfter":{
           "shape":"StartAfter",
           "location":"querystring",
-          "locationName":"start-key"
+          "locationName":"start-after"
         }
       }
     },

data/apis/s3/2006-03-01/paginators-1.json

@@ -46,6 +46,15 @@
         "CommonPrefixes"
       ]
     },
+    "ListObjectsV2": {
+      "limit_key": "MaxKeys",
+      "output_token": "NextContinuationToken",
+      "input_token": "ContinuationToken",
+      "result_key": [
+        "Contents",
+        "CommonPrefixes"
+      ]
+    },
     "ListParts": {
       "more_results": "IsTruncated",
       "limit_key": "MaxParts",

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

@@ -5,3 +5,11 @@ Aws.add_service(:CloudFront, {
   paginators: "#{Aws::API_DIR}/cloudfront/2016-01-28/paginators-1.json",
   waiters: "#{Aws::API_DIR}/cloudfront/2016-01-28/waiters-2.json",
 })
+
+module Aws
+  module CloudFront
+
+    autoload :UrlSigner, 'aws-sdk-core/cloudfront/url_signer.rb'
+
+  end
+end

data/lib/aws-sdk-core/cloudfront/url_signer.rb

@@ -0,0 +1,167 @@
+require 'base64'
+require 'uri'
+require 'time'
+require 'json'
+require 'openssl'
+
+module Aws
+  module CloudFront
+
+    # Allows you to create signed URLs for Amazon CloudFront resources
+    #
+    #     signer = Aws::CloudFront::UrlSigner.new
+    #     url = signer.signed_url(url,
+    #       key_pair_id: "cf-keypair-id",
+    #       private_key_path: "./cf_private_key.pem"
+    #     )
+    #
+    class UrlSigner
+
+      # @option options [String] :key_pair_id
+      # @option options [String] :private_key
+      # @option options [String] :private_key_path
+      def initialize(options = {})
+        @key_pair_id = key_pair_id(options)
+        @private_key = private_key(options)
+      end
+
+      # create a signed Amazon CloudFront URL
+      # @param [String] url
+      # @option params [Time, DateTime, Date, String, Integer<timestamp>] :expires
+      # @option params [String<JSON>] :policy
+      def signed_url(url, params = {})
+        url_sections = url.split('://')
+        if url_sections.length < 2
+          raise ArgumentError, "Invaild URL:#{url}"
+        end
+        # removing wildcard character to get real scheme
+        scheme = url_sections[0].gsub('*', '')
+        uri = "#{scheme}://#{url_sections[1]}"
+        signed_content = signature(
+          :resource => resource(scheme, uri),
+          :expires => time(params[:expires]),
+          :policy => params[:policy]
+        )
+
+        start_flag = URI.parse(uri).query ? '&' : '?'
+        uri = "#{uri}#{start_flag}#{signed_content}"
+
+        if scheme == 'rtmp'
+          rtmp_url(URI(uri))
+        else
+          uri
+        end
+      end
+
+      private
+
+      def time(expires)
+        case expires
+        when Time then expires.to_i
+        when DateTime, Date then expires.to_time.to_i
+        when String then Time.parse(expires).to_i
+        when Integer, NIL then expires
+        else
+          msg = "expected a time value for :expires, got `#{expires.class}'"
+          raise ArgumentError, msg
+        end
+      end
+
+      # create a relative signed URL for RTMP distribution
+      def rtmp_url(uri)
+        result = uri.path.gsub(' ', '/')
+        result[0] = ''
+        if uri.query
+          "#{result}?#{uri.query}"
+        else
+          result
+        end
+      end
+
+      # prepare resource for signing
+      def resource(scheme, url)
+        case scheme
+        when 'http', 'http*', 'https' then url
+        when 'rtmp'
+          url_info = URI.parse(url)
+          path = url_info.path
+          path[0] = ''
+          resource_content = "#{File.dirname(path)}/#{File.basename(path)}".gsub(' ', '/')
+          if url_info.query
+            "#{resource_content}?#{uri.query}"
+          else
+            resource_content
+          end
+        else
+          msg = "Invaild URI scheme:#{scheme}.Scheme must be one of: http, https or rtmp."
+          raise ArgumentError, msg
+        end
+      end
+
+      # create signed values that used to construct signed URLs
+      # @option param [String] :resource
+      # @option param [Integer<timestamp>] :expires
+      # @option param [String<JSON>] :policy
+      def signature(params = {})
+        signature_content = []
+        if params[:policy]
+          policy = params[:policy].gsub('/\s/s', '')
+          signature_content << "Policy=#{encode(policy)}"
+        elsif params[:resource] && params[:expires]
+          policy = canned_policy(params[:resource], params[:expires])
+          signature_content << "Expires=#{params[:expires]}"
+        else
+          msg = "Either a policy or a resource with an expiration time must be provided."
+          raise ArgumentError, msg
+        end
+
+        signature_content << "Signature=#{encode(sign_policy(policy))}"
+        signature_content << "Key-Pair-Id=#{@key_pair_id}"
+        signature_content.join('&').gsub("\n", '')
+      end
+
+      # create the signature string with policy signed
+      def sign_policy(policy)
+        key = OpenSSL::PKey::RSA.new(@private_key)
+        key.sign(OpenSSL::Digest::SHA1.new, policy)
+      end
+
+      # create canned policy that used for signing
+      def canned_policy(resource, expires)
+        json_hash = {
+          'Statement' => [
+            'Resource' => resource,
+              'Condition' => {
+                'DateLessThan' => {'AWS:EpochTime' => expires}
+              }
+          ]
+        }
+        json_hash.to_json
+      end
+
+      def encode(policy)
+        Base64.encode64(policy).gsub(/[+=\/]/, '+' => '-', '=' => '_', '/' => '~')
+      end
+
+      def key_pair_id(options)
+        if options[:key_pair_id].nil? or options[:key_pair_id] == ''
+          raise ArgumentError, ":key_pair_id must not be blank"
+        else
+          options[:key_pair_id]
+        end
+      end
+
+      def private_key(options)
+        if options[:private_key]
+          options[:private_key]
+        elsif options[:private_key_path]
+          File.open(options[:private_key_path], 'rb') { |f| f.read }
+        else
+          msg = ":private_key or :private_key_path should be provided"
+          raise ArgumentError, msg
+        end
+      end
+
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = '2.3.12'
+  VERSION = '2.3.13'
 end

data/lib/seahorse/client/configuration.rb

@@ -59,9 +59,15 @@ module Seahorse
       end
 
       # @api private
-      DynamicDefault = Struct.new(:block) do
-        def call(*args)
-          block.call(*args)
+      class DynamicDefault
+        attr_accessor :block
+
+        def initialize(block = nil)
+          @block = block
+        end
+
+        def call(*args) 
+          @block.call(*args)
         end
       end
 

data/lib/seahorse/client/net_http/connection_pool.rb

@@ -10,17 +10,6 @@ module Seahorse
   module Client
     module NetHttp
 
-      # @attr_reader [URI::HTTP,nil] http_proxy Returns the configured proxy.
-      # @attr_reader [Integer,Float] http_open_timeout
-      # @attr_reader [Integer,Float] http_read_timeout
-      # @attr_reader [Integer,Float] http_idle_timeout
-      # @attr_reader [Float,nil] http_continue_timeout
-      # @attr_reader [Boolean] http_wire_trace
-      # @attr_reader [Logger,nil] logger
-      # @attr_reader [Boolean] ssl_verify_peer
-      # @attr_reader [String,nil] ssl_ca_bundle
-      # @attr_reader [String,nil] ssl_ca_directory
-      # @attr_reader [String,nil] ssl_ca_store
       class ConnectionPool
 
         @pools_mutex = Mutex.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 2.3.12
+  version: 2.3.13
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jmespath
@@ -261,6 +261,7 @@ files:
 - lib/aws-sdk-core/client_waiters.rb
 - lib/aws-sdk-core/cloudformation.rb
 - lib/aws-sdk-core/cloudfront.rb
+- lib/aws-sdk-core/cloudfront/url_signer.rb
 - lib/aws-sdk-core/cloudhsm.rb
 - lib/aws-sdk-core/cloudsearch.rb
 - lib/aws-sdk-core/cloudsearchdomain.rb