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 172B59B975 for ; Fri, 26 May 2023 09:27:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EF91AA90D for ; Fri, 26 May 2023 09:27:33 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 26 May 2023 09:27:32 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 4504A8B61; Fri, 26 May 2023 09:27:26 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 3D79D2E3B3F; Fri, 26 May 2023 09:27:26 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Fri, 26 May 2023 09:27:24 +0200 Message-Id: <20230526072724.1605613-5-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230526072724.1605613-1-aderumier@odiso.com> References: <20230526072724.1605613-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.003 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 HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-manager 4/4] api2: network: check vlan 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: Fri, 26 May 2023 07:27:34 -0000 We need to display the bridge is the user have a permission on any vlan on the bridge. to avoid to check permissions on 4096 vlans for each bridge (could be slow with a lot of bridges), we first list vlans where acls are defined. (4000 check took 60ms on 10year xeon server, should be enough for any network where the total number of vlans is limited) Signed-off-by: Alexandre Derumier --- PVE/API2/Network.pm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/PVE/API2/Network.pm b/PVE/API2/Network.pm index ba3b3e0e..39f17d14 100644 --- a/PVE/API2/Network.pm +++ b/PVE/API2/Network.pm @@ -240,17 +240,35 @@ __PACKAGE__->register_method({ if (my $tfilter = $param->{type}) { my $vnets; + my $bridges_vlans_acl = {}; #check access for local bridges my $can_access_vnet = sub { + my $bridge = $_[0]; return 1 if $authuser eq 'root@pam'; return 1 if $rpcenv->check_any($authuser, "/sdn/zones/local", ['SDN.Audit', 'SDN.Allocate'], 1); - return 1 if $rpcenv->check_any($authuser, "/sdn/vnets/$_[0]", ['SDN.Audit', 'SDN.Allocate'], 1); + return 1 if $rpcenv->check($authuser, "/sdn/vnets/$bridge", ['SDN.Audit'], 1); + my $bridge_vlan = $bridges_vlans_acl->{$bridge}; + for my $tag (sort keys %$bridge_vlan) { + return 1 if $rpcenv->check($authuser, "/sdn/vnets/$bridge.$tag", ['SDN.Audit'], 1); + } }; if ($have_sdn && $param->{type} eq 'any_bridge') { $vnets = PVE::Network::SDN::get_local_vnets(); # returns already access-filtered } + #find all vlans where we have specific acls + if ($tfilter =~ /^any(_local)?_bridge$/) { + my $cfg = $rpcenv->{user_cfg}; + my $vnets_acl_root = $cfg->{acl_root}->{children}->{sdn}->{children}->{vnets}; + PVE::AccessControl::iterate_acl_tree("/", $vnets_acl_root, sub { + my ($path, $node) = @_; + if ($path =~ /\/(.*)\.(\d+)$/) { + $bridges_vlans_acl->{$1}->{$2} = 1; + } + }); + } + for my $k (sort keys $ifaces->%*) { my $type = $ifaces->{$k}->{type}; my $match = $tfilter eq $type || ($tfilter =~ /^any(_local)?_bridge$/ && ($type eq 'bridge' || $type eq 'OVSBridge')); -- 2.30.2