public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added option to disable the sender header when using VERP

Browse source
This commit is contained in:
witzig 2017-05-02 23:51:55 +02:00
parent c4b80fff93
commit 85cefc14e8
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/default.toml
View file

@ -103,6 +103,12 @@ db=5
enabled=false enabled=false
port=2525 port=2525
host="0.0.0.0" host="0.0.0.0"
# With DMARC, the Return-Path and From address must match the same domain.
# By default we get around this by using the VERP address in the Sender header,
# with the side effect that some email clients diplay an ugly "on behalf of" message.
# You can safely disable this Sender header if you're not using DMARC or your
# VERP hostname is in the same domain as the From address.
# disablesenderheader=true
[testserver] [testserver]
# Starts a vanity server that redirects all mail to /dev/null # Starts a vanity server that redirects all mail to /dev/null

3
services/sender.js
View file

@ -318,6 +318,7 @@ function formatMessage(message, callback) {
} }
let useVerp = config.verp.enabled && configItems.verpUse && configItems.verpHostname; let useVerp = config.verp.enabled && configItems.verpUse && configItems.verpHostname;
let useVerpSenderHeader = useVerp && config.verp.disablesenderheader !== true;
fields.list(list.id, (err, fieldList) => { fields.list(list.id, (err, fieldList) => {
if (err) { if (err) {
return callback(err); return callback(err);
@ -389,7 +390,7 @@ function formatMessage(message, callback) {
name: [].concat(message.subscription.firstName || []).concat(message.subscription.lastName || []).join(' '), name: [].concat(message.subscription.firstName || []).concat(message.subscription.lastName || []).join(' '),
address: message.subscription.email address: message.subscription.email
}, },
sender: useVerp ? campaignAddress + '@' + configItems.verpHostname : false, sender: useVerpSenderHeader ? campaignAddress + '@' + configItems.verpHostname : false,
envelope: useVerp ? { envelope: useVerp ? {
from: campaignAddress + '@' + configItems.verpHostname, from: campaignAddress + '@' + configItems.verpHostname,