TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Heinemeier Hansson 2017-07-24 12:06:25 -05:00
commit 6de1c0b7b5
6 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/active_storage/blob.rb
View File

@ -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

2
lib/active_storage/service.rb
View File

@ -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

6
lib/active_storage/service/gcs_service.rb
View File

@ -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

4
lib/active_storage/service/s3_service.rb
View File

@ -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

11
test/service/gcs_service_test.rb
View File

@ -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
)

9
test/service/s3_service_test.rb
View File

@ -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
)