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 BEBEABA3B for ; Fri, 25 Nov 2022 09:08:49 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CEC23193D5 for ; Fri, 25 Nov 2022 09:08:48 +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 ; Fri, 25 Nov 2022 09:08:47 +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 49BC843FB1 for ; Fri, 25 Nov 2022 09:08:47 +0100 (CET) From: Dominik Csapak To: pmg-devel@lists.proxmox.com Date: Fri, 25 Nov 2022 09:08:46 +0100 Message-Id: <20221125080846.434468-1-d.csapak@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.186 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 KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years 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] queue administration: try to decode utf8 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: Fri, 25 Nov 2022 08:08:49 -0000 similar to how we do the rest of the mail parsing, decode with decode_rfc1522 instead of mime_to_perl_string and use try_decode_utf8 otherwise this is only used for the queue administration api for the user to view Signed-off-by: Dominik Csapak --- src/PMG/Postfix.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PMG/Postfix.pm b/src/PMG/Postfix.pm index 43270c8..2708b9b 100644 --- a/src/PMG/Postfix.pm +++ b/src/PMG/Postfix.pm @@ -180,9 +180,9 @@ sub postcat { my $res = ''; while (defined(my $line = <$fh>)) { if ($decode) { - $res .= mime_to_perl_string($line); + $res .= PMG::Utils::decode_rfc1522($line); } else { - $res .= $line; + $res .= PMG::Utils::try_decode_utf8($line); } } -- 2.30.2