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 1D6371FF177 for ; Fri, 2 Aug 2024 15:28:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EB86BDF68; Fri, 2 Aug 2024 15:28:20 +0200 (CEST) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Fri, 2 Aug 2024 15:26:48 +0200 Message-Id: <20240802132656.270077-11-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240802132656.270077-1-m.carrara@proxmox.com> References: <20240802132656.270077-1-m.carrara@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.035 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] [PATCH v1 pve-common 10/18] pbsclient: use `File::Spec->catfile` to concatenate file paths 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" Signed-off-by: Max Carrara --- src/PVE/PBSClient.pm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/PVE/PBSClient.pm b/src/PVE/PBSClient.pm index 2084bb5..69b4e40 100644 --- a/src/PVE/PBSClient.pm +++ b/src/PVE/PBSClient.pm @@ -5,6 +5,7 @@ use warnings; use Fcntl qw(F_GETFD F_SETFD FD_CLOEXEC); use File::Path; +use File::Spec; use File::Temp qw(tempdir); use IO::File; use JSON; @@ -181,7 +182,7 @@ sub new { my sub password_file_name { my ($self) = @_; - return "$self->{secret_dir}/$self->{storeid}.pw"; + return File::Spec->catfile($self->{secret_dir}, "$self->{storeid}.pw"); } =pod @@ -267,7 +268,7 @@ I it is located in. sub encryption_key_file_name { my ($self) = @_; - return "$self->{secret_dir}/$self->{storeid}.enc"; + return File::Spec->catfile($self->{secret_dir}, "$self->{storeid}.enc"); }; =pod @@ -354,7 +355,7 @@ my sub do_raw_client_cmd { my $client_bin = delete($opts{binary}) || 'proxmox-backup-client'; my $use_crypto = $USE_CRYPT_PARAMS->{$client_bin}->{$client_cmd} // 0; - my $client_exe = "/usr/bin/$client_bin"; + my $client_exe = File::Spec->catfile("/usr/bin", $client_bin); die "executable not found '$client_exe'! $client_bin not installed?\n" if ! -x $client_exe; my $scfg = $self->{scfg}; @@ -865,18 +866,20 @@ sub file_restore_extract_prepare { my ($self) = @_; my $tmpdir = tempdir(); - mkfifo("$tmpdir/fifo", 0600) - or die "creating file download fifo '$tmpdir/fifo' failed: $!\n"; + my $fifo_path = File::Spec->catfile($tmpdir, "fifo"); + + mkfifo($fifo_path, 0600) + or die "creating file download fifo '$fifo_path' failed: $!\n"; # allow reading data for proxy user my $wwwid = getpwnam('www-data') || die "getpwnam failed"; chown($wwwid, -1, "$tmpdir") or die "changing permission on fifo dir '$tmpdir' failed: $!\n"; - chown($wwwid, -1, "$tmpdir/fifo") - or die "changing permission on fifo '$tmpdir/fifo' failed: $!\n"; + chown($wwwid, -1, $fifo_path) + or die "changing permission on fifo '$fifo_path' failed: $!\n"; - return "$tmpdir/fifo"; + return $fifo_path; } =pod -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel