kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ignore emails with Auto-Submitted: auto-replied header (#10607). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9390 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-04-13 16:55:04 +00:00
parent dd8d8e0560
commit 4edc30d157
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/models/mail_handler.rb
View File

@ -42,6 +42,12 @@ class MailHandler < ActionMailer::Base
super email super email
end end
cattr_accessor :ignored_emails_headers
@@ignored_emails_headers = {
'X-Auto-Response-Suppress' => 'OOF',
'Auto-Submitted' => 'auto-replied'
}
# Processes incoming emails # Processes incoming emails
# Returns the created object (eg. an issue, a message) or false # Returns the created object (eg. an issue, a message) or false
def receive(email) def receive(email)
@ -54,13 +60,16 @@ class MailHandler < ActionMailer::Base
end end
return false return false
end end
# Ignore out-of-office emails # Ignore auto generated emails
if email.header_string("X-Auto-Response-Suppress") == 'OOF' self.class.ignored_emails_headers.each do |key, ignored_value|
value = email.header_string(key)
if value && value.to_s.downcase == ignored_value.downcase
if logger && logger.info if logger && logger.info
logger.info "MailHandler: ignoring out-of-office email" logger.info "MailHandler: ignoring email with #{key}:#{value} header"
end end
return false return false
end end
end
@user = User.find_by_mail(sender_email) if sender_email.present? @user = User.find_by_mail(sender_email) if sender_email.present?
if @user && !@user.active? if @user && !@user.active?
if logger && logger.info if logger && logger.info

12
test/unit/mail_handler_test.rb
View File

@ -359,12 +359,18 @@ class MailHandlerTest < ActiveSupport::TestCase
end end
end end
def test_should_ignore_oof_emails def test_should_ignore_auto_replied_emails
[
"X-Auto-Response-Suppress: OOF",
"Auto-Submitted: auto-replied",
"Auto-Submitted: Auto-Replied"
].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 = "X-Auto-Response-Suppress: OOF\n" + raw raw = header + "\n" + raw
assert_no_difference 'Issue.count' do assert_no_difference 'Issue.count' do
assert_equal false, MailHandler.receive(raw) assert_equal false, MailHandler.receive(raw), "email with #{header} header was not ignored"
end
end end
end end