carrierwave_direct 0.0.17 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4ad399ddf002036a40657b35ee0b50280a158b7
-  data.tar.gz: 793b4c2f7228322befc4fec1b658b8f94322950c
+  metadata.gz: b64419d902b8c1afba920fafe9a7029dd4c3d94a
+  data.tar.gz: 5dfbb28ea14db2c7ae9bd665192c009534cbef90
 SHA512:
-  metadata.gz: 138bee67f0a6a9c78ebc483f2680dcd611dbb83ea5b2094f9e19d73e94015facaa782092d1200305bf966d974eca063fabb49383649f1864bed8726624e89551
-  data.tar.gz: 160672ced1119afff6b7e6960e51fc4c4e1e382c9be00e8e58488b7aa24662fc5dfb4b26458c0ba3fd1881f6e52979f35558a72c9e4a5c6851dfebb2e09fee53
+  metadata.gz: c8f39ac6ced22656b3a96821356d92333f9ca141f215bb66125b3d2a8fa282718341adb133b0baa33308f9268cf1ef2014e59e3e21bb1f7949a389f170b4c1be
+  data.tar.gz: b2e2fe378dfed399fc011fb4ebcb8a94d5d4ffe4cb4c982ed71b918aa53fa7767a1b1c6d226e6fda5ad2169af24af2a43c83b80b300650367ad49aa0e6faa9d6

data/.travis.yml

@@ -1,16 +1,12 @@
 rvm:
- - 2.0.0
- - 2.1.0
- - 2.2.0
-install:
-  - 'travis_retry bundle install'
+ - 2.3.0
+ - 2.4.0
+ - 2.5.0
 script: 'bundle exec rspec spec'
 gemfile:
   - Gemfile
-  - gemfiles/3.2.gemfile
-  - gemfiles/4.0.gemfile
-  - gemfiles/4.1.gemfile
+  - gemfiles/4.2.gemfile
+  - gemfiles/5.1.gemfile
 # Move to containerized travis, see http://docs.travis-ci.com/user/migrating-from-legacy
 sudo: false
 cache: bundler
-

data/Changelog.md

@@ -1,7 +1,7 @@
-### 0.0.17
+### 1.0.0
 
-Misc:
-  * Pin carrierwave to 0.11
+Features:
+  * Upgraded signing algorithm to use [AWS V4 POST authentication](http://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-authentication-HTTPPOST.html). This is a breaking change if you are constructing your own upload forms or submitting your own POST requests. See the Sinatra section of the README for a summary of the new fields required in your V4 POST request. (Fran Worley @fran-worley)
 
 ### 0.0.16
 
@@ -127,4 +127,3 @@ Misc:
 ### 0.0.1
 
 [Full Changes](https://github.com/dwilkie/carrierwave_direct/compare/e68498587a4e4209d121512dbb0df529e15e9282...v0.0.1)
-

data/README.md

@@ -113,15 +113,19 @@ end
 ```
 ```haml
 # index.haml
+# Now using AWS POST authentication V4
+# See http://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-authentication-HTTPPOST.html for more information
 
 %form{:action => @uploader.direct_fog_url, :method => "post", :enctype => "multipart/form-data"}
   %input{:name => "utf8", :type => "hidden"}
   %input{:type => "hidden", :name => "key", :value => @uploader.key}
-  %input{:type => "hidden", :name => "AWSAccessKeyId", :value => @uploader.aws_access_key_id}
   %input{:type => "hidden", :name => "acl", :value => @uploader.acl}
   %input{:type => "hidden", :name => "success_action_redirect", :value => @uploader.success_action_redirect}
   %input{:type => "hidden", :name => "policy", :value => @uploader.policy}
-  %input{:type => "hidden", :name => "signature", :value => @uploader.signature}
+  %input{:type => "hidden", :name => "x-amz-algorithm", :value => @uploader.algorithm}
+  %input{:type => "hidden", :name => "x-amz-credential", :value => @uploader.credential}
+  %input{:type => "hidden", :name => "x-amz-date", :value => @uploader.date}
+  %input{:type => "hidden", :name => "x-amz-signature", :value => @uploader.signature}
   %input{:name => "file", :type => "file"}
   %input{:type => "submit", :value => "Upload to S3"}
 ```

data/gemfiles/{3.2.gemfile → 4.2.gemfile}

@@ -4,9 +4,9 @@ gem "carrierwave", "~>0.11"
 gem "fog-aws"
 
 group :test do
-  gem "rspec", '3.0.0'
+  gem "rspec", '~> 3.0'
   gem "timecop"
-  gem "rails", "~>3.2.12"
+  gem "rails", "~>4.2.0"
   gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
   gem "capybara"
   # gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby

data/gemfiles/{4.0.gemfile → 5.1.gemfile}

@@ -4,9 +4,9 @@ gem "carrierwave", "~>0.11"
 gem "fog-aws"
 
 group :test do
-  gem "rspec", '3.0.0'
+  gem "rspec", '~> 3.0'
   gem "timecop"
-  gem "rails", "~>4.0.0"
+  gem "rails", "~>5.1.0"
   gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
   gem "capybara"
   # gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby

data/lib/carrierwave_direct/form_builder.rb

@@ -31,10 +31,12 @@ module CarrierWaveDirect
 
     def required_base_fields
       hidden_field(:key,                     :name => "key") <<
-      hidden_field(:aws_access_key_id,       :name => "AWSAccessKeyId") <<
       hidden_field(:acl,                     :name => "acl") <<
       hidden_field(:policy,                  :name => "policy") <<
-      hidden_field(:signature,               :name => "signature")
+      hidden_field(:signature,               :name => "X-Amz-Signature") <<
+      hidden_field(:credential,              :name => "X-Amz-Credential") <<
+      hidden_field(:algorithm,               :name => "X-Amz-Algorithm") <<
+      hidden_field(:date,                    :name => "X-Amz-Date")
     end
 
     def content_type_field(options)

data/lib/carrierwave_direct/uploader.rb

@@ -26,6 +26,11 @@ module CarrierWaveDirect
     include CarrierWaveDirect::Uploader::ContentType
     include CarrierWaveDirect::Uploader::DirectUrl
 
+    #ensure that region returns something. Since sig v4 it is required in the signing key & credentials
+    def region
+      defined?(super) ? super : "us-east-1"
+    end
+
     def acl
       fog_public ? 'public-read' : 'private'
     end
@@ -35,20 +40,36 @@ module CarrierWaveDirect
       options[:min_file_size] ||= min_file_size
       options[:max_file_size] ||= max_file_size
 
+      @date ||= Time.now.utc.strftime("%Y%m%d")
+      @timestamp ||= Time.now.utc.strftime("%Y%m%dT%H%M%SZ")
       @policy ||= generate_policy(options, &block)
     end
 
+    def date
+      @timestamp ||= Time.now.utc.strftime("%Y%m%dT%H%M%SZ")
+    end
+
+    def algorithm
+      'AWS4-HMAC-SHA256'
+    end
+
+    def credential
+      @date ||= Time.now.utc.strftime("%Y%m%d")
+      "#{aws_access_key_id}/#{@date}/#{region}/s3/aws4_request"
+    end
+
     def clear_policy!
       @policy = nil
+      @date = nil
+      @timestamp = nil
     end
 
     def signature
-      Base64.encode64(
-        OpenSSL::HMAC.digest(
-          OpenSSL::Digest.new('sha1'),
-          aws_secret_access_key, policy
-        )
-      ).gsub("\n","")
+      OpenSSL::HMAC.hexdigest(
+        'sha256',
+        signing_key,
+        policy
+      )
     end
 
     def url_scheme_white_list
@@ -139,7 +160,9 @@ module CarrierWaveDirect
 
       conditions << ["starts-with", "$utf8", ""] if options[:enforce_utf8]
       conditions << ["starts-with", "$key", key.sub(/#{Regexp.escape(FILENAME_WILDCARD)}\z/, "")]
-
+      conditions << {'X-Amz-Algorithm' => algorithm}
+      conditions << {'X-Amz-Credential' => credential}
+      conditions << {'X-Amz-Date' => date}
       conditions << ["starts-with", "$Content-Type", ""] if will_include_content_type
       conditions << {"bucket" => fog_directory}
       conditions << {"acl" => acl}
@@ -161,5 +184,16 @@ module CarrierWaveDirect
         }.to_json
       ).gsub("\n","")
     end
+
+    def signing_key(options = {})
+      @date ||= Time.now.utc.strftime("%Y%m%d")
+      #AWS Signature Version 4
+      kDate    = OpenSSL::HMAC.digest('sha256', "AWS4" + aws_secret_access_key, @date)
+      kRegion  = OpenSSL::HMAC.digest('sha256', kDate, region)
+      kService = OpenSSL::HMAC.digest('sha256', kRegion, 's3')
+      kSigning = OpenSSL::HMAC.digest('sha256', kService, "aws4_request")
+
+      kSigning
+    end
   end
 end

data/lib/carrierwave_direct/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
 module CarrierwaveDirect
-  VERSION = "0.0.17"
+  VERSION = "1.0.0"
 end
 

data/spec/form_builder_spec.rb

@@ -12,11 +12,13 @@ end
 shared_examples_for 'hidden values form' do
   hidden_fields = [
                     :key,
-                    {:aws_access_key_id => "AWSAccessKeyId"},
+                    {:credential => "X-Amz-Credential"},
+                    {:algorithm => "X-Amz-Algorithm"},
+                    {:date => "X-Amz-Date"},
+                    {:signature => "X-Amz-Signature"},
                     :acl,
                     :success_action_redirect,
-                    :policy,
-                    :signature
+                    :policy
                   ]
 
   hidden_fields.each do |input|
@@ -60,19 +62,23 @@ describe CarrierWaveDirect::FormBuilder do
 
     default_hidden_fields = [
                       :key,
-                      {:aws_access_key_id => "AWSAccessKeyId"},
+                      {:credential => "X-Amz-Credential"},
+                      {:algorithm => "X-Amz-Algorithm"},
+                      {:date => "X-Amz-Date"},
+                      {:signature => "X-Amz-Signature"},
                       :acl,
                       :success_action_redirect,
                       :policy,
-                      :signature
                     ]
     status_hidden_fields = [
                       :key,
-                      {:aws_access_key_id => "AWSAccessKeyId"},
+                      {:credential => "X-Amz-Credential"},
+                      {:algorithm => "X-Amz-Algorithm"},
+                      {:date => "X-Amz-Date"},
+                      {:signature => "X-Amz-Signature"},
                       :acl,
                       :success_action_status,
                       :policy,
-                      :signature
                     ]
 
     # http://aws.amazon.com/articles/1434?_encoding=UTF8

data/spec/orm/activerecord_spec.rb

@@ -9,8 +9,12 @@ describe CarrierWaveDirect::ActiveRecord do
     :adapter => 'sqlite3',
     :database => ':memory:'
   }
-
-  class TestMigration < ActiveRecord::Migration
+  if ActiveRecord::VERSION::MAJOR >= 5
+    migration_class = ::ActiveRecord::Migration[5.0]
+  else
+    migration_class = ::ActiveRecord::Migration
+  end
+  class TestMigration < migration_class
     def self.up
       create_table :parties, :force => true do |t|
         t.column :video, :string

data/spec/orm/indirect_activerecord_spec.rb

@@ -10,7 +10,13 @@ describe CarrierWave::ActiveRecord do
     :database => ':memory:'
   }
 
-  class OtherTestMigration < ActiveRecord::Migration
+  if ActiveRecord::VERSION::MAJOR >= 5
+    migration_class = ::ActiveRecord::Migration[5.0]
+  else
+    migration_class = ::ActiveRecord::Migration
+  end
+
+  class OtherTestMigration < migration_class
     def self.up
       create_table :other_parties, :force => true do |t|
         t.column :video, :string

data/spec/uploader_spec.rb

@@ -275,6 +275,7 @@ describe CarrierWaveDirect::Uploader do
   end
 
   # http://aws.amazon.com/articles/1434?_encoding=UTF8
+  #http://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-UsingHTTPPOST.html
   describe "#policy" do
 
 
@@ -478,13 +479,24 @@ describe CarrierWaveDirect::Uploader do
       expect(subject.signature).to_not include("\n")
     end
 
-    it "should return a base64 encoded 'sha1' hash of the secret key and policy document" do
-      expect(Base64.decode64(subject.signature)).to eq OpenSSL::HMAC.digest(
-        OpenSSL::Digest.new('sha1'),
-        subject.aws_secret_access_key, subject.policy
+    it "should return a HMAC hexdigest encoded 'sha256' hash of the secret key and policy document" do
+      expect(subject.signature).to eq OpenSSL::HMAC.hexdigest(
+        OpenSSL::Digest.new('sha256'),
+        subject.send(:signing_key), subject.policy
       )
     end
   end
+  #http://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-UsingHTTPPOST.html
+  describe "#signature_key" do
+    it "should include correct signature_key elements" do
+      kDate    = OpenSSL::HMAC.digest('sha256', "AWS4" + subject.aws_secret_access_key, Time.now.utc.strftime("%Y%m%d"))
+      kRegion  = OpenSSL::HMAC.digest('sha256', kDate, subject.region)
+      kService = OpenSSL::HMAC.digest('sha256', kRegion, 's3')
+      kSigning = OpenSSL::HMAC.digest('sha256', kService, "aws4_request")
+
+      expect(subject.send(:signing_key)).to eq (kSigning)
+    end
+  end
 
 
   # note that 'video' is hardcoded into the MountedClass support file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave_direct
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 1.0.0
 platform: ruby
 authors:
 - David Wilkie
@@ -123,9 +123,8 @@ files:
 - README.md
 - Rakefile
 - carrierwave_direct.gemspec
-- gemfiles/3.2.gemfile
-- gemfiles/4.0.gemfile
-- gemfiles/4.1.gemfile
+- gemfiles/4.2.gemfile
+- gemfiles/5.1.gemfile
 - lib/carrierwave_direct.rb
 - lib/carrierwave_direct/action_view_extensions/form_helper.rb
 - lib/carrierwave_direct/form_builder.rb

data/gemfiles/4.1.gemfile

@@ -1,13 +0,0 @@
-source "https://rubygems.org"
-
-gem "carrierwave", "~>0.11"
-gem "fog-aws"
-
-group :test do
-  gem "rspec", '3.0.0'
-  gem "timecop"
-  gem "rails", "~>4.1.0"
-  gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
-  gem "capybara"
-  # gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
-end