From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 528621FF0C2 for ; Thu, 22 Oct 2026 14:48:58 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 360C1218E5; Thu, 22 Oct 2026 14:48:02 +0200 (CEST) From: Arthur Bied-Charreton To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v4 16/27] api: destroy_vm: add option to handle dangling IPSet references Date: Thu, 22 Oct 2026 14:46:57 +0200 Message-ID: <20261022124708.429069-17-a.bied-charreton@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261022124708.429069-1-a.bied-charreton@proxmox.com> References: <20261022124708.429069-1-a.bied-charreton@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1792673237599 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.826 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: O64OAFVT4WWERAAEJEE3FUBTFKUYSR5L X-Message-ID-Hash: O64OAFVT4WWERAAEJEE3FUBTFKUYSR5L X-MailFrom: a.bied-charreton@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: For each guest with IPAM entries, a 'guest-ipam-' IPSet is auto-generated. Therefore, deleting a guest can lead to firewall rules referencing non-existing IPSets, which the firewall fails to parse and ignores. Add a 'dangling-ipset-references' option for DELETE /nodes/{node}/qemu/{vmid} allowing to 'drop' rules referencing now-deleted IPSets, to 'disable' them, or to 'keep' them as they are. Signed-off-by: Arthur Bied-Charreton --- src/PVE/API2/Qemu.pm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/PVE/API2/Qemu.pm b/src/PVE/API2/Qemu.pm index cfbc1f51..bba6c270 100644 --- a/src/PVE/API2/Qemu.pm +++ b/src/PVE/API2/Qemu.pm @@ -56,6 +56,7 @@ use PVE::AccessControl; use PVE::INotify; use PVE::Network; use PVE::Firewall; +use PVE::Firewall::References; use PVE::API2::Firewall::VM; use PVE::API2::Qemu::Agent; use PVE::API2::Qemu::HMPPerms; @@ -2838,6 +2839,15 @@ __PACKAGE__->register_method({ optional => 1, default => 0, }, + 'dangling-ipset-references' => { + type => 'string', + enum => ['keep', 'disable', 'drop'], + optional => 1, + default => 'keep', + description => 'Handle firewall rules referencing the IPSet auto-generated for ' + . 'this guest (\'guest-ipam-\'). Use \'disable\' to disable them, or ' + . '\'drop\' to remove them entirely.', + }, }, }, returns => { @@ -2915,6 +2925,16 @@ __PACKAGE__->register_method({ } } + my $action = $param->{'dangling-ipset-references'} // 'keep'; + if ($action ne 'keep') { + eval { + PVE::Firewall::References::update_guest_ipam_ipset_refs( + $vmid, $action, + ); + }; + warn "could not $action dangling IPSet references: $@" if $@; + } + # only now remove the zombie config, else we can have reuse race PVE::QemuConfig->destroy_config($vmid); }, -- 2.47.3