all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: David Riley <d.riley@proxmox.com>
To: pve-devel@lists.proxmox.com
Cc: David Riley <d.riley@proxmox.com>
Subject: [PATCH pve-network 1/2] fix #7520: sdn: clean up dangling ACLs on resource deletion
Date: Tue,  5 May 2026 16:22:06 +0200	[thread overview]
Message-ID: <20260505142207.2563052-2-d.riley@proxmox.com> (raw)
In-Reply-To: <20260505142207.2563052-1-d.riley@proxmox.com>

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

Signed-off-by: David Riley <d.riley@proxmox.com>
---
 src/PVE/Network/SDN.pm | 45 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm
index 0bb36bf..0e802d6 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);
@@ -227,11 +228,55 @@ 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);
+    foreach my $type (@types) {
+        if (my $old_ids = $old_cfg->{$type}->{ids}) {
+            my $new_ids = $new_cfg->{$type}->{ids} // {};
+
+            foreach my $id (keys %$old_ids) {
+                if (!$new_ids->{$id}) {
+                    push @paths_to_delete, [$type, $id];
+                }
+            }
+        }
+    }
+
+    if (my $old_vnets = $old_cfg->{vnets}->{ids}) {
+        my $new_vnets = $new_cfg->{vnets}->{ids} // {};
+
+        foreach my $vnetid (keys %$old_vnets) {
+            if (!$new_vnets->{$vnetid}) {
+                my $zoneid = $old_vnets->{$vnetid}->{zone};
+
+                if ($zoneid) {
+                    push @paths_to_delete, ['zones', $zoneid, $vnetid];
+                } else {
+                    log_warn(
+                        "SDN Cleanup: Could not find zone for VNet $vnetid, skipping ACL cleanup");
+                }
+            }
+        }
+    }
+
+    if (scalar(@paths_to_delete) > 0) {
+        PVE::AccessControl::remove_sdn_resource_access(\@paths_to_delete);
+    }
+}
+
 sub has_pending_changes {
     my $running_cfg = PVE::Network::SDN::running_config();
 
-- 
2.47.3





  reply	other threads:[~2026-05-05 14:23 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-05 14:22 [PATCH access-control/network 0/2] fix #7520: sdn: clean up dangling ACLs on resource deletion David Riley
2026-05-05 14:22 ` David Riley [this message]
2026-05-05 14:22 ` [PATCH pve-access-control 2/2] fix #7520: access-control: add SDN ACL cleanup helper David Riley
2026-05-07 13:03 ` [PATCH access-control/network 0/2] fix #7520: sdn: clean up dangling ACLs on resource deletion Stefan Hanreich

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=20260505142207.2563052-2-d.riley@proxmox.com \
    --to=d.riley@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.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal