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 940A283BB2 for ; Tue, 7 Dec 2021 09:10:45 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 87F85285FB for ; Tue, 7 Dec 2021 09:10:15 +0100 (CET) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id B8AD4285E7 for ; Tue, 7 Dec 2021 09:10:14 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8ABCD443D9 for ; Tue, 7 Dec 2021 09:10:14 +0100 (CET) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Tue, 7 Dec 2021 09:10:13 +0100 Message-Id: <20211207081013.8995-2-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211207081013.8995-1-w.bumiller@proxmox.com> References: <20211207081013.8995-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.419 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [tfa.pm] Subject: [pve-devel] [PATCH v2 access-control 2/2] tfa list: account for admin permissions 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: Tue, 07 Dec 2021 08:10:45 -0000 instead of restricting listing tfa entries of others to root@pam, perform the same checks the user-list does and which also reflect the permissions of the api calls actually operating on those users, so, `User.Modify` on the user (but also `Sys.Audit`, since it's only a read-operation, just like the user index API call) Signed-off-by: Wolfgang Bumiller --- No changes to v1 in this one. src/PVE/API2/TFA.pm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/PVE/API2/TFA.pm b/src/PVE/API2/TFA.pm index 31e5741..fd42d90 100644 --- a/src/PVE/API2/TFA.pm +++ b/src/PVE/API2/TFA.pm @@ -374,10 +374,24 @@ __PACKAGE__->register_method ({ my $rpcenv = PVE::RPCEnvironment::get(); my $authuser = $rpcenv->get_user(); - my $top_level_allowed = ($authuser eq 'root@pam'); my $tfa_cfg = cfs_read_file('priv/tfa.cfg'); - return $tfa_cfg->api_list_tfa($authuser, $top_level_allowed); + my $entries = $tfa_cfg->api_list_tfa($authuser, 1); + + my $privs = [ 'User.Modify', 'Sys.Audit' ]; + if ($rpcenv->check_any($authuser, "/access/groups", $privs, 1)) { + # can modify all + return $entries; + } + + my $groups = $rpcenv->filter_groups($authuser, $privs, 1); + my $allowed_users = $rpcenv->group_member_join([keys %$groups]); + return [ + grep { + my $userid = $_->{userid}; + $userid eq $authuser || $allowed_users->{$userid} + } $entries->@* + ]; }}); __PACKAGE__->register_method ({ -- 2.30.2