From: Arthur Bied-Charreton <a.bied-charreton@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-firewall v7 05/28] firewall: references: add wrappers for the SDN-generated IPSets
Date: Thu, 12 Nov 2026 16:10:22 +0100 [thread overview]
Message-ID: <20261112151045.577923-6-a.bied-charreton@proxmox.com> (raw)
In-Reply-To: <20261112151045.577923-1-a.bied-charreton@proxmox.com>
SDN generates IPSets that cannot be deleted directly, but rather
disappear once the config stops generating them: the 4 IPSets of a VNet
go away with the VNet, and a guest's IPAM IPSet goes away once the guest
is destroyed. Rules referencing those are left dangling as well.
Add update_sdn_ipset_refs() for a list of such ipsets,
update_vnet_ipset_refs() for the four ipsets of a VNet and
update_guest_ipam_ipset_refs() for a guest's IPAM ipset.
The update can touch any firewall config in the cluster, and its log
shows which ones. Since the user destroying a guest may only have
permissions for that guest, the wrappers run udpates in a separate task
owned by root@pam. This makes it only visible to users with Sys.Audit on
the node. The user who triggered the update is still recorded in the
log.
The callers are PUT /cluster/sdn in pve-network, and the guest destroy
endpoints in qemu-server and pve-container.
Signed-off-by: Arthur Bied-Charreton <a.bied-charreton@proxmox.com>
---
src/PVE/Firewall/References.pm | 101 +++++++++++++++++++++++++++++++++
1 file changed, 101 insertions(+)
diff --git a/src/PVE/Firewall/References.pm b/src/PVE/Firewall/References.pm
index 6ea39cb..f245d42 100644
--- a/src/PVE/Firewall/References.pm
+++ b/src/PVE/Firewall/References.pm
@@ -477,4 +477,105 @@ sub log_ref_line {
return;
}
+sub start_sdn_ipset_ref_task {
+ my ($id, $ipsets, $action, $subject) = @_;
+
+ my $rpcenv = PVE::RESTEnvironment::get();
+ my $user = $rpcenv->get_user();
+
+ my $worker = sub {
+ print "firewall: started by $user\n";
+ update_sdn_ipset_refs($ipsets, $action, $subject);
+ };
+
+ my $upid = eval { $rpcenv->fork_worker('fw-sdn-ipset-refs', $id, 'root@pam', $worker, 1) };
+ if (my $err = $@) {
+ warn "could not start reference update task for the removed IPSets: $err";
+ return;
+ }
+
+ print "firewall: updating references to removed IPSets in task $upid\n";
+}
+
+=head3 update_sdn_ipset_refs($ipsets, $action, $subject, $log)
+
+Apply C<$action> to all references to the SDN-generated IPSets in C<$ipsets>.
+
+C<$subject> is the header for the log block and C<$log> is an optional log sink callback.
+
+Return the number of references changed.
+
+=cut
+
+sub update_sdn_ipset_refs {
+ my ($ipsets, $action, $subject, $log) = @_;
+
+ die "SDN IPSets cannot be renamed\n" if $action && $action eq 'rename';
+
+ my $count = 0;
+
+ PVE::Firewall::lock_clusterfw_conf(
+ 10,
+ sub {
+ my $conf = PVE::Firewall::load_clusterfw_conf();
+
+ $count = update_refs({
+ conf => $conf,
+ kind => 'ipset',
+ old => $ipsets,
+ env => 'sdn',
+ action => $action,
+ subject => $subject,
+ log => $log,
+ });
+
+ PVE::Firewall::save_clusterfw_conf($conf);
+ },
+ );
+
+ return $count;
+}
+
+=head3 update_vnet_ipset_refs($vnets, $action)
+
+Apply C<$action> to all references to the auto-generated IPSets for C<$vnets>.
+
+Return the number of references changed.
+
+=cut
+
+sub update_vnet_ipset_refs {
+ my ($vnets, $action) = @_;
+
+ return if $action eq 'keep' || !$vnets->@*;
+
+ my $ipsets = [
+ map {
+ my $vnet = $_;
+ map { "$vnet-$_" } qw(all gateway no-gateway dhcp)
+ } $vnets->@*
+ ];
+
+ my $names = join(', ', map { "'$_'" } $vnets->@*);
+ my $subject = scalar($vnets->@*) > 1 ? "vnets $names removed" : "vnet $names removed";
+
+ start_sdn_ipset_ref_task(join(',', $vnets->@*), $ipsets, $action, $subject);
+}
+
+=head3 update_guest_ipam_ipset_refs($vmid, $action)
+
+Apply C<$action> to all references to the IPAM IPSet of the guest C<$vmid>.
+
+Return the number of references changed.
+
+=cut
+
+sub update_guest_ipam_ipset_refs {
+ my ($vmid, $action) = @_;
+
+ return if $action eq 'keep';
+
+ start_sdn_ipset_ref_task($vmid, "guest-ipam-$vmid", $action, "guest $vmid destroyed");
+}
+
1;
--
2.47.3
next prev parent reply other threads:[~2026-11-12 15:11 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-12 15:10 [PATCH container/docs/firewall/manager/network/qemu-server v7 00/28] handle dangling references when firewall objects go away Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-firewall v7 01/28] firewall: run make tidy Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-firewall v7 02/28] firewall: move object reference helpers to their own module Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-firewall v7 03/28] firewall: references: add helpers to update object references Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-firewall v7 04/28] firewall: references: log the references an object update touched Arthur Bied-Charreton
2026-11-13 7:15 ` Arthur Bied-Charreton
2026-11-12 15:10 ` Arthur Bied-Charreton [this message]
2026-11-13 7:19 ` [PATCH pve-firewall v7 05/28] firewall: references: add wrappers for the SDN-generated IPSets Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-firewall v7 06/28] firewall: parser: do not log errors for disabled rules Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-firewall v7 07/28] firewall: ipset: add option to handle dangling references on rename Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-firewall v7 08/28] firewall: ipset: add option to handle dangling references on delete Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-firewall v7 09/28] firewall: aliases: add option to handle dangling references on rename Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-firewall v7 10/28] firewall: aliases: add option to handle dangling references on delete Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-firewall v7 11/28] firewall: api: run reference updates as tasks Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-firewall v7 12/28] firewall: tests: add tests for object reference updates Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-firewall v7 13/28] firewall: references: handle security groups Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-firewall v7 14/28] firewall: groups: add option to handle dangling references on rename Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-firewall v7 15/28] fix #8176: firewall: groups: handle dangling references on delete Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-network v7 16/28] apply: add option to handle dangling references on VNet deletion Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH qemu-server v7 17/28] api: destroy_vm: add option to handle dangling IPSet references Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-container v7 18/28] " Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-manager v7 19/28] ui: firewall: add a common widget for handling dangling references Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-manager v7 20/28] ui: firewall: ipset: add controls for " Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-manager v7 21/28] ui: firewall: aliases: " Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-manager v7 22/28] ui: sdn: apply: add control for dangling IPSet references Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-manager v7 23/28] ui: guest destroy: use let for non-constant variable bindings Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-manager v7 24/28] ui: guest destroy: add control for dangling IPSet references Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-manager v7 25/28] ui: firewall: show the task for reference updates Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-manager v7 26/28] ui: firewall: groups: add controls for dangling references Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-docs v7 27/28] firewall: remove trailing spaces Arthur Bied-Charreton
2026-11-12 15:10 ` [PATCH pve-docs v7 28/28] firewall: document renaming and removing objects Arthur Bied-Charreton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261112151045.577923-6-a.bied-charreton@proxmox.com \
--to=a.bied-charreton@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox