From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id B7CF51FF15C for ; Fri, 8 Aug 2025 11:31:20 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A0E1D1223D; Fri, 8 Aug 2025 11:32:52 +0200 (CEST) From: Hannes Laimer To: pve-devel@lists.proxmox.com Date: Fri, 8 Aug 2025 11:32:03 +0200 Message-ID: <20250808093203.17668-1-h.laimer@proxmox.com> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1754645514634 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.025 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [inotify.pm] Subject: [pve-devel] [PATCH pve-common v2] inotify: interfaces: also set type 'bridge' for empty bridges X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" If a bridge has `bridge_ports` set to `none` we just skip the field. Later we use the existance of the field to determine whether the type should be `bridge`. This led to bridges without `bridge_ports` not being recognized as bridges. In the `/nodes/{}/network` endpiont we do permission checks for bridges, and if interfaces were missing the type=bridge field no permission checks were done. This led to interfaces being returned even if the user did not have permission to access them. This fixes this by also setting the type to `bridge` for empty bridges. Signed-off-by: Hannes Laimer --- as Fabian noted on v1, this probably also makes sense to add to stable-bookworm changes since v1, thanks @Fabian: - fix problem were `bonds` were also recognized as bridges src/PVE/INotify.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm index bbcb9f8..898b522 100644 --- a/src/PVE/INotify.pm +++ b/src/PVE/INotify.pm @@ -994,7 +994,10 @@ SECTION: while (defined($line = <$fh>)) { } elsif ($id eq 'slaves' || $id eq 'bridge_ports') { my $devs = {}; foreach my $p (split(/\s+/, $value)) { - next if $p eq 'none'; + if ($p eq 'none') { + $d->{'is_empty_bridge'} = $id eq 'bridge_ports'; + next; + } $devs->{$p} = 1; } my $str = join(' ', sort keys %{$devs}); @@ -1077,7 +1080,8 @@ OUTER: my $ip_link = $ip_links->{$altnames->{$iface} // $iface}; - if (defined $d->{'bridge_ports'}) { + if (defined $d->{'bridge_ports'} || $d->{'is_empty_bridge'}) { + delete $d->{'is_empty_bridge'} if defined $d->{'is_empty_bridge'}; $d->{type} = 'bridge'; if (!defined($d->{bridge_stp})) { $d->{bridge_stp} = 'off'; -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel