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

Merge pull request #33667 from cbothner/azure-service-swallowing-all-errors

Browse source 
Handle only specifically relevant Azure HTTPErrors in ActiveStorage::Service::AzureStorageService
This commit is contained in:
George Claghorn 2018-08-23 18:42:20 -04:00 committed by GitHub
commit b204d167c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
activestorage/CHANGELOG.md
View file

@ -1,3 +1,10 @@
* `ActiveStorage::Service::AzureStorageService` only handles specifically
relevant types of `Azure::Core::Http::HTTPError`. It previously obscured
other types of `HTTPError`, which is the azure-storage gem’s catch-all
exception class.
*Cameron Bothner*
* `ActiveStorage::DiskController#show` generates a 404 Not Found response when * `ActiveStorage::DiskController#show` generates a 404 Not Found response when
the requested file is missing from the disk service. It previously raised the requested file is missing from the disk service. It previously raised
`Errno::ENOENT`. `Errno::ENOENT`.

20
activestorage/lib/active_storage/service/azure_storage_service.rb
View file

@ -19,10 +19,8 @@ module ActiveStorage
def upload(key, io, checksum: nil) def upload(key, io, checksum: nil)
instrument :upload, key: key, checksum: checksum do instrument :upload, key: key, checksum: checksum do
begin handle_errors do
blobs.create_block_blob(container, key, IO.try_convert(io) || io, content_md5: checksum) blobs.create_block_blob(container, key, IO.try_convert(io) || io, content_md5: checksum)
rescue Azure::Core::Http::HTTPError
raise ActiveStorage::IntegrityError
end end
end end
end end
@ -55,7 +53,8 @@ module ActiveStorage
instrument :delete, key: key do instrument :delete, key: key do
begin begin
blobs.delete_blob(container, key) blobs.delete_blob(container, key)
rescue Azure::Core::Http::HTTPError rescue Azure::Core::Http::HTTPError => e
raise unless e.type == "BlobNotFound"
# Ignore files already deleted # Ignore files already deleted
end end
end end
@ -128,8 +127,12 @@ module ActiveStorage
def blob_for(key) def blob_for(key)
blobs.get_blob_properties(container, key) blobs.get_blob_properties(container, key)
rescue Azure::Core::Http::HTTPError rescue Azure::Core::Http::HTTPError => e
false if e.type == "BlobNotFound"
false
else
raise
end
end end
def format_expiry(expires_in) def format_expiry(expires_in)
@ -155,8 +158,11 @@ module ActiveStorage
def handle_errors def handle_errors
yield yield
rescue Azure::Core::Http::HTTPError => e rescue Azure::Core::Http::HTTPError => e
if e.type == "BlobNotFound" case e.type
when "BlobNotFound"
raise ActiveStorage::FileNotFoundError raise ActiveStorage::FileNotFoundError
when "Md5Mismatch"
raise ActiveStorage::IntegrityError
else else
raise raise
end end