From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9887B8BB1 for ; Wed, 16 Nov 2022 15:04:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8D49020622 for ; Wed, 16 Nov 2022 15:04:43 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 16 Nov 2022 15:04:41 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 615E444D6B for ; Wed, 16 Nov 2022 15:04:39 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Wed, 16 Nov 2022 15:04:35 +0100 Message-Id: <20221116140435.93067-7-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221116140435.93067-1-f.ebner@proxmox.com> References: <20221116140435.93067-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL 0.027 Adjusted score from AWL reputation of From: =?UTF-8?Q?address=0A=09?=BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict =?UTF-8?Q?Alignment=0A=09?=SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF =?UTF-8?Q?Record=0A=09?=SPF_PASS -0.001 SPF: sender matches SPF =?UTF-8?Q?record=0A=09?=URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [backup.pm, vzdump.pm] Subject: [pve-devel] [PATCH manager 6/6] api: backup/vzdump: add get_storage_param helper 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: , X-List-Received-Date: Wed, 16 Nov 2022 14:04:44 -0000 to capture the logic in a single place. Suggested-by: Fabian Grünbichler Signed-off-by: Fiona Ebner --- PVE/API2/Backup.pm | 10 +++++----- PVE/API2/VZDump.pm | 15 ++++++++------- PVE/VZDump.pm | 11 +++++++++-- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/PVE/API2/Backup.pm b/PVE/API2/Backup.pm index 74bf95ca..25e615d1 100644 --- a/PVE/API2/Backup.pm +++ b/PVE/API2/Backup.pm @@ -60,10 +60,9 @@ my sub assert_param_permission_create { assert_param_permission_common($rpcenv, $user, $param); - if (!$param->{dumpdir}) { - my $storeid = $param->{storage} || 'local'; + if (my $storeid = PVE::VZDump::get_storage_param($param)) { $rpcenv->check($user, "/storage/$storeid", [ 'Datastore.Allocate' ]); - } # no else branch, because dumpdir is root-only + } } my sub assert_param_permission_update { @@ -84,8 +83,9 @@ my sub assert_param_permission_update { if ($current->{dumpdir}) { die "only root\@pam may edit jobs with a 'dumpdir' option."; } else { - my $storeid = $current->{storage} || 'local'; - $rpcenv->check($user, "/storage/$storeid", [ 'Datastore.Allocate' ]); + if (my $storeid = PVE::VZDump::get_storage_param($current)) { + $rpcenv->check($user, "/storage/$storeid", [ 'Datastore.Allocate' ]); + } } } diff --git a/PVE/API2/VZDump.pm b/PVE/API2/VZDump.pm index 8e873c05..e3dcd0bd 100644 --- a/PVE/API2/VZDump.pm +++ b/PVE/API2/VZDump.pm @@ -27,10 +27,11 @@ my sub assert_param_permission_vzdump { PVE::API2::Backup::assert_param_permission_common($rpcenv, $user, $param); - if (!$param->{dumpdir} && (defined($param->{maxfiles}) || defined($param->{'prune-backups'}))) { - my $storeid = $param->{storage} || 'local'; - $rpcenv->check($user, "/storage/$storeid", [ 'Datastore.Allocate' ]); - } # no else branch, because dumpdir is root-only + if (defined($param->{maxfiles}) || defined($param->{'prune-backups'})) { + if (my $storeid = PVE::VZDump::get_storage_param($param)) { + $rpcenv->check($user, "/storage/$storeid", [ 'Datastore.Allocate' ]); + } + } } __PACKAGE__->register_method ({ @@ -108,9 +109,9 @@ __PACKAGE__->register_method ({ die "you can only backup a single VM with option --stdout\n" if $param->{stdout} && scalar(@{$local_vmids}) != 1; - # If the root-only dumpdir is used rather than a storage, the check will succeed anyways. - my $storeid = $param->{storage} || 'local'; - $rpcenv->check($user, "/storage/$storeid", [ 'Datastore.AllocateSpace' ]); + if (my $storeid = PVE::VZDump::get_storage_param($param)) { + $rpcenv->check($user, "/storage/$storeid", [ 'Datastore.AllocateSpace' ]); + } my $worker = sub { my $upid = shift; diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index a04837e7..bd17c986 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -55,6 +55,13 @@ foreach my $plug (@pve_vzdump_classes) { } } +sub get_storage_param { + my ($param) = @_; + + return if $param->{dumpdir}; + return $param->{storage} || 'local'; +} + # helper functions sub debugmsg { @@ -557,8 +564,8 @@ sub new { die "cannot use options 'storage' and 'dumpdir' at the same time\n"; } - if (!$opts->{dumpdir} && !$opts->{storage}) { - $opts->{storage} = 'local'; + if (my $storage = get_storage_param($opts)) { + $opts->{storage} = $storage; } # Enforced by the API too, but these options might come in via defaults. Drop them if necessary. -- 2.30.2