From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 19 Apr 2021 16:41:29 +0000 (+0200)
Subject: Add Message-ID header to outgoing emails (#16076)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=1efcbb9cfe36d4428ef6af988bb0d7b25ace3971;p=mastodon.git

Add Message-ID header to outgoing emails (#16076)

* Add Message-ID header to outgoing emails

* Use email domain name from SMTP_FROM_ADDRESS, fallback on WEB_DOMAIN on failure

* Use notifications@localhost as fallback for SMTP_FROM_ADDRESS, do not catch parse errors
---

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 22be14749..df6b07d77 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -90,9 +90,12 @@ Rails.application.configure do
   config.action_mailer.perform_caching = false
 
   # E-mails
+  outgoing_email_address = ENV.fetch('SMTP_FROM_ADDRESS', 'notifications@localhost')
+  outgoing_mail_domain   = Mail::Address.new(outgoing_email_address).domain
   config.action_mailer.default_options = {
-    from: ENV.fetch('SMTP_FROM_ADDRESS', 'notifications@localhost'),
-    reply_to: ENV['SMTP_REPLY_TO']
+    from: outgoing_email_address,
+    reply_to: ENV['SMTP_REPLY_TO'],
+    'Message-ID': -> { "<#{Mail.random_tag}@#{outgoing_mail_domain}>" },
   }
 
   config.action_mailer.smtp_settings = {