meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

only ignore undesirable Auto-Submitted headers defined in RFC3834 (#16190)

Browse Source 
Contributed by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@13206 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2014-07-02 16:13:18 +00:00
parent f6abc06eee
commit 4b55bb913c
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/mail_handler.rb
View File

@ -74,7 +74,7 @@ class MailHandler < ActionMailer::Base
cattr_accessor :ignored_emails_headers cattr_accessor :ignored_emails_headers
@@ignored_emails_headers = { @@ignored_emails_headers = {
'X-Auto-Response-Suppress' => 'oof', 'X-Auto-Response-Suppress' => 'oof',
'Auto-Submitted' => /^auto-/ 'Auto-Submitted' => /^auto-(replied|generated)/
} }
# Processes incoming emails # Processes incoming emails

16
test/unit/mail_handler_test.rb
View File

@ -637,8 +637,7 @@ class MailHandlerTest < ActiveSupport::TestCase
"X-Auto-Response-Suppress: OOF", "X-Auto-Response-Suppress: OOF",
"Auto-Submitted: auto-replied", "Auto-Submitted: auto-replied",
"Auto-Submitted: Auto-Replied", "Auto-Submitted: Auto-Replied",
"Auto-Submitted: auto-generated", "Auto-Submitted: auto-generated"
"Auto-Submitted: auto-forwarded"
].each do |header| ].each do |header|
raw = IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml')) raw = IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml'))
raw = header + "\n" + raw raw = header + "\n" + raw
@ -649,6 +648,19 @@ class MailHandlerTest < ActiveSupport::TestCase
end end
end end
test "should not ignore Auto-Submitted headers not defined in RFC3834" do
[
"Auto-Submitted: auto-forwarded"
].each do |header|
raw = IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml'))
raw = header + "\n" + raw
assert_difference 'Issue.count', 1 do
assert_not_nil MailHandler.receive(raw), "email with #{header} header was ignored"
end
end
end
def test_add_issue_should_send_email_notification def test_add_issue_should_send_email_notification
Setting.notified_events = ['issue_added'] Setting.notified_events = ['issue_added']
ActionMailer::Base.deliveries.clear ActionMailer::Base.deliveries.clear