[pmg-devel] [PATCH pmg-api 4/7] ruledb: use admin-mail-from where sensible

[Stoiko Ivanov]

use the new setting as From header for notifications, but keep
the envelope-sender fixed as 'postmaster'.

add a comment that we do not want to sign a mail released from the
quarantine, as it remains the only use of 'postmaster' without this
fallback, but as above - only for the envelope-sender.

the admin-mail-from setting has to be carried through pmg-smtp-filter
in the msginfo variable as was done for the dkim settings as well.

Signed-off-by: Stoiko Ivanov <s.ivanov at proxmox.com>
---
 src/PMG/Quarantine.pm    | 1 +
 src/PMG/RuleDB/Notify.pm | 6 +++---
 src/bin/pmg-smtp-filter  | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/PMG/Quarantine.pm b/src/PMG/Quarantine.pm
index 77f64a0..4f756d5 100644
--- a/src/PMG/Quarantine.pm
+++ b/src/PMG/Quarantine.pm
@@ -116,6 +116,7 @@ sub deliver_quarantined_mail {
     $entity->head->delete('Delivered-To');
     $entity->head->delete('Return-Path');
 
+    # mail delivered from quarantine will not be DKIM signed as locally originating mails
     my $sender = 'postmaster'; # notify postmaster if something fails
 
     eval {
diff --git a/src/PMG/RuleDB/Notify.pm b/src/PMG/RuleDB/Notify.pm
index c024840..1d31985 100644
--- a/src/PMG/RuleDB/Notify.pm
+++ b/src/PMG/RuleDB/Notify.pm
@@ -206,7 +206,7 @@ sub execute {
 
     my $original;
 
-    my $from = 'postmaster';
+    my $from_header = $msginfo->{admin_mail_from} // 'postmaster';
 
     my $rulename = encode('UTF-8', $vars->{RULE} // 'unknown');
 
@@ -227,7 +227,7 @@ sub execute {
     my $top = MIME::Entity->build(
 	Encoding    => 'quoted-printable',
 	Charset => 'UTF-8',
-	From    => $from,
+	From    => $from_header,
 	To      => $to,
 	Subject => encode_mimewords(encode('UTF-8', $subject), "Charset" => "UTF-8"),
 	Data => encode('UTF-8', $body));
@@ -257,7 +257,7 @@ sub execute {
     } else {
 	my @targets = split(/\s*,\s*/, $to);
 	my $qid = PMG::Utils::reinject_local_mail(
-	    $top, $from, \@targets, undef, $msginfo->{fqdn});
+	    $top, 'postmaster', \@targets, undef, $msginfo->{fqdn});
 	foreach (@targets) {
 	    my $target = encode('UTF-8', $_);
 	    if ($qid) {
diff --git a/src/bin/pmg-smtp-filter b/src/bin/pmg-smtp-filter
index 60737ea..88690dd 100755
--- a/src/bin/pmg-smtp-filter
+++ b/src/bin/pmg-smtp-filter
@@ -646,6 +646,7 @@ sub handle_smtp {
 	    $msginfo->{dkim}->{sign_all} = $pmg_cfg->get('admin', 'dkim_sign_all_mail');
 	    $msginfo->{dkim}->{selector} = $pmg_cfg->get('admin', 'dkim_selector');
 	}
+	$msginfo->{admin_mail_from} = $pmg_cfg->get('admin', 'admin-mail-from', 1);
 
 	$msginfo->{hostname} = PVE::INotify::nodename();
 	my $resolv = PVE::INotify::read_file('resolvconf');
-- 
2.39.5