[pve-devel] [PATCH ha-manager] rules: fix utf-8 encoding and decoding for comments field
Daniel Kral
d.kral at proxmox.com
Fri Sep 5 12:13:32 CEST 2025
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 <d.kral at proxmox.com>
---
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
More information about the pve-devel
mailing list