always strip s/mime signatures in incoming emails

This commit is contained in:
Régis Hanol
2016-06-27 22:26:05 +02:00
parent 32b22996d0
commit 376881845c
2 changed files with 8 additions and 1 deletions

View File

@ -5,7 +5,11 @@ module Validators; end
class Validators::UploadValidator < ActiveModel::Validator
def validate(upload)
return true if upload.is_attachment_for_group_message && SiteSetting.allow_all_attachments_for_group_messages
# allow all attachments except S/MIME signatures
# cf. https://meta.discourse.org/t/strip-s-mime-signatures/46371
if upload.is_attachment_for_group_message && SiteSetting.allow_all_attachments_for_group_messages
return upload.original_filename != "smime.p7s".freeze
end
extension = File.extname(upload.original_filename)[1..-1] || ""