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 14DC174D53 for ; Thu, 2 Jun 2022 09:25:48 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BDAFA277B9 for ; Thu, 2 Jun 2022 09:25:16 +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 68CE227474 for ; Thu, 2 Jun 2022 09:25:06 +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 3B57D42A48 for ; Thu, 2 Jun 2022 09:25:06 +0200 (CEST) From: Oguz Bektas To: pve-devel@lists.proxmox.com Date: Thu, 2 Jun 2022 09:24:37 +0200 Message-Id: <20220602072450.55209-6-o.bektas@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602072450.55209-1-o.bektas@proxmox.com> References: <20220602072450.55209-1-o.bektas@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.315 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 POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_1 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes 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. [tfa.pm, rpcenvironment.pm, accesscontrol.pm] Subject: [pve-devel] [PATCH v4 access-control 05/18] api: allow superusers to edit tfa and password settings 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: Thu, 02 Jun 2022 07:25:48 -0000 - prevent non-SU to change SU passwords - warning messages on raise_perm_exc() - log who did the password change - has_superuser_anywhere helper Suggested-by: Fabian Grünbichler Signed-off-by: Oguz Bektas --- src/PVE/API2/AccessControl.pm | 24 ++++++++++++++---------- src/PVE/API2/TFA.pm | 16 +++++++++++++++- src/PVE/RPCEnvironment.pm | 15 +++++++++++++++ 3 files changed, 44 insertions(+), 11 deletions(-) diff --git a/src/PVE/API2/AccessControl.pm b/src/PVE/API2/AccessControl.pm index 5d78c6f..2a584ab 100644 --- a/src/PVE/API2/AccessControl.pm +++ b/src/PVE/API2/AccessControl.pm @@ -378,23 +378,27 @@ __PACKAGE__->register_method ({ $rpcenv->check_user_exist($userid); + my $is_superuser = $rpcenv->check($authuser, "/access", ['SuperUser'], 1); + if ($authuser eq 'root@pam') { # OK - root can change anything - } else { - if ($authuser eq $userid) { - $rpcenv->check_user_enabled($userid); - # OK - each user can change its own password - } else { - # only root may change root password - raise_perm_exc() if $userid eq 'root@pam'; - # do not allow to change system user passwords - raise_perm_exc() if $realm eq 'pam'; + } elsif ($authuser eq $userid) { + $rpcenv->check_user_enabled($userid); + # OK - each user can change its own password + } else { # changing someone else's password + raise_perm_exc("only root\@pam may change their password!\n") if $userid eq 'root@pam'; + raise_perm_exc("changing system user passwords is not allowed!\n") if $realm eq 'pam'; + + if (!$is_superuser) { + # check if the target user has SU privileges + raise_perm_exc("only superusers can change another superuser's password!\n") + if $rpcenv->has_superuser_anywhere($userid); } } PVE::AccessControl::domain_set_password($realm, $ruid, $param->{password}); - PVE::Cluster::log_msg('info', 'root@pam', "changed password for user '$userid'"); + PVE::Cluster::log_msg('info', "$authuser", "changed password for user '$userid'"); return undef; }}); diff --git a/src/PVE/API2/TFA.pm b/src/PVE/API2/TFA.pm index bee4dee..c1cdd5e 100644 --- a/src/PVE/API2/TFA.pm +++ b/src/PVE/API2/TFA.pm @@ -96,22 +96,36 @@ my $TFA_UPDATE_INFO_SCHEMA = { }; # Only root may modify root, regular users need to specify their password. +# Only users with SU on /access may modify other users with SU anywhere # # Returns the userid returned from `verify_username`. # Or ($userid, $realm) in list context. my sub root_permission_check : prototype($$$$) { my ($rpcenv, $authuser, $userid, $password) = @_; + # authuser = the user making the change + # userid = the user to be changed + + if ($userid eq 'root@pam') { + raise_perm_exc("only root\@pam may edit themselves!\n") + if $authuser ne 'root@pam'; + } + ($userid, undef, my $realm) = PVE::AccessControl::verify_username($userid); $rpcenv->check_user_exist($userid); - raise_perm_exc() if $userid eq 'root@pam' && $authuser ne 'root@pam'; + my $is_superuser = $rpcenv->check($authuser, "/access", ['SuperUser'], 1); # Regular users need to confirm their password to change TFA settings. if ($authuser ne 'root@pam') { raise_param_exc({ 'password' => 'password is required to modify TFA data' }) if !defined($password); + if (!$is_superuser && $authuser ne $userid) { + raise_perm_exc("only superusers can change another superuser's TFA settings!\n") + if $rpcenv->has_superuser_anywhere($userid); + } + ($authuser, my $auth_username, my $auth_realm) = PVE::AccessControl::verify_username($authuser); diff --git a/src/PVE/RPCEnvironment.pm b/src/PVE/RPCEnvironment.pm index 4c55b25..5bcb4ba 100644 --- a/src/PVE/RPCEnvironment.pm +++ b/src/PVE/RPCEnvironment.pm @@ -479,6 +479,21 @@ sub check_api2_permissions { raise_perm_exc(); } +sub has_superuser_anywhere { + my ($self, $username) = @_; + + return 1 if $username eq 'root@pam'; + + # get all ACL paths from config and check for SU privilege + my $acls = $self->{user_cfg}->{acl}; + my @acl_paths = keys(%$acls); + @acl_paths = ['/'] if !@acl_paths; + foreach my $path (@acl_paths) { + return 1 if $self->check($username, $path, ['SuperUser'], 1); + } + return 0; +} + sub log_cluster_msg { my ($self, $pri, $user, $msg) = @_; -- 2.30.2