* [pve-devel] [PATCH qemu-server] api: create/modify: fix content type checks by re-allowing iso images
@ 2022-04-22 11:03 Fabian Ebner
2022-04-22 12:42 ` [pve-devel] applied: " Thomas Lamprecht
0 siblings, 1 reply; 2+ messages in thread
From: Fabian Ebner @ 2022-04-22 11:03 UTC (permalink / raw)
To: pve-devel
Fixes: f9be9137 ("api: create/modify: add content type checks"
Reported-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
PVE/API2/Qemu.pm | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 3af21325..71db264a 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -142,14 +142,12 @@ my $check_storage_access = sub {
raise_param_exc({ storage => "storage '$storeid' does not support vm images"})
if !$scfg->{content}->{images};
} else {
- PVE::Storage::check_volume_access(
- $rpcenv,
- $authuser,
- $storecfg,
- $vmid,
- $volid,
- 'images',
- );
+ PVE::Storage::check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $volid);
+ if ($storeid) {
+ my ($vtype) = PVE::Storage::parse_volname($storecfg, $volid);
+ raise_param_exc({ $ds => "content type needs to be 'images' or 'iso'" })
+ if $vtype ne 'images' && $vtype ne 'iso';
+ }
}
if (my $src_image = $drive->{'import-from'}) {
@@ -421,14 +419,12 @@ my $create_disks = sub {
print "$ds: successfully created disk '$res->{$ds}'\n";
} else {
- PVE::Storage::check_volume_access(
- $rpcenv,
- $authuser,
- $storecfg,
- $vmid,
- $volid,
- 'images',
- );
+ PVE::Storage::check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $volid);
+ if ($storeid) {
+ my ($vtype) = PVE::Storage::parse_volname($storecfg, $volid);
+ die "cannot use volume $volid - content type needs to be 'images' or 'iso'"
+ if $vtype ne 'images' && $vtype ne 'iso';
+ }
PVE::Storage::activate_volumes($storecfg, [ $volid ]) if $storeid;
--
2.30.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pve-devel] applied: [PATCH qemu-server] api: create/modify: fix content type checks by re-allowing iso images
2022-04-22 11:03 [pve-devel] [PATCH qemu-server] api: create/modify: fix content type checks by re-allowing iso images Fabian Ebner
@ 2022-04-22 12:42 ` Thomas Lamprecht
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Lamprecht @ 2022-04-22 12:42 UTC (permalink / raw)
To: Proxmox VE development discussion, Fabian Ebner
On 22.04.22 13:03, Fabian Ebner wrote:
> Fixes: f9be9137 ("api: create/modify: add content type checks"
> Reported-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
> PVE/API2/Qemu.pm | 28 ++++++++++++----------------
> 1 file changed, 12 insertions(+), 16 deletions(-)
>
>
applied, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-04-22 12:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-22 11:03 [pve-devel] [PATCH qemu-server] api: create/modify: fix content type checks by re-allowing iso images Fabian Ebner
2022-04-22 12:42 ` [pve-devel] applied: " Thomas Lamprecht
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox