Fix some MP3 files not being recognized as such #12809
Conversation
ClearlyClaire
force-pushed
the
fixes/mp3-wrong-magic
branch
from
06679cd
to
c6add02
Compare
|
Big issue for me. Would help a lot to get it merged before 3.1 cc @Gargron |
|
Is there an upstream bug? It is nice to have a temporary workaround but this is certainly not the right solution here (big thanks @ThibG for getting it sorted out). |
| @@ -63,7 +63,12 @@ def appropriate_extension(attachment) | |||
| end | |||
|
|
|||
| def calculated_content_type(attachment) | |||
| content_type = Paperclip.run('file', '-b --mime :file', file: attachment.queued_for_write[:original].path).split(/[:;\s]+/).first.chomp | |||
| content_types = Paperclip.run('file', '-b -k -r --mime :file', file: attachment.queued_for_write[:original].path).split("\n- ") | |||
| content_types -= ['application/x-font-gdos'] | |||
There was a problem hiding this comment.
I would feel better if you aligned the = and put the mime type into a constant variable with a self-explaining name like BOGUS_MIME_TYPES or something.
There was a problem hiding this comment.
Addressed this just in case, but I think this PR isn't needed anymore, as the underlying bug in file has been fixed along with security fixes a while ago.
There was a problem hiding this comment.
Ah, in that case the PR can be closed. The workaround is still concerning to me because what if someone tried to upload a real font file, it would then be accepted and treated as MP3...
There was a problem hiding this comment.
It probably wouldn't, as the font file would probably not be detected as mp3 (the bug happens because both the mp3 magic and the font thing are detected, and the font thing used to take precedence even though it was unreliable and uses of that font format are incredibly rare).
Closing.
Work around libmagic mistakenly identifying some obscure font format for some files, by not stopping on the first guess, and taking the first that is *not* that file format. Fixes mastodon#12693
ClearlyClaire
force-pushed
the
fixes/mp3-wrong-magic
branch
from
c6add02
to
7aeca6b
Compare
Work around libmagic mistakenly identifying some obscure font format for some
files, by not stopping on the first guess, and taking the first that is not
that file format.
Fixes #12693