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 26D6A1FF16B for <inbox@lore.proxmox.com>; Thu, 17 Apr 2025 16:31:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AA1861E4AA; Thu, 17 Apr 2025 16:31:37 +0200 (CEST) Date: Thu, 17 Apr 2025 16:31:03 +0200 From: Stoiko Ivanov <s.ivanov@proxmox.com> To: Hannes Duerr <h.duerr@proxmox.com> Message-ID: <20250417163103.3dda6a64@rosa.proxmox.com> In-Reply-To: <20250414153656.98610-1-h.duerr@proxmox.com> References: <20250414153656.98610-1-h.duerr@proxmox.com> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.064 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: Re: [pmg-devel] [RFC pmg-api] trim Message-ID when parsing E-mail 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> Cc: pmg-devel@lists.proxmox.com 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> Thanks for the patch! generally looks ok - and could be merged - some nits/questions inline (can fixup most upon applying): On Mon, 14 Apr 2025 17:36:56 +0200 Hannes Duerr <h.duerr@proxmox.com> wrote: > when we currently parse emails we do not remove trailing newlines from > the message-id. The consequence of this is that if you use the rule > system macro __MSGID__, there is also a newline at the end of the > string. This in turn leads to problems if you create a rule and want to > add something after the message ID. As we talked off-list about this I know the context - but mentioning the case of - modifying the message-id, after stripping <> and the domain to not leak information would help people in the future remembering why this was added. > > Signed-off-by: Hannes Duerr <h.duerr@proxmox.com> > --- > > Notes: > I'm not 100% sure whether we can simply trim the newline without any > problems. I have searched through the code a bit, but I have not come > across any problematic areas. We use the msgid for the log messages, but I was surprised that the newline might be there at all - but the docs of MIME::Head (https://metacpan.org/pod/MIME::Head) say so: NOTE: The header(s) returned may end with a newline. If you don't want this, then chomp the return value. Else I looked through our code and also think that this is read once, and then used in a log-message and for adding it as template variable https://git.proxmox.com/?p=pmg-api.git;a=blob;f=src/bin/pmg-smtp-filter;h=32bad7b881733147e5defe64a590dc709669dd1a;hb=HEAD#l184 > it is in the last position there and a newline is set. This means that > the log message does not change > If anyone has any objections or other ideas on how to tackle the > problem, I'd be interested to hear them How did you test this - I gave it a quick spin with a modify field object (adding a X-my-msgid header) and it looked ok - but out of curiosity? > > src/PMG/MailQueue.pm | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/src/PMG/MailQueue.pm b/src/PMG/MailQueue.pm > index 4e37cb9..2af95bd 100644 > --- a/src/PMG/MailQueue.pm > +++ b/src/PMG/MailQueue.pm > @@ -4,6 +4,7 @@ use strict; > use warnings; > > use PVE::SafeSyslog; > +use PVE::Tools qw (trim); > use MIME::Parser; > use IO::File; > use Encode; > @@ -394,7 +395,7 @@ sub parse_mail { > PMG::MIMEUtils::fixup_multipart($entity); > > if ((my $idcount = $entity->head->count ('Message-Id')) > 0) { > - $self->msgid ($entity->head->get ('Message-Id', $idcount - 1)); > + $self->msgid (trim($entity->head->get ('Message-Id', $idcount - 1))); nit: when touching this you could remove the space `msgid(...)` vs `msgid (...)` > } > > # fixme: add parse_time to statistic database _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel