public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
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 19/51] api: status: simplify file content assertion logic for up-/download
Date: Tue, 17 Nov 2026 21:38:51 +0100	[thread overview]
Message-ID: <20261117203953.913035-20-m.carrara@proxmox.com> (raw)
In-Reply-To: <20261117203953.913035-1-m.carrara@proxmox.com>

Create another helper for the file content assertion logic in the
upload / download_url API methods. Absorb the `assert_ova_contents()`
helper along the way, since it does not need to be standalone anymore.

Signed-off-by: Max R. Carrara <m.carrara@proxmox.com>
---
 src/PVE/API2/Storage/Status.pm | 91 ++++++++++++----------------------
 1 file changed, 32 insertions(+), 59 deletions(-)

diff --git a/src/PVE/API2/Storage/Status.pm b/src/PVE/API2/Storage/Status.pm
index 4ef7755a..f18b64cb 100644
--- a/src/PVE/API2/Storage/Status.pm
+++ b/src/PVE/API2/Storage/Status.pm
@@ -100,29 +100,44 @@ my sub parse_transferred_file_path_extension : prototype($$) {
     }
 
     die "upload / download: failed to parse '$path' - unhandled content type '$vtype'\n";
 }
 
-my sub assert_ova_contents {
-    my ($file) = @_;
+my sub assert_file_transfer_contents_valid : prototype($$$) {
+    my ($path, $vtype, $extension) = @_;
 
-    # test if it's really a tar file with an ovf file inside
-    my $hasOvf = 0;
-    run_command(
-        ['tar', '-t', '-f', $file],
-        outfunc => sub {
-            my ($line) = @_;
+    if ($vtype eq 'iso') {
+        PVE::Storage::assert_iso_content($path);
+        return;
+    }
 
-            if ($line =~ m/\.ovf$/) {
-                $hasOvf = 1;
-            }
-        },
-    );
+    if ($vtype eq 'import') {
+        if ($extension eq 'ova') {
+            # test if it's really a tar file with an ovf file inside
+            my $hasOvf = 0;
+            run_command(
+                ['tar', '-t', '-f', $path],
+                outfunc => sub {
+                    my ($line) = @_;
 
-    die "ova archive has no .ovf file inside\n" if !$hasOvf;
+                    if ($line =~ m/\.ovf$/) {
+                        $hasOvf = 1;
+                    }
+                },
+            );
 
-    return 1;
+            die "ova archive has no .ovf file inside\n" if !$hasOvf;
+            return;
+        }
+
+        my $is_untrusted = 1;
+        my $timeout = 10;
+
+        PVE::Storage::file_size_info($path, $timeout, $extension, $is_untrusted);
+
+        return;
+    }
 }
 
 __PACKAGE__->register_method({
     name => 'index',
     path => '',
@@ -644,24 +659,12 @@ __PACKAGE__->register_method({
 
         my $size = -s $tmpfilename;
         die "temporary file '$tmpfilename' does not exist\n" if !defined($size);
 
         my $filename = PVE::Storage::normalize_content_filename($param->{filename});
-
-        my $is_ova = 0;
-        my $image_format;
-
         my $extension = parse_transferred_file_path_extension($filename, $content);
 
-        if ($content eq 'import') {
-            if ($extension eq 'ova') {
-                $is_ova = 1;
-            } else {
-                $image_format = $extension;
-            }
-        }
-
         # FIXME: Call plugin_get_vtype_subdir() instead of
         # $plugin->get_subdir() on the next APIAGE reset.
         my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
         my $path = $plugin->get_subdir($scfg, $content);
 
@@ -725,20 +728,11 @@ __PACKAGE__->register_method({
                         print "\n"; # the front end expects the error to reside at the last line without any noise
                         die "checksum mismatch: got '$checksum_got' != expect '$checksum'\n";
                     }
                 }
 
-                if ($content eq 'iso') {
-                    PVE::Storage::assert_iso_content($tmpfilename);
-                }
-
-                if ($is_ova) {
-                    assert_ova_contents($tmpfilename);
-                } elsif (defined($image_format)) {
-                    # checks untrusted image
-                    PVE::Storage::file_size_info($tmpfilename, 10, $image_format, 1);
-                }
+                assert_file_transfer_contents_valid($tmpfilename, $content, $extension);
             };
             if (my $err = $@) {
                 # unlinks only the temporary file from the http server
                 unlink $tmpfilename
                     or $! == ENOENT
@@ -859,24 +853,12 @@ __PACKAGE__->register_method({
         my ($content, $url) = $param->@{ 'content', 'url' };
 
         assert_can_transfer_files($scfg, $storage, $content);
 
         my $filename = PVE::Storage::normalize_content_filename($param->{filename});
-
-        my $is_ova = 0;
-        my $image_format;
-
         my $extension = parse_transferred_file_path_extension($filename, $content);
 
-        if ($content eq 'import') {
-            if ($extension eq 'ova') {
-                $is_ova = 1;
-            } else {
-                $image_format = $extension;
-            }
-        }
-
         # FIXME: Call plugin_get_vtype_subdir() instead of
         # $plugin->get_subdir() on the next APIAGE reset.
         my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
         my $path = $plugin->get_subdir($scfg, $content);
 
@@ -898,20 +880,11 @@ __PACKAGE__->register_method({
         }
 
         $opts->{assert_file_validity} = sub {
             my ($tmp_path) = @_;
 
-            if ($content eq 'iso') {
-                PVE::Storage::assert_iso_content($tmp_path);
-            }
-
-            if ($is_ova) {
-                assert_ova_contents($tmp_path);
-            } elsif (defined($image_format)) {
-                # checks untrusted image
-                PVE::Storage::file_size_info($tmp_path, 10, $image_format, 1);
-            }
+            assert_file_transfer_contents_valid($tmp_path, $content, $extension);
         };
 
         my $worker = sub {
             if ($compression) {
                 die "decompression not supported for $content\n" if $content ne 'iso';
-- 
2.47.3





  parent reply	other threads:[~2026-11-17 20:42 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 ` Max R. Carrara [this message]
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   ` [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-20-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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal