this patch allows configuring usb devices that are mapped via
cluster resource mapping when the user has 'Resource.Use' on the ACL
path '/resource/usb/{ID}' (in addition to the usual required vm config
privileges)
for now, this is only valid if there is exactly one mapping for the
host, since we don't track passed through usb devices yet
Signed-off-by: Dominik Csapak <d.csa...@proxmox.com>
---
PVE/API2/Qemu.pm | 40 +++++++++++++++++++++++++++++++++++++---
PVE/QemuServer.pm | 4 ++++
PVE/QemuServer/USB.pm | 22 +++++++++++++++++++++-
3 files changed, 62 insertions(+), 4 deletions(-)
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 587bb222..cedddf97 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -32,6 +32,7 @@ use PVE::QemuServer::Drive;
use PVE::QemuServer::ImportDisk;
use PVE::QemuServer::Monitor qw(mon_cmd);
use PVE::QemuServer::Machine;
+use PVE::QemuServer::USB qw(parse_usb_device);
use PVE::QemuMigrate;
use PVE::RPCEnvironment;
use PVE::AccessControl;
@@ -590,8 +591,13 @@ my $check_vm_create_usb_perm = sub {
foreach my $opt (keys %{$param}) {
next if $opt !~ m/^usb\d+$/;
+ my $entry = PVE::JSONSchema::parse_property_string('pve-qm-usb',
$param->{$opt});
+ my $device = parse_usb_device($entry->{host});
- if ($param->{$opt} =~ m/spice/) {
+ if ($device->{spice}) {
+ $rpcenv->check_vm_perm($authuser, $vmid, $pool,
['VM.Config.HWType']);
+ } elsif ($device->{mapped}) {
+ $rpcenv->check_full($authuser, "/resource/usb/$entry->{host}",
['Resource.Use']);
$rpcenv->check_vm_perm($authuser, $vmid, $pool,
['VM.Config.HWType']);
} else {
die "only root can set '$opt' config for real devices\n";
@@ -1696,7 +1702,12 @@ my $update_vm_api = sub {
PVE::QemuConfig->add_to_pending_delete($conf, $opt, $force);
PVE::QemuConfig->write_config($vmid, $conf);
} elsif ($opt =~ m/^usb\d+$/) {
- if ($val =~ m/spice/) {
+ my $device =
PVE::JSONSchema::parse_property_string('pve-qm-usb', $val);
+ my $host = parse_usb_device($device->{host});
+ if ($host->{spice}) {
+ $rpcenv->check_vm_perm($authuser, $vmid, undef,
['VM.Config.HWType']);
+ } elsif ($host->{mapped}) {
+ $rpcenv->check_full($authuser,
"/resource/usb/$device->{host}", ['Resource.Use']);
$rpcenv->check_vm_perm($authuser, $vmid, undef,
['VM.Config.HWType']);
} elsif ($authuser ne 'root@pam') {
die "only root can delete '$opt' config for real
devices\n";
@@ -1761,7 +1772,30 @@ my $update_vm_api = sub {
}
$conf->{pending}->{$opt} = $param->{$opt};
} elsif ($opt =~ m/^usb\d+/) {
- if ((!defined($conf->{$opt}) || $conf->{$opt} =~ m/spice/)
&& $param->{$opt} =~ m/spice/) {
+ my $olddevice;
+ my $oldhost;
+ if (defined($conf->{$opt})) {
+ $olddevice =
PVE::JSONSchema::parse_property_string('pve-qm-usb', $conf->{$opt});
+ $oldhost = parse_usb_device($olddevice->{host});
+ }
+ if (defined($oldhost)) {
+ if ($oldhost->{spice}) {
+ $rpcenv->check_vm_perm($authuser, $vmid, undef,
['VM.Config.HWType']);
+ } elsif ($oldhost->{mapped}) {
+ $rpcenv->check_full($authuser,
"/resource/usb/$olddevice->{host}", ['Resource.Use']);
+ $rpcenv->check_vm_perm($authuser, $vmid, undef,
['VM.Config.HWType']);
+ } elsif ($authuser ne 'root@pam') {
+ die "only root can modify '$opt' config for real
devices\n";
+ }
+ }
+
+ my $newdevice =
PVE::JSONSchema::parse_property_string('pve-qm-usb', $param->{$opt});
+ my $newhost = parse_usb_device($newdevice->{host});
+
+ if ($newhost->{spice}) {
+ $rpcenv->check_vm_perm($authuser, $vmid, undef,
['VM.Config.HWType']);
+ } elsif ($newhost->{mapped}) {
+ $rpcenv->check_full($authuser,
"/resource/usb/$newdevice->{host}", ['Resource.Use']);
$rpcenv->check_vm_perm($authuser, $vmid, undef,
['VM.Config.HWType']);
} elsif ($authuser ne 'root@pam') {
die "only root can modify '$opt' config for real
devices\n";
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index ab33aa37..bdc4f3d9 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -1090,6 +1090,8 @@ The Host USB device or port or the value 'spice'.
HOSTUSBDEVICE syntax is:
You can use the 'lsusb -t' command to list existing usb devices.
+Alternatively, you can used an ID of a mapped usb device.
+
NOTE: This option allows direct access to host hardware. So it is no longer
possible to migrate such
machines - use with special care.
@@ -1106,6 +1108,8 @@ EODESCR
},
};
+PVE::JSONSchema::register_format('pve-qm-usb', $usb_fmt);
+
my $usbdesc = {
optional => 1,
type => 'string', format => $usb_fmt,
diff --git a/PVE/QemuServer/USB.pm b/PVE/QemuServer/USB.pm
index 686461cc..b764ce39 100644
--- a/PVE/QemuServer/USB.pm
+++ b/PVE/QemuServer/USB.pm
@@ -6,6 +6,7 @@ use PVE::QemuServer::PCI qw(print_pci_addr);
use PVE::QemuServer::Machine;
use PVE::QemuServer::Helpers qw(min_version windows_version);
use PVE::JSONSchema;
+use PVE::Resource::USB;
use base 'Exporter';
our @EXPORT_OK = qw(
@@ -31,7 +32,26 @@ sub parse_usb_device {
} elsif ($value =~ m/^spice$/i) {
$res->{spice} = 1;
} else {
- return;
+ # we have no ordinary usb device, must be a mapping
+ my $devices = PVE::Resource::USB::find_on_current_node($value);
+ return undef if scalar($devices->@*) != 1;
+ eval {
+ PVE::Resource::USB::assert_valid($value, $devices->[0]);
+ };
+ if (my $err = $@) {
+ warn "USB Mapping invalid (hardware probably changed): $err\n";
+ return;
+ }
+
+ my $device = $devices->[0];
+
+ if ($device->{path}) {
+ $res = parse_usb_device($device->{path});
+ } else {
+ $res = parse_usb_device($device->{id});
+ }
+
+ $res->{mapped} = 1;
}
return $res;
--
2.30.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
