From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 2F3881FF17E for ; Thu, 18 Sep 2025 16:53:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AC2D93AC9; Thu, 18 Sep 2025 16:54:05 +0200 (CEST) Message-ID: <6e0cca08-3cb3-473a-a9a1-6c145c275563@proxmox.com> Date: Thu, 18 Sep 2025 16:54:01 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta To: Hannes Laimer , pmg-devel@lists.proxmox.com References: <20250918143142.248758-1-h.laimer@proxmox.com> <20250918143142.248758-2-h.laimer@proxmox.com> Content-Language: en-US From: Thomas Lamprecht In-Reply-To: <20250918143142.248758-2-h.laimer@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1758207232789 X-SPAM-LEVEL: Spam detection results: 0 AWL -1.027 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_MAILER 2 Automated Mailer Tag Left in Email RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pmg-devel] [PATCH pmg-api v2 1/3] pmgqm: add plain subject/from fields for reports 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pmg-devel-bounces@lists.proxmox.com Sender: "pmg-devel" Am 18.09.25 um 16:32 schrieb Hannes Laimer: > We don't want plain-text reports to contain HTML-escaped chars, > this skips html encoding for the plain-text part. > > Signed-off-by: Hannes Laimer > --- > v2: > - explicitly utf8 encode after `decode_rfc1522` > > src/PMG/CLI/pmgqm.pm | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) > > diff --git a/src/PMG/CLI/pmgqm.pm b/src/PMG/CLI/pmgqm.pm > index 41f9f1a..c26b545 100755 > --- a/src/PMG/CLI/pmgqm.pm > +++ b/src/PMG/CLI/pmgqm.pm > @@ -45,17 +45,25 @@ sub get_item_data { > > $item->{id} = sprintf("C%dR%dT%d", $ref->{cid}, $ref->{rid}, $ref->{ticketid}); > > - $item->{subject} = > - PMG::Utils::rfc1522_to_html(PVE::Tools::trim($head->get('subject')) || 'No Subject'); > + my $raw_subject = PVE::Tools::trim($head->get('subject')) || 'No Subject'; > + $item->{subject} = PMG::Utils::rfc1522_to_html($raw_subject); > + $item->{subject_plain} = Encode::encode('UTF-8', PMG::Utils::decode_rfc1522($raw_subject)); it's a bit borderline, but might be worth adding a rfc1522_to_utf8 (or rfc1522_to_plain_utf8?) helper for this. For one there would be a tiny bit better code re-use, but it would make it slightly clearer for what happens here. > > - my $from = PMG::Utils::rfc1522_to_html(PVE::Tools::trim($head->get('from') // $ref->{sender})); > - my $sender = PMG::Utils::rfc1522_to_html(PVE::Tools::trim($head->get('sender'))); > + my $raw_from = PVE::Tools::trim($head->get('from') // $ref->{sender}); > + my $from = PMG::Utils::rfc1522_to_html($raw_from); > + my $from_plain = Encode::encode('UTF-8', PMG::Utils::decode_rfc1522($raw_from)); > + > + my $raw_sender = PVE::Tools::trim($head->get('sender')); > + my $sender = PMG::Utils::rfc1522_to_html($raw_sender); > + my $sender_plain = Encode::encode('UTF-8', PMG::Utils::decode_rfc1522($raw_sender)); > > if ($sender) { > $item->{sender} = $sender; > $item->{from} = sprintf("%s on behalf of %s", $sender, $from); > + $item->{from_plain} = sprintf("%s on behalf of %s", $sender_plain, $from_plain); > } else { > $item->{from} = $from; > + $item->{from_plain} = $from_plain; > } > > $item->{envelope_sender} = $ref->{sender}; _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel