[pve-devel] [PATCH qemu-server v8 5/7] Permission check for virtiofs directory access

[Markus Frank]

Signed-off-by: Markus Frank <m.fr...@proxmox.com>
---
 PVE/API2/Qemu.pm  | 39 ++++++++++++++++++++++++++++++++++++++-
 PVE/QemuServer.pm |  5 ++++-
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index c8a87f3..1c5eb4c 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -650,6 +650,32 @@ my sub check_vm_create_hostpci_perm {
     return 1;
 };
 
+my sub check_dir_perm {
+    my ($rpcenv, $authuser, $vmid, $pool, $opt, $value) = @_;
+
+    return 1 if $authuser eq 'root@pam';
+
+    $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.Disk']);
+
+    my $virtiofs = PVE::JSONSchema::parse_property_string('pve-qm-virtiofs', 
$value);
+    $rpcenv->check_full($authuser, "/mapping/dir/$virtiofs->{dirid}", 
['Mapping.Use']);
+
+    return 1;
+};
+
+my sub check_vm_create_dir_perm {
+    my ($rpcenv, $authuser, $vmid, $pool, $param) = @_;
+
+    return 1 if $authuser eq 'root@pam';
+
+    foreach my $opt (keys %{$param}) {
+       next if $opt !~ m/^virtiofs\d+$/;
+       check_dir_perm($rpcenv, $authuser, $vmid, $pool, $opt, $param->{$opt});
+    }
+
+    return 1;
+};
+
 my $check_vm_modify_config_perm = sub {
     my ($rpcenv, $authuser, $vmid, $pool, $key_list) = @_;
 
@@ -660,7 +686,7 @@ my $check_vm_modify_config_perm = sub {
        # else, as there the permission can be value dependend
        next if PVE::QemuServer::is_valid_drivename($opt);
        next if $opt eq 'cdrom';
-       next if $opt =~ m/^(?:unused|serial|usb|hostpci)\d+$/;
+       next if $opt =~ m/^(?:unused|serial|usb|hostpci|virtiofs)\d+$/;
        next if $opt eq 'tags';
 
 
@@ -929,6 +955,7 @@ __PACKAGE__->register_method({
            &$check_vm_create_serial_perm($rpcenv, $authuser, $vmid, $pool, 
$param);
            check_vm_create_usb_perm($rpcenv, $authuser, $vmid, $pool, $param);
            check_vm_create_hostpci_perm($rpcenv, $authuser, $vmid, $pool, 
$param);
+           check_vm_create_dir_perm($rpcenv, $authuser, $vmid, $pool, $param);
 
            PVE::QemuServer::check_bridge_access($rpcenv, $authuser, $param);
            &$check_cpu_model_access($rpcenv, $authuser, $param);
@@ -1790,6 +1817,10 @@ my $update_vm_api  = sub {
                    check_hostpci_perm($rpcenv, $authuser, $vmid, undef, $opt, 
$val);
                    PVE::QemuConfig->add_to_pending_delete($conf, $opt, $force);
                    PVE::QemuConfig->write_config($vmid, $conf);
+               } elsif ($opt =~ m/^virtiofs\d$/) {
+                   check_dir_perm($rpcenv, $authuser, $vmid, undef, $opt, 
$val);
+                   PVE::QemuConfig->add_to_pending_delete($conf, $opt, $force);
+                   PVE::QemuConfig->write_config($vmid, $conf);
                } elsif ($opt eq 'tags') {
                    assert_tag_permissions($vmid, $val, '', $rpcenv, $authuser);
                    delete $conf->{$opt};
@@ -1869,6 +1900,12 @@ my $update_vm_api  = sub {
                    }
                    check_hostpci_perm($rpcenv, $authuser, $vmid, undef, $opt, 
$param->{$opt});
                    $conf->{pending}->{$opt} = $param->{$opt};
+               } elsif ($opt =~ m/^virtiofs\d$/) {
+                   if (my $oldvalue = $conf->{$opt}) {
+                       check_dir_perm($rpcenv, $authuser, $vmid, undef, $opt, 
$oldvalue);
+                   }
+                   check_dir_perm($rpcenv, $authuser, $vmid, undef, $opt, 
$param->{$opt});
+                   $conf->{pending}->{$opt} = $param->{$opt};
                } elsif ($opt eq 'tags') {
                    assert_tag_permissions($vmid, $conf->{$opt}, 
$param->{$opt}, $rpcenv, $authuser);
                    $conf->{pending}->{$opt} = 
PVE::GuestHelpers::get_unique_tags($param->{$opt});
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 92580df..f66f26e 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -6643,7 +6643,10 @@ sub check_mapping_access {
            } else {
                die "either 'host' or 'mapping' must be set.\n";
            }
-       }
+       } elsif ($opt =~ m/^virtiofs\d$/) {
+           my $virtiofs = 
PVE::JSONSchema::parse_property_string('pve-qm-virtiofs', $conf->{$opt});
+           $rpcenv->check_full($user, "/mapping/dir/$virtiofs->{dirid}", 
['Mapping.Use']);
+       }
    }
 };
 
-- 
2.39.2



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel