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 B0D3B1FF0E6 for ; Fri, 24 Jul 2026 16:29:43 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 3A428214CF; Fri, 24 Jul 2026 16:29:43 +0200 (CEST) From: David Riley To: pve-devel@lists.proxmox.com Subject: [PATCH pve-access-control v3 05/12] fix #7294: acl: pool: add helpers to remove and migrate pool VNets Date: Fri, 24 Jul 2026 16:25:21 +0200 Message-ID: <20260724142528.109453-6-d.riley@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260724142528.109453-1-d.riley@proxmox.com> References: <20260724142528.109453-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: 1784903318035 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.094 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) RCVD_IN_DNSWL_LOW -0.7 Sender listed at https://www.dnswl.org/, low 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: D2G3WHJYZHROEETQIVFWVB3TWQX44DG2 X-Message-ID-Hash: D2G3WHJYZHROEETQIVFWVB3TWQX44DG2 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 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 helper methods to keep network pool entries in sync with the SDN configuration. Drop stale references from the pool configuration when a VNet is deleted. When a VNet migrates across zones, update the existing pool entries to point to the new zone path. Suggested-by: Daniel Kral Signed-off-by: David Riley Link: https://bugzilla.proxmox.com/show_bug.cgi?id=7294 --- src/PVE/AccessControl.pm | 104 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/src/PVE/AccessControl.pm b/src/PVE/AccessControl.pm index 50fdb2d..42fa709 100644 --- a/src/PVE/AccessControl.pm +++ b/src/PVE/AccessControl.pm @@ -2041,6 +2041,110 @@ sub remove_vm_from_pool { lock_user_config($delVMfromPoolFn, "pool cleanup for VM $vmid failed"); } +sub remove_vnets_from_pool { + my ($paths) = @_; + + my $del_vnet_from_pool_fn = sub { + my $usercfg = cfs_read_file("user.cfg"); + my $modified = 0; + + for my $pool (keys $usercfg->{pools}->%*) { + my $pool_cfg = $usercfg->{pools}->{$pool}; + + my @to_delete = (); + + for my $net_key (keys $pool_cfg->{network}->%*) { + for my $path (@$paths) { + my (undef, $zone, $vnet) = split('/', $path); + my $network_key = "vnet/$zone/$vnet"; + + if ($net_key =~ m!^\Q$network_key\E(?:/(?:[0-9]+|\*))?$!) { + push(@to_delete, $net_key); + last; # match skip ahead + } + } + } + + if (@to_delete) { + for my $del_key (@to_delete) { + delete $pool_cfg->{network}->{$del_key}; + } + $modified = 1; + } + + } + if ($modified) { + cfs_write_file("user.cfg", $usercfg); + } + }; + + lock_user_config($del_vnet_from_pool_fn, "pool cleanup for VNet failed"); +} + +sub migrate_vnet_zone_in_pool { + my ($move_paths) = @_; + + my $update_vnet_zone_fn = sub { + my $usercfg = cfs_read_file("user.cfg"); + my $modified = 0; + + my %move_map = (); + for my $move ($move_paths->@*) { + my $src_key = $move->{src_path}; + my $dest_key = $move->{dest_path}; + + $src_key =~ s!^zones/!vnet/!; + $dest_key =~ s!^zones/!vnet/!; + + if ($src_key ne $dest_key) { + $move_map{$src_key} = $dest_key; + } + + } + + for my $pool (keys $usercfg->{pools}->%*) { + my $pool_cfg = $usercfg->{pools}->{$pool}; + + my @to_delete = (); + my %to_add = (); + + for my $net_key (sort keys $pool_cfg->{network}->%*) { + if ($net_key =~ m!^(vnet/[^/]+/[^/]+)(?:/([0-9]+|\*))?$!) { + my $base_key = $1; + my $vlan = $2; + + if (my $new_base = $move_map{$base_key}) { + push(@to_delete, $net_key); + + my $target_key = $new_base; + $target_key .= "/$vlan" if defined($vlan); + + $to_add{$target_key} = $pool_cfg->{network}->{$net_key}; + } + } + } + + if (@to_delete || keys %to_add) { + for my $delete_key (@to_delete) { + delete $pool_cfg->{network}->{$delete_key}; + } + + for my $add_key (sort keys %to_add) { + $pool_cfg->{network}->{$add_key} = $to_add{$add_key}; + } + + $modified = 1; + } + } + + if ($modified) { + cfs_write_file("user.cfg", $usercfg); + } + }; + + lock_user_config($update_vnet_zone_fn, "pool update for VNets failed"); +} + sub remove_sdn_resource_access { my ($paths) = @_; # [ 'zones/', 'zones//' ] -- 2.47.3