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 7B7BE61188 for ; Tue, 8 Feb 2022 14:10:51 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 747512EC70 for ; Tue, 8 Feb 2022 14:10:21 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id E9BA92EC41 for ; Tue, 8 Feb 2022 14:10:17 +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 C285A40B15 for ; Tue, 8 Feb 2022 14:10:17 +0100 (CET) From: Oguz Bektas To: pve-devel@lists.proxmox.com Date: Tue, 8 Feb 2022 14:10:07 +0100 Message-Id: <20220208131011.752134-2-o.bektas@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220208131011.752134-1-o.bektas@proxmox.com> References: <20220208131011.752134-1-o.bektas@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.665 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [accesscontrol.pm, rpcenvironment.pm] Subject: [pve-devel] [PATCH v1 access-control 1/5] add default "SuperAdministrator" role with the new "SuperUser" privilege 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, 08 Feb 2022 13:10:51 -0000 we map all valid privileges to the "Administrator" role except "SuperUser". "SuperAdministrator"/SA gets all valid privileges (including the new "SuperUser"/SU priv), and 'root@pam' is assigned as an SA by default. Signed-off-by: Oguz Bektas --- src/PVE/AccessControl.pm | 9 ++++++--- src/PVE/RPCEnvironment.pm | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/PVE/AccessControl.pm b/src/PVE/AccessControl.pm index 1306576..1137756 100644 --- a/src/PVE/AccessControl.pm +++ b/src/PVE/AccessControl.pm @@ -1008,6 +1008,7 @@ my $privgroups = { }, Sys => { root => [ + 'SuperUser', 'Sys.PowerMgmt', 'Sys.Modify', # edit/change node settings ], @@ -1074,7 +1075,8 @@ my $valid_privs = {}; my $special_roles = { 'NoAccess' => {}, # no privileges - 'Administrator' => $valid_privs, # all privileges + 'Administrator' => {}, # populated with all privs except superuser + 'SuperAdministrator' => $valid_privs, # can do everything }; sub create_roles { @@ -1101,6 +1103,7 @@ sub create_roles { } $special_roles->{"PVETemplateUser"} = { 'VM.Clone' => 1, 'VM.Audit' => 1 }; + $special_roles->{"Administrator"} = { map { $_ => 1 } grep { $_ ne 'SuperUser' } keys %$valid_privs }; }; create_roles(); @@ -1581,7 +1584,7 @@ sub write_user_config { $collect_rolelist_members->($d->{'groups'}, $rolelist_members, '@'); - # no need to save 'root@pam', it is always 'Administrator' + # no need to save 'root@pam', it is always 'SuperAdministrator' $collect_rolelist_members->($d->{'users'}, $rolelist_members, '', 'root@pam'); $collect_rolelist_members->($d->{'tokens'}, $rolelist_members, ''); @@ -1635,7 +1638,7 @@ sub roles { # corresponding user has. # Use $rpcenv->permission() for any actual permission checks! - return 'Administrator' if $user eq 'root@pam'; # root can do anything + return 'SuperAdministrator' if $user eq 'root@pam'; # root can do anything if (pve_verify_tokenid($user, 1)) { my $tokenid = $user; diff --git a/src/PVE/RPCEnvironment.pm b/src/PVE/RPCEnvironment.pm index b1348fa..3afb311 100644 --- a/src/PVE/RPCEnvironment.pm +++ b/src/PVE/RPCEnvironment.pm @@ -101,7 +101,7 @@ sub permissions { if ($user eq 'root@pam') { # root can do anything my $cfg = $self->{user_cfg}; - return { map { $_ => 1 } keys %{$cfg->{roles}->{'Administrator'}} }; + return { map { $_ => 1 } keys %{$cfg->{roles}->{'SuperAdministrator'}} }; } if (PVE::AccessControl::pve_verify_tokenid($user, 1)) { -- 2.30.2