specter/mastodon
1
0
Fork 0
forked from fedi/mastodon
Code Pull requests Activity

Fix ogg vorbis files with a cover art not being correctly processed (#14255)

Browse source
This commit is contained in:
ThibG 2020-07-07 16:32:14 +02:00 committed by GitHub
parent 6e25574ce5
commit 701e5b9a19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/paperclip/media_type_spoof_detector_extensions.rb
View file

@ -2,8 +2,16 @@
module Paperclip module Paperclip
module MediaTypeSpoofDetectorExtensions module MediaTypeSpoofDetectorExtensions
def calculated_content_type def mapping_override_mismatch?
@calculated_content_type ||= type_from_mime_magic || type_from_file_command !Array(mapped_content_type).include?(calculated_content_type) && !Array(mapped_content_type).include?(type_from_mime_magic)
end
def calculated_media_type_from_mime_magic
@calculated_media_type_from_mime_magic ||= type_from_mime_magic.split('/').first
end
def calculated_type_mismatch?
!media_types_from_name.include?(calculated_media_type) && !media_types_from_name.include?(calculated_media_type_from_mime_magic)
end end
def type_from_mime_magic def type_from_mime_magic