From 1986048d27383b0e70264583e8b6922652d6e5c4 Mon Sep 17 00:00:00 2001 From: Graham Conzett Date: Sun, 7 Oct 2018 15:22:58 -0400 Subject: Fix issue ActiveStorage direct upload disk Fix an issue in ActiveStorage where a direct upload to disk storage would fail due to a content type mismatch if the file was uploaded using a mime-type synonym. --- .../app/controllers/active_storage/disk_controller.rb | 3 ++- activestorage/test/controllers/disk_controller_test.rb | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'activestorage') diff --git a/activestorage/app/controllers/active_storage/disk_controller.rb b/activestorage/app/controllers/active_storage/disk_controller.rb index 7bd641ab9a..652084e822 100644 --- a/activestorage/app/controllers/active_storage/disk_controller.rb +++ b/activestorage/app/controllers/active_storage/disk_controller.rb @@ -61,6 +61,7 @@ class ActiveStorage::DiskController < ActiveStorage::BaseController end def acceptable_content?(token) - token[:content_type] == request.content_type && token[:content_length] == request.content_length + Mime::Type.lookup(request.content_type) == token[:content_type] && + token[:content_length] == request.content_length end end diff --git a/activestorage/test/controllers/disk_controller_test.rb b/activestorage/test/controllers/disk_controller_test.rb index 4bc61d13f3..7b5e989699 100644 --- a/activestorage/test/controllers/disk_controller_test.rb +++ b/activestorage/test/controllers/disk_controller_test.rb @@ -67,6 +67,16 @@ class ActiveStorage::DiskControllerTest < ActionDispatch::IntegrationTest assert_not blob.service.exist?(blob.key) end + test "directly uploading blob with different but equivalent content type" do + data = "Something else entirely!" + blob = create_blob_before_direct_upload( + byte_size: data.size, checksum: Digest::MD5.base64digest(data), content_type: "application/x-gzip") + + put blob.service_url_for_direct_upload, params: data, headers: { "Content-Type" => "application/x-gzip" } + assert_response :no_content + assert_equal data, blob.download + end + test "directly uploading blob with mismatched content length" do data = "Something else entirely!" blob = create_blob_before_direct_upload byte_size: data.size - 1, checksum: Digest::MD5.base64digest(data) -- cgit v1.2.3 From bba5ecc923bbc8a635913c1101188163cb9699be Mon Sep 17 00:00:00 2001 From: Graham Conzett Date: Mon, 8 Oct 2018 09:50:51 -0400 Subject: Use content_mime_type --- activestorage/app/controllers/active_storage/disk_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'activestorage') diff --git a/activestorage/app/controllers/active_storage/disk_controller.rb b/activestorage/app/controllers/active_storage/disk_controller.rb index 652084e822..99982202dd 100644 --- a/activestorage/app/controllers/active_storage/disk_controller.rb +++ b/activestorage/app/controllers/active_storage/disk_controller.rb @@ -61,7 +61,6 @@ class ActiveStorage::DiskController < ActiveStorage::BaseController end def acceptable_content?(token) - Mime::Type.lookup(request.content_type) == token[:content_type] && - token[:content_length] == request.content_length + token[:content_type] == request.content_mime_type && token[:content_length] == request.content_length end end -- cgit v1.2.3 From b4e827d80a65483c6884cc61dc43bdddc13ab926 Mon Sep 17 00:00:00 2001 From: Donnie Propst Date: Mon, 8 Oct 2018 11:26:51 -0400 Subject: Point to requiring the ASt engine in the installation instructions [ci skip] --- activestorage/README.md | 2 ++ 1 file changed, 2 insertions(+) (limited to 'activestorage') diff --git a/activestorage/README.md b/activestorage/README.md index b677721d95..bd31f0ea58 100644 --- a/activestorage/README.md +++ b/activestorage/README.md @@ -16,6 +16,8 @@ A key difference to how Active Storage works compared to other attachment soluti Run `rails active_storage:install` to copy over active_storage migrations. +NOTE: If the task cannot be found, verify that `require "active_storage/engine"` is present in `config/application.rb`. + ## Examples One attachment: -- cgit v1.2.3