kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Tell service which content-type to use for the response

Browse source
This commit is contained in:
David Heinemeier Hansson 2017-07-23 17:50:31 -05:00
parent cb2f7d4994
commit 5944850bc1
12 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/active_storage/disk_controller.rb
View file

@ -11,8 +11,8 @@
class ActiveStorage::DiskController < ActionController::Base
def show
if key = decode_verified_key
# FIXME: Find a way to set the correct content type
send_data disk_service.download(key), filename: params[:filename], disposition: disposition_param
# FIXME: Do we need to sign or otherwise validate the content type?
send_data disk_service.download(key), filename: params[:filename], disposition: disposition_param, content_type: params[:content_type]
else
head :not_found
end

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

@ -57,7 +57,7 @@ class ActiveStorage::Blob < ActiveRecord::Base
def url(expires_in: 5.minutes, disposition: :inline)
service.url key, expires_in: expires_in, disposition: disposition, filename: filename
service.url key, expires_in: expires_in, disposition: disposition, filename: filename, content_type: content_type
end
def url_for_direct_upload(expires_in: 5.minutes)

2
app/models/active_storage/service.rb
View file

@ -74,7 +74,7 @@ class ActiveStorage::Service
raise NotImplementedError
end
def url(key, expires_in:, disposition:, filename:)
def url(key, expires_in:, disposition:, filename:, content_type:)
raise NotImplementedError
end

8
app/models/active_storage/service/disk_service.rb
View file

@ -51,15 +51,17 @@ class ActiveStorage::Service::DiskService < ActiveStorage::Service
end
end
def url(key, expires_in:, disposition:, filename:)
def url(key, expires_in:, disposition:, filename:, content_type:)
instrument :url, key do |payload|
verified_key_with_expiration = ActiveStorage.verifier.generate(key, expires_in: expires_in, purpose: :blob_key)
generated_url =
if defined?(Rails) && defined?(Rails.application)
Rails.application.routes.url_helpers.rails_disk_blob_path(verified_key_with_expiration, disposition: disposition, filename: filename)
Rails.application.routes.url_helpers.rails_disk_blob_path \
verified_key_with_expiration,
disposition: disposition, filename: filename, content_type: content_type
else
"/rails/active_storage/disk/#{verified_key_with_expiration}/#{filename}?disposition=#{disposition}"
"/rails/active_storage/disk/#{verified_key_with_expiration}/#{filename}?disposition=#{disposition}&content_type=#{content_type}"
end
payload[:url] = generated_url

8
app/models/active_storage/service/gcs_service.rb
View file

@ -42,10 +42,12 @@ class ActiveStorage::Service::GCSService < ActiveStorage::Service
end
end
def url(key, expires_in:, disposition:, filename:)
def url(key, expires_in:, disposition:, filename:, content_type:)
instrument :url, key do |payload|
query = { "response-content-disposition" => "#{disposition}; filename=\"#{filename}\"" }
generated_url = file_for(key).signed_url(expires: expires_in, query: query)
generated_url = file_for(key).signed_url expires: expires_in, query: {
"response-content-disposition" => "#{disposition}; filename=\"#{filename}\"",
"response-content-type" => content_type
}
payload[:url] = generated_url

5
app/models/active_storage/service/s3_service.rb
View file

@ -47,10 +47,11 @@ class ActiveStorage::Service::S3Service < ActiveStorage::Service
end
end
def url(key, expires_in:, disposition:, filename:)
def url(key, expires_in:, disposition:, filename:, content_type:)
instrument :url, key do |payload|
generated_url = object_for(key).presigned_url :get, expires_in: expires_in,
response_content_disposition: "#{disposition}; filename=\"#{filename}\""
response_content_disposition: "#{disposition}; filename=\"#{filename}\"",
response_content_type: content_type
payload[:url] = generated_url

2
app/models/active_storage/variant.rb
View file

@ -19,7 +19,7 @@ class ActiveStorage::Variant
end
def url(expires_in: 5.minutes, disposition: :inline)
service.url key, expires_in: expires_in, disposition: disposition, filename: blob.filename
service.url key, expires_in: expires_in, disposition: disposition, filename: blob.filename, content_type: blob.content_type
end

2
test/models/blob_test.rb
View file

@ -35,6 +35,6 @@ class ActiveStorage::BlobTest < ActiveSupport::TestCase
private
def expected_url_for(blob, disposition: :inline)
"/rails/active_storage/disk/#{ActiveStorage.verifier.generate(blob.key, expires_in: 5.minutes, purpose: :blob_key)}/#{blob.filename}?disposition=#{disposition}"
"/rails/active_storage/disk/#{ActiveStorage.verifier.generate(blob.key, expires_in: 5.minutes, purpose: :blob_key)}/#{blob.filename}?disposition=#{disposition}&content_type=#{blob.content_type}"
end
end

2
test/service/disk_service_test.rb
View file

@ -7,6 +7,6 @@ class ActiveStorage::Service::DiskServiceTest < ActiveSupport::TestCase
test "url generation" do
assert_match /rails\/active_storage\/disk\/.*\/avatar\.png\?disposition=inline/,
@service.url(FIXTURE_KEY, expires_in: 5.minutes, disposition: :inline, filename: "avatar.png")
@service.url(FIXTURE_KEY, expires_in: 5.minutes, disposition: :inline, filename: "avatar.png", content_type: "image/png")
end
end

5
test/service/gcs_service_test.rb
View file

@ -29,9 +29,10 @@ if SERVICE_CONFIGURATIONS[:gcs]
test "signed URL generation" do
freeze_time do
url = SERVICE.bucket.signed_url(FIXTURE_KEY, expires: 120) +
"&response-content-disposition=inline%3B+filename%3D%22test.txt%22"
"&response-content-disposition=inline%3B+filename%3D%22test.txt%22" +
"&response-content-type=text%2Fplain"
assert_equal url, @service.url(FIXTURE_KEY, expires_in: 2.minutes, disposition: :inline, filename: "test.txt")
assert_equal url, @service.url(FIXTURE_KEY, expires_in: 2.minutes, disposition: :inline, filename: "test.txt", content_type: "text/plain")
end
end
end

4
test/service/mirror_service_test.rb
View file

@ -46,8 +46,8 @@ class ActiveStorage::Service::MirrorServiceTest < ActiveSupport::TestCase
test "URL generation in primary service" do
freeze_time do
assert_equal SERVICE.primary.url(FIXTURE_KEY, expires_in: 2.minutes, disposition: :inline, filename: "test.txt"),
@service.url(FIXTURE_KEY, expires_in: 2.minutes, disposition: :inline, filename: "test.txt")
assert_equal SERVICE.primary.url(FIXTURE_KEY, expires_in: 2.minutes, disposition: :inline, filename: "test.txt", content_type: "text/plain"),
@service.url(FIXTURE_KEY, expires_in: 2.minutes, disposition: :inline, filename: "test.txt", content_type: "text/plain")
end
end

4
test/service/s3_service_test.rb
View file

@ -27,8 +27,8 @@ if SERVICE_CONFIGURATIONS[:s3]
end
test "signed URL generation" do
assert_match /#{SERVICE_CONFIGURATIONS[:s3][:bucket]}\.s3.(\S+)?amazonaws.com.*response-content-disposition=inline.*avatar\.png/,
@service.url(FIXTURE_KEY, expires_in: 5.minutes, disposition: :inline, filename: "avatar.png")
assert_match /#{SERVICE_CONFIGURATIONS[:s3][:bucket]}\.s3.(\S+)?amazonaws.com.*response-content-disposition=inline.*avatar\.png.*response-content-type=image%2Fpng/,
@service.url(FIXTURE_KEY, expires_in: 5.minutes, disposition: :inline, filename: "avatar.png", content_type: "image/png")
end
test "uploading with server-side encryption" do