From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api] utils: fix mailflow if smtputf8 is disabled
Date: Tue, 13 Dec 2022 18:01:59 +0100 [thread overview]
Message-ID: <20221213170159.18049-1-s.ivanov@proxmox.com> (raw)
with the recent addition of smtputf8 support for the rulesystem setups
explicitly disabling smtputf8 in postfix got broken.
This is mostly noticeable for the spamreports (the receivers are taken
from the database and potentially decoded from utf-8, which sets the
'is_utf8' flag, and then tries to use the smtputf8 extension when
reinjecting the mail, which fails (since smtputf8 is disabled)
Instead of checking for the internal flag explicitly check if the
address contains only ascii printable characters (everything excluding
controlcharacters - '[\x20-\x7E]') - see
https://perldoc.perl.org/perlunifaq#What-is-%22the-UTF8-flag%22?
and
https://perldoc.perl.org/perlrecharclass#POSIX-Character-Classes
reported in our community forum:
https://forum.proxmox.com/threads/.119387/
issue is reproducible by setting
`smtputf8_enable = no` in postfix main.cf
and sending a spamreport using `pmgqm`
regular mailflow should not be affected in those setups (as no utf-8
addresses would come into the system)
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
src/PMG/Utils.pm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm
index 10193f6..b0a3c52 100644
--- a/src/PMG/Utils.pm
+++ b/src/PMG/Utils.pm
@@ -247,7 +247,7 @@ sub reinject_mail {
my $has_utf8_targets = 0;
foreach my $target (@$targets) {
- if (utf8::is_utf8($target)) {
+ if ($target =~ /[^\p{PosixPrint}]/) {
$has_utf8_targets = 1;
last;
}
@@ -255,7 +255,7 @@ sub reinject_mail {
my $mail_opts = " BODY=8BITMIME";
my $sender_addr;
- if (utf8::is_utf8($sender)) {
+ if ($sender =~ /[^\p{PosixPrint}]/) {
$sender_addr = encode('UTF-8', $smtp->_addr($sender));
$mail_opts .= " SMTPUTF8";
} else {
@@ -285,7 +285,7 @@ sub reinject_mail {
}
}
- if (utf8::is_utf8($target)) {
+ if ($sender =~ /[^\p{PosixPrint}]/) {
$rcpt_addr = encode('UTF-8', $smtp->_addr($target));
} else {
$rcpt_addr = $smtp->_addr($target);
--
2.30.2
next reply other threads:[~2022-12-13 17:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-13 17:01 Stoiko Ivanov [this message]
2022-12-15 11:17 ` Dominik Csapak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221213170159.18049-1-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pmg-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox