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 4E27F1FF177 for ; Fri, 2 Aug 2024 15:28:24 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C7772DF41; Fri, 2 Aug 2024 15:28:15 +0200 (CEST) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Fri, 2 Aug 2024 15:26:47 +0200 Message-Id: <20240802132656.270077-10-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 09/18] pbsclient: create secret dir with `mkdir -p` and mode `700` 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" .. instead of using a regular `mkdir` call. The `File::Path::make_path` subroutine is used for this purpose, which recursively creates all directories if they didn't exist before. Upon creation of those directories, the mode is also set to `700`. This means that (like before), directory permissions are left untouched if the directory existed already. Signed-off-by: Max Carrara --- src/PVE/PBSClient.pm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/PVE/PBSClient.pm b/src/PVE/PBSClient.pm index e0468d3..2084bb5 100644 --- a/src/PVE/PBSClient.pm +++ b/src/PVE/PBSClient.pm @@ -4,6 +4,7 @@ use strict; use warnings; use Fcntl qw(F_GETFD F_SETFD FD_CLOEXEC); +use File::Path; use File::Temp qw(tempdir); use IO::File; use JSON; @@ -191,7 +192,8 @@ my sub password_file_name { Updates or creates the I file, storing the given C<$password>. -If the I does not exist, it is created beforehand. +If the I does not exist, it is recursively created with the +permissions C<700> beforehand. If the I file does not exist, a new one with the permissions C<600> is created. @@ -202,7 +204,9 @@ sub set_password { my ($self, $password) = @_; my $pwfile = password_file_name($self); - mkdir($self->{secret_dir}); + File::Path::make_path($self->{secret_dir}, { + mode => 0700, + }); PVE::Tools::file_set_contents($pwfile, "$password\n", 0600); }; @@ -274,7 +278,8 @@ sub encryption_key_file_name { Updates or creates the I file, storing the given C<$key>. -If the I does not exist, it is created beforehand. +If the I does not exist, it is recursively created with the +permissions C<700> beforehand. If the I file does not exist, a new one with the permissions C<600> is created. @@ -285,7 +290,9 @@ sub set_encryption_key { my ($self, $key) = @_; my $encfile = $self->encryption_key_file_name(); - mkdir($self->{secret_dir}); + File::Path::make_path($self->{secret_dir}, { + mode => 0700, + }); PVE::Tools::file_set_contents($encfile, "$key\n", 0600); }; -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel