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 C371895B6 for ; Thu, 17 Nov 2022 16:07:15 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A30232FC18 for ; Thu, 17 Nov 2022 16:06:45 +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 ; Thu, 17 Nov 2022 16:06:45 +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 DF45544D86 for ; Thu, 17 Nov 2022 16:06:44 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Thu, 17 Nov 2022 16:06:04 +0100 Message-Id: <20221117150611.253644-2-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221117150611.253644-1-s.ivanov@proxmox.com> References: <20221117150611.253644-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL -0.080 Adjusted score from AWL reputation of From: =?UTF-8?Q?address=0A=09?=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 =?UTF-8?Q?Alignment=0A=09?=KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current =?UTF-8?Q?years=0A=09?=SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF =?UTF-8?Q?Record=0A=09?=SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pmg-devel] [PATCH pmg-api v2 1/8] utils: return perl string from decode_rfc1522 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: Thu, 17 Nov 2022 15:07:15 -0000 decode_rfc1522 is a more robust version of decode_mimewords (in scalar context) - adapt it to return a perlstring, under the assumption that data is utf-8 encoded (holds true for ascii and smtputf8 mails) Signed-off-by: Stoiko Ivanov --- src/PMG/Utils.pm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm index cef232b..77abde4 100644 --- a/src/PMG/Utils.pm +++ b/src/PMG/Utils.pm @@ -1088,6 +1088,7 @@ sub decode_to_html { return $res; } +# assume enc contains utf-8 and mime-encoded data a perl-string (with wide characters) sub decode_rfc1522 { my ($enc) = @_; @@ -1100,7 +1101,7 @@ sub decode_rfc1522 { my ($d, $cs) = @$r; if ($d) { if ($cs) { - $res .= decode($cs, $d); + $res .= encode('UTF-8', decode($cs, $d)); } else { $res .= $d; } @@ -1108,8 +1109,11 @@ sub decode_rfc1522 { } }; - $res = $enc if $@; - + if ($@) { + $res = $enc; + } else { + $res = decode('UTF-8', $res); + } return $res; } -- 2.30.2