jro_apps/redmine Commit - r11937:cfc05d310e71

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

Jean-Philippe Lang -

r11937:cfc05d310e71

parent child

Context file:

r11937:cfc05d310e71

app/models/mail_handler.rb +14 0

               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,
                 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)

app/views/settings/_mail_handler.html.erb +5 0

                 <%= 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">

config/locales/en.yml +1 0

               setting_non_working_week_days: Non-working days
               setting_jsonp_enabled: Enable JSONP support
               setting_default_projects_tracker_ids: Default trackers for new projects
+              setting_mail_handler_excluded_filenames: Exclude attachments by name
               permission_add_project: Create project
               permission_add_subprojects: Create subprojects

config/locales/fr.yml +1 0

               setting_non_working_week_days: Jours non travaillés
               setting_jsonp_enabled: Activer le support JSONP
               setting_default_projects_tracker_ids: Trackers par défaut pour les nouveaux projets
+              setting_mail_handler_excluded_filenames: Exclure les fichiers attachés par leur nom
               permission_add_project: Créer un projet
               permission_add_subprojects: Créer des sous-projets

config/settings.yml +2 0

               - issue_updated
             mail_handler_body_delimiters:
               default: ''
+            mail_handler_excluded_filenames:
+              default: ''
             mail_handler_api_enabled:
               default: 0
             mail_handler_api_key:

test/unit/mail_handler_test.rb +18 0

@@ -759,6 +759,24 class MailHandlerTest < ActiveSupport::TestCase
759	end	759	end
760	end	760	end
761		761
		762	def test_attachments_that_match_mail_handler_excluded_filenames_should_be_ignored
		763	with_settings :mail_handler_excluded_filenames => '.vcf, .jpg' do
		764	issue = submit_email('ticket_with_attachment.eml', :issue => {:project => 'onlinestore'})
		765	assert issue.is_a?(Issue)
		766	assert !issue.new_record?
		767	assert_equal 0, issue.reload.attachments.size
		768	end
		769	end
		770
		771	def test_attachments_that_do_not_match_mail_handler_excluded_filenames_should_be_attached
		772	with_settings :mail_handler_excluded_filenames => '.vcf, .gif' do
		773	issue = submit_email('ticket_with_attachment.eml', :issue => {:project => 'onlinestore'})
		774	assert issue.is_a?(Issue)
		775	assert !issue.new_record?
		776	assert_equal 1, issue.reload.attachments.size
		777	end
		778	end
		779
762	def test_email_with_long_subject_line	780	def test_email_with_long_subject_line
763	issue = submit_email('ticket_with_long_subject.eml')	781	issue = submit_email('ticket_with_long_subject.eml')
764	assert issue.is_a?(Issue)	782	assert issue.is_a?(Issue)

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages