From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 150D7EFB4 for ; Tue, 13 Dec 2022 18:02:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E3CAE22882 for ; Tue, 13 Dec 2022 18:02:17 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 13 Dec 2022 18:02:16 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 282B144CD2 for ; Tue, 13 Dec 2022 18:02:15 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Tue, 13 Dec 2022 18:01:59 +0100 Message-Id: <20221213170159.18049-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.161 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [main.cf, utils.pm, proxmox.com, perl.org] Subject: [pmg-devel] [PATCH pmg-api] utils: fix mailflow if smtputf8 is disabled X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Dec 2022 17:02:48 -0000 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 --- 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