0ct0pu5/anonaddy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated DKIM signing for custom domains

Browse source
This commit is contained in:
Will Browning 2019-12-20 12:47:52 +00:00
parent 9a48650ae2
commit d1b25999bb
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Mail/ForwardEmail.php
View file

@ -74,7 +74,6 @@ class ForwardEmail extends Mailable implements ShouldQueue
$this->dkimSigner = new Swift_Signers_DKIMSigner(config('anonaddy.dkim_signing_key'), $this->alias->domain, config('anonaddy.dkim_selector')); $this->dkimSigner = new Swift_Signers_DKIMSigner(config('anonaddy.dkim_signing_key'), $this->alias->domain, config('anonaddy.dkim_selector'));
$this->dkimSigner->ignoreHeader('List-Unsubscribe'); $this->dkimSigner->ignoreHeader('List-Unsubscribe');
$this->dkimSigner->ignoreHeader('Return-Path'); $this->dkimSigner->ignoreHeader('Return-Path');
$this->dkimSigner->setBodyCanon('relaxed');
} else { } else {
$fromEmail = config('mail.from.address'); $fromEmail = config('mail.from.address');
$returnPath = config('anonaddy.return_path'); $returnPath = config('anonaddy.return_path');
@ -109,9 +108,7 @@ class ForwardEmail extends Mailable implements ShouldQueue
if ($this->fingerprint) { if ($this->fingerprint) {
$message->attachSigner($this->openpgpsigner); $message->attachSigner($this->openpgpsigner);
} } elseif ($this->dkimSigner) { // TODO fix issue with failing DKIM signature if message is encrypted
if ($this->dkimSigner) {
$message->attachSigner($this->dkimSigner); $message->attachSigner($this->dkimSigner);
} }
}); });

1
app/Mail/ReplyToEmail.php
View file

@ -54,7 +54,6 @@ class ReplyToEmail extends Mailable implements ShouldQueue
$this->dkimSigner = new Swift_Signers_DKIMSigner(config('anonaddy.dkim_signing_key'), $this->alias->domain, config('anonaddy.dkim_selector')); $this->dkimSigner = new Swift_Signers_DKIMSigner(config('anonaddy.dkim_signing_key'), $this->alias->domain, config('anonaddy.dkim_selector'));
$this->dkimSigner->ignoreHeader('Return-Path'); $this->dkimSigner->ignoreHeader('Return-Path');
$this->dkimSigner->setBodyCanon('relaxed');
} else { } else {
$fromEmail = config('mail.from.address'); $fromEmail = config('mail.from.address');
$returnPath = config('anonaddy.return_path'); $returnPath = config('anonaddy.return_path');