cloudfront-signer 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d37c96b16a6cb79d5ac0d02e63832c5a7e0f025b
-  data.tar.gz: 18a4dec2b55f184a73101d7cc5c7215442fd83ec
+  metadata.gz: 39a04cdad6eadba7f441fb8cfba1c643b3f5fe9b
+  data.tar.gz: 7786c9d47b121178a26e832b129b9a163e299bf5
 SHA512:
-  metadata.gz: c85cc296da175cc226fb149a84bb45d0c8cef0dca4fa738ebc79ebeae2e9e64d0556a7ddc69ceb9fa50ae18986b109d6bef914b5a3385260ff9f29a2cd2f428b
-  data.tar.gz: 3dc4a69e1e0aa92dbefa2621bc88d267a212edf9168b70b47f47c4817600f57e538f97b7c8cc2b48296a681c036463e36af4fab5f520c58893272d7c939ce445
+  metadata.gz: 39a5a4e824e33d04b5b5d19726f2a935e0b51d3202ed9819900cf9ff952b6e1eea17a335a355d5990a0048e1c2f203684a5033d38abe1d381b36d86e62c62a14
+  data.tar.gz: 03a54b2be4915bb859b96c5ffba4fb15d5c845a8c0fef62f70e81dc6566e73b4d4c3653d31906599100f5a78829694dee2e2f98a4ae42b505a822dc7a18f000f

data/ChangeLog.markdown

@@ -1,3 +1,5 @@
+### 2.1.2 / 2015-04-16
+* Accepted merge request from https://github.com/tuvistavie - fixing custom policy bug.
 ### 2.1.1 / 2013-10-31
 * Added changelog file
 * Aceppted merge request from https://github.com/bullfight, Refactored configuration to allow for key to be passed in directly.

data/lib/cloudfront-signer.rb

@@ -4,6 +4,7 @@ require 'openssl'
 require 'time'
 require 'base64'
 require "cloudfront-signer/version"
+require 'json'
 
 module AWS
   module CF
@@ -176,9 +177,10 @@ module AWS
           policy = IO.read(policy_options[:policy_file])
           result = "#{subject}#{separator}Policy=#{encode_policy(policy)}&Signature=#{create_signature(policy)}&Key-Pair-Id=#{@key_pair_id}"
         else
+          policy_options[:expires] = epoch_time(policy_options[:expires] || Time.now + default_expires)
           if policy_options.keys.size <= 1
             # Canned Policy - shorter URL
-            expires_at = epoch_time(policy_options[:expires] || Time.now + self.default_expires)
+            expires_at = policy_options[:expires]
             policy = %({"Statement":[{"Resource":"#{subject}","Condition":{"DateLessThan":{"AWS:EpochTime":#{expires_at}}}}]})
             result = "#{subject}#{separator}Expires=#{expires_at}&Signature=#{create_signature(policy)}&Key-Pair-Id=#{@key_pair_id}"
           else
@@ -196,23 +198,27 @@ module AWS
         end
       end
 
-
       # Private helper methods
       private
 
-
       def self.generate_custom_policy(resource, options)
-        conditions = ["\"DateLessThan\":{\"AWS:EpochTime\":#{epoch_time(options[:expires])}}"]
-        conditions << "\"DateGreaterThan\":{\"AWS:EpochTime\":#{epoch_time(options[:starting])}}" if options[:starting]
-        conditions << "\"IpAddress\":{\"AWS:SourceIp\":\"#{options[:ip_range]}\"" if options[:ip_range]
-                %({"Statement":[{"Resource":"#{resource}","Condition":{#{conditions.join(',')}}}}]})
+        conditions = { 'DateLessThan' => { 'AWS:EpochTime' => epoch_time(options[:expires]) } }
+        conditions['DateGreaterThan'] = { 'AWS:EpochTime' => epoch_time(options[:starting]) } if options[:starting]
+        conditions['IpAddress'] = { 'AWS:SourceIp' => option[:ip_range] } if options[:ip_range]
+        {
+          'Statement' => [{
+            'Resource' => resource,
+            'Condition' => conditions
+          }]
+        }.to_json
       end
 
       def self.epoch_time(timelike)
         case timelike
         when String then Time.parse(timelike).to_i
         when Time   then timelike.to_i
-        else raise ArgumentError.new("Invalid argument - String or Time required - #{timelike.class} passed.")
+        when Fixnum then timelike
+        else raise ArgumentError.new("Invalid argument - String, Fixnum or Time required - #{timelike.class} passed.")
         end
       end
 

data/lib/cloudfront-signer/version.rb

@@ -1,5 +1,5 @@
 module AWS
     module CF
-        VERSION = "2.1.1"
+        VERSION = "2.1.2"
     end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: cloudfront-signer
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Anthony Bouch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A gem to sign url and stream paths for Amazon CloudFront private content.
@@ -33,8 +33,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - ChangeLog.markdown
 - Gemfile
 - LICENSE
@@ -58,17 +58,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: cloudfront-signer
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A gem to sign url and stream paths for Amazon CloudFront private content.