From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 091471FF0DE for ; Thu, 19 Nov 2026 13:48:24 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 329EF217BA; Thu, 19 Nov 2026 13:47:51 +0100 (CET) From: David Riley To: pve-devel@lists.proxmox.com Subject: [PATCH access-control/manager/network v5 0/6] fix #7294: pool: add SDN VNets as pool members Date: Thu, 19 Nov 2026 13:47:25 +0100 Message-ID: <20261119124731.84602-1-d.riley@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1795092461453 X-SPAM-LEVEL: Spam detection results: 0 AWL -1.897 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_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_DBL_SPAM 5 Contains a spam URL listed in the Spamhaus DBL blocklist [sdn.pm] Message-ID-Hash: 4RCJRCJ7HDMHF5FS2FHMKGWLG6FYWCJI X-Message-ID-Hash: 4RCJRCJ7HDMHF5FS2FHMKGWLG6FYWCJI 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: Maintainer Note: This patch requires version bumps: * pve-access-control * pve-manager * pve-network Please also ensure that the correct version is set in the pve-manager api patch where 'assert_min_cluster_version' (Pool.pm) is called. This series does not depend on '[PATCH access-control/network v6 0/8] fix #7520: sdn: prune orphaned ACLs and handle VNet migrations' [1] anymore as this has been applied recently. --- Differences from v4: - Fix: validate VNet additions against the running SDN config - Fix: only run the cluster version and existence checks when adding VNets, so stale entries can always be removed - Fix: check permissions before the existence checks - Fix: require 'Permissions.Modify' or propagated 'SDN.Allocate' to add a VNet with the '*' wildcard - Fix: reject VLAN tags with leading zeros, which the user.cfg parser silently dropped - Fix: 'pveum pool list --poolid ' failing result verification for pools with VNet members - Fix: format hint and validator errors of the 'network' parameter - Fix: filter the VNet selector by exact zone instead of by prefix - Fix: reword the VLAN tag hint to 'Untagged network devices only' - Add: describe the effect on the ACL API in the commit message (Patch 1/6) - Refactor: pass the member ID directly when removing a VNet in the UI - Reword: error messages, commit messages and trailers Differences from v3: - New: Patch 1: rpcenv: add SDN.Allocate to modify permission check - Fix: Properly enforce `SDN.Allocate` permissions when modifying pools (Patch 5/6) - Fix: Relocated the VLAN-awareness check. Previously, if a VNet had its VLAN-awareness disabled while it was a member of a pool, users were prevented from removing it from that pool. (Patch 5/6) - Fix: Change default vlan tag text from 'All' to 'untagged' to reflect the actual behavior. Differences from v2: - Add/Improve: Instead of allowing full vnet access (tagged and untagged using the base path 'sdn/zones//' there is now an explicit path for this 'sdn/zones///*' this allows access to untagged and tagged traffic of this specific vnet. In the WebUI this is reflected by a 'propagate' flag. Using just 'sdn/zones//' only allows for untagged use of this vnet, so trying to add a NIC with tag 1 will fail. Thanks @Daniel K. for the great suggestion! - Refactor: migrate vnet zone in pool. Passing in a array of path strings instead of each single path. This avoids locking the user.cfg for each path. Passing in strings because the underlying patch series was adapted. [1] - Refactor: remove vnet from pool. Similar to migrations this now also gets passed an array of path strings and only locks the configuration once. - Reorder: patches to improve the review flow - Remove: #7294 from unrelated commits - Fix: various nits - Add: maintainer note about bumping the version to ensure the gatekeeper for this feature works properly Differences from v1: - Access: Fix permissions propagation. Pool ACL paths are setup without propagation, therefore checking /sdn/zones/// fails even if the user has the permission for the base path /sdn/zones//. To allow this, the roles of the base VNet path are looked up if the exact tagged path is not found in the pool (see patch 5/9). - API: Add a unified property string format for VNets (zone=,vnet=,tag=]), ensuring that zone and vnet are strictly required and coupled. - API CLI: Add typetext to the vnet format for better error messages in the CLI - API: The registered format validation for VNets and Zones now also check the length. - API: Add membership checks for network resources during add/delete operations (matching storage/VM behavior). - Relocated version helpers from PVE::Cluster to PVE::Tools - UI: Fix light mode. The icons are now light grey to match the storage and vm icons. - Series is now based on v4 instead of v3 of [1] - Minor refactors === Original Cover Letter === This series implements support for adding SDN VNets to resource pools, resolving #7294 [0]. This series depends on the v4 'fix #7520: sdn: prune orphaned ACLs and handle VNet migrations' [1]. It does not, however, add zones as pool members as requested in #7294. Zones currently share ACL paths for managing the zone itself and allocating VNets within it. This makes self-service VNet management without also granting zone management (and its associated side-effects) difficult. This patch series extends the pool section in the user.cfg and introduces a new network property to the pool configuration which will hold VNet entries: * vnet// * vnet/// The type prefix allows future extension to other network resource types. To prevent potential data loss from overwriting newly added VNets, a cluster-version check is added which ensures all nodes are running a version that supports this feature. Note: The hardcoded version guard should be updated to match the final target release when being applied. The existing version check helpers were moved from `qemu-server` to a new module within `pve-cluster` to make them available for this implementation, and any future developments that require gatekeeping. Appropriate attribution has been included for the relocated code. Please let me know if this organizational move aligns with current design preferences or additional adjustments are needed. [0] https://bugzilla.proxmox.com/show_bug.cgi?id=7294 [1] https://lore.proxmox.com/pve-devel/20260716104247.29047-1-d.riley@proxmox.com/ pve-access-control: David Riley (1): rpcenv: allow SDN.Allocate to modify permissions on SDN paths src/PVE/RPCEnvironment.pm | 2 ++ 1 file changed, 2 insertions(+) pve-network: David Riley (2): sdn: register api formats for zones and vnets fix #7294: sdn: vnet: update pool members on VNet zone change and deletion src/PVE/Network/SDN.pm | 6 ++++++ src/PVE/Network/SDN/VnetPlugin.pm | 26 +++++++++++++++++++++++--- src/PVE/Network/SDN/Zones/Plugin.pm | 26 +++++++++++++++++++++++--- 3 files changed, 52 insertions(+), 6 deletions(-) pve-manager: David Riley (3): ui: replace var with let to match style guide for variable declaration fix #7294: api: pool: add SDN VNets as pool members fix #7294: ui: pool: add SDN VNets as pool members PVE/API2/Pool.pm | 176 ++++++++++++++++++++++++++++++- www/css/ext6-pve.css | 15 +++ www/manager6/Utils.js | 1 + www/manager6/grid/PoolMembers.js | 170 ++++++++++++++++++++++++++--- 4 files changed, 343 insertions(+), 19 deletions(-) Summary over all repositories: 8 files changed, 397 insertions(+), 25 deletions(-) -- Generated by murpp 0.11.0