From: Arthur Bied-Charreton <a.bied-charreton@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-network v6 16/28] apply: add option to handle dangling references on VNet deletion
Date: Wed, 11 Nov 2026 14:18:49 +0100 [thread overview]
Message-ID: <20261111131901.1791124-17-a.bied-charreton@proxmox.com> (raw)
In-Reply-To: <20261111131901.1791124-1-a.bied-charreton@proxmox.com>
For each VNet, 4 IPSets are auto-generated (<vnet>-all, -gateway,
-no-gateway and -dhcp) [0]. Therefore, deleting a VNet can lead to
rules referencing non-existing IPSets, which the firewall fails to
parse and ignores.
Add a 'dangling-ipset-references' option for PUT /cluster/sdn allowing
to 'drop' rules referencing now-deleted IPSets, 'disable' them, or
'keep' them as they are.
[0] https://pve.proxmox.com/wiki/Software-Defined_Network#pvesdn_firewall_integration
Signed-off-by: Arthur Bied-Charreton <a.bied-charreton@proxmox.com>
---
src/PVE/API2/Network/SDN.pm | 39 +++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/src/PVE/API2/Network/SDN.pm b/src/PVE/API2/Network/SDN.pm
index e3c8d9d..cc290e9 100644
--- a/src/PVE/API2/Network/SDN.pm
+++ b/src/PVE/API2/Network/SDN.pm
@@ -8,6 +8,8 @@ use JSON qw(from_json);
use PVE::Cluster qw(cfs_lock_file cfs_read_file cfs_write_file);
use PVE::Exception qw(raise_param_exc);
+use PVE::Firewall;
+use PVE::Firewall::References;
use PVE::JSONSchema qw(get_standard_option);
use PVE::RESTHandler;
use PVE::RPCEnvironment;
@@ -302,6 +304,15 @@ __PACKAGE__->register_method({
description =>
'When lock-token has been provided and configuration successfully committed, release the lock automatically afterwards',
},
+ 'dangling-ipset-references' => get_standard_option(
+ 'pve-dangling-references-delete',
+ {
+ description =>
+ 'If the applied SDN changes delete one or more VNets, handle the firewall '
+ . 'rules referencing their auto-generated IPSets. Use \'disable\' to '
+ . 'disable those rules, or \'drop\' to remove them entirely.',
+ },
+ ),
},
},
returns => {
@@ -315,13 +326,36 @@ __PACKAGE__->register_method({
my $lock_token = extract_param($param, 'lock-token');
my $release_lock = extract_param($param, 'release-lock');
+ my $dangling_refs = extract_param($param, 'dangling-ipset-references') // 'keep';
my $previous_config_has_frr;
my $new_config_has_frr;
+ my $ref_log = [];
+ my $ref_err;
+
PVE::Network::SDN::lock_sdn_config(
sub {
$previous_config_has_frr = PVE::Network::SDN::running_config_has_frr();
+
+ if ($dangling_refs ne 'keep') {
+ my $running = PVE::Network::SDN::running_config() // {};
+ my $vnets = PVE::Network::SDN::Vnets::config() // {};
+ my $removed =
+ [grep { !$vnets->{ids}->{$_} } keys $running->{vnets}->{ids}->%*];
+
+ if ($removed->@*) {
+ eval {
+ PVE::Firewall::References::update_vnet_ipset_refs(
+ $removed,
+ $dangling_refs,
+ sub { push $ref_log->@*, $_[0] },
+ );
+ };
+ $ref_err = $@ if $@;
+ }
+ }
+
PVE::Network::SDN::commit_config();
$new_config_has_frr = PVE::Network::SDN::running_config_has_frr();
@@ -336,6 +370,11 @@ __PACKAGE__->register_method({
my $regenerate_frr = ($previous_config_has_frr || $new_config_has_frr) ? 1 : 0;
my $code = sub {
+ # the rewrite has to happen under the SDN lock and before the config is committed,
+ # which is before there is a task, so only log here.
+ print("$_\n") for $ref_log->@*;
+ warn "could not update references to VNet IPSets: $ref_err" if $ref_err;
+
$rpcenv->{type} = 'priv'; # to start tasks in background
PVE::Cluster::check_cfs_quorum();
my $nodelist = PVE::Cluster::get_nodelist();
--
2.47.3
next prev parent reply other threads:[~2026-11-11 13:21 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-11 13:18 [PATCH container/docs/firewall/manager/network/qemu-server v6 00/28] handle dangling references when firewall objects go away Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-firewall v6 01/28] firewall: run make tidy Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-firewall v6 02/28] firewall: move object reference helpers to their own module Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-firewall v6 03/28] firewall: references: add helpers to update object references Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-firewall v6 04/28] firewall: references: log the references an object update touched Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-firewall v6 05/28] firewall: references: add wrappers for the SDN-generated IPSets Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-firewall v6 06/28] firewall: parser: do not log errors for disabled rules Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-firewall v6 07/28] firewall: ipset: add option to handle dangling references on rename Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-firewall v6 08/28] firewall: ipset: add option to handle dangling references on delete Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-firewall v6 09/28] firewall: aliases: add option to handle dangling references on rename Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-firewall v6 10/28] firewall: aliases: add option to handle dangling references on delete Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-firewall v6 11/28] firewall: api: run reference updates as tasks Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-firewall v6 12/28] firewall: tests: add tests for object reference updates Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-firewall v6 13/28] firewall: references: handle security groups Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-firewall v6 14/28] firewall: groups: add option to handle dangling references on rename Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-firewall v6 15/28] fix #8176: firewall: groups: handle dangling references on delete Arthur Bied-Charreton
2026-11-11 13:18 ` Arthur Bied-Charreton [this message]
2026-11-11 13:18 ` [PATCH qemu-server v6 17/28] api: destroy_vm: add option to handle dangling IPSet references Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-container v6 18/28] " Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-manager v6 19/28] ui: firewall: add a common widget for handling dangling references Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-manager v6 20/28] ui: firewall: ipset: add controls for " Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-manager v6 21/28] ui: firewall: aliases: " Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-manager v6 22/28] ui: sdn: apply: add control for dangling IPSet references Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-manager v6 23/28] ui: guest destroy: use let for non-constant variable bindings Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-manager v6 24/28] ui: guest destroy: add control for dangling IPSet references Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-manager v6 25/28] ui: firewall: show the task for reference updates Arthur Bied-Charreton
2026-11-11 13:18 ` [PATCH pve-manager v6 26/28] ui: firewall: groups: add controls for dangling references Arthur Bied-Charreton
2026-11-11 13:19 ` [PATCH pve-docs v6 27/28] firewall: remove trailing spaces Arthur Bied-Charreton
2026-11-11 13:19 ` [PATCH pve-docs v6 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=20261111131901.1791124-17-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.