From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 51F511FF15E for ; Tue, 25 Feb 2025 00:25:06 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BCFA211500; Tue, 25 Feb 2025 00:25:03 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Tue, 25 Feb 2025 00:24:49 +0100 Message-Id: <20250224232451.399803-5-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250224232451.399803-1-s.ivanov@proxmox.com> References: <20250224232451.399803-1-s.ivanov@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.066 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pmg-devel] [PATCH pmg-api 4/7] ruledb: use admin-mail-from where sensible X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pmg-devel-bounces@lists.proxmox.com Sender: "pmg-devel" 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 --- 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 _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel