From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pmg-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id B856F1FF15E for <inbox@lore.proxmox.com>; Tue, 25 Feb 2025 00:25:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DEB82114DD; Tue, 25 Feb 2025 00:25:03 +0100 (CET) From: Stoiko Ivanov <s.ivanov@proxmox.com> To: pmg-devel@lists.proxmox.com Date: Tue, 25 Feb 2025 00:24:48 +0100 Message-Id: <20250224232451.399803-4-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 3/7] smtp-engine: use admin-mail-from as from header for bounces X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion <pmg-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pmg-devel>, <mailto:pmg-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pmg-devel/> List-Post: <mailto:pmg-devel@lists.proxmox.com> List-Help: <mailto:pmg-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel>, <mailto:pmg-devel-request@lists.proxmox.com?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pmg-devel-bounces@lists.proxmox.com Sender: "pmg-devel" <pmg-devel-bounces@lists.proxmox.com> generate_ndr is currently only used to generate a bounce-mail if the following occur: * email is blocked only for part of the receivers * before-queue-filtering is active - in the after-queue case postfix generates the bounces for us. Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> --- src/PMG/SMTP.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/PMG/SMTP.pm b/src/PMG/SMTP.pm index b7bc5d3..f387fcb 100644 --- a/src/PMG/SMTP.pm +++ b/src/PMG/SMTP.pm @@ -185,7 +185,8 @@ sub loop { $self->reply ("250 2.5.0 OK ($queueid)"); if ($cfg->get('mail', 'ndr_on_block')) { my $dnsinfo = $cfg->get_host_dns_info(); - generate_ndr($self->{from}, [ @reject_rec ], $dnsinfo->{fqdn}, $queueid) if scalar(@reject_rec); + my $from_header = $cfg->get('admin', 'admin-mail-from', 1) // '<postmaster>'; + generate_ndr($self->{from}, [ @reject_rec ], $dnsinfo->{fqdn}, $queueid, $from_header) if scalar(@reject_rec); } } else { $self->reply ("451 4.4.0 detected undelivered mail ($queueid)"); @@ -265,7 +266,7 @@ sub save_data { } sub generate_ndr { - my ($sender, $receivers, $hostname, $queueid) = @_; + my ($sender, $receivers, $hostname, $queueid, $from_header) = @_; my $ndr_text = <<EOF This is the mail system at host $hostname. @@ -284,7 +285,7 @@ EOF my $ndr = MIME::Entity->build( Type => 'multipart/report; report-type=delivery-status;', To => $sender, - From => 'postmaster', + From => $from_header, Subject => 'Undelivered Mail'); $ndr->attach( -- 2.39.5 _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel