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 F2F8D68A36 for ; Mon, 21 Mar 2022 14:06:40 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F15522E03 for ; Mon, 21 Mar 2022 14:06:40 +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 id 0FB802DCA for ; Mon, 21 Mar 2022 14:06:39 +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 DB76241C9D for ; Mon, 21 Mar 2022 14:06:38 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 21 Mar 2022 14:06:29 +0100 Message-Id: <20220321130633.62086-5-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220321130633.62086-1-f.ebner@proxmox.com> References: <20220321130633.62086-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.118 Adjusted score from AWL reputation of From: address 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 Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH storage 4/4] api: file restore: use check_volume_access to restrict content type 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: Mon, 21 Mar 2022 13:06:41 -0000 Signed-off-by: Fabian Ebner --- PVE/API2/Storage/FileRestore.pm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/PVE/API2/Storage/FileRestore.pm b/PVE/API2/Storage/FileRestore.pm index a4bad44..ccc56e5 100644 --- a/PVE/API2/Storage/FileRestore.pm +++ b/PVE/API2/Storage/FileRestore.pm @@ -111,14 +111,12 @@ __PACKAGE__->register_method ({ my $cfg = PVE::Storage::config(); my $scfg = PVE::Storage::storage_config($cfg, $storeid); - PVE::Storage::check_volume_access($rpcenv, $user, $cfg, undef, $volid); + PVE::Storage::check_volume_access($rpcenv, $user, $cfg, undef, $volid, 'backup'); raise_param_exc({'storage' => "Only PBS storages supported for file-restore."}) if $scfg->{type} ne 'pbs'; - my ($vtype, $snap) = PVE::Storage::parse_volname($cfg, $volid); - raise_param_exc({'volume' => 'Not a backup archive.'}) - if $vtype ne 'backup'; + my (undef, $snap) = PVE::Storage::parse_volname($cfg, $volid); my $client = PVE::PBSClient->new($scfg, $storeid); my $ret = $client->file_restore_list($snap, $path, $base64); @@ -177,14 +175,12 @@ __PACKAGE__->register_method ({ my $cfg = PVE::Storage::config(); my $scfg = PVE::Storage::storage_config($cfg, $storeid); - PVE::Storage::check_volume_access($rpcenv, $user, $cfg, undef, $volid); + PVE::Storage::check_volume_access($rpcenv, $user, $cfg, undef, $volid, 'backup'); raise_param_exc({'storage' => "Only PBS storages supported for file-restore."}) if $scfg->{type} ne 'pbs'; - my ($vtype, $snap) = PVE::Storage::parse_volname($cfg, $volid); - raise_param_exc({'volume' => 'Not a backup archive.'}) - if $vtype ne 'backup'; + my (undef, $snap) = PVE::Storage::parse_volname($cfg, $volid); my $client = PVE::PBSClient->new($scfg, $storeid); my $fifo = $client->file_restore_extract_prepare(); -- 2.30.2