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 672981FF15C for ; Fri, 8 Aug 2025 11:32:20 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BA73412411; Fri, 8 Aug 2025 11:33:54 +0200 (CEST) Message-ID: Date: Fri, 8 Aug 2025 11:33:51 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: pve-devel@lists.proxmox.com References: <20250807142141.72815-1-h.laimer@proxmox.com> Content-Language: en-US From: Hannes Laimer In-Reply-To: <20250807142141.72815-1-h.laimer@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1754645607745 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] superseded: Re: [PATCH pve-common] 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" superseded-by: https://lore.proxmox.com/pve-devel/20250808093203.17668-1-h.laimer@proxmox.com/T/#u On 07.08.25 16:21, Hannes Laimer wrote: > 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` we do permissions checks but only for ifaces > with type `bridge`(or `OVSBridge`). So interfaces were returned by the > endpoint even if the user did not have permissions the correct > permissions because the interface did not have type `bridge`. > > This fixes this by also setting the type to `bridge` for empty bridges. > > Signed-off-by: Hannes Laimer > --- > 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..5a42ddd 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'} = 1; > + 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'; _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel