proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-07 11:10:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use check() instead of check_storage_perm()

Browse Source
This commit is contained in:
Dietmar Maurer 2012-02-06 12:19:35 +01:00
parent 95d6343bfa
commit fcbb753e3c
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
PVE/API2/Qemu.pm
View File

@ -34,7 +34,7 @@ my $resolve_cdrom_alias = sub {
}; };
my $check_volume_access = sub { my $check_volume_access = sub {
my ($rpcenv, $authuser, $storecfg, $vmid, $volid, $pool) = @_; my ($rpcenv, $authuser, $storecfg, $vmid, $volid) = @_;
my $path; my $path;
if (my ($sid, $volname) = PVE::Storage::parse_volume_id($volid, 1)) { if (my ($sid, $volname) = PVE::Storage::parse_volume_id($volid, 1)) {
@ -44,7 +44,7 @@ my $check_volume_access = sub {
# we simply allow access # we simply allow access
} elsif (!$ownervm || ($ownervm != $vmid)) { } elsif (!$ownervm || ($ownervm != $vmid)) {
# allow if we are Datastore administrator # allow if we are Datastore administrator
$rpcenv->check_storage_perm($authuser, $vmid, $pool, $sid, [ 'Datastore.Allocate' ]); $rpcenv->check($authuser, "/storage/$sid", ['Datastore.Allocate']);
} }
} else { } else {
die "Only root can pass arbitrary filesystem paths." die "Only root can pass arbitrary filesystem paths."
@ -56,7 +56,7 @@ my $check_volume_access = sub {
}; };
my $check_storage_access = sub { my $check_storage_access = sub {
my ($rpcenv, $authuser, $storecfg, $vmid, $pool, $settings, $default_storage) = @_; my ($rpcenv, $authuser, $storecfg, $vmid, $settings, $default_storage) = @_;
PVE::QemuServer::foreach_drive($settings, sub { PVE::QemuServer::foreach_drive($settings, sub {
my ($ds, $drive) = @_; my ($ds, $drive) = @_;
@ -70,9 +70,9 @@ my $check_storage_access = sub {
} elsif (!$isCDROM && ($volid =~ m/^(([^:\s]+):)?(\d+(\.\d+)?)$/)) { } elsif (!$isCDROM && ($volid =~ m/^(([^:\s]+):)?(\d+(\.\d+)?)$/)) {
my ($storeid, $size) = ($2 || $default_storage, $3); my ($storeid, $size) = ($2 || $default_storage, $3);
die "no storage ID specified (and no default storage)\n" if !$storeid; die "no storage ID specified (and no default storage)\n" if !$storeid;
$rpcenv->check_storage_perm($authuser, $vmid, $pool, $storeid, [ 'Datastore.AllocateSpace' ]); $rpcenv->check($authuser, "/storage/$storeid", ['Datastore.AllocateSpace']);
} else { } else {
my $path = &$check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $volid, $pool); my $path = &$check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $volid);
die "image '$path' does not exists\n" if (!(-f $path || -b $path)); die "image '$path' does not exists\n" if (!(-f $path || -b $path));
} }
}); });
@ -105,7 +105,7 @@ my $create_disks = sub {
delete $disk->{format}; # no longer needed delete $disk->{format}; # no longer needed
$res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk); $res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk);
} else { } else {
my $path = &$check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $volid, $pool); my $path = &$check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $volid);
die "image '$path' does not exists\n" if (!(-f $path || -b $path)); die "image '$path' does not exists\n" if (!(-f $path || -b $path));
$res->{$ds} = $settings->{$ds}; $res->{$ds} = $settings->{$ds};
} }
@ -290,13 +290,13 @@ __PACKAGE__->register_method({
$rpcenv->check_perm_modify($authuser, "/pool/$pool"); $rpcenv->check_perm_modify($authuser, "/pool/$pool");
} }
$rpcenv->check_storage_perm($authuser, $vmid, $pool, $storage, [ 'Datastore.AllocateSpace' ]) $rpcenv->check($authuser, "/storage/$storage", ['Datastore.AllocateSpace'])
if defined($storage); if defined($storage);
if (!$archive) { if (!$archive) {
&$resolve_cdrom_alias($param); &$resolve_cdrom_alias($param);
&$check_storage_access($rpcenv, $authuser, $storecfg, $vmid, $pool, $param, $storage); &$check_storage_access($rpcenv, $authuser, $storecfg, $vmid, $param, $storage);
&$check_vm_modify_config_perm($rpcenv, $authuser, $vmid, $pool, [ keys %$param]); &$check_vm_modify_config_perm($rpcenv, $authuser, $vmid, $pool, [ keys %$param]);
@ -319,7 +319,7 @@ __PACKAGE__->register_method({
die "pipe requires cli environment\n" die "pipe requires cli environment\n"
&& $rpcenv->{type} ne 'cli'; && $rpcenv->{type} ne 'cli';
} else { } else {
my $path = &$check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $archive, $pool); my $path = &$check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $archive);
die "can't find archive file '$archive'\n" if !($path && -f $path); die "can't find archive file '$archive'\n" if !($path && -f $path);
$archive = $path; $archive = $path;
} }
@ -634,7 +634,7 @@ my $vmconfig_delete_option = sub {
my $drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt}); my $drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt});
if (my $sid = &$test_deallocate_drive($storecfg, $vmid, $opt, $drive, $force)) { if (my $sid = &$test_deallocate_drive($storecfg, $vmid, $opt, $drive, $force)) {
$rpcenv->check_storage_perm($authuser, $vmid, undef, $sid, [ 'Datastore.Allocate' ]); $rpcenv->check($authuser, "/storage/$sid", ['Datastore.Allocate']);
} }
} }
@ -831,7 +831,7 @@ __PACKAGE__->register_method({
&$check_vm_modify_config_perm($rpcenv, $authuser, $vmid, undef, [keys %$param]); &$check_vm_modify_config_perm($rpcenv, $authuser, $vmid, undef, [keys %$param]);
&$check_storage_access($rpcenv, $authuser, $storecfg, $vmid, undef, $param); &$check_storage_access($rpcenv, $authuser, $storecfg, $vmid, $param);
my $updatefn = sub { my $updatefn = sub {

4
qmextract
View File

@ -142,12 +142,12 @@ sub extract_archive {
if ($user ne 'root@pam') { if ($user ne 'root@pam') {
if (defined($opts->{storage})) { if (defined($opts->{storage})) {
my $sid = $opts->{storage} || 'local'; my $sid = $opts->{storage} || 'local';
$rpcenv->check_storage_perm($user, $vmid, $pool, $sid, ['Datastore.AllocateSpace']); $rpcenv->check($user, "/storage/$sid", ['Datastore.AllocateSpace']);
} else { } else {
foreach my $fn (keys %$map) { foreach my $fn (keys %$map) {
my $fi = $map->{$fn}; my $fi = $map->{$fn};
my $sid = $fi->{storeid} || 'local'; my $sid = $fi->{storeid} || 'local';
$rpcenv->check_storage_perm($user, $vmid, $pool, $sid, ['Datastore.AllocateSpace']); $rpcenv->check($user, "/storage/$sid", ['Datastore.AllocateSpace']);
} }
} }
} }