From c6fb8d223bdeaccdc9e8bdbd031fe3f325ac0677 Mon Sep 17 00:00:00 2001 From: Joost Kalwij - van Horssen Date: Wed, 22 Mar 2023 15:01:04 +0100 Subject: [PATCH] Make resent-sender header optional (#2384) --- config/postal.defaults.yml | 1 + lib/postal/smtp_sender.rb | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config/postal.defaults.yml b/config/postal.defaults.yml index c19c65d..f788e97 100644 --- a/config/postal.defaults.yml +++ b/config/postal.defaults.yml @@ -17,6 +17,7 @@ general: use_local_ns_for_domains: false default_spam_threshold: 5.0 default_spam_failure_threshold: 20.0 + use_resent_sender_header: true web_server: bind_address: 127.0.0.1 diff --git a/lib/postal/smtp_sender.rb b/lib/postal/smtp_sender.rb index c2fd4b1..0d5ebe6 100644 --- a/lib/postal/smtp_sender.rb +++ b/lib/postal/smtp_sender.rb @@ -140,7 +140,11 @@ module Postal else mail_from = "#{message.server.token}@#{Postal.config.dns.return_path}" end - raw_message = "Resent-Sender: #{mail_from}\r\n" + message.raw_message + if Postal.config.general.use_resent_sender_header + raw_message = "Resent-Sender: #{mail_from}\r\n" + message.raw_message + else + raw_message = message.raw_message + end tries = 0 begin if @smtp_client.nil?