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 60F861FF179 for ; Wed, 1 Oct 2025 12:47:54 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4523C1D455; Wed, 1 Oct 2025 12:47:40 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com, pmg-devel@lists.proxmox.com Date: Wed, 1 Oct 2025 12:47:13 +0200 Message-ID: <20251001104729.70314-5-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: 1759315631379 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. [pbsclient.pm] Subject: [pve-devel] [PATCH common 4/4] pbs client: allow using password that would be auto-encoded as neither ASCII nor UTF-8 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" Using passwords that would be auto-encoded by Perl as either ASCII or UTF-8 already worked, but other encodings would not, for example ISO-8859 would result in: > proxmox-backup-client failed: Error: error building client for > repository latin@pbs@10.10.100.180:8007:bigone - PBS_PASSWORD > contains bad characters (500) The issue only affected PMG, because in PVE, the PBS storage plugin uses its own implementation of {get,set}_password() which does handle UTF-8 already since pve-storage commit 5245e04 ("fix #5181: pbs: store and read passwords as unicode"). Follow that commit to align the behavior. This is also in preparation to using the PBS Client more from the storage plugin too. Signed-off-by: Fiona Ebner --- src/PVE/PBSClient.pm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/PVE/PBSClient.pm b/src/PVE/PBSClient.pm index 6333304..16d4740 100644 --- a/src/PVE/PBSClient.pm +++ b/src/PVE/PBSClient.pm @@ -4,6 +4,7 @@ package PVE::PBSClient; use strict; use warnings; +use Encode qw(decode encode); use Fcntl qw(F_GETFD F_SETFD FD_CLOEXEC); use File::Temp qw(tempdir); use IO::File; @@ -72,7 +73,7 @@ sub set_password { my $pwfile = password_file_name($self); mkdir($self->{secret_dir}); - PVE::Tools::file_set_contents($pwfile, "$password\n", 0600); + PVE::Tools::file_set_contents($pwfile, "$password\n", 0600, 1); } sub delete_password { @@ -88,7 +89,9 @@ sub get_password { my $pwfile = password_file_name($self); - return PVE::Tools::file_read_firstline($pwfile); + my $contents = PVE::Tools::file_read_firstline($pwfile); + + return eval { decode('UTF-8', $contents, 1) } // $contents; } sub encryption_key_file_name { @@ -185,7 +188,11 @@ my sub do_raw_client_cmd { push(@$cmd, '--ns', $ns); } - local $ENV{PBS_PASSWORD} = $self->get_password(); + my $password = $self->get_password(); + # 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} = $scfg->{fingerprint}; -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel