FEATURE: new email attachment blacklists site settings

This commit is contained in:
Régis Hanol
2016-08-03 17:55:54 +02:00
parent cb809784df
commit e92f5e4fbf
5 changed files with 24 additions and 5 deletions

View File

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