From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 144071FF189
for <inbox@lore.proxmox.com>; Fri, 21 Feb 2025 11:23:40 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id D504A2B39B;
Fri, 21 Feb 2025 09:28:22 +0100 (CET)
Message-ID: <ba985a41-7593-48d0-8f1a-5840eea049c8@proxmox.com>
Date: Fri, 21 Feb 2025 09:27:48 +0100
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
From: Daniel Kral <d.kral@proxmox.com>
To: Fiona Ebner <f.ebner@proxmox.com>,
Proxmox VE development discussion <pve-devel@lists.proxmox.com>
References: <20250211160825.254167-1-d.kral@proxmox.com>
<20250211160825.254167-11-d.kral@proxmox.com>
<1f09cf15-1ee5-43f5-9b3e-e5a5910d25ea@proxmox.com>
Content-Language: en-US
In-Reply-To: <1f09cf15-1ee5-43f5-9b3e-e5a5910d25ea@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.009 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
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: Re: [pve-devel] [PATCH qemu-server v2 05/15] api: remove unusable
default storage parameter in check_storage_access
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
On 2/20/25 15:09, Fiona Ebner wrote:
> Am 11.02.25 um 17:08 schrieb Daniel Kral:
>> Since 0541eeb8 ("use property strings for drive options") the user input
>> of a volume with allocation support must be a pair of a PVE-managed
>> storage and an arbitrary string (i.e. the volume name or the size of a
>> new disk in GB) [0]. Therefore, the `$volid` must always be the string
>> "$storeid:$volname_or_size" for cloudinit images and new disks.
>> Therefore, the `$default_storage` parameter is redundant.
>>
>> Remove it as it is rejected by `verify_volume_id_or_qm_path` for
>> allocatable disk drives before calling this subroutine anyway, which is
>> used by both API handlers, i.e. `create_vm` and `update_vm`, that call
>> the subroutine.
>>
>> [0] except the special cases "none", "cdrom" and absolute paths, which
>> were introduced some time later with `pve-volume-id-or-absolute-path`
>> and `pve-volume-id-or-qm-path`.
>>
>> Signed-off-by: Daniel Kral <d.kral@proxmox.com>
>> ---
>> changes since v1:
>> - new!
>>
>> PVE/API2/Qemu.pm | 11 ++++-------
>> 1 file changed, 4 insertions(+), 7 deletions(-)
>>
>> diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
>> index 5ac61aa5..2a2d971e 100644
>> --- a/PVE/API2/Qemu.pm
>> +++ b/PVE/API2/Qemu.pm
>> @@ -133,7 +133,7 @@ my $check_drive_param = sub {
>> };
>>
>> my $check_storage_access = sub {
>> - my ($rpcenv, $authuser, $storecfg, $vmid, $settings, $default_storage, $extraction_storage) = @_;
>> + my ($rpcenv, $authuser, $storecfg, $vmid, $settings, $extraction_storage) = @_;
>>
>> $foreach_volume_with_alloc->($settings, sub {
>> my ($ds, $drive) = @_;
>> @@ -143,13 +143,11 @@ my $check_storage_access = sub {
>> my $volid = $drive->{file};
>> my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
>>
>> - if (!$volid || ($volid eq 'none' || $volid eq 'cloudinit' || (defined($volname) && $volname eq 'cloudinit'))) {
>> + if (!$volid || ($volid eq 'none' || (defined($volname) && $volname eq 'cloudinit'))) {
>> # nothing to check
>> } elsif ($isCDROM && ($volid eq 'cdrom')) {
>> $rpcenv->check($authuser, "/", ['Sys.Console']);
>> } elsif (!$isCDROM && ($volid =~ $PVE::QemuServer::Drive::NEW_DISK_RE)) {
>> - my $storeid = $2 || $default_storage;
>
> The rest looks fine, but I'd rather keep the assignment with the result
> from the regex match here. Because otherwise, the code would rely on
> parse_volume_id() to work for everything matching the regex and that is
> a pretty implicit assumption and might not stay true in the future.
Hm, the reason why I did it this way was so that the following fix for
cloudinit drives could be written a little bit cleaner as they both need
the same storage access checks, so I don't need to duplicate the same
core logic.
I guess I could leave, but I'd have to fallback the `$storeid` provided
by `parse_volume_id()` for the cloudinit case then, as $2 will not
contain anything since the NEW_DISK_RE regex was unsuccessful (captures
only if the $storeid follow a digit). Would that way work for you?
I guess a cleaner way to do this in the future is to make `NEW_DISK_RE`
depend on the regex of the "pve-volume-id" format as much as possible
(e.g. the now required $storeid prefix), but that'd be beyond this patch
series and one should take a closer look before doing this.
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel