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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id AA6C875150 for ; Wed, 23 Jun 2021 15:10:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 91539B2D9 for ; Wed, 23 Jun 2021 15:10:26 +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 D766DB2CD for ; Wed, 23 Jun 2021 15:10:22 +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 9F0CA4658E for ; Wed, 23 Jun 2021 15:10:22 +0200 (CEST) From: Lorenz Stechauner To: pve-devel@lists.proxmox.com Date: Wed, 23 Jun 2021 15:10:15 +0200 Message-Id: <20210623131015.3483512-1-l.stechauner@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.694 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 Subject: [pve-devel] [PATCH storage] factoring out regex for vztmpl 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: Wed, 23 Jun 2021 13:10:56 -0000 stores the regex definition in PVE::Storage. One test had to be adapted because it tested obsolete code. Namely: it expects vztmpl to only end with .tar.gz, but the new regex also includes .tar.xz, there is nothing against allowing .tar.xz files as vztmpl files. Signed-off-by: Lorenz Stechauner --- updates "[PATCH v10 storage 1/3] factoring out regex'es for backup and vztmpl" changes: * only factor vztmpl_extension_re out PVE/API2/Storage/Status.pm | 6 +++--- PVE/Storage.pm | 4 +++- PVE/Storage/Plugin.pm | 4 ++-- test/path_to_volume_id_test.pm | 7 ++++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/PVE/API2/Storage/Status.pm b/PVE/API2/Storage/Status.pm index 8a36aef..7069244 100644 --- a/PVE/API2/Storage/Status.pm +++ b/PVE/API2/Storage/Status.pm @@ -423,12 +423,12 @@ __PACKAGE__->register_method ({ if ($content eq 'iso') { if ($filename !~ m![^/]+$PVE::Storage::iso_extension_re$!) { - raise_param_exc({ filename => "missing '.iso' or '.img' extension" }); + raise_param_exc({ filename => "wrong file extension" }); } $path = PVE::Storage::get_iso_dir($cfg, $param->{storage}); } elsif ($content eq 'vztmpl') { - if ($filename !~ m![^/]+\.tar\.[gx]z$!) { - raise_param_exc({ filename => "missing '.tar.gz' or '.tar.xz' extension" }); + if ($filename !~ m![^/]+$PVE::Storage::vztmpl_extension_re$!) { + raise_param_exc({ filename => "wrong file extension" }); } $path = PVE::Storage::get_vztmpl_dir($cfg, $param->{storage}); } else { diff --git a/PVE/Storage.pm b/PVE/Storage.pm index ea887a4..60cd19e 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -101,6 +101,8 @@ PVE::Storage::Plugin->init(); our $iso_extension_re = qr/\.(?:iso|img)/i; +our $vztmpl_extension_re = qr/\.tar\.([gx]z)/i; + # PVE::Storage utility functions sub config { @@ -573,7 +575,7 @@ sub path_to_volume_id { } elsif ($path =~ m!^$isodir/([^/]+$iso_extension_re)$!) { my $name = $1; return ('iso', "$sid:iso/$name"); - } elsif ($path =~ m!^$tmpldir/([^/]+\.tar\.gz)$!) { + } elsif ($path =~ m!^$tmpldir/([^/]+$vztmpl_extension_re)$!) { 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 d330845..fe6365c 100644 --- a/PVE/Storage/Plugin.pm +++ b/PVE/Storage/Plugin.pm @@ -518,7 +518,7 @@ sub parse_volname { return ('images', $name, $vmid, undef, undef, $isBase, $format); } elsif ($volname =~ m!^iso/([^/]+$PVE::Storage::iso_extension_re)$!) { return ('iso', $1); - } elsif ($volname =~ m!^vztmpl/([^/]+\.tar\.[gx]z)$!) { + } elsif ($volname =~ m!^vztmpl/([^/]+$PVE::Storage::vztmpl_extension_re)$!) { return ('vztmpl', $1); } elsif ($volname =~ m!^rootdir/(\d+)$!) { return ('rootdir', $1, $1); @@ -1041,7 +1041,7 @@ my $get_subdir_files = sub { $info = { volid => "$sid:iso/$1", format => 'iso' }; } elsif ($tt eq 'vztmpl') { - next if $fn !~ m!/([^/]+\.tar\.([gx]z))$!; + next if $fn !~ m!/([^/]+$PVE::Storage::vztmpl_extension_re)$!; $info = { volid => "$sid:vztmpl/$1", format => "t$2" }; diff --git a/test/path_to_volume_id_test.pm b/test/path_to_volume_id_test.pm index 5eee2f6..e0c46d9 100644 --- a/test/path_to_volume_id_test.pm +++ b/test/path_to_volume_id_test.pm @@ -166,12 +166,13 @@ my @tests = ( 'local:snippets/hookscript.pl', ], }, - - # no matches { description => 'CT template, tar.xz', volname => "$storage_dir/template/cache/debian-10.0-standard_10.0-1_amd64.tar.xz", - expected => [''], + expected => [ + 'vztmpl', + 'local:vztmpl/debian-10.0-standard_10.0-1_amd64.tar.xz', + ], }, # no matches, path or files with failures -- 2.30.2