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 49/51] storage: resolve images in content dir overrides ending with a slash
Date: Wed, 18 Nov 2026 10:14:11 +0100 [thread overview]
Message-ID: <20261118091416.27183-5-m.carrara@proxmox.com> (raw)
In-Reply-To: <20261118091416.27183-1-m.carrara@proxmox.com>
The content dir option accepts overrides like 'images=imgs/'. The
`images` branch of `path_to_volume_id()` strips the subdirectory only
if it is followed by a slash, and compares the path of each listed
image with the given path as strings. With a trailing slash, neither
matches, so such images were never resolved, also not before the
parsing rework.
Since the files of other volume types may now be found in nested
subdirectories, such a path falls through to the volume type of an
enclosing content directory instead. With 'snippets=/' and
'images=imgs/', for example, a VM disk can resolve to a snippet.
Strip trailing slashes from the subdirectory and compare the image
paths in canonical form.
Signed-off-by: Max R. Carrara <m.carrara@proxmox.com>
---
src/PVE/Storage.pm | 3 +-
src/PVE/Storage/Common.pm | 5 +-
src/test/path_to_volume_id_test.pm | 99 ++++++++++++++++++++++++++++++
3 files changed, 105 insertions(+), 2 deletions(-)
diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm
index f3d1298d..3cd17993 100755
--- a/src/PVE/Storage.pm
+++ b/src/PVE/Storage.pm
@@ -8,10 +8,11 @@ use IO::Select;
use IO::File;
use IO::Socket::IP;
use IPC::Open3;
use File::Basename;
use File::Path;
+use File::Spec;
use Cwd 'abs_path';
use Socket;
use Time::Local qw(timelocal);
use PVE::Cmd qw(build_ssh_command);
@@ -815,11 +816,11 @@ sub path_to_volume_id {
my $vollist = $plugin->list_images($sid, $scfg, $vmid);
for my $info ($vollist->@*) {
my ($storeid, $volname) = parse_volume_id($info->{volid});
my $volpath = $plugin->path($scfg, $volname, $storeid);
- if ($volpath eq $path) {
+ if (File::Spec->canonpath($volpath) eq $path) {
my ($parsed_vtype) = $plugin->parse_volname($volname);
return ($parsed_vtype, $info->{volid});
}
}
diff --git a/src/PVE/Storage/Common.pm b/src/PVE/Storage/Common.pm
index d39ee3d0..68464a1a 100644
--- a/src/PVE/Storage/Common.pm
+++ b/src/PVE/Storage/Common.pm
@@ -431,9 +431,12 @@ sub plugin_get_vtype_subdir : prototype($$) ($scfg, $vtype) {
# Intermediate step to prevent autovivification
my $content_dirs = $scfg->{'content-dirs'} // {};
my $subdir = $content_dirs->{$vtype} // $DEFAULT_VTYPE_SUBDIRS->{$vtype};
- return "$path/$subdir";
+ # Content dirs may contain a trailing slash, but shouldn't!
+ my $without_trailing_slash = "$path/$subdir" =~ s!/+$!!r;
+
+ return $without_trailing_slash;
}
1;
diff --git a/src/test/path_to_volume_id_test.pm b/src/test/path_to_volume_id_test.pm
index bcd9db9c..12ed94d3 100644
--- a/src/test/path_to_volume_id_test.pm
+++ b/src/test/path_to_volume_id_test.pm
@@ -34,10 +34,53 @@ my $DEFAULT_CFG = {
},
},
},
'order' => {
'local' => 1,
+ 'overrides' => 2,
+ 'nested' => 3,
+ },
+};
+
+my $OVERRIDES_STORAGE_DIR = File::Temp->newdir(); # unlinks on exit
+$DEFAULT_CFG->{ids}->{overrides} = {
+ 'shared' => 0,
+ 'path' => "$OVERRIDES_STORAGE_DIR",
+ 'type' => 'dir',
+ 'content' => {
+ 'images' => 1,
+ 'snippets' => 1,
+ 'iso' => 1,
+ 'vztmpl' => 1,
+ },
+ 'content-dirs' => {
+ # nested inside each other
+ 'snippets' => 'tpl',
+ 'vztmpl' => 'tpl/cache',
+ # trailing slash
+ 'iso' => 'isos/',
+ 'images' => 'imgs/',
+ },
+};
+
+my $NESTED_STORAGE_DIR = File::Temp->newdir(); # unlinks on exit
+$DEFAULT_CFG->{ids}->{nested} = {
+ 'shared' => 0,
+ 'path' => "$NESTED_STORAGE_DIR",
+ 'type' => 'dir',
+ 'content' => {
+ 'iso' => 1,
+ 'vztmpl' => 1,
+ 'backup' => 1,
+ 'snippets' => 1,
+ },
+ 'content-dirs' => {
+ # vtypes that accept subdirectories contain the directories of other vtypes
+ 'iso' => 'data',
+ 'vztmpl' => 'data/tpl',
+ 'backup' => 'data/tpl/dump',
+ 'snippets' => 'data/snippets',
},
};
# Each test is comprised of the following keys:
# description => to identify a single test
@@ -278,10 +321,66 @@ my $tests = [
# currently not possible because it would introduce parsing ambiguities.
description => 'Import, ova, subdirectory',
file => "$DEFAULT_STORAGE_DIR/import/foo/import.ova",
expected => [''],
},
+ {
+ description => 'Content dir override with trailing slash, ISO',
+ file => "$OVERRIDES_STORAGE_DIR/isos/debian.iso",
+ expected => [
+ 'iso', 'overrides:iso/debian.iso',
+ ],
+ },
+ {
+ description => 'Content dir override with trailing slash, image',
+ file => "$OVERRIDES_STORAGE_DIR/imgs/100/vm-100-disk-0.raw",
+ expected => [
+ 'vm-vol', 'overrides:100/vm-100-disk-0.raw',
+ ],
+ },
+ {
+ description => 'Content dir override nested in another one, vztmpl',
+ file => "$OVERRIDES_STORAGE_DIR/tpl/cache/debian.tar.zst",
+ expected => [
+ 'vztmpl', 'overrides:vztmpl/debian.tar.zst',
+ ],
+ },
+ {
+ description => 'Content dir nested in an ISO dir, snippets',
+ file => "$NESTED_STORAGE_DIR/data/snippets/seed.img",
+ expected => [
+ 'snippets', 'nested:snippets/seed.img',
+ ],
+ },
+ {
+ description => 'Content dir nested in an ISO dir, vztmpl',
+ file => "$NESTED_STORAGE_DIR/data/tpl/debian.tar.zst",
+ expected => [
+ 'vztmpl', 'nested:vztmpl/debian.tar.zst',
+ ],
+ },
+ {
+ description => 'Content dir nested in a vztmpl dir, backup',
+ file => "$NESTED_STORAGE_DIR/data/tpl/dump/vzdump-lxc-100-2020_03_30-21_39_30.tar.zst",
+ expected => [
+ 'backup', 'nested:backup/vzdump-lxc-100-2020_03_30-21_39_30.tar.zst',
+ ],
+ },
+ {
+ description => 'Content dir containing other ones, ISO in subdirectory',
+ file => "$NESTED_STORAGE_DIR/data/sub/debian.iso",
+ expected => [
+ 'iso', 'nested:iso/sub/debian.iso',
+ ],
+ },
+ {
+ description => 'Content dir override containing another one, snippets',
+ file => "$OVERRIDES_STORAGE_DIR/tpl/userconfig.yaml",
+ expected => [
+ 'snippets', 'overrides:snippets/userconfig.yaml',
+ ],
+ },
];
my sub run_tests($tests) {
my $seen_vtype;
my $vtype_subdirs = { map { $_ => 1 } keys plugin_get_default_vtype_subdirs()->%* };
--
2.47.3
next prev parent reply other threads:[~2026-11-18 9:15 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 ` [PATCH pve-storage v3 24/51] tree-wide: replace usages of BACKUP_EXT_RE_2 " Max R. Carrara
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 ` Max R. Carrara [this message]
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=20261118091416.27183-5-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox