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 3BDDE1FF16F for ; Tue, 30 Sep 2025 10:59:32 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C3B39268B; Tue, 30 Sep 2025 10:59:35 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Tue, 30 Sep 2025 10:58:40 +0200 Message-ID: <20250930085858.21180-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250930085858.21180-1-f.ebner@proxmox.com> References: <20250930085858.21180-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1759222721203 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.023 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 Subject: [pve-devel] [RFC cluster v2 2/2] cluster files: support registering UTF-8 configuration file 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" 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 --- src/PVE/Cluster.pm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/PVE/Cluster.pm b/src/PVE/Cluster.pm index e829687..2f38fba 100644 --- a/src/PVE/Cluster.pm +++ b/src/PVE/Cluster.pm @@ -517,7 +517,7 @@ sub verify_token { my $file_info = {}; sub cfs_register_file { - my ($filename, $parser, $writer) = @_; + my ($filename, $parser, $writer, $utf8) = @_; $observed->{$filename} || die "unknown file '$filename'"; @@ -526,11 +526,12 @@ sub cfs_register_file { $file_info->{$filename} = { parser => $parser, writer => $writer, + utf8 => $utf8, }; } my $ccache_read = sub { - my ($filename, $parser, $version) = @_; + my ($filename, $parser, $version, $utf8) = @_; $ccache->{$filename} = {} if !$ccache->{$filename}; @@ -540,6 +541,7 @@ 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); + $data = decode('utf8', $data) if $utf8; $ci->{data} = &$parser("/etc/pve/$filename", $data); $ci->{version} = $version; } @@ -577,7 +579,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 { @@ -595,6 +597,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 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel