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 40EC71FF173 for <inbox@lore.proxmox.com>; Mon, 10 Mar 2025 19:06:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 659691FBFA; Mon, 10 Mar 2025 19:06:51 +0100 (CET) From: Stoiko Ivanov <s.ivanov@proxmox.com> To: pmg-devel@lists.proxmox.com Date: Mon, 10 Mar 2025 19:06:12 +0100 Message-Id: <20250310180612.21877-3-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310180612.21877-1-s.ivanov@proxmox.com> References: <20250310180612.21877-1-s.ivanov@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.063 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 2/2] local generated mail: add Auto-Submitted header 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> following the implementation in the proxmox-sendmail crate: bcdcb181 ("fix #4162: sys: added `auto-submitted` header to email body") this patch adds Auto-Submitted headers to the mail generated by PMG (notifications, reports, bounces). reports and notifications get a 'auto-generated' value set, while bounces 'auto-replied'. The latter is following postfix' bounces. see https://www.rfc-editor.org/rfc/rfc3834.html and https://bugzilla.proxmox.com/show_bug.cgi?id=4162 the header is added after MIME::Entity->build(), because this has a list of allowed headers that are accepted as arguments: https://metacpan.org/pod/MIME::Entity#Construction Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> --- src/PMG/RuleDB/Notify.pm | 2 ++ src/PMG/SMTP.pm | 2 ++ src/PMG/Utils.pm | 3 +++ 3 files changed, 7 insertions(+) diff --git a/src/PMG/RuleDB/Notify.pm b/src/PMG/RuleDB/Notify.pm index b74675b..1ed1a20 100644 --- a/src/PMG/RuleDB/Notify.pm +++ b/src/PMG/RuleDB/Notify.pm @@ -244,6 +244,8 @@ sub execute { Type => "message/rfc822",); } + $top->head()->add('Auto-Submitted', 'auto-generated'); + if ($msginfo->{testmode}) { my $fh = $msginfo->{test_fh}; print $fh "notify: $self->{to}\n"; diff --git a/src/PMG/SMTP.pm b/src/PMG/SMTP.pm index 77a707a..3fcfea2 100644 --- a/src/PMG/SMTP.pm +++ b/src/PMG/SMTP.pm @@ -290,6 +290,8 @@ EOF Date => strftime("%a, %d %b %Y %T %z", localtime()), Subject => 'Undelivered Mail'); + $ndr->head()->add('Auto-Submitted', 'auto-replied'); + $ndr->attach( Data => $ndr_text, Type => 'text/plain; charset=utf-8', diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm index ab0e6ac..d4d2b87 100644 --- a/src/PMG/Utils.pm +++ b/src/PMG/Utils.pm @@ -1328,6 +1328,9 @@ sub finalize_report { Type => 'text/plain; charset=utf-8', Encoding => '8-bit'); } + + $top->head()->add('Auto-Submitted', 'auto-generated'); + if ($debug) { $top->print(); return; -- 2.39.5 _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel