From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id EAB751FF168
for <inbox@lore.proxmox.com>; Tue, 18 Feb 2025 13:30:59 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 6787CB678;
Tue, 18 Feb 2025 13:30:44 +0100 (CET)
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 18 Feb 2025 13:30:06 +0100
Message-Id: <20250218123006.61691-3-f.ebner@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250218123006.61691-1-f.ebner@proxmox.com>
References: <20250218123006.61691-1-f.ebner@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.045 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
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 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 <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
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 <f.ebner@proxmox.com>
---
Tested a bit with the virtiofs directory mapping config opting into
this, which could be an initial user of this feature.
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 b9311c7..fe1601e 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, $utf8) = @_;
$observed->{$filename} || die "unknown file '$filename'";
@@ -528,11 +528,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};
@@ -542,6 +543,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;
}
@@ -579,7 +581,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 {
@@ -597,6 +599,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.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel