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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 5464E9F6C9 for ; Fri, 9 Jun 2023 10:08:59 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 34F262ACD3 for ; Fri, 9 Jun 2023 10:08:59 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [185.151.191.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 9 Jun 2023 10:08:56 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 99A2D80CC; Fri, 9 Jun 2023 10:08:56 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 827DC2F17E2; Fri, 9 Jun 2023 10:08:56 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Fri, 9 Jun 2023 10:08:55 +0200 Message-Id: <20230609080855.541473-1-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.035 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy HEADER_FROM_DIFFERENT_DOMAINS 0.25 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an 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] Subject: [pve-devel] [PATCH qemu-server] restore: remove param from restored config if no access 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: Fri, 09 Jun 2023 08:08:59 -0000 Currently check bridge access, but it could be extended for pci/usb devices access when it'll be implemented Signed-off-by: Alexandre Derumier --- PVE/QemuServer.pm | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 7f7b10b..786764e 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -6520,6 +6520,26 @@ sub check_bridge_access { return 1; }; +#remove params from restore config where we don't have permissions +sub check_restore_config_access { + my ($rpcenv, $authuser, $conf) = @_; + + return 1 if $authuser eq 'root@pam'; + + for my $opt (sort keys $conf->%*) { + next if $opt !~ m/^net\d+$/; + eval { + check_bridge_access($rpcenv, $authuser, {$opt => $conf->{$opt}}); + }; + if ($@) { + warn "$opt: $@\n"; + warn "$opt: no bridge access. removing $opt from restored config\n"; + delete $conf->{$opt}; + } + } + return 1; +}; + # vzdump restore implementaion sub tar_archive_read_firstfile { @@ -7164,7 +7184,7 @@ sub restore_proxmox_backup_archive { } my $new_conf = $restore_merge_config->($conffile, $new_conf_raw, $options->{override_conf}); - check_bridge_access($rpcenv, $user, $new_conf); + check_restore_config_access($rpcenv, $user, $new_conf); PVE::QemuConfig->write_config($vmid, $new_conf); eval { rescan($vmid, 1); }; @@ -7478,7 +7498,7 @@ sub restore_vma_archive { } my $new_conf = $restore_merge_config->($conffile, $new_conf_raw, $opts->{override_conf}); - check_bridge_access($rpcenv, $user, $new_conf); + check_restore_config_access($rpcenv, $user, $new_conf); PVE::QemuConfig->write_config($vmid, $new_conf); eval { rescan($vmid, 1); }; -- 2.30.2