From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 908871FF0C0 for ; Wed, 18 Nov 2026 10:14:42 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id C13232135D; Wed, 18 Nov 2026 10:14:29 +0100 (CET) From: "Max R. Carrara" To: pve-devel@lists.proxmox.com Subject: [PATCH pve-storage v3 47/51] test: add more tests for 'import' vtype & guard against nested subdirs Date: Wed, 18 Nov 2026 10:14:09 +0100 Message-ID: <20261118091416.27183-3-m.carrara@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261118091416.27183-1-m.carrara@proxmox.com> References: <20261117203953.913035-1-m.carrara@proxmox.com> <20261118091416.27183-1-m.carrara@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1794993261193 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.236 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: D5Y5MGTPS43G7GCSWZR73BREQ6NU4NLS X-Message-ID-Hash: D5Y5MGTPS43G7GCSWZR73BREQ6NU4NLS X-MailFrom: m.carrara@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Wolfgang Bumiller X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Supporting nested subdirectories for the 'import' volume type is currently not possible, because of a parsing ambiguity that would be introduced. In particular, it would not be possible to differentiate whether 'foo.ova' in 'foo.ova/bar.qcow2' refers to a directory ending with '.ova' or an actual '.ova' file through parsing alone. Note this down in a comment as well, so it doesn't get overlooked. Therefore, instead of supporting nested subdirectories for the 'import' volume type, add tests that explicitly guard against subdirectory scanning support. Additionally, toss in a few extra tests for the `filesystem_path()` plugin API method and also for the differences in whitespace handling for file paths and volume names for the 'import' volume type. Signed-off-by: Max R. Carrara --- src/PVE/Storage/Common/Parse.pm | 7 ++ src/PVE/Storage/Common/test/parser_tests.pl | 40 +++++++ src/test/filesystem_path_test.pm | 14 +++ src/test/list_volumes_test.pm | 65 +++++++++++ src/test/parse_volname_test.pm | 120 ++++++++++++++++++++ src/test/path_to_volume_id_test.pm | 13 +++ 6 files changed, 259 insertions(+) diff --git a/src/PVE/Storage/Common/Parse.pm b/src/PVE/Storage/Common/Parse.pm index 8ec2236d..0ecf7378 100644 --- a/src/PVE/Storage/Common/Parse.pm +++ b/src/PVE/Storage/Common/Parse.pm @@ -145,10 +145,17 @@ my $RE_SNIPPETS_FILE_PATH = qr! (? $RE_DIRECTORY_COMPONENTS )? (? [^/]+ ) ) !xn; +# NOTE: Supporting subdirectories would introduce a parsing ambiguity with +# volume names; in particular, there would be no way to tell whether 'foo.ova' +# in 'foo.ova/bar.qcow2' refers to a directory or a file just through parsing +# alone. +# +# Therefore, neither RE_IMPORT_FILE_PATH nor RE_IMPORT_VOLNAME currently +# accept subdirectory components. my $RE_IMPORT_FILE_PATH = qr! (? (? ($RE_SAFE_CHAR_CLASS)+ \. (? $RE_IMPORT_EXTENSIONS) ) ) !xn; diff --git a/src/PVE/Storage/Common/test/parser_tests.pl b/src/PVE/Storage/Common/test/parser_tests.pl index 44aa7e88..ad3651e0 100755 --- a/src/PVE/Storage/Common/test/parser_tests.pl +++ b/src/PVE/Storage/Common/test/parser_tests.pl @@ -726,10 +726,50 @@ my $volname_cases_import_invalid = [ path => '🐪perl-playground🐪.ova', vtype => 'import', }, expected => undef, }, + { + description => "Subdirectory (import)", + args => { + path => 'subdir/disk.ovf', + vtype => 'import', + }, + expected => undef, + }, + { + description => "Nested subdirectory (import)", + args => { + path => 'deeply/nested/subdir/disk.raw', + vtype => 'import', + }, + expected => undef, + }, + { + description => "Parent dir reference in path (beginning) (import)", + args => { + path => '../disk.ova', + vtype => 'import', + }, + expected => undef, + }, + { + description => "Parent dir reference in path (middle) (import)", + args => { + path => 'subdir/../disk.raw', + vtype => 'import', + }, + expected => undef, + }, + { + description => "Parent dir reference in path (end) (import)", + args => { + path => 'subdir/disk.qcow2/..', + vtype => 'import', + }, + expected => undef, + }, ]; my $volname_cases_newline_invalid = [ { description => "Trailing newline (iso)", diff --git a/src/test/filesystem_path_test.pm b/src/test/filesystem_path_test.pm index 06789187..c85ab554 100644 --- a/src/test/filesystem_path_test.pm +++ b/src/test/filesystem_path_test.pm @@ -132,10 +132,24 @@ my $tests = [ volname => 'snippets/foo/bar/baz/something.txt', snapname => undef, expected => ["$DEFAULT_STORAGE_DIR/snippets/foo/bar/baz/something.txt", undef, 'snippets'], }, + { + volname => 'import/import.ova', + snapname => undef, + expected => [ + "$DEFAULT_STORAGE_DIR/import/import.ova", undef, 'import', + ], + }, + { + volname => 'import/import.ovf', + snapname => undef, + expected => [ + "$DEFAULT_STORAGE_DIR/import/import.ovf", undef, 'import', + ], + }, ]; my sub run_tests($tests) { for my $t ($tests->@*) { my $volname = $t->{volname}; diff --git a/src/test/list_volumes_test.pm b/src/test/list_volumes_test.pm index c93b1634..d72dbd6e 100644 --- a/src/test/list_volumes_test.pm +++ b/src/test/list_volumes_test.pm @@ -1424,10 +1424,30 @@ my $test_param_list = [ }, { file => "$DEFAULT_STORAGE_PATH/snippets/1/2/3/4/5/some-hookscript.pl", expected => undef, }, + { + file => "$DEFAULT_STORAGE_PATH/import/some-import.ova", + expected => { + content => 'import', + ctime => $DEFAULT_CTIME, + format => 'ova', + size => $DEFAULT_SIZE, + volid => 'local:import/some-import.ova', + }, + }, + { + # Not allowed regardless + file => "$DEFAULT_STORAGE_PATH/import/1/some-import.ova", + expected => undef, + }, + { + # Not allowed regardless + file => "$DEFAULT_STORAGE_PATH/import/1/2/3/4/5/some-import.ova", + expected => undef, + }, ], }, { description => "VMID: none, nested subdirectories allowed, max-scan-depth = 1", storeid => $DEFAULT_STOREID, @@ -1519,10 +1539,30 @@ my $test_param_list = [ { # Exceeds max-scan-depth file => "$DEFAULT_STORAGE_PATH/snippets/1/2/some-hookscript.pl", expected => undef, }, + { + file => "$DEFAULT_STORAGE_PATH/import/some-import.ova", + expected => { + content => 'import', + ctime => $DEFAULT_CTIME, + format => 'ova', + size => $DEFAULT_SIZE, + volid => 'local:import/some-import.ova', + }, + }, + { + # Not allowed + file => "$DEFAULT_STORAGE_PATH/import/1/some-import.ova", + expected => undef, + }, + { + # Not allowed + exceeds max-scan-depth + file => "$DEFAULT_STORAGE_PATH/import/1/2/some-import.ova", + expected => undef, + }, ], }, { description => "VMID: none, nested subdirectories allowed, max-scan-depth = 5", storeid => $DEFAULT_STOREID, @@ -1646,10 +1686,35 @@ my $test_param_list = [ { # Exceeds max-scan-depth file => "$DEFAULT_STORAGE_PATH/snippets/1/2/3/4/5/6/some-hookscript.pl", expected => undef, }, + { + file => "$DEFAULT_STORAGE_PATH/import/some-import.ova", + expected => { + content => 'import', + ctime => $DEFAULT_CTIME, + format => 'ova', + size => $DEFAULT_SIZE, + volid => 'local:import/some-import.ova', + }, + }, + { + # Not allowed + file => "$DEFAULT_STORAGE_PATH/import/1/some-import.ova", + expected => undef, + }, + { + # Still not allowed + file => "$DEFAULT_STORAGE_PATH/import/1/2/3/4/5/some-import.ova", + expected => undef, + }, + { + # Not allowed + exceeds max-scan-depth + file => "$DEFAULT_STORAGE_PATH/import/1/2/3/4/5/6/some-import.ova", + expected => undef, + }, ], }, { description => "VMID: none, max-scan-depth = 2, nested content dir of snippets", storeid => $DEFAULT_STOREID, diff --git a/src/test/parse_volname_test.pm b/src/test/parse_volname_test.pm index f2aa0344..8b8e3f8b 100644 --- a/src/test/parse_volname_test.pm +++ b/src/test/parse_volname_test.pm @@ -99,10 +99,22 @@ my $tests = [ description => "Import, inner file of ova with whitespace in name", volname => 'import/import.ova/OS disk.vmdk', expected => ['import', 'import.ova/OS disk.vmdk', undef, undef, undef, undef, 'ova+vmdk'], }, + { + description => "Import, ova file on disk with whitespace in name", + volname => 'import/My neat import.ova/disk.vmdk', + expected => + ['import', 'My neat import.ova/disk.vmdk', undef, undef, undef, undef, 'ova+vmdk'], + }, + { + description => "Import, ova file on disk and inner file of ova with whitespace in name", + volname => 'import/My neat import.ova/OS disk.vmdk', + expected => + ['import', 'My neat import.ova/OS disk.vmdk', undef, undef, undef, undef, 'ova+vmdk'], + }, # # failed matches # { description => "Failed match: VM disk image, base, raw", @@ -775,10 +787,61 @@ for my $plugin_name (qw(ZFSPlugin ZFSPoolPlugin)) { }, ); push($tests->@*, @extra_tests); } + + # Expected to fail + { + my $file_name = "$prefix.ova"; + + my @extra_failed_tests = ( + { + description => "Import, ova, directory", + volname => "import/foo/$file_name", + expected => "unable to parse directory volume name 'import/foo/$file_name'\n", + }, + { + description => "Import, ova, subdirectories", + volname => "import/foo/bar/baz/$file_name", + expected => + "unable to parse directory volume name 'import/foo/bar/baz/$file_name'\n", + }, + { + description => "Import, ova, directory with same name as file", + volname => "import/$file_name/$file_name", + expected => + "unable to parse directory volume name 'import/$file_name/$file_name'\n", + }, + { + description => + "Import, ova, parent directory reference before volume type prefix", + volname => "../import/$file_name", + expected => "unable to parse directory volume name '../import/$file_name'\n", + }, + { + description => + "Import, ova, parent directory reference at beginning of volume path", + volname => "import/../$file_name", + expected => "unable to parse directory volume name 'import/../$file_name'\n", + }, + { + description => "Import, ova, parent directory reference at end of volume path", + volname => "import/$file_name/..", + expected => "unable to parse directory volume name 'import/$file_name/..'\n", + }, + { + description => + "Import, ova, parent directory reference between dir components of volume path", + volname => "import/foo/../bar/$file_name", + expected => + "unable to parse directory volume name 'import/foo/../bar/$file_name'\n", + }, + ); + + push($tests->@*, @extra_failed_tests); + } } # Test cases for OVA import files with content inside { my $content_suffixes = ['qcow2', 'vmdk', 'raw']; @@ -804,10 +867,67 @@ for my $plugin_name (qw(ZFSPlugin ZFSPoolPlugin)) { }, ); push($tests->@*, @extra_tests); } + + # Expected to fail + { + my $content_file_name = "disk.qcow2"; + + my @extra_failed_tests = ( + { + description => "Import, inner file of ova (qcow2), directory", + volname => "import/foo/$file_name/$content_file_name", + expected => + "unable to parse directory volume name 'import/foo/$file_name/$content_file_name'\n", + }, + { + description => "Import, inner file of ova (qcow2), nested directories", + volname => "import/foo/bar/baz/$file_name/$content_file_name", + expected => + "unable to parse directory volume name 'import/foo/bar/baz/$file_name/$content_file_name'\n", + }, + { + description => + "Import, inner file of ova (qcow2), directory with same name as file", + volname => "import/$file_name/$file_name/$content_file_name", + expected => + "unable to parse directory volume name 'import/$file_name/$file_name/$content_file_name'\n", + }, + { + description => "Import, inner file of ova (qcow2)," + . " parent directory reference before volume type prefix", + volname => "../import/$file_name/$content_file_name", + expected => + "unable to parse directory volume name '../import/$file_name/$content_file_name'\n", + }, + { + description => "Import, inner file of ova (qcow2)," + . " parent directory reference at beginning of volume path", + volname => "import/../$file_name/$content_file_name", + expected => + "unable to parse directory volume name 'import/../$file_name/$content_file_name'\n", + }, + { + description => "Import, inner file of ova (qcow2)," + . " parent directory reference at end of disk path", + volname => "import/$file_name/../$content_file_name", + expected => + "unable to parse directory volume name 'import/$file_name/../$content_file_name'\n", + }, + { + description => "Import, inner file of ova (qcow2)," + . " parent directory reference at end of volume path", + volname => "import/$file_name/$content_file_name/..", + expected => + "unable to parse directory volume name 'import/$file_name/$content_file_name/..'\n", + }, + ); + + push($tests->@*, @extra_failed_tests); + } } my sub run_tests($tests) { my $seen_vtype = {}; my $vtype_subdirs = { map { $_ => 1 } keys plugin_get_default_vtype_subdirs()->%* }; diff --git a/src/test/path_to_volume_id_test.pm b/src/test/path_to_volume_id_test.pm index dcd05111..3cdf23ae 100644 --- a/src/test/path_to_volume_id_test.pm +++ b/src/test/path_to_volume_id_test.pm @@ -254,10 +254,23 @@ my $tests = [ { description => 'Import, non ova/ovf/disk image in import dir', file => "$DEFAULT_STORAGE_DIR/import/test.foo", expected => [''], }, + { + # Allowed in volume names, but not in file paths + description => 'Import, ova, whitespace in file name', + file => "$DEFAULT_STORAGE_DIR/import/My Import.ova", + expected => [''], + }, + { + # Supporting subdirectories for the 'import' volume type is + # currently not possible because it would introduce parsing ambiguities. + description => 'Import, ova, subdirectory', + file => "$DEFAULT_STORAGE_DIR/import/foo/import.ova", + expected => [''], + }, ]; my sub run_tests($tests) { my $seen_vtype; my $vtype_subdirs = { map { $_ => 1 } keys plugin_get_default_vtype_subdirs()->%* }; -- 2.47.3