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 3AD3AB201 for ; Wed, 6 Apr 2022 13:58:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3473C2A49B for ; Wed, 6 Apr 2022 13:58:03 +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 id 6C48C2A492 for ; Wed, 6 Apr 2022 13:58:02 +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 448E4459B1 for ; Wed, 6 Apr 2022 13:58:02 +0200 (CEST) From: Oguz Bektas To: pve-devel@lists.proxmox.com Date: Wed, 6 Apr 2022 13:57:21 +0200 Message-Id: <20220406115734.898714-5-o.bektas@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220406115734.898714-1-o.bektas@proxmox.com> References: <20220406115734.898714-1-o.bektas@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.552 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v3 access-control 04/17] api: roles: only allow modifying roles to add/remove SU if user has SU themselves 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, 06 Apr 2022 11:58:03 -0000 Signed-off-by: Oguz Bektas --- v2->v3: * also check if previous role contained SU privilege (when removing privilege) src/PVE/API2/Role.pm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/PVE/API2/Role.pm b/src/PVE/API2/Role.pm index 70a92b6..4a09ad6 100644 --- a/src/PVE/API2/Role.pm +++ b/src/PVE/API2/Role.pm @@ -4,6 +4,7 @@ use strict; use warnings; use PVE::Cluster qw (cfs_read_file cfs_write_file); use PVE::AccessControl; +use PVE::Tools qw (split_list); use PVE::JSONSchema qw(get_standard_option register_standard_option); use PVE::SafeSyslog; @@ -90,11 +91,19 @@ __PACKAGE__->register_method ({ my $usercfg = cfs_read_file("user.cfg"); + my $rpcenv = PVE::RPCEnvironment::get(); + my $authuser = $rpcenv->get_user(); + my $is_superuser = $rpcenv->check($authuser, "/", ['SuperUser'], 1); + my $role = $param->{roleid}; die "role '$role' already exists\n" if $usercfg->{roles}->{$role}; + my $contains_superuser = grep { $_ eq 'SuperUser' } split_list($param->{privs}); + die "only superusers can add this privilege!\n" + if $contains_superuser && !$is_superuser; + $usercfg->{roles}->{$role} = {}; PVE::AccessControl::add_role_privs($role, $usercfg, $param->{privs}); @@ -136,9 +145,21 @@ __PACKAGE__->register_method ({ my $usercfg = cfs_read_file("user.cfg"); + my $rpcenv = PVE::RPCEnvironment::get(); + my $authuser = $rpcenv->get_user(); + my $is_superuser = $rpcenv->check($authuser, "/", ['SuperUser'], 1); + die "role '$role' does not exist\n" if !$usercfg->{roles}->{$role}; + my @old_role_privs = keys(%{$usercfg->{roles}->{$role}}); + + my $contained_superuser = grep { $_ eq 'SuperUser' } @old_role_privs; + my $contains_superuser = grep { $_ eq 'SuperUser' } split_list($param->{privs}); + + die "only superusers can add/remove this privilege!\n" + if ($contains_superuser || $contained_superuser) && !$is_superuser; + $usercfg->{roles}->{$role} = {} if !$param->{append}; PVE::AccessControl::add_role_privs($role, $usercfg, $param->{privs}); -- 2.30.2