From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9125A9F01C for ; Wed, 7 Jun 2023 16:45:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7A5DB1B61A for ; Wed, 7 Jun 2023 16:45:40 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 7 Jun 2023 16:45:39 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 862ED41F22 for ; Wed, 7 Jun 2023 16:45:39 +0200 (CEST) Date: Wed, 07 Jun 2023 16:45:32 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20230607120357.4177891-1-aderumier@odiso.com> <20230607120357.4177891-4-aderumier@odiso.com> In-Reply-To: <20230607120357.4177891-4-aderumier@odiso.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1686149104.s7kd1zg63z.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.072 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] applied: [PATCH v3 pve-manager 1/4] api2: network: check permissions for local 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: , X-List-Received-Date: Wed, 07 Jun 2023 14:45:40 -0000 applied this one with a bit of followups to make it more readable, but no semantic changes intended. On June 7, 2023 2:03 pm, Alexandre Derumier wrote: > always check permissions, also when not filtered >=20 > Signed-off-by: Alexandre Derumier > --- > PVE/API2/Network.pm | 25 +++++++++++++++---------- > 1 file changed, 15 insertions(+), 10 deletions(-) >=20 > diff --git a/PVE/API2/Network.pm b/PVE/API2/Network.pm > index a43579fa..8dc56482 100644 > --- a/PVE/API2/Network.pm > +++ b/PVE/API2/Network.pm > @@ -209,7 +209,7 @@ __PACKAGE__->register_method({ > type =3D> { > description =3D> "Only list specific interface types.", > type =3D> 'string', > - enum =3D> [ @$network_type_enum, 'any_bridge' ], > + enum =3D> [ @$network_type_enum, 'any_bridge', 'any_local_bridge' ], > optional =3D> 1, > }, > }, > @@ -240,22 +240,17 @@ __PACKAGE__->register_method({ > =20 > if (my $tfilter =3D $param->{type}) { > my $vnets; > - my $vnet_cfg; > - my $can_access_vnet =3D sub { # only matters for the $have_sdn case= , checked implict > - return 1 if $authuser eq 'root@pam' || !defined($vnets); > - return 1 if !defined(PVE::Network::SDN::Vnets::sdn_vnets_config($vnet_= cfg, $_[0], 1)); # not a vnet > - $rpcenv->check_any($authuser, "/sdn/vnets/$_[0]", ['SDN.Audit', 'SDN.A= llocate'], 1) > - }; > =20 > if ($have_sdn && $param->{type} eq 'any_bridge') { > $vnets =3D PVE::Network::SDN::get_local_vnets(); # returns already acc= ess-filtered > - $vnet_cfg =3D PVE::Network::SDN::Vnets::config(); > } > =20 > for my $k (sort keys $ifaces->%*) { > my $type =3D $ifaces->{$k}->{type}; > - my $match =3D $tfilter eq $type || ($tfilter eq 'any_bridge' && ($type= eq 'bridge' || $type eq 'OVSBridge')); > - delete $ifaces->{$k} if !($match && $can_access_vnet->($k)); > + my $match =3D ($param->{type} eq $type) || ( > + ($param->{type} =3D~ /^any(_local)?_bridge$/) && > + ($type eq 'bridge' || $type eq 'OVSBridge')); > + delete $ifaces->{$k} if !$match; > } > =20 > if (defined($vnets)) { > @@ -263,6 +258,16 @@ __PACKAGE__->register_method({ > } > } > =20 > + #always check bridge access > + my $can_access_vnet =3D sub { > + return 1 if $authuser eq 'root@pam'; > + return 1 if $rpcenv->check_sdn_bridge($authuser, "localnetwork", $_= [0], ['SDN.Audit', 'SDN.Use'], 1); > + }; > + for my $k (sort keys $ifaces->%*) { > + my $type =3D $ifaces->{$k}->{type}; > + delete $ifaces->{$k} if ($type eq 'bridge' || $type eq 'OVSBridge')= && !$can_access_vnet->($k); > + } > + > return PVE::RESTHandler::hash_to_array($ifaces, 'iface'); > }}); > =20 > --=20 > 2.30.2 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20