github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-04 23:36:11 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Failed to show details about some bounced emails

Browse Source 
Bounces sent to reply_by_email_address could not be found.
This commit is contained in:
Gerhard Schlager
2019-03-26 17:59:56 +01:00
parent de011b53b5
commit 4f04ae5692
4 changed files with 93 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/email/sender.rb
View File

@ -165,13 +165,13 @@ module Email
@message.header['List-Post'] = "<mailto:#{email}>"
end
if SiteSetting.reply_by_email_address.present? && SiteSetting.reply_by_email_address["+"]
if Email::Sender.bounceable_reply_address?
email_log.bounce_key = SecureRandom.hex
# WARNING: RFC claims you can not set the Return Path header, this is 100% correct
# however Rails has special handling for this header and ends up using this value
# as the Envelope From address so stuff works as expected
@message.header[:return_path] = SiteSetting.reply_by_email_address.sub("%{reply_key}", "verp-#{email_log.bounce_key}")
@message.header[:return_path] = Email::Sender.bounce_address(email_log.bounce_key)
end
email_log.post_id = post_id if post_id.present?
@ -282,5 +282,12 @@ module Email
header_value('Reply-To').gsub!("%{reply_key}", reply_key)
end
def self.bounceable_reply_address?
SiteSetting.reply_by_email_address.present? && SiteSetting.reply_by_email_address["+"]
end
def self.bounce_address(bounce_key)
SiteSetting.reply_by_email_address.sub("%{reply_key}", "verp-#{bounce_key}")
end
end
end