From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <l.stechauner@proxmox.com> 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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 16863776A0 for <pve-devel@lists.proxmox.com>; Fri, 22 Oct 2021 14:23:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 06078A5F1 for <pve-devel@lists.proxmox.com>; Fri, 22 Oct 2021 14:23:30 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id D88C1A5DA for <pve-devel@lists.proxmox.com>; Fri, 22 Oct 2021 14:23:28 +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 7B2F146973 for <pve-devel@lists.proxmox.com>; Fri, 22 Oct 2021 14:23:22 +0200 (CEST) From: Lorenz Stechauner <l.stechauner@proxmox.com> To: pve-devel@lists.proxmox.com Date: Fri, 22 Oct 2021 14:23:10 +0200 Message-Id: <20211022122312.413252-2-l.stechauner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211022122312.413252-1-l.stechauner@proxmox.com> References: <20211022122312.413252-1-l.stechauner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.373 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. [plugin.pm, status.pm, storage.pm] Subject: [pve-devel] [PATCH v3 storage 1/2] storage: rename REs for iso and vztmpl extensions 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> X-List-Received-Date: Fri, 22 Oct 2021 12:23:30 -0000 these changes make it more clear, how many capture groups each RE inclues. Signed-off-by: Lorenz Stechauner <l.stechauner@proxmox.com> --- PVE/API2/Storage/Status.pm | 8 ++++---- PVE/Storage.pm | 14 ++++++++++---- PVE/Storage/Plugin.pm | 8 ++++---- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/PVE/API2/Storage/Status.pm b/PVE/API2/Storage/Status.pm index 02c970f..e028423 100644 --- a/PVE/API2/Storage/Status.pm +++ b/PVE/API2/Storage/Status.pm @@ -437,12 +437,12 @@ __PACKAGE__->register_method ({ my $path; if ($content eq 'iso') { - if ($filename !~ m![^/]+$PVE::Storage::iso_extension_re$!) { + if ($filename !~ m![^/]+$PVE::Storage::ISO_EXT_RE_0$!) { raise_param_exc({ filename => "wrong file extension" }); } $path = PVE::Storage::get_iso_dir($cfg, $param->{storage}); } elsif ($content eq 'vztmpl') { - if ($filename !~ m![^/]+$PVE::Storage::vztmpl_extension_re$!) { + if ($filename !~ m![^/]+$PVE::Storage::VZTMPL_EXT_RE_1$!) { raise_param_exc({ filename => "wrong file extension" }); } $path = PVE::Storage::get_vztmpl_dir($cfg, $param->{storage}); @@ -618,12 +618,12 @@ __PACKAGE__->register_method({ my $path; if ($content eq 'iso') { - if ($filename !~ m![^/]+$PVE::Storage::iso_extension_re$!) { + if ($filename !~ m![^/]+$PVE::Storage::ISO_EXT_RE_0$!) { raise_param_exc({ filename => "wrong file extension" }); } $path = PVE::Storage::get_iso_dir($cfg, $storage); } elsif ($content eq 'vztmpl') { - if ($filename !~ m![^/]+$PVE::Storage::vztmpl_extension_re$!) { + if ($filename !~ m![^/]+$PVE::Storage::VZTMPL_EXT_RE_1$!) { raise_param_exc({ filename => "wrong file extension" }); } $path = PVE::Storage::get_vztmpl_dir($cfg, $storage); diff --git a/PVE/Storage.pm b/PVE/Storage.pm index 71d6ad7..4e1b1f7 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -101,9 +101,15 @@ if ( -d '/usr/share/perl5/PVE/Storage/Custom' ) { # initialize all plugins PVE::Storage::Plugin->init(); -our $iso_extension_re = qr/\.(?:iso|img)/i; +# the following REs indicate the number or capture groups via the trailing digit +# CAUTION don't forget to update the digits accordingly after messing with the capture groups -our $vztmpl_extension_re = qr/\.tar\.(gz|xz|zst)/i; +our $ISO_EXT_RE_0 = qr/\.(?:iso|img)/i; + +our $VZTMPL_EXT_RE_1 = qr/\.tar\.(gz|xz|zst)/i; + +# FIXME remove with PVE 8.0, add versioned breaks for pve-manager +our $vztmpl_extension_re = $VZTMPL_EXT_RE_1; # PVE::Storage utility functions @@ -574,10 +580,10 @@ sub path_to_volume_id { return ('images', $info->{volid}); } } - } elsif ($path =~ m!^$isodir/([^/]+$iso_extension_re)$!) { + } elsif ($path =~ m!^$isodir/([^/]+$ISO_EXT_RE_0)$!) { my $name = $1; return ('iso', "$sid:iso/$name"); - } elsif ($path =~ m!^$tmpldir/([^/]+$vztmpl_extension_re)$!) { + } elsif ($path =~ m!^$tmpldir/([^/]+$VZTMPL_EXT_RE_1)$!) { my $name = $1; return ('vztmpl', "$sid:vztmpl/$name"); } elsif ($path =~ m!^$privatedir/(\d+)$!) { diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm index aeb4fff..770f439 100644 --- a/PVE/Storage/Plugin.pm +++ b/PVE/Storage/Plugin.pm @@ -563,9 +563,9 @@ sub parse_volname { my ($vmid, $name) = ($1, $2); my (undef, $format, $isBase) = parse_name_dir($name); return ('images', $name, $vmid, undef, undef, $isBase, $format); - } elsif ($volname =~ m!^iso/([^/]+$PVE::Storage::iso_extension_re)$!) { + } elsif ($volname =~ m!^iso/([^/]+$PVE::Storage::ISO_EXT_RE_0)$!) { return ('iso', $1); - } elsif ($volname =~ m!^vztmpl/([^/]+$PVE::Storage::vztmpl_extension_re)$!) { + } elsif ($volname =~ m!^vztmpl/([^/]+$PVE::Storage::VZTMPL_EXT_RE_1)$!) { return ('vztmpl', $1); } elsif ($volname =~ m!^rootdir/(\d+)$!) { return ('rootdir', $1, $1); @@ -1093,12 +1093,12 @@ my $get_subdir_files = sub { my $info; if ($tt eq 'iso') { - next if $fn !~ m!/([^/]+$PVE::Storage::iso_extension_re)$!i; + next if $fn !~ m!/([^/]+$PVE::Storage::ISO_EXT_RE_0)$!i; $info = { volid => "$sid:iso/$1", format => 'iso' }; } elsif ($tt eq 'vztmpl') { - next if $fn !~ m!/([^/]+$PVE::Storage::vztmpl_extension_re)$!; + next if $fn !~ m!/([^/]+$PVE::Storage::VZTMPL_EXT_RE_1)$!; $info = { volid => "$sid:vztmpl/$1", format => "t$2" }; -- 2.30.2