From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id BBBC91FF15C for ; Fri, 19 Sep 2025 10:36:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D7376107E7; Fri, 19 Sep 2025 10:36:58 +0200 (CEST) From: Hannes Laimer To: pmg-devel@lists.proxmox.com Date: Fri, 19 Sep 2025 10:36:20 +0200 Message-ID: <20250919083622.22955-2-h.laimer@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250919083622.22955-1-h.laimer@proxmox.com> References: <20250919083622.22955-1-h.laimer@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1758270976094 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.961 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pmgqm.pm, utils.pm] Subject: [pmg-devel] [PATCH pmg-api v3 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" 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 --- v3: - add small helper for 1522_decode+utf8_encode src/PMG/CLI/pmgqm.pm | 16 ++++++++++++---- src/PMG/Utils.pm | 9 +++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/PMG/CLI/pmgqm.pm b/src/PMG/CLI/pmgqm.pm index 41f9f1a..0c30dbe 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} = PMG::Utils::rfc1522_to_plain_utf8($raw_subject); - 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 = PMG::Utils::rfc1522_to_plain_utf8($raw_from); + + my $raw_sender = PVE::Tools::trim($head->get('sender')); + my $sender = PMG::Utils::rfc1522_to_html($raw_sender); + my $sender_plain = PMG::Utils::rfc1522_to_plain_utf8($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}; diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm index 3dc909d..4e35aec 100644 --- a/src/PMG/Utils.pm +++ b/src/PMG/Utils.pm @@ -1194,6 +1194,15 @@ sub decode_rfc1522 { return $res; } +sub rfc1522_to_plain_utf8 { + my ($enc) = @_; + + my $res = eval { Encode::encode('UTF-8', decode_rfc1522($enc)) }; + return $enc if $@; + + return $res; +} + sub rfc1522_to_html { my ($enc) = @_; -- 2.47.3 _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel