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 1A6F11FF15C for ; Fri, 5 Sep 2025 12:17:09 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 146F8119EE; Fri, 5 Sep 2025 12:17:24 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Date: Fri, 5 Sep 2025 12:13:32 +0200 Message-ID: <20250905101648.79655-1-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1757067393350 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.014 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 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. [ed.ac.uk, rules.pm, proxmox.com] Subject: [pve-devel] [PATCH ha-manager] rules: fix utf-8 encoding and decoding for comments field X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" As reported by a user in the community forum [0]. [0] https://forum.proxmox.com/threads/169258/page-14#post-792521 Signed-off-by: Daniel Kral --- Tested a few strings from an unicode example page [1], including at least a mix of ASCII, Latin-1, Cyrillic and Bengali characters. Also checked this applies both on master and on another ha-manager series [2] without any fuzz. [1] https://www.cogsci.ed.ac.uk/~richard/unicode-sample.html [2] https://lore.proxmox.com/pve-devel/20250821143705.256562-1-d.kral@proxmox.com/ src/PVE/HA/Rules.pm | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/src/PVE/HA/Rules.pm b/src/PVE/HA/Rules.pm index 323ad038..8c60b5ce 100644 --- a/src/PVE/HA/Rules.pm +++ b/src/PVE/HA/Rules.pm @@ -163,8 +163,6 @@ sub decode_value { } return $res; - } elsif ($key eq 'comment') { - return PVE::Tools::decode_text($value); } my $plugin = $class->lookup($type); @@ -198,8 +196,6 @@ sub encode_value { PVE::HA::Tools::pve_verify_ha_resource_id($_) for keys %$value; return join(',', sort keys %$value); - } elsif ($key eq 'comment') { - return PVE::Tools::encode_text($value); } my $plugin = $class->lookup($type); @@ -220,6 +216,30 @@ sub parse_section_header { return undef; } +sub parse_config { + my ($class, $filename, $raw, $allow_unknown) = @_; + + my $cfg = $class->SUPER::parse_config($filename, $raw, $allow_unknown); + + for my $rule (values $cfg->{ids}->%*) { + $rule->{comment} = PVE::Tools::decode_text($rule->{comment}) + if defined($rule->{comment}); + } + + return $cfg; +} + +sub write_config { + my ($class, $filename, $cfg, $allow_unknown) = @_; + + for my $rule (values $cfg->{ids}->%*) { + $rule->{comment} = PVE::Tools::encode_text($rule->{comment}) + if defined($rule->{comment}); + } + + return $class->SUPER::write_config($filename, $cfg, $allow_unknown); +} + # General rule helpers =head3 $class->set_rule_defaults($rule) -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel