yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check volume accesss: add content type parameter

Browse Source 
Adding such a check here avoids the need to parse at the call sites in
some cases.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner
2022-03-30 12:24:31 +02:00
committed by Fabian Grünbichler
parent 42352a4988
commit 21c7b54622
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
PVE/Storage.pm
View File

@ -473,13 +473,18 @@ sub parse_volume_id {
# test if we have read access to volid # test if we have read access to volid
sub check_volume_access { 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); my ($sid, $volname) = parse_volume_id($volid, 1);
if ($sid) { 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); 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') { if ($vtype eq 'iso' || $vtype eq 'vztmpl') {
# require at least read access to storage, (custom) templates/ISOs could be sensitive # require at least read access to storage, (custom) templates/ISOs could be sensitive
$rpcenv->check_any($user, "/storage/$sid", ['Datastore.AllocateSpace', 'Datastore.Audit']); $rpcenv->check_any($user, "/storage/$sid", ['Datastore.AllocateSpace', 'Datastore.Audit']);