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 232931FF144 for ; Tue, 10 Mar 2026 11:17:16 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2A525172F2; Tue, 10 Mar 2026 11:17:10 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH common v4 2/5] section config: prepare for supporting UTF-8 encoded configurations Date: Tue, 10 Mar 2026 11:13:31 +0100 Message-ID: <20260310101631.32870-3-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: 1773137762228 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: ZOKGOU73S75PL76EWLUTRBMNQNGEZGIZ X-Message-ID-Hash: ZOKGOU73S75PL76EWLUTRBMNQNGEZGIZ 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: Configurations registered as UTF-8 will be decoded after reading to Perl's internal string format and thus may contain wide characters. The Digest::SHA::sha1_hex() function croaks on wide characters, so encode again before calling the function. Signed-off-by: Fiona Ebner --- Changes in v4: * rather than searching for wide characters, tell parse_config() directly whether the file was registered as UTF-8 src/PVE/SectionConfig.pm | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/src/PVE/SectionConfig.pm b/src/PVE/SectionConfig.pm index 84ff81a..9ff91ee 100644 --- a/src/PVE/SectionConfig.pm +++ b/src/PVE/SectionConfig.pm @@ -103,6 +103,7 @@ use warnings; use Carp; use Digest::SHA; +use Encode qw(encode); use PVE::Exception qw(raise_param_exc); use PVE::JSONSchema qw(get_standard_option); @@ -1103,10 +1104,10 @@ sub get_property_schema { =head3 $base->parse_config(...) -=head3 $base->parse_config($filename, $raw [, $allow_unknown ]) +=head3 $base->parse_config($filename, $raw [, $allow_unknown [, $options ]]) - $config = PVE::Example::BasePlugin->parse_config($filename, $raw, $allow_unknown) - $config = $class->parse_config($filename, $raw, $allow_unknown) + $config = PVE::Example::BasePlugin->parse_config($filename, $raw, $allow_unknown, $options) + $config = $class->parse_config($filename, $raw, $allow_unknown, $options) Parses the contents of a file as C>, returning the parsed data annotated with additional information (see below). @@ -1127,6 +1128,18 @@ The raw content of C<$filename>. Whether to allow parsing unknown I. +=item C<$options> (optional) + +Further options: + +=over + +=item C<$utf8> + +The config file was registered as UTF-8 encoded. + +=back + =back The returned hash is structured as follows: @@ -1205,7 +1218,7 @@ The error. =cut sub parse_config { - my ($class, $filename, $raw, $allow_unknown) = @_; + my ($class, $filename, $raw, $allow_unknown, $options) = @_; my $pdata = $class->private(); @@ -1214,7 +1227,13 @@ sub parse_config { $raw = '' if !defined($raw); - my $digest = Digest::SHA::sha1_hex($raw); + my $bytes = $raw; + if ($options && $options->{utf8}) { + # Digest::SHA croaks on wide characters + $bytes = encode('UTF-8', $raw); + } + + my $digest = Digest::SHA::sha1_hex($bytes); my $pri = 1; -- 2.47.3