From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 39FCD8B5C6 for ; Thu, 25 Aug 2022 11:25:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 33E2922FFA for ; Thu, 25 Aug 2022 11:24:57 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 25 Aug 2022 11:24:50 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A6AFF43F52 for ; Thu, 25 Aug 2022 11:24:42 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 25 Aug 2022 11:24:21 +0200 Message-Id: <20220825092440.1810328-13-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220825092440.1810328-1-d.csapak@proxmox.com> References: <20220825092440.1810328-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.094 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm, qemu.pm] Subject: [pve-devel] [PATCH qemu-server v2 07/13] PVE/API2/Qemu: add permission checks for mapped usb devices X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Aug 2022 09:25:00 -0000 Signed-off-by: Dominik Csapak --- PVE/API2/Qemu.pm | 40 +++++++++++++++++++++++++++++++++++++--- PVE/QemuServer.pm | 2 ++ 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 99b426e..08e5104 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -26,6 +26,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; @@ -567,8 +568,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, "/hardware/$entry->{host}", ['Hardware.Use']); $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.HWType']); } else { die "only root can set '$opt' config for real devices\n"; @@ -1552,7 +1558,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, "/hardware/$device->{host}", ['Hardware.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"; @@ -1613,7 +1624,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, "/hardware/$olddevice->{host}", ['Hardware.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, "/hardware/$newdevice->{host}", ['Hardware.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 68e1366..a17a28b 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -1085,6 +1085,8 @@ EODESCR }, }; +PVE::JSONSchema::register_format('pve-qm-usb', $usb_fmt); + my $usbdesc = { optional => 1, type => 'string', format => $usb_fmt, -- 2.30.2