From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 16E71BFD0F for ; Tue, 9 Jan 2024 12:55:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id ED8641685D for ; Tue, 9 Jan 2024 12:55:11 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 9 Jan 2024 12:55:10 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C230B4903B for ; Tue, 9 Jan 2024 12:55:10 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Tue, 9 Jan 2024 12:55:07 +0100 Message-Id: <20240109115507.44509-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.076 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH cluster] cfs_write_file: fix accidental UTF-8 re-encoding 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: , X-List-Received-Date: Tue, 09 Jan 2024 11:55:12 -0000 by correclty passing the $force_utf8 flag to PVE::Tools::file_set_contents(). The idea was that only callers that are ready will opt-in to the behavior. When reading files with PVE::Tools::file_get_contents() or ipcc_get_config(), the UTF-8 flag on the Perl string is not set, even if the data is UTF-8. Such data would then be encoded a second time, as reported in the community forum [0] and bug tracker [1]. [0]: https://forum.proxmox.com/threads/139282/ [1]: https://bugzilla.proxmox.com/show_bug.cgi?id=1909#c1 Fixes: 90c824b ("cluster fs: allow to force UTF-8 encoding for cfs_write_file") Signed-off-by: Fiona Ebner --- src/PVE/Cluster.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PVE/Cluster.pm b/src/PVE/Cluster.pm index 4c828c1..f899dbe 100644 --- a/src/PVE/Cluster.pm +++ b/src/PVE/Cluster.pm @@ -594,7 +594,7 @@ sub cfs_write_file { $ci->{version} = undef; } - PVE::Tools::file_set_contents($fsname, $raw, undef, 1); + PVE::Tools::file_set_contents($fsname, $raw, undef, $force_utf8); } my $cfs_lock = sub { -- 2.39.2