meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-02-28 14:31:48 +00:00
Code Issues Releases Wiki Activity

Mail handler should not ignore emails with x-auto-response-suppress header (#19558).

Browse Source 
Patch by Sebastian Paluch.

git-svn-id: http://svn.redmine.org/redmine/trunk@14159 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2015-04-11 07:15:38 +00:00
parent 11e8dc263f
commit 09eef4e75c
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/mail_handler.rb
View File

@ -73,7 +73,6 @@ 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|all)/,
'Auto-Submitted' => /\Aauto-(replied|generated)/, 'Auto-Submitted' => /\Aauto-(replied|generated)/,
'X-Autoreply' => 'yes' 'X-Autoreply' => 'yes'
} }

2
app/models/mailer.rb
View File

@ -389,7 +389,7 @@ class Mailer < ActionMailer::Base
headers.reverse_merge! 'X-Mailer' => 'Redmine', headers.reverse_merge! 'X-Mailer' => 'Redmine',
'X-Redmine-Host' => Setting.host_name, 'X-Redmine-Host' => Setting.host_name,
'X-Redmine-Site' => Setting.app_title, 'X-Redmine-Site' => Setting.app_title,
'X-Auto-Response-Suppress' => 'OOF', 'X-Auto-Response-Suppress' => 'All',
'Auto-Submitted' => 'auto-generated', 'Auto-Submitted' => 'auto-generated',
'From' => Setting.mail_from, 'From' => Setting.mail_from,
'List-Id' => "<#{Setting.mail_from.to_s.gsub('@', '.')}>" 'List-Id' => "<#{Setting.mail_from.to_s.gsub('@', '.')}>"

1
test/unit/mail_handler_test.rb
View File

@ -629,7 +629,6 @@ class MailHandlerTest < ActiveSupport::TestCase
def test_should_ignore_auto_replied_emails def test_should_ignore_auto_replied_emails
MailHandler.any_instance.expects(:dispatch).never MailHandler.any_instance.expects(:dispatch).never
[ [
"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",

2
test/unit/mailer_test.rb
View File

@ -197,7 +197,7 @@ class MailerTest < ActiveSupport::TestCase
Mailer.deliver_issue_add(issue) Mailer.deliver_issue_add(issue)
mail = last_email mail = last_email
assert_not_nil mail assert_not_nil mail
assert_equal 'OOF', mail.header['X-Auto-Response-Suppress'].to_s assert_equal 'All', mail.header['X-Auto-Response-Suppress'].to_s
assert_equal 'auto-generated', mail.header['Auto-Submitted'].to_s assert_equal 'auto-generated', mail.header['Auto-Submitted'].to_s
assert_equal '<redmine.example.net>', mail.header['List-Id'].to_s assert_equal '<redmine.example.net>', mail.header['List-Id'].to_s
end end