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 B890E1FF144 for ; Tue, 10 Mar 2026 11:17:00 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EE320171ED; Tue, 10 Mar 2026 11:16:42 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH cluster v4 5/5] cluster files: support registering UTF-8 configuration file Date: Tue, 10 Mar 2026 11:13:34 +0100 Message-ID: <20260310101631.32870-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260310101631.32870-1-f.ebner@proxmox.com> References: <20260310101631.32870-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1773137762436 X-SPAM-LEVEL: Spam detection results: 0 AWL -1.068 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.408 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.819 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.903 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 Message-ID-Hash: KBIHBKCWQBIOG3SEFH7XLTCKIFZR7R73 X-Message-ID-Hash: KBIHBKCWQBIOG3SEFH7XLTCKIFZR7R73 X-MailFrom: f.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: A configuration file registered as UTF-8 will be automatically decoded from UTF-8 to Perl's internal string format after reading and encoded in the other direction before writing. Signed-off-by: Fiona Ebner --- Versioned dependency bump pve-cluster -> pve-common needed! Changes in v4: * tell the parser() directly whether the file was registered as UTF-8 src/PVE/Cluster.pm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/PVE/Cluster.pm b/src/PVE/Cluster.pm index cd5d6b5..c1e7d4c 100644 --- a/src/PVE/Cluster.pm +++ b/src/PVE/Cluster.pm @@ -519,7 +519,7 @@ sub verify_token { my $file_info = {}; sub cfs_register_file { - my ($filename, $parser, $writer) = @_; + my ($filename, $parser, $writer, $options) = @_; $observed->{$filename} || die "unknown file '$filename'"; @@ -529,12 +529,13 @@ sub cfs_register_file { parser => $parser, writer => $writer, }; + $file_info->{$filename}->{utf8} = 1 if $options && $options->{utf8}; return; } my $ccache_read = sub { - my ($filename, $parser, $version) = @_; + my ($filename, $parser, $version, $utf8) = @_; $ccache->{$filename} = {} if !$ccache->{$filename}; @@ -544,7 +545,14 @@ my $ccache_read = sub { # we always call the parser, even when the file does not exist # (in that case $data is undef) my $data = get_config($filename); - $ci->{data} = &$parser("/etc/pve/$filename", $data); + my $options = {}; + + if ($utf8) { + $data = decode('UTF-8', $data); + $options->{utf8} = 1; + } + + $ci->{data} = &$parser("/etc/pve/$filename", $data, undef, $options); $ci->{version} = $version; } @@ -581,7 +589,7 @@ sub cfs_read_file { my ($version, $info) = cfs_file_version($filename); my $parser = $info->{parser}; - return &$ccache_read($filename, $parser, $version); + return &$ccache_read($filename, $parser, $version, $info->{utf8}); } sub cfs_write_file { @@ -599,6 +607,8 @@ sub cfs_write_file { $ci->{version} = undef; } + $force_utf8 = 1 if $info->{utf8}; + PVE::Tools::file_set_contents($fsname, $raw, undef, $force_utf8); } -- 2.47.3