Exclude attachments from incoming emails based on file name (#3413).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12167 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2013-09-29 11:50:49 +00:00
parent 2c97f9ecde
commit cfc05d310e
6 changed files with 41 additions and 0 deletions
+14
View File
@@ -267,6 +267,7 @@ class MailHandler < ActionMailer::Base
def add_attachments(obj)
if email.attachments && email.attachments.any?
email.attachments.each do |attachment|
next unless accept_attachment?(attachment)
obj.attachments << Attachment.create(:container => obj,
:file => attachment.decoded,
:filename => attachment.filename,
@@ -276,6 +277,19 @@ class MailHandler < ActionMailer::Base
end
end
# Returns false if the +attachment+ of the incoming email should be ignored
def accept_attachment?(attachment)
@excluded ||= Setting.mail_handler_excluded_filenames.to_s.split(',').map(&:strip).reject(&:blank?)
@excluded.each do |pattern|
regexp = %r{\A#{Regexp.escape(pattern).gsub("\\*", ".*")}\z}i
if attachment.filename.to_s =~ regexp
logger.info "MailHandler: ignoring attachment #{attachment.filename} matching #{pattern}"
return false
end
end
true
end
# Adds To and Cc as watchers of the given object if the sender has the
# appropriate permission
def add_watchers(obj)
@@ -5,6 +5,11 @@
<%= setting_text_area :mail_handler_body_delimiters, :rows => 5 %>
<em class="info"><%= l(:text_line_separated) %></em>
</p>
<p>
<%= setting_text_field :mail_handler_excluded_filenames, :size => 60 %>
<em class="info"><%= l(:text_comma_separated) %>
<%= l(:label_example) %>: smime.p7s, *.vcf</em>
</p>
</div>
<div class="box tabular settings">