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 5D5088DEE for ; Wed, 30 Mar 2022 12:25:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 27B516E42 for ; Wed, 30 Mar 2022 12:24:46 +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 C314D6DF1 for ; Wed, 30 Mar 2022 12:24:44 +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 9807C4296F for ; Wed, 30 Mar 2022 12:24:44 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 30 Mar 2022 12:24:36 +0200 Message-Id: <20220330102437.46955-11-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.114 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 container 1/1] api: create/modify: add content type checks 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:42 -0000 Signed-off-by: Fabian Ebner --- No changes from v1. For root@pam the check is skipped in check_ct_modify_config_perm() (everything is), but I didn't want to refactor the whole function just for this... src/PVE/API2/LXC.pm | 10 +++++++++- src/PVE/LXC.pm | 9 ++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm index 84712f7..ea4827f 100644 --- a/src/PVE/API2/LXC.pm +++ b/src/PVE/API2/LXC.pm @@ -283,7 +283,15 @@ __PACKAGE__->register_method({ $archive = '-'; die "restore from pipe requires rootfs parameter\n" if !defined($param->{rootfs}); } else { - PVE::Storage::check_volume_access($rpcenv, $authuser, $storage_cfg, $vmid, $ostemplate); + my $content_type = $restore ? 'backup' : 'vztmpl'; + PVE::Storage::check_volume_access( + $rpcenv, + $authuser, + $storage_cfg, + $vmid, + $ostemplate, + $content_type, + ); $archive = $ostemplate; } diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index b07d986..fe63087 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -1272,7 +1272,14 @@ sub check_ct_modify_config_perm { my $sid = $1; $rpcenv->check($authuser, "/storage/$sid", ['Datastore.AllocateSpace']); } else { - PVE::Storage::check_volume_access($rpcenv, $authuser, $storage_cfg, $vmid, $volid); + PVE::Storage::check_volume_access( + $rpcenv, + $authuser, + $storage_cfg, + $vmid, + $volid, + 'rootdir', + ); } } elsif ($opt eq 'memory' || $opt eq 'swap') { $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.Memory']); -- 2.30.2