<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<p><br>
</p>
<div class="moz-cite-prefix">On 4/17/25 16:31, Stoiko Ivanov wrote:<br>
</div>
<blockquote type="cite"
cite="mid:20250417163103.3dda6a64@rosa.proxmox.com">
<pre wrap="" class="moz-quote-pre">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 <a class="moz-txt-link-rfc2396E" href="mailto:h.duerr@proxmox.com"><h.duerr@proxmox.com></a> wrote:
</pre>
<blockquote type="cite">
<pre wrap="" class="moz-quote-pre">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.
</pre>
</blockquote>
<pre wrap="" class="moz-quote-pre">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.
</pre>
</blockquote>
yes good point, i will add it in a v2<br>
<blockquote type="cite"
cite="mid:20250417163103.3dda6a64@rosa.proxmox.com">
<pre wrap="" class="moz-quote-pre">
</pre>
<blockquote type="cite">
<pre wrap="" class="moz-quote-pre">
Signed-off-by: Hannes Duerr <a class="moz-txt-link-rfc2396E" href="mailto:h.duerr@proxmox.com"><h.duerr@proxmox.com></a>
---
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
</pre>
</blockquote>
<pre wrap="" class="moz-quote-pre">I was surprised that the newline might be there at all - but the docs of
MIME::Head (<a class="moz-txt-link-freetext" href="https://metacpan.org/pod/MIME::Head">https://metacpan.org/pod/MIME::Head</a>) 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
<a class="moz-txt-link-freetext" href="https://git.proxmox.com/?p=pmg-api.git;a=blob;f=src/bin/pmg-smtp-filter;h=32bad7b881733147e5defe64a590dc709669dd1a;hb=HEAD#l184">https://git.proxmox.com/?p=pmg-api.git;a=blob;f=src/bin/pmg-smtp-filter;h=32bad7b881733147e5defe64a590dc709669dd1a;hb=HEAD#l184</a>
</pre>
<blockquote type="cite">
<pre wrap="" class="moz-quote-pre"> 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
</pre>
</blockquote>
<pre wrap="" class="moz-quote-pre">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?
</pre>
</blockquote>
I constructed the setup described by the customer:<br>
I sent messages from a domain x, stripped the domain from the
Message-ID with postfix header-checks and added another domain y
with an header attribute (modify field) and the __MSGID__ macro<br>
I also checked the log messages when sending some other arbitrary
mails.<br>
<blockquote type="cite"
cite="mid:20250417163103.3dda6a64@rosa.proxmox.com">
<pre wrap="" class="moz-quote-pre">
</pre>
<blockquote type="cite">
<pre wrap="" class="moz-quote-pre">
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)));
</pre>
</blockquote>
<pre wrap="" class="moz-quote-pre">nit: when touching this you could remove the space `msgid(...)` vs
`msgid (...)`
</pre>
</blockquote>
<p>good point, will incorporate it in the v2</p>
<p><span style="white-space: pre-wrap">
</span></p>
<p><span style="white-space: pre-wrap">The v2 can be found here:
<a class="moz-txt-link-freetext" href="https://lore.proxmox.com/pmg-devel/20250423084549.20411-1-h.duerr@proxmox.com/T/#u">https://lore.proxmox.com/pmg-devel/20250423084549.20411-1-h.duerr@proxmox.com/T/#u</a>
</span></p>
</body>
</html>