Merge branch 'master' of github.com:rails/activestorage

rails · Jul 24, 2017 · 6de1c0b · 6de1c0b
2 parents d4f014b + 52eed68
commit 6de1c0b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 deletions.
diff --git a/app/models/active_storage/blob.rb b/app/models/active_storage/blob.rb
@@ -115,7 +115,7 @@ def service_url(expires_in: 5.minutes, disposition: :inline)
   # Returns a URL that can be used to directly upload a file for this blob on the service. This URL is intended to be
   # short-lived for security and only generated on-demand by the client-side JavaScript responsible for doing the uploading.
   def service_url_for_direct_upload(expires_in: 5.minutes)
-    service.url_for_direct_upload key, expires_in: expires_in, content_type: content_type, content_length: byte_size
+    service.url_for_direct_upload key, expires_in: expires_in, content_type: content_type, content_length: byte_size, checksum: checksum
   end
 
 

diff --git a/lib/active_storage/service.rb b/lib/active_storage/service.rb
@@ -78,7 +78,7 @@ def url(key, expires_in:, disposition:, filename:, content_type:)
     raise NotImplementedError
   end
 
-  def url_for_direct_upload(key, expires_in:, content_type:, content_length:)
+  def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:)
     raise NotImplementedError
   end
 

diff --git a/lib/active_storage/service/gcs_service.rb b/lib/active_storage/service/gcs_service.rb
@@ -44,7 +44,7 @@ def exist?(key)
 
   def url(key, expires_in:, disposition:, filename:, content_type:)
     instrument :url, key do |payload|
-      generated_url = file_for(key).signed_url expires: expires_in, query: { 
+      generated_url = file_for(key).signed_url expires: expires_in, query: {
         "response-content-disposition" => "#{disposition}; filename=\"#{filename}\"",
         "response-content-type" => content_type
       }
@@ -55,10 +55,10 @@ def url(key, expires_in:, disposition:, filename:, content_type:)
     end
   end
 
-  def url_for_direct_upload(key, expires_in:, content_type:, content_length:)
+  def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:)
     instrument :url, key do |payload|
       generated_url = bucket.signed_url key, method: "PUT", expires: expires_in,
-        content_type: content_type
+        content_type: content_type, content_md5: checksum
 
       payload[:url] = generated_url
 

diff --git a/lib/active_storage/service/s3_service.rb b/lib/active_storage/service/s3_service.rb
@@ -59,10 +59,10 @@ def url(key, expires_in:, disposition:, filename:, content_type:)
     end
   end
 
-  def url_for_direct_upload(key, expires_in:, content_type:, content_length:)
+  def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:)
     instrument :url, key do |payload|
       generated_url = object_for(key).presigned_url :put, expires_in: expires_in,
-        content_type: content_type, content_length: content_length
+        content_type: content_type, content_length: content_length, content_md5: checksum
 
       payload[:url] = generated_url
 

diff --git a/test/service/gcs_service_test.rb b/test/service/gcs_service_test.rb
@@ -9,14 +9,15 @@ class ActiveStorage::Service::GCSServiceTest < ActiveSupport::TestCase
 
     test "direct upload" do
       begin
-        key = SecureRandom.base58(24)
-        data = "Something else entirely!"
-        direct_upload_url = @service.url_for_direct_upload(key, expires_in: 5.minutes, content_type: "text/plain", content_length: data.size)
+        key      = SecureRandom.base58(24)
+        data     = "Something else entirely!"
+        checksum = Digest::MD5.base64digest(data)
+        url      = @service.url_for_direct_upload(key, expires_in: 5.minutes, content_type: "text/plain", content_length: data.size, checksum: checksum)
 
         HTTParty.put(
-          direct_upload_url,
+          url,
           body: data,
-          headers: { "Content-Type" => "text/plain" },
+          headers: { "Content-Type" => "text/plain", "Content-MD5" => checksum },
           debug_output: STDOUT
         )
 

diff --git a/test/service/s3_service_test.rb b/test/service/s3_service_test.rb
@@ -9,14 +9,15 @@ class ActiveStorage::Service::S3ServiceTest < ActiveSupport::TestCase
 
     test "direct upload" do
       begin
-        key  = SecureRandom.base58(24)
-        data = "Something else entirely!"
-        url  = @service.url_for_direct_upload(key, expires_in: 5.minutes, content_type: "text/plain", content_length: data.size)
+        key      = SecureRandom.base58(24)
+        data     = "Something else entirely!"
+        checksum = Digest::MD5.base64digest(data)
+        url      = @service.url_for_direct_upload(key, expires_in: 5.minutes, content_type: "text/plain", content_length: data.size, checksum: checksum)
 
         HTTParty.put(
           url,
           body: data,
-          headers: { "Content-Type" => "text/plain" },
+          headers: { "Content-Type" => "text/plain", "Content-MD5" => checksum },
           debug_output: STDOUT
         )