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 2305AE449 for ; Fri, 22 Apr 2022 13:03:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 177E1274F2 for ; Fri, 22 Apr 2022 13:03:11 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 8C581274E8 for ; Fri, 22 Apr 2022 13:03:10 +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 647FD426F5 for ; Fri, 22 Apr 2022 13:03:10 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 22 Apr 2022 13:03:06 +0200 Message-Id: <20220422110306.53913-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.088 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemu.pm] Subject: [pve-devel] [PATCH qemu-server] api: create/modify: fix content type checks by re-allowing iso images 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: Fri, 22 Apr 2022 11:03:41 -0000 Fixes: f9be9137 ("api: create/modify: add content type checks" Reported-by: Thomas Lamprecht Signed-off-by: Fabian Ebner --- 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