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 B68B08D92 for ; Wed, 30 Mar 2022 12:25:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A53506DCA for ; Wed, 30 Mar 2022 12:24:43 +0200 (CEST) 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 D29586D9F for ; Wed, 30 Mar 2022 12:24:42 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9F53742866 for ; Wed, 30 Mar 2022 12:24:42 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 30 Mar 2022 12:24:31 +0200 Message-Id: <20220330102437.46955-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220330102437.46955-1-f.ebner@proxmox.com> References: <20220330102437.46955-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.115 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 v2 storage 4/6] check volume accesss: add content type parameter 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, 30 Mar 2022 10:25:13 -0000 Adding such a check here avoids the need to parse at the call sites in some cases. Signed-off-by: Fabian Ebner --- No changes from v1. PVE/Storage.pm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/PVE/Storage.pm b/PVE/Storage.pm index a864c33..3b86956 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -473,13 +473,18 @@ sub parse_volume_id { # test if we have read access to volid sub check_volume_access { - my ($rpcenv, $user, $cfg, $vmid, $volid) = @_; + my ($rpcenv, $user, $cfg, $vmid, $volid, $type) = @_; my ($sid, $volname) = parse_volume_id($volid, 1); if ($sid) { + my ($vtype, undef, $ownervm) = parse_volname($cfg, $volid); + + # Need to allow 'images' when expecting 'rootdir' too - not cleanly separated in plugins. + die "unable to use volume $volid - content type needs to be '$type'\n" + if defined($type) && $vtype ne $type && ($type ne 'rootdir' || $vtype ne 'images'); + return if $rpcenv->check($user, "/storage/$sid", ['Datastore.Allocate'], 1); - my ($vtype, undef, $ownervm) = parse_volname($cfg, $volid); if ($vtype eq 'iso' || $vtype eq 'vztmpl') { # require at least read access to storage, (custom) templates/ISOs could be sensitive $rpcenv->check_any($user, "/storage/$sid", ['Datastore.AllocateSpace', 'Datastore.Audit']); -- 2.30.2