From: "Max R. Carrara" <m.carrara@proxmox.com>
To: pve-devel@lists.proxmox.com
Cc: Wolfgang Bumiller <w.bumiller@proxmox.com>
Subject: [PATCH pve-storage v3 24/51] tree-wide: replace usages of BACKUP_EXT_RE_2 with parsing functions
Date: Tue, 17 Nov 2026 21:38:56 +0100 [thread overview]
Message-ID: <20261117203953.913035-25-m.carrara@proxmox.com> (raw)
In-Reply-To: <20261117203953.913035-1-m.carrara@proxmox.com>
Add support for the 'backup' volume type in
`PVE::Storage::Common::Parse`.
Also add corresponding test cases.
Use the module's parsing functions to replace usages of the
`PVE::Storage::BACKUP_EXT_RE_2` regex across the repository.
Note that the new regex for parsing 'backup' vtype file paths is also
able to optionally extract the VMID and the type of guest from the
file name. This makes it possible to further simplify some parts of
the original logic.
The VMID is only parsed for backup volumes that begin with e.g.
`vzdump-qemu-1337-` etc. This means that the extra regex checks in
`parse_volname()` and `get_subdir_files()` are not necessary anymore,
since the new parsing function handles this out of the box now.
Most importantly, the VMID has to be *valid* now, i.e. it must
actually be in the VMID range. The original regexes matched any number
of digits, including something like "0000".
As done with the `ISO_EXT_RE_0` and `VZTMPL_EXT_RE_1` regexes, add a
FIXME comment to the `BACKUP_EXT_RE_2` regex to mark its removal on
the next APIAGE reset. Its removal will be noted in the next APIVER +
APIAGE bump.
Additionally, the `COMPRESSOR_RE` constant in `PVE::Storage::Plugin`
is only used by `BACKUP_EXT_RE_2` now. Together with its related
`KNOWN_COMPRESSION_FORMATS` constant, it should be phased out and
replaced eventually. Add a TODO comment for that and mark
`COMPRESSOR_RE` for removal as well.
In the meantime, keep track of the compression formats for specific
vtypes in the `::Common::Parse` module until we move them to a more
adequate place.
Signed-off-by: Max R. Carrara <m.carrara@proxmox.com>
---
src/PVE/Storage.pm | 76 ++++--
src/PVE/Storage/Common/Parse.pm | 86 ++++++
src/PVE/Storage/Common/test/parser_tests.pl | 280 +++++++++++++++++++-
src/PVE/Storage/Plugin.pm | 42 +--
4 files changed, 444 insertions(+), 40 deletions(-)
diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm
index 57355ffd..bdd8e445 100755
--- a/src/PVE/Storage.pm
+++ b/src/PVE/Storage.pm
@@ -27,10 +27,11 @@ use PVE::RESTEnvironment qw(log_warn);
use PVE::Storage::Common qw(
plugin_get_default_vtype_subdirs
);
use PVE::Storage::Common::Parse qw(
+ parse_volname_as_parts
parse_abs_path_as_volid
);
use PVE::Storage::Plugin;
use PVE::Storage::DirPlugin;
use PVE::Storage::LVMPlugin;
@@ -124,10 +125,11 @@ PVE::Storage::Plugin->init();
our $ISO_EXT_RE_0 = qr/\.(?:iso|img)/i;
# FIXME: remove this regex on the next APIAGE reset.
our $VZTMPL_EXT_RE_1 = qr/\.(?|(tar)(?!\.)|tar\.(gz|xz|zst|bz2))/i;
+# FIXME: remove this regex on the next APIAGE reset.
our $BACKUP_EXT_RE_2 = qr/\.(tgz|(?:tar|vma)(?:\.(${\PVE::Storage::Plugin::COMPRESSOR_RE}))?)/;
our $IMPORT_EXT_RE_1 = qr/\.(ova|ovf|qcow2|raw|vmdk)/;
our $UPLOAD_IMPORT_EXT_RE_1 = qr/\.(ova|qcow2|raw|vmdk)/;
@@ -817,13 +819,11 @@ sub path_to_volume_id {
if ($vtype eq 'vztmpl') {
return ($vtype, parse_abs_path_as_volid($sid, $scfg, $path, $vtype));
}
if ($vtype eq 'backup') {
- return if $filename !~ m!^/([^/]+$BACKUP_EXT_RE_2)$!;
- my $name = $1;
- return ($vtype, "$sid:backup/$name");
+ return ($vtype, parse_abs_path_as_volid($sid, $scfg, $path, $vtype));
}
if ($vtype eq 'snippets') {
return if $filename !~ m!^/([^/]+)$!;
my $name = $1;
@@ -1926,33 +1926,69 @@ sub protection_file_path {
return "${path}.protected";
}
sub archive_info {
my ($archive) = shift;
- my $info;
- my $volid = basename($archive);
- if ($volid =~ /^(vzdump-(lxc|openvz|qemu)-.+$BACKUP_EXT_RE_2)$/) {
- my $filename = "$1"; # untaint
- my ($type, $extension, $comp) = ($2, $3, $4);
- (my $format = $extension) =~ s/\..*//;
- $info = decompressor_info($format, $comp);
- $info->{filename} = $filename;
- $info->{type} = $type;
+ # $archive can be either an absolute or relative path, so construct a valid
+ # volname for further parsing first
+ my $filename = basename($archive);
+ my $volname = "backup/$filename";
+
+ my $info = eval {
+ my $volname_parts = parse_volname_as_parts($volname);
+
+ die "'$volname' is not a valid volume name\n"
+ if !defined($volname_parts);
+
+ my $type = $volname_parts->{type};
+
+ # Best-effort parsing, because `prune_backups()` doesn't need a VMID
+ if (!defined($type) && $filename =~ m/^vzdump-(?<type> openvz|lxc|qemu)/xn) {
+ $type = $+{type};
+ }
+
+ die "'$volname' does not contain a valid backup type\n"
+ if !defined($type);
+
+ my ($format, $compression) = $volname_parts->@{qw(ext-archive ext-compression)};
+
+ # Conform to what decompressor_info() expects
+ $compression = undef if $format eq 'tgz';
+ my $decomp_info = decompressor_info($format, $compression);
+
+ my $info = {
+ $decomp_info->%*, # shallow copy
+ filename => $volname_parts->{file},
+ type => $type,
+ };
+
+ if (defined($volname_parts->{timestamp})) {
+ my ($filename_no_ext, undef) = split(qr!\.!, $volname_parts->{file}, 2);
+ $info->{logfilename} = $filename_no_ext . PVE::Storage::Plugin::LOG_EXT;
+
+ $info->{notesfilename} = $volname_parts->{file} . PVE::Storage::Plugin::NOTES_EXT;
+
+ $info->{vmid} = int($volname_parts->{vmid});
+
+ $info->{ctime} = timelocal(
+ $volname_parts->{second},
+ $volname_parts->{minute},
+ $volname_parts->{hour},
+ $volname_parts->{day},
+ $volname_parts->{month} - 1,
+ $volname_parts->{year},
+ );
- if ($volid =~
- /^(vzdump-${type}-([1-9][0-9]{2,8})-(\d{4})_(\d{2})_(\d{2})-(\d{2})_(\d{2})_(\d{2}))\.${extension}$/
- ) {
- $info->{logfilename} = "$1" . PVE::Storage::Plugin::LOG_EXT;
- $info->{notesfilename} = "$filename" . PVE::Storage::Plugin::NOTES_EXT;
- $info->{vmid} = int($2);
- $info->{ctime} = timelocal($8, $7, $6, $5, $4 - 1, $3);
$info->{is_std_name} = 1;
} else {
$info->{is_std_name} = 0;
}
- } else {
+
+ $info;
+ };
+ if (my $err = $@) {
die "ERROR: couldn't determine archive info from '$archive'\n";
}
return $info;
}
diff --git a/src/PVE/Storage/Common/Parse.pm b/src/PVE/Storage/Common/Parse.pm
index 94dd75f1..73f4e2bc 100644
--- a/src/PVE/Storage/Common/Parse.pm
+++ b/src/PVE/Storage/Common/Parse.pm
@@ -33,27 +33,36 @@ primarily related to.
=cut
my @VZTMPL_COMPRESSION_EXTENSIONS = ('gz', 'xz', 'zst', 'bz2');
+my @BACKUP_COMPRESSION_EXTENSIONS = ('gz', 'lzo', 'zst', 'bz2');
+
my sub join_to_re_alternations(@list) {
return join('|', map { quotemeta } @list);
}
my $RE_VZTMPL_COMPRESSION_EXTENSIONS = join_to_re_alternations(@VZTMPL_COMPRESSION_EXTENSIONS);
+my $RE_BACKUP_COMPRESSION_EXTENSIONS = join_to_re_alternations(@BACKUP_COMPRESSION_EXTENSIONS);
+
my $RE_PARENT_DIR = quotemeta('..');
my $RE_CONTAINS_PARENT_DIR = qr!
( ^$RE_PARENT_DIR$ ) # .. --> Entire path
|
( ^$RE_PARENT_DIR/ ) # ../ --> Beginning of path
|
( /$RE_PARENT_DIR/ ) # /../ --> Between two path components
|
( /$RE_PARENT_DIR$ ) # /.. --> End of path
!xn;
+# A vmid is an integer between 100 and 999_999_999
+# See: https://git.proxmox.com/?p=pve-common.git;a=blob;f=src/PVE/JSONSchema.pm;h=17e7126a6c42f8326a1da890680af10b6106d906;hb=refs/heads/master#l62
+# See also: https://git.proxmox.com/?p=pve-common.git;a=blob;f=src/PVE/JSONSchema.pm;h=17e7126a6c42f8326a1da890680af10b6106d906;hb=refs/heads/master#l304
+my $RE_VMID = qr![1-9][0-9]{2,8}!;
+
my $RE_ISO_FILE_PATH = qr!
(?<path>
(?<file> [^/]+ \. (?<ext> (?i: iso|img) ) )
)
!xn;
@@ -69,18 +78,59 @@ my $RE_VZTMPL_FILE_PATH = qr!
)
)
)
!xn;
+my $RE_GUEST_VZDUMP_BACKUP_FILE_TIMESTAMP = qr!
+ (?<timestamp>
+ (?<year> \d{4})
+ _ (?<month> \d{2})
+ _ (?<day> \d{2})
+ - (?<hour> \d{2})
+ _ (?<minute> \d{2})
+ _ (?<second> \d{2})
+ )
+!xn;
+
+my $RE_GUEST_VZDUMP_BACKUP_FILE_NAME = qr!
+ vzdump
+ - (?<type> openvz|lxc|qemu)
+ - (?<vmid> $RE_VMID)
+ - ( $RE_GUEST_VZDUMP_BACKUP_FILE_TIMESTAMP | [^/]+ )
+!xn;
+
+my $RE_BACKUP_FILE_PATH = qr!
+ (?<path>
+ (?<file>
+ (
+ ($RE_GUEST_VZDUMP_BACKUP_FILE_NAME)
+ |
+ ([^/]+)
+ )
+ \.
+ (?<ext>
+ (?<ext_archive> tgz)
+ |
+ (
+ (?<ext_archive> tar|vma)
+ ( \. (?<ext_compression> $RE_BACKUP_COMPRESSION_EXTENSIONS) )?
+ )
+ )
+ )
+ )
+!xn;
+
my $RE_FILE_PATH_FOR_VTYPE = {
iso => qr/^$RE_ISO_FILE_PATH$/,
vztmpl => qr/^$RE_VZTMPL_FILE_PATH$/,
+ backup => qr/^$RE_BACKUP_FILE_PATH$/,
};
my $RE_VOLNAME_FOR_VTYPE = {
iso => qr/^$RE_ISO_FILE_PATH$/,
vztmpl => qr/^$RE_VZTMPL_FILE_PATH$/,
+ backup => qr/^$RE_BACKUP_FILE_PATH$/,
};
my sub contains_parent_dir($path) {
return $path =~ $RE_CONTAINS_PARENT_DIR;
}
@@ -184,10 +234,46 @@ C<ext-archive>, C<ext-compression> (optional):
path => 'archlinux-base_20190924-1_amd64.tar.gz',
vtype => 'vztmpl',
volname => 'vztmpl/archlinux-base_20190924-1_amd64.tar.gz',
}
+=item C<backup>
+
+C<type> (optional), C<vmid> (optional), which are included in backups created
+by Proxmox VE. These backups may also contain a C<timestamp> that consists of
+C<year>, C<month>, C<day>, C<hour>, C<minute>, and C<second>.
+
+To further differentiate the file extension, there are also C<ext-archive>,
+C<ext-compression> (optional).
+
+ {
+ file => 'vzdump-qemu-16110-2020_03_30-21_12_45.vma.lzo',
+
+ # Used to further differentiate 'file'
+ type => 'qemu',
+ vmid => '16110',
+
+ timestamp => '2020_03_30-21_12_45',
+ year => '2020',
+ month => '03',
+ day => '30',
+ hour => '21',
+ minute => '12',
+ second => '45',
+
+ ext => 'vma.lzo',
+
+ # Used to further differentiate 'ext'
+ 'ext-archive' => 'vma',
+ 'ext-compression' => 'lzo',
+
+ 'disk-path' => 'vzdump-qemu-16110-2020_03_30-21_12_45.vma.lzo',
+ path => 'vzdump-qemu-16110-2020_03_30-21_12_45.vma.lzo',
+ vtype => 'backup',
+ volname => 'backup/vzdump-qemu-16110-2020_03_30-21_12_45.vma.lzo',
+ }
+
=back
=cut
=head3 parse_rel_path_as_volname_parts
diff --git a/src/PVE/Storage/Common/test/parser_tests.pl b/src/PVE/Storage/Common/test/parser_tests.pl
index 687ad6ae..bfb17bbc 100755
--- a/src/PVE/Storage/Common/test/parser_tests.pl
+++ b/src/PVE/Storage/Common/test/parser_tests.pl
@@ -191,10 +191,283 @@ my $volname_cases_vztmpl_invalid = [
},
expected => undef,
},
];
+my $volname_cases_backup_valid = [
+ {
+ path => 'vzdump-qemu-16110-2020_03_30-21_13_55.vma',
+ expected => {
+ type => 'qemu',
+ vmid => '16110',
+ file => 'vzdump-qemu-16110-2020_03_30-21_13_55.vma',
+ ext => 'vma',
+ 'ext-archive' => 'vma',
+ 'disk-path' => 'vzdump-qemu-16110-2020_03_30-21_13_55.vma',
+ path => 'vzdump-qemu-16110-2020_03_30-21_13_55.vma',
+ vtype => 'backup',
+ volname => 'backup/vzdump-qemu-16110-2020_03_30-21_13_55.vma',
+
+ timestamp => '2020_03_30-21_13_55',
+ year => '2020',
+ month => '03',
+ day => '30',
+ hour => '21',
+ minute => '13',
+ second => '55',
+ },
+ },
+ {
+ path => 'vzdump-qemu-16110-2020_03_30-21_11_40.vma.gz',
+ expected => {
+ type => 'qemu',
+ vmid => '16110',
+ file => 'vzdump-qemu-16110-2020_03_30-21_11_40.vma.gz',
+ ext => 'vma.gz',
+ 'ext-archive' => 'vma',
+ 'ext-compression' => 'gz',
+ 'disk-path' => 'vzdump-qemu-16110-2020_03_30-21_11_40.vma.gz',
+ path => 'vzdump-qemu-16110-2020_03_30-21_11_40.vma.gz',
+ vtype => 'backup',
+ volname => 'backup/vzdump-qemu-16110-2020_03_30-21_11_40.vma.gz',
+
+ timestamp => '2020_03_30-21_11_40',
+ year => '2020',
+ month => '03',
+ day => '30',
+ hour => '21',
+ minute => '11',
+ second => '40',
+ },
+ },
+ {
+ path => 'vzdump-qemu-16110-2020_03_30-21_12_45.vma.lzo',
+ expected => {
+ type => 'qemu',
+ vmid => '16110',
+ file => 'vzdump-qemu-16110-2020_03_30-21_12_45.vma.lzo',
+ ext => 'vma.lzo',
+ 'ext-archive' => 'vma',
+ 'ext-compression' => 'lzo',
+ 'disk-path' => 'vzdump-qemu-16110-2020_03_30-21_12_45.vma.lzo',
+ path => 'vzdump-qemu-16110-2020_03_30-21_12_45.vma.lzo',
+ vtype => 'backup',
+ volname => 'backup/vzdump-qemu-16110-2020_03_30-21_12_45.vma.lzo',
+
+ timestamp => '2020_03_30-21_12_45',
+ year => '2020',
+ month => '03',
+ day => '30',
+ hour => '21',
+ minute => '12',
+ second => '45',
+ },
+ },
+ {
+ path => 'vzdump-qemu-16110-2020_03_30-21_13_55.vma.zst',
+ expected => {
+ type => 'qemu',
+ vmid => '16110',
+ file => 'vzdump-qemu-16110-2020_03_30-21_13_55.vma.zst',
+ ext => 'vma.zst',
+ 'ext-archive' => 'vma',
+ 'ext-compression' => 'zst',
+ 'disk-path' => 'vzdump-qemu-16110-2020_03_30-21_13_55.vma.zst',
+ path => 'vzdump-qemu-16110-2020_03_30-21_13_55.vma.zst',
+ vtype => 'backup',
+ volname => 'backup/vzdump-qemu-16110-2020_03_30-21_13_55.vma.zst',
+
+ timestamp => '2020_03_30-21_13_55',
+ year => '2020',
+ month => '03',
+ day => '30',
+ hour => '21',
+ minute => '13',
+ second => '55',
+ },
+ },
+ {
+ path => 'vzdump-lxc-16112-2020_03_30-21_39_30.tar.lzo',
+ expected => {
+ type => 'lxc',
+ vmid => '16112',
+ file => 'vzdump-lxc-16112-2020_03_30-21_39_30.tar.lzo',
+ ext => 'tar.lzo',
+ 'ext-archive' => 'tar',
+ 'ext-compression' => 'lzo',
+ 'disk-path' => 'vzdump-lxc-16112-2020_03_30-21_39_30.tar.lzo',
+ path => 'vzdump-lxc-16112-2020_03_30-21_39_30.tar.lzo',
+ vtype => 'backup',
+ volname => 'backup/vzdump-lxc-16112-2020_03_30-21_39_30.tar.lzo',
+
+ timestamp => '2020_03_30-21_39_30',
+ year => '2020',
+ month => '03',
+ day => '30',
+ hour => '21',
+ minute => '39',
+ second => '30',
+ },
+ },
+ {
+ path => 'vzdump-lxc-16112-2020_03_30-21_49_30.tar.gz',
+ expected => {
+ type => 'lxc',
+ vmid => '16112',
+ file => 'vzdump-lxc-16112-2020_03_30-21_49_30.tar.gz',
+ ext => 'tar.gz',
+ 'ext-archive' => 'tar',
+ 'ext-compression' => 'gz',
+ 'disk-path' => 'vzdump-lxc-16112-2020_03_30-21_49_30.tar.gz',
+ path => 'vzdump-lxc-16112-2020_03_30-21_49_30.tar.gz',
+ vtype => 'backup',
+ volname => 'backup/vzdump-lxc-16112-2020_03_30-21_49_30.tar.gz',
+
+ timestamp => '2020_03_30-21_49_30',
+ year => '2020',
+ month => '03',
+ day => '30',
+ hour => '21',
+ minute => '49',
+ second => '30',
+ },
+ },
+ {
+ path => 'vzdump-lxc-16112-2020_03_30-21_49_30.tar.zst',
+ expected => {
+ type => 'lxc',
+ vmid => '16112',
+ file => 'vzdump-lxc-16112-2020_03_30-21_49_30.tar.zst',
+ ext => 'tar.zst',
+ 'ext-archive' => 'tar',
+ 'ext-compression' => 'zst',
+ 'disk-path' => 'vzdump-lxc-16112-2020_03_30-21_49_30.tar.zst',
+ path => 'vzdump-lxc-16112-2020_03_30-21_49_30.tar.zst',
+ vtype => 'backup',
+ volname => 'backup/vzdump-lxc-16112-2020_03_30-21_49_30.tar.zst',
+
+ timestamp => '2020_03_30-21_49_30',
+ year => '2020',
+ month => '03',
+ day => '30',
+ hour => '21',
+ minute => '49',
+ second => '30',
+ },
+ },
+ {
+ path => 'vzdump-lxc-16112-2020_03_30-21_59_30.tgz',
+ expected => {
+ type => 'lxc',
+ vmid => '16112',
+ file => 'vzdump-lxc-16112-2020_03_30-21_59_30.tgz',
+ ext => 'tgz',
+ 'ext-archive' => 'tgz',
+ 'disk-path' => 'vzdump-lxc-16112-2020_03_30-21_59_30.tgz',
+ path => 'vzdump-lxc-16112-2020_03_30-21_59_30.tgz',
+ vtype => 'backup',
+ volname => 'backup/vzdump-lxc-16112-2020_03_30-21_59_30.tgz',
+
+ timestamp => '2020_03_30-21_59_30',
+ year => '2020',
+ month => '03',
+ day => '30',
+ hour => '21',
+ minute => '59',
+ second => '30',
+ },
+ },
+ {
+ path => 'vzdump-openvz-16112-2020_03_30-21_39_30.tar.bz2',
+ expected => {
+ type => 'openvz',
+ vmid => '16112',
+ file => 'vzdump-openvz-16112-2020_03_30-21_39_30.tar.bz2',
+ ext => 'tar.bz2',
+ 'ext-archive' => 'tar',
+ 'ext-compression' => 'bz2',
+ 'disk-path' => 'vzdump-openvz-16112-2020_03_30-21_39_30.tar.bz2',
+ path => 'vzdump-openvz-16112-2020_03_30-21_39_30.tar.bz2',
+ vtype => 'backup',
+ volname => 'backup/vzdump-openvz-16112-2020_03_30-21_39_30.tar.bz2',
+
+ timestamp => '2020_03_30-21_39_30',
+ year => '2020',
+ month => '03',
+ day => '30',
+ hour => '21',
+ minute => '39',
+ second => '30',
+ },
+ },
+ {
+ path => 'vzdump-lxc-16110-3070_01_01-00_00_00.tgz',
+ expected => {
+ type => 'lxc',
+ vmid => '16110',
+ file => 'vzdump-lxc-16110-3070_01_01-00_00_00.tgz',
+ ext => 'tgz',
+ 'ext-archive' => 'tgz',
+ 'disk-path' => 'vzdump-lxc-16110-3070_01_01-00_00_00.tgz',
+ path => 'vzdump-lxc-16110-3070_01_01-00_00_00.tgz',
+ vtype => 'backup',
+ volname => 'backup/vzdump-lxc-16110-3070_01_01-00_00_00.tgz',
+
+ timestamp => '3070_01_01-00_00_00',
+ year => '3070',
+ month => '01',
+ day => '01',
+ hour => '00',
+ minute => '00',
+ second => '00',
+ },
+ },
+];
+
+my $volname_cases_backup_invalid = [
+ {
+ description => "Invalid file extension (1) (backup)",
+ args => {
+ path => 'vzdump-openvz-16112-2020_03_30-21_39_30.tar.zip',
+ vtype => 'backup',
+ },
+ expected => undef,
+ },
+ {
+ description => "Invalid file extension (2) (backup)",
+ args => {
+ path => 'vzdump-openvz-16112-2020_03_30-21_39_30.zip.gz',
+ vtype => 'backup',
+ },
+ expected => undef,
+ },
+ {
+ description => "Invalid file extension (3) (backup)",
+ args => {
+ path => 'vzdump-qemu-16110-2020_03_30-21_12_40.vma.xz',
+ vtype => 'backup',
+ },
+ expected => undef,
+ },
+ {
+ description => "Uppercase letter in file extension (1) (backup)",
+ args => {
+ path => 'vzdump-qemu-16110-2020_03_30-21_12_40.Tar.gz',
+ vtype => 'backup',
+ },
+ expected => undef,
+ },
+ {
+ description => "Uppercase letter in file extension (2) (backup)",
+ args => {
+ path => 'vzdump-qemu-16110-2020_03_30-21_12_40.tar.Gz',
+ vtype => 'backup',
+ },
+ expected => undef,
+ },
+];
+
my $volname_cases_newline_invalid = [
{
description => "Trailing newline (iso)",
args => {
path => "debian.iso\n",
@@ -219,15 +492,18 @@ my $volname_cases_newline_invalid = [
expected => undef,
},
];
my $cases_valid_all = [
- $volname_cases_iso_valid, $volname_cases_vztmpl_valid,
+ $volname_cases_iso_valid, $volname_cases_vztmpl_valid, $volname_cases_backup_valid,
];
my $cases_invalid_all = [
- $volname_cases_iso_invalid, $volname_cases_vztmpl_invalid, $volname_cases_newline_invalid,
+ $volname_cases_iso_invalid,
+ $volname_cases_vztmpl_invalid,
+ $volname_cases_backup_invalid,
+ $volname_cases_newline_invalid,
];
{
for my $cases_list ($cases_valid_all->@*) {
for my $case ($cases_list->@*) {
diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm
index 3786b6f5..e3d7367d 100644
--- a/src/PVE/Storage/Plugin.pm
+++ b/src/PVE/Storage/Plugin.pm
@@ -26,11 +26,13 @@ use PVE::Storage::Common::Parse qw(
use JSON;
use base qw(PVE::SectionConfig);
+# TODO: Phase out these two constants
use constant KNOWN_COMPRESSION_FORMATS => ('gz', 'lzo', 'zst', 'bz2');
+# FIXME: remove this regex on the next APIAGE reset.
use constant COMPRESSOR_RE => join('|', KNOWN_COMPRESSION_FORMATS);
use constant LOG_EXT => ".log";
use constant NOTES_EXT => ".notes";
@@ -907,18 +909,14 @@ sub parse_volname {
}
if ($vtype eq 'vztmpl') {
return ($vtype, $volume_path, undef, undef, undef, undef, 'raw');
}
- }
- if ($volname =~ m!^backup/([^/]+$PVE::Storage::BACKUP_EXT_RE_2)$!) {
- my $fn = $1;
- if ($fn =~ m/^vzdump-(openvz|lxc|qemu)-(\d+)-.+/) {
- return ('backup', $fn, $2, undef, undef, undef, 'raw');
+ if ($vtype eq 'backup') {
+ return ($vtype, $volume_path, $parts->{vmid}, undef, undef, undef, 'raw');
}
- return ('backup', $fn, undef, undef, undef, undef, 'raw');
}
if ($volname =~ m!^snippets/([^/]+)$!) {
return ('snippets', $1, undef, undef, undef, undef, 'raw');
}
@@ -1919,41 +1917,49 @@ my sub get_subdir_files {
format => $format,
};
}
if ($vtype eq 'backup') {
- return if $filename !~ m!/([^/]+$PVE::Storage::BACKUP_EXT_RE_2)$!;
+ my $parts = parse_abs_path_as_volid_parts($storeid, $scfg, $path, $vtype);
+ return if !defined($parts);
- my $original = $path;
- my $format = $2;
- $filename = $1;
+ my $format = $parts->{ext};
+ my $volume_path = $parts->{path};
- # Attribute archives to a guest like parse_volname() does, which the access checks use.
- next if defined($vmid) && $filename !~ m/^vzdump-(?:openvz|lxc|qemu)-\Q$vmid\E-/;
+ # Check if parsed VMID matched provided VMID in order to avoid
+ # false positives (VMID in parent directory name)
+ my $parsed_vmid = $parts->{vmid};
+ if (defined($vmid)) {
+ if (defined($parsed_vmid)) {
+ return if $vmid ne $parsed_vmid;
+ } else {
+ return;
+ }
+ }
my $info = {
- volid => "$storeid:backup/$filename",
+ volid => $parts->{volid},
format => $format,
};
- my $archive_info = eval { PVE::Storage::archive_info($filename) } // {};
+ my $archive_info = eval { PVE::Storage::archive_info($volume_path) } // {};
$info->{ctime} = $archive_info->{ctime} if defined($archive_info->{ctime});
$info->{subtype} = $archive_info->{type} // 'unknown';
- if (defined($vmid) || $filename =~ m!\-([1-9][0-9]{2,8})\-[^/]+\.${format}$!) {
- $info->{vmid} = $vmid // $1;
+ if (defined($vmid) || defined($parsed_vmid)) {
+ $info->{vmid} = $vmid // $parsed_vmid;
}
- my $notes_filename = $original . NOTES_EXT;
+ my $notes_filename = $path . NOTES_EXT;
if (-f $notes_filename) {
my $notes = PVE::Tools::file_read_firstline($notes_filename);
$info->{notes} = eval { decode('UTF-8', $notes, 1) } // $notes
if defined($notes);
}
- $info->{protected} = 1 if -e PVE::Storage::protection_file_path($original);
+ $info->{protected} = 1 if -e PVE::Storage::protection_file_path($path);
return $info;
}
if ($vtype eq 'snippets') {
--
2.47.3
next prev parent reply other threads:[~2026-11-17 20:44 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 20:38 [PATCH manager/storage v3 00/51] Fix #2884: Implement Subdirectory Scanning for Dir-Based Storage Types Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 01/51] test: plugin tests: run tests with at most 4 jobs Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 02/51] plugin, common: remove superfluous use of =pod command paragraph Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 03/51] common: use Exporter module for PVE::Storage::Common Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 04/51] plugin: make get_subdir_files a proper subroutine and update style Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 05/51] plugin api: replace subdir helper methods with standalone functions Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 06/51] common: prevent autovivification in plugin_get_vtype_subdir helper Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 07/51] plugin: break up if-elsif chain into separate if-blocks Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 08/51] plugin: adapt get_subdir_files helper of list_volumes API method Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 09/51] plugin: update code style of list_volumes plugin " Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 10/51] plugin: use closure for obtaining raw volume data in list_volumes Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 11/51] plugin: use closure for inner loop logic " Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 12/51] storage: update code style in function path_to_volume_id Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 13/51] storage: break up if-elsif chain in path_to_volume_id Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 14/51] storage: heave vtype file path parsing logic inside loop into helper Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 15/51] storage: clean up code that was moved into helper in path_to_volume_id Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 16/51] api: status: move content type assert for up-/downloads into helper Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 17/51] api: status: use get_subdir helper method to get content directory Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 18/51] api: status: move up-/download file path parsing code into helper Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 19/51] api: status: simplify file content assertion logic for up-/download Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 20/51] test: guest import: add tests for PVE::GuestImport Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 21/51] tree-wide: introduce parsing module and replace usages of ISO_EXT_RE_0 Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 22/51] common: test: set up parser testing code, add tests for 'iso' vtype Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 23/51] tree-wide: replace usages of VZTMPL_EXT_RE_1 with parsing functions Max R. Carrara
2026-11-17 20:38 ` Max R. Carrara [this message]
2026-11-17 20:38 ` [PATCH pve-storage v3 25/51] tree-wide: replace usages of inline regexes for snippets with parsers Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 26/51] tree-wide: partially replace usages of regexes for 'import' vtype Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 27/51] tree-wide: replace remaining " Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 28/51] tree-wide: simplify recently refactored parsing logic Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 29/51] test: list volumes: reorganize and modernize test running code Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 30/51] test: list volumes: fix broken test checking for vmlist modifications Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 31/51] test: list volumes: introduce new format for test cases Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 32/51] test: list volumes: remove legacy code and migrate cases to new format Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 33/51] plugin: do not return volumes of undeclared content types anymore Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 34/51] plugin: correct comment in get_subdir_files helper Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 35/51] test: parse volname: modernize code Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 36/51] test: parse volname: adapt tests regarding 'import' volume type Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 37/51] test: parse volname: move VM disk test creation into separate block Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 38/51] test: parse volname: move backup file test creation into sep. block Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 39/51] test: parse volname: parameterize test case creation for some vtypes Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 40/51] test: volume id: modernize code Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 41/51] test: volume id: rename 'volname' test case parameter to 'file' Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 42/51] test: filesystem path: modernize code Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 43/51] plugin: list content directories without globbing Max R. Carrara
2026-11-18 9:12 ` [PATCH pve-storage v3 44/51] fix #2884: implement nested subdir scanning and support 'iso' vtype Max R. Carrara
2026-11-18 9:14 ` [PATCH pve-storage v3 45/51] fix #2884: support nested subdir scanning for 'vztmpl' volume type Max R. Carrara
2026-11-18 9:14 ` [PATCH pve-storage v3 46/51] fix #2884: support nested subdir scanning for 'snippets' vtype Max R. Carrara
2026-11-18 9:14 ` [PATCH pve-storage v3 47/51] test: add more tests for 'import' vtype & guard against nested subdirs Max R. Carrara
2026-11-18 9:14 ` [PATCH pve-storage v3 48/51] test: add tests guarding against subdir scanning for vtypes Max R. Carrara
2026-11-18 9:14 ` [PATCH pve-storage v3 49/51] storage: resolve images in content dir overrides ending with a slash Max R. Carrara
2026-11-18 9:14 ` [PATCH pve-storage v3 50/51] bump the storage plugin API version Max R. Carrara
2026-11-18 9:14 ` [PATCH pve-manager v3 51/51] fix #2884: ui: storage: add field for 'max-scan-depth' property Max R. Carrara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261117203953.913035-25-m.carrara@proxmox.com \
--to=m.carrara@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
--cc=w.bumiller@proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.