From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 8 Jun 2023 07:32:30 +0000 (+0200)
Subject: Fix attachments getting processed despite failing content-type validation
X-Git-Url: https://awoo.directory/?a=commitdiff_plain;h=6e72fb5a7935f809302083633139b1c4b252f320;p=mastodon.git

Fix attachments getting processed despite failing content-type validation

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---

diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb
index 01fae4236..35819003e 100644
--- a/app/models/concerns/attachmentable.rb
+++ b/app/models/concerns/attachmentable.rb
@@ -22,15 +22,14 @@ module Attachmentable
 
   included do
     def self.has_attached_file(name, options = {}) # rubocop:disable Naming/PredicateName
-      options = { validate_media_type: false }.merge(options)
       super(name, options)
-      send(:"before_#{name}_post_process") do
+
+      send(:"before_#{name}_validate") do
         attachment = send(name)
         check_image_dimension(attachment)
         set_file_content_type(attachment)
         obfuscate_file_name(attachment)
         set_file_extension(attachment)
-        Paperclip::Validators::MediaTypeSpoofDetectionValidator.new(attributes: [name]).validate(self)
       end
     end
   end