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 E2C521FF179 for ; Wed, 1 Oct 2025 12:47:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 647651D28C; Wed, 1 Oct 2025 12:47:38 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com, pmg-devel@lists.proxmox.com Date: Wed, 1 Oct 2025 12:47:11 +0200 Message-ID: <20251001104729.70314-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251001104729.70314-1-f.ebner@proxmox.com> References: <20251001104729.70314-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1759315631337 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm] Subject: [pve-devel] [PATCH qemu-server 2/4] pbs: properly encode PBS password as UTF-8 when setting the environment variable 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" The PBS password is saved as UTF-8 and decoded to Perl's internal string representation upon reading from the password file. When the password contains multi-byte UTF-8 characters, backing up a diskless VM would fail with: > Error: error building client for repository XXX - > PBS_PASSWORD contains bad characters and restoring would fail with: > restore failed: invalid utf-8 sequence of 1 bytes from index 0 This is fixed by properly encoding the value for the PBS_PASSWORD environment variable value again as UTF-8. Signed-off-by: Fiona Ebner --- src/PVE/QemuServer.pm | 4 ++++ src/PVE/VZDump/QemuServer.pm | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index 7d5ab718..a57eecd5 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -5,6 +5,7 @@ use warnings; use Cwd 'abs_path'; use Digest::SHA; +use Encode qw(encode); use Fcntl ':flock'; use Fcntl; use File::Basename; @@ -6971,6 +6972,9 @@ sub restore_proxmox_backup_archive { # This is only used for `pbs-restore` and the QEMU PBS driver (live-restore) my $password = PVE::Storage::PBSPlugin::pbs_get_password($scfg, $storeid); + # The password is saved as UTF-8 and is decoded upon reading. Need to re-encode when setting the + # environment variable. + $password = encode('UTF-8', $password, 1); local $ENV{PBS_PASSWORD} = $password; local $ENV{PBS_FINGERPRINT} = $fingerprint if defined($fingerprint); diff --git a/src/PVE/VZDump/QemuServer.pm b/src/PVE/VZDump/QemuServer.pm index 5b94c369..30a77ea9 100644 --- a/src/PVE/VZDump/QemuServer.pm +++ b/src/PVE/VZDump/QemuServer.pm @@ -3,6 +3,7 @@ package PVE::VZDump::QemuServer; use strict; use warnings; +use Encode qw(encode); use Fcntl qw(:mode); use File::Basename; use File::Path qw(make_path remove_tree); @@ -737,6 +738,9 @@ sub archive_pbs { if (!$diskcount) { $self->loginfo("backup contains no disks"); + # The password is saved as UTF-8 and is decoded upon reading. Need to re-encode when setting + # the environment variable. + $password = encode('UTF-8', $password, 1); local $ENV{PBS_PASSWORD} = $password; local $ENV{PBS_FINGERPRINT} = $fingerprint if defined($fingerprint); my $cmd = [ -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel