plugin: dir: implement import content type

in DirPlugin and not Plugin (because of cyclic dependency of
Plugin -> OVF -> Storage -> Plugin otherwise)

only ovf is currently supported (though ova will be shown in import
listing), expects the files to not be in a subdir, and adjacent to the
ovf file.

listed will be all ovf/qcow2/raw/vmdk files.
ovf because it can be imported, and the rest because they can be used
in the 'import-from' part of qemu-server.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>

diff --git a/src/PVE/GuestImport/OVF.pm b/src/PVE/GuestImport/OVF.pm
index 39502891d3378fb57e93a77d64b29ec40afeb328..29dfaadea7e670edbd571b5fe10d2694f1a3ca45 100644 (file)
--- a/src/PVE/GuestImport/OVF.pm
+++ b/src/PVE/GuestImport/OVF.pm
@@ -221,6 +221,8 @@ ovf:Item[rasd:InstanceID='%s']/rasd:ResourceType", $controller_id);
        }
 
        ($backing_file_path) = $backing_file_path =~ m|^(/.*)|; # untaint
+       ($filepath) = $filepath =~ m|^(${PVE::Storage::SAFE_CHAR_CLASS_RE}+)$|; # untaint & check no sub/parent dirs
+       die "invalid path\n" if !$filepath;
 
        my $virtual_size = PVE::Storage::file_size_info($backing_file_path);
        die "error parsing $backing_file_path, cannot determine file size\n"
@@ -229,7 +231,8 @@ ovf:Item[rasd:InstanceID='%s']/rasd:ResourceType", $controller_id);
        $pve_disk = {
            disk_address => $pve_disk_address,
            backing_file => $backing_file_path,
-           virtual_size => $virtual_size
+           virtual_size => $virtual_size,
+           relative_path => $filepath,
        };
        push @disks, $pve_disk;
 

diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm
index 1c4c5cd611f27fca046b9919ab5fec1df28cf43b..6e12a005fc9010f7992ea5b7b8ad014d42983a55 100755 (executable)
--- a/src/PVE/Storage.pm
+++ b/src/PVE/Storage.pm
@@ -114,6 +114,10 @@ our $VZTMPL_EXT_RE_1 = qr/\.tar\.(gz|xz|zst|bz2)/i;
 
 our $BACKUP_EXT_RE_2 = qr/\.(tgz|(?:tar|vma)(?:\.(${\PVE::Storage::Plugin::COMPRESSOR_RE}))?)/;
 
+our $IMPORT_EXT_RE_1 = qr/\.(ovf|qcow2|raw|vmdk)/;
+
+our $SAFE_CHAR_CLASS_RE = qr/[a-zA-Z0-9\-\.\+\=\_]/;
+
 # FIXME remove with PVE 9.0, add versioned breaks for pve-manager
 our $vztmpl_extension_re = $VZTMPL_EXT_RE_1;
 
@@ -612,6 +616,7 @@ sub path_to_volume_id {
        my $backupdir = $plugin->get_subdir($scfg, 'backup');
        my $privatedir = $plugin->get_subdir($scfg, 'rootdir');
        my $snippetsdir = $plugin->get_subdir($scfg, 'snippets');
+       my $importdir = $plugin->get_subdir($scfg, 'import');
 
        if ($path =~ m!^$imagedir/(\d+)/([^/\s]+)$!) {
            my $vmid = $1;
@@ -640,6 +645,9 @@ sub path_to_volume_id {
        } elsif ($path =~ m!^$snippetsdir/([^/]+)$!) {
            my $name = $1;
            return ('snippets', "$sid:snippets/$name");
+       } elsif ($path =~ m!^$importdir/(${SAFE_CHAR_CLASS_RE}+${IMPORT_EXT_RE_1})$!) {
+           my $name = $1;
+           return ('import', "$sid:import/$name");
        }
     }
 

diff --git a/src/PVE/Storage/DirPlugin.pm b/src/PVE/Storage/DirPlugin.pm
index 2efa8d5abe4a7124e68e404c5e5cdc0337513f0e..efbca0cea2a9164f675ef55ea25909e9e3d24cde 100644 (file)
--- a/src/PVE/Storage/DirPlugin.pm
+++ b/src/PVE/Storage/DirPlugin.pm
@@ -10,6 +10,7 @@ use IO::File;
 use POSIX;
 
 use PVE::Storage::Plugin;
+use PVE::GuestImport::OVF;
 use PVE::JSONSchema qw(get_standard_option);
 
 use base qw(PVE::Storage::Plugin);
@@ -22,7 +23,7 @@ sub type {
 
 sub plugindata {
     return {
-       content => [ { images => 1, rootdir => 1, vztmpl => 1, iso => 1, backup => 1, snippets => 1, none => 1 },
+       content => [ { images => 1, rootdir => 1, vztmpl => 1, iso => 1, backup => 1, snippets => 1, none => 1, import => 1 },
                     { images => 1,  rootdir => 1 }],
        format => [ { raw => 1, qcow2 => 1, vmdk => 1, subvol => 1 } , 'raw' ],
     };
@@ -247,4 +248,37 @@ sub check_config {
     return $opts;
 }
 
+sub get_import_metadata {
+    my ($class, $scfg, $volname, $storeid) = @_;
+
+    my ($vtype, $name, undef, undef, undef, undef, $fmt) = $class->parse_volname($volname);
+    die "invalid content type '$vtype'\n" if $vtype ne 'import';
+    die "invalid format\n" if $fmt ne 'ovf';
+
+    # NOTE: all types of warnings must be added to the return schema of the import-metadata API endpoint
+    my $warnings = [];
+
+    my $path = $class->path($scfg, $volname, $storeid, undef);
+    my $res = PVE::GuestImport::OVF::parse_ovf($path);
+    my $disks = {};
+    for my $disk ($res->{disks}->@*) {
+       my $id = $disk->{disk_address};
+       my $size = $disk->{virtual_size};
+       my $path = $disk->{relative_path};
+       $disks->{$id} = {
+           volid => "$storeid:import/$path",
+           defined($size) ? (size => $size) : (),
+       };
+    }
+
+    return {
+       type => 'vm',
+       source => $volname,
+       'create-args' => $res->{qm},
+       'disks' => $disks,
+       warnings => $warnings,
+       net => [],
+    };
+}
+
 1;

diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm
index 437365a0ff981b1108495d1df736704842e458a4..3655e6a2c8f8045c98eb133db727e06b70afd460 100644 (file)
--- a/src/PVE/Storage/Plugin.pm
+++ b/src/PVE/Storage/Plugin.pm
@@ -663,6 +663,8 @@ sub parse_volname {
        return ('backup', $fn);
     } elsif ($volname =~ m!^snippets/([^/]+)$!) {
        return ('snippets', $1);
+    } elsif ($volname =~ m!^import/(${PVE::Storage::SAFE_CHAR_CLASS_RE}+$PVE::Storage::IMPORT_EXT_RE_1)$!) {
+       return ('import', $1, undef, undef, undef, undef, $2);
     }
 
     die "unable to parse directory volume name '$volname'\n";
@@ -675,6 +677,7 @@ my $vtype_subdirs = {
     vztmpl => 'template/cache',
     backup => 'dump',
     snippets => 'snippets',
+    import => 'import',
 };
 
 sub get_vtype_subdirs {
@@ -1269,7 +1272,7 @@ sub list_images {
     return $res;
 }
 
-# list templates ($tt = <iso|vztmpl|backup|snippets>)
+# list templates ($tt = <iso|vztmpl|backup|snippets|import>)
 my $get_subdir_files = sub {
     my ($sid, $path, $tt, $vmid) = @_;
 
@@ -1325,6 +1328,10 @@ my $get_subdir_files = sub {
                volid => "$sid:snippets/". basename($fn),
                format => 'snippet',
            };
+       } elsif ($tt eq 'import') {
+           next if $fn !~ m!/(${PVE::Storage::SAFE_CHAR_CLASS_RE}+$PVE::Storage::IMPORT_EXT_RE_1)$!i;
+
+           $info = { volid => "$sid:import/$1", format => "$2" };
        }
 
        $info->{size} = $st->size;
@@ -1359,6 +1366,8 @@ sub list_volumes {
                $data = $get_subdir_files->($storeid, $path, 'backup', $vmid);
            } elsif ($type eq 'snippets') {
                $data = $get_subdir_files->($storeid, $path, 'snippets');
+           } elsif ($type eq 'import') {
+               $data = $get_subdir_files->($storeid, $path, 'import');
            }
        }
 

diff --git a/src/test/parse_volname_test.pm b/src/test/parse_volname_test.pm
index 6c5ba0433a8036b3bfe53c5cbafd6ca246f2894f..92e984fecfd64203671ffe533fca176a017a7b6f 100644 (file)
--- a/src/test/parse_volname_test.pm
+++ b/src/test/parse_volname_test.pm
@@ -86,6 +86,14 @@ my $tests = [
        expected    => ['snippets', 'hookscript.pl'],
     },
     #
+    # Import
+    #
+    {
+       description => "Import, ovf",
+       volname     => 'import/import.ovf',
+       expected    => ['import', 'import.ovf', undef, undef, undef ,undef, 'ovf'],
+    },
+    #
     # failed matches
     #
     {
@@ -123,6 +131,11 @@ my $tests = [
        volname     => "$vmid/base-$vmid-disk-0.qcow2/ssss/vm-$vmid-disk-0.qcow2",
        expected    => "unable to parse volume filename 'base-$vmid-disk-0.qcow2/ssss/vm-$vmid-disk-0.qcow2'\n",
     },
+    {
+       description => "Failed match: import dir but no ova/ovf/disk image",
+       volname     => "import/test.foo",
+       expected    => "unable to parse directory volume name 'import/test.foo'\n",
+    },
 ];
 
 # create more test cases for VM disk images matches

diff --git a/src/test/path_to_volume_id_test.pm b/src/test/path_to_volume_id_test.pm
index 3198752f1adfc17d48c8003ffb2e4b28acdf91b1..d954f4b57a5050e78853dabe8a01e7c5f34a56c5 100644 (file)
--- a/src/test/path_to_volume_id_test.pm
+++ b/src/test/path_to_volume_id_test.pm
@@ -190,6 +190,14 @@ my @tests = (
            'local:vztmpl/debian-10.0-standard_10.0-1_amd64.tar.xz',
        ],
     },
+    {
+       description => 'Import, ovf',
+       volname     => "$storage_dir/import/import.ovf",
+       expected    => [
+           'import',
+           'local:import/import.ovf',
+       ],
+    },
 
     # no matches, path or files with failures
     {
@@ -237,6 +245,11 @@ my @tests = (
        volname     => "$storage_dir/images/ssss/vm-1234-disk-0.qcow2",
        expected    => [''],
     },
+    {
+       description => 'Import, non ova/ovf/disk image in import dir',
+       volname     => "$storage_dir/import/test.foo",
+       expected    => [''],
+    },
 );
 
 plan tests => scalar @tests + 1;