Skip to content

Replica: Feat: Add message token to return path #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lucaforni wants to merge 4 commits into from
Closed

Replica: Feat: Add message token to return path #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
503e25a
Jmdunsing patch 1 (#11)
jmdunsing Mar 6, 2024
c66f007
Revert "Jmdunsing patch 1 (#11)" (#13)
jmdunsing Mar 6, 2024
3dc769c
feat: Add message token to return path
jmdunsing Mar 6, 2024
0e0bd15
test: update smtp_sender_spect.rb to reflect design changes to mail from
jmdunsing Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/senders/smtp_sender.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ def determine_mail_from_for_message(message)
# If the domain has a valid custom return path configured, return
# that.
if message.domain.return_path_status == "OK"
return "#{message.server.token}@#{message.domain.return_path_domain}"
return "#{message.server.token}+#{message.token}@#{message.domain.return_path_domain}"
end

"#{message.server.token}@#{Postal::Config.dns.return_path_domain}"
"#{message.server.token}+#{message.token}@#{Postal::Config.dns.return_path_domain}"
end

# Return the RCPT TO to use for the given message in this sending session
Expand Down
6 changes: 3 additions & 3 deletions spec/senders/smtp_sender_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
sender.send_message(message)
expect(sender.endpoints.last).to have_received(:send_message).with(
kind_of(String),
"#{server.token}@#{domain.return_path_domain}",
"#{server.token}+#{message.token}@#{domain.return_path_domain}",
["john@example.com"]
)
end
Expand All @@ -272,7 +272,7 @@
sender.send_message(message)
expect(sender.endpoints.last).to have_received(:send_message).with(
kind_of(String),
"#{server.token}@#{Postal::Config.dns.return_path_domain}",
"#{server.token}+#{message.token}@#{Postal::Config.dns.return_path_domain}",
["john@example.com"]
)
end
Expand Down Expand Up @@ -306,7 +306,7 @@
it "adds the resent-sender header" do
sender.send_message(message)
expect(sender.endpoints.last).to have_received(:send_message).with(
"Resent-Sender: #{server.token}@#{Postal::Config.dns.return_path_domain}\r\n#{message.raw_message}",
"Resent-Sender: #{server.token}+#{message.token}@#{Postal::Config.dns.return_path_domain}\r\n#{message.raw_message}",
kind_of(String),
kind_of(Array)
)
Expand Down
Loading