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 10E4FC70E for ; Tue, 29 Nov 2022 15:01:13 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9DE5C6B11 for ; Tue, 29 Nov 2022 15:01:12 +0100 (CET) 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 ; Tue, 29 Nov 2022 15:01:08 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 4999944B65 for ; Tue, 29 Nov 2022 15:01:08 +0100 (CET) From: Daniel Tschlatscher To: pve-devel@lists.proxmox.com Date: Tue, 29 Nov 2022 15:00:19 +0100 Message-Id: <20221129140019.203126-2-d.tschlatscher@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221129140019.203126-1-d.tschlatscher@proxmox.com> References: <20221129140019.203126-1-d.tschlatscher@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.124 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [lxc.pm] Subject: [pve-devel] [PATCH container v2 2/2] restore: also remove firewall config after failed restore 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: Tue, 29 Nov 2022 14:01:13 -0000 Before, a failed restore would only remove the container config, but the firewall config would remain. Now, the firewall config is also removed, except for the case when the user only has the VM.Backup permission. In this case the firewall would not have been restored/changed by us and is left as is. Signed-off-by: Daniel Tschlatscher --- Changes from v1: * Moved into destroy_config_on_error check src/PVE/API2/LXC.pm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm index f2113de..50c9eaf 100644 --- a/src/PVE/API2/LXC.pm +++ b/src/PVE/API2/LXC.pm @@ -499,6 +499,11 @@ __PACKAGE__->register_method({ if ($destroy_config_on_error) { eval { PVE::LXC::Config->destroy_config($vmid) }; warn $@ if $@; + + if (!$skip_fw_config_restore) { # Only if user has permission to change the fw + PVE::Firewall::remove_vmfw_conf($vmid); + warn $@ if $@; + } } die "$emsg $err"; } -- 2.30.2