From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 623651FF13F for ; Thu, 21 May 2026 16:42:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 86AFD1C07B; Thu, 21 May 2026 16:42:20 +0200 (CEST) From: David Riley To: pve-devel@lists.proxmox.com Subject: [PATCH pve-network v2 2/2] fix #7520: sdn: clean up dangling ACLs on resource deletion Date: Thu, 21 May 2026 16:40:59 +0200 Message-ID: <20260521144059.107229-3-d.riley@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260521144059.107229-1-d.riley@proxmox.com> References: <20260521144059.107229-1-d.riley@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1779374489586 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.244 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 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 Message-ID-Hash: U6PLLKPK3KC7HRGNRXK4O53JR7WJYFYR X-Message-ID-Hash: U6PLLKPK3KC7HRGNRXK4O53JR7WJYFYR X-MailFrom: d.riley@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 CC: David Riley X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Add pruning mechanism to clean up orphaned SDN ACL entries by comparing the current `running-config` with the newly compiled state during `commit_config`. This ensures state consistency for manual applies via the UI/API as well as during the automatic configuration reload on system boot. Covers resources tracked in the `running-config`: * Zones * VNets * Fabrics * Controllers * Route Maps * Prefix Lists Suggested-by: Stefan Hanreich Signed-off-by: David Riley --- src/PVE/Network/SDN.pm | 76 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm index 33a3cf3..7bb2fca 100644 --- a/src/PVE/Network/SDN.pm +++ b/src/PVE/Network/SDN.pm @@ -12,6 +12,7 @@ use UUID; use PVE::Cluster qw(cfs_read_file cfs_write_file cfs_lock_file); use PVE::INotify; +use PVE::AccessControl; use PVE::RESTEnvironment qw(log_warn); use PVE::RPCEnvironment; use PVE::Tools qw(file_get_contents file_set_contents extract_param dir_glob_regex run_command); @@ -238,11 +239,86 @@ sub compile_running_cfg { } sub commit_config { + my $old_cfg = cfs_read_file($RUNNING_CFG_FILENAME); my $cfg = compile_running_cfg(); + cleanup_sdn_acls($old_cfg, $cfg); + cfs_write_file($RUNNING_CFG_FILENAME, $cfg); } +sub cleanup_sdn_acls { + my ($old_cfg, $new_cfg) = @_; + return if !$old_cfg || !$new_cfg; + + my @paths_to_delete; + + my @types = qw(zones controllers fabrics prefix-lists); + foreach my $type (@types) { + next if !$old_cfg->{$type} || !$old_cfg->{$type}->{ids}; + + my $old_ids = $old_cfg->{$type}->{ids}; + my $new_ids = {}; + if (my $type_block = $new_cfg->{$type}) { + $new_ids = $type_block->{ids} // {}; + } + + foreach my $id (keys %$old_ids) { + next if $new_ids->{$id}; + push @paths_to_delete, [$type, $id]; + } + } + + if ($old_cfg->{'route-maps'} && $old_cfg->{'route-maps'}->{ids}) { + my $old_route_maps = $old_cfg->{'route-maps'}->{ids}; + my $route_map_suffix = qr/_\d+$/; + + my %active_route_maps; + if ($new_cfg->{'route-maps'} && $new_cfg->{'route-maps'}->{ids}) { + foreach my $id (keys %{ $new_cfg->{'route-maps'}->{ids} }) { + (my $base_name = $id) =~ s/$route_map_suffix//; + $active_route_maps{$base_name} = 1; + } + } + + my %queued_route_maps; + foreach my $id (keys %$old_route_maps) { + next if $new_cfg->{'route-maps'}->{ids}->{$id}; + + (my $base_name = $id) =~ s/$route_map_suffix//; + next if $active_route_maps{$base_name}; + next if $queued_route_maps{$base_name}; + + push @paths_to_delete, ['route-maps', $base_name]; + $queued_route_maps{$base_name} = 1; + } + } + + if ($old_cfg->{vnets} && $old_cfg->{vnets}->{ids}) { + my $old_vnets = $old_cfg->{vnets}->{ids}; + my $new_vnets = {}; + + if (my $type_block = $new_cfg->{vnets}) { + $new_vnets = $type_block->{ids} // {}; + } + + foreach my $vnetid (keys %$old_vnets) { + next if $new_vnets->{$vnetid}; + + if (my $zoneid = $old_vnets->{$vnetid}->{zone}) { + push @paths_to_delete, ['zones', $zoneid, $vnetid]; + next; + } + + log_warn("SDN Cleanup: Could not find zone for VNet $vnetid, skipping ACL cleanup"); + } + } + + if (@paths_to_delete) { + PVE::AccessControl::remove_sdn_resource_access(\@paths_to_delete); + } +} + sub has_pending_changes { my $running_cfg = PVE::Network::SDN::running_config(); -- 2.47.3