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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id AC01C6394B for ; Wed, 23 Sep 2020 10:38:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9ED83DBE1 for ; Wed, 23 Sep 2020 10:38:56 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 11E93DBD6 for ; Wed, 23 Sep 2020 10:38:56 +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 D5E4244987 for ; Wed, 23 Sep 2020 10:38:55 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Wed, 23 Sep 2020 10:38:48 +0200 Message-Id: <20200923083849.2586622-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [tasks.pm] Subject: [pve-devel] [PATCH manager] tasks: allow API tokens to query their own UPIDs 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, 23 Sep 2020 08:38:56 -0000 and regular users to read all their own tasks as well as those of their associated tokens. Signed-off-by: Fabian Grünbichler --- PVE/API2/Tasks.pm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/PVE/API2/Tasks.pm b/PVE/API2/Tasks.pm index 5dc6a4ad..8f6ab603 100644 --- a/PVE/API2/Tasks.pm +++ b/PVE/API2/Tasks.pm @@ -24,6 +24,18 @@ my $convert_token_task = sub { } }; +my $check_task_user = sub { + my ($task, $user) = @_; + + if ($task->{tokenid}) { + my $fulltoken = PVE::AccessControl::join_tokenid($task->{user}, $task->{tokenid}); + # token only sees token tasks, user sees user + token tasks + return $user eq $fulltoken || $user eq $task->{user}; + } else { + return $user eq $task->{user}; + } +}; + __PACKAGE__->register_method({ name => 'node_tasks', path => '', @@ -126,7 +138,7 @@ __PACKAGE__->register_method({ my $task = shift; return 1 if $userfilter && $task->{user} !~ m/\Q$userfilter\E/i; - return 1 if !($auditor || $user eq $task->{user}); + return 1 if !($auditor || $check_task_user->($task, $user)); return 1 if $typefilter && $task->{type} ne $typefilter; @@ -253,7 +265,7 @@ __PACKAGE__->register_method({ $convert_token_task->($task); - if ($user ne $task->{user}) { + if (!$check_task_user->($task, $user)) { $rpcenv->check($user, "/nodes/$node", [ 'Sys.Modify' ]); } @@ -322,7 +334,7 @@ __PACKAGE__->register_method({ $convert_token_task->($task); - if ($user ne $task->{user}) { + if (!$check_task_user->($task, $user)) { $rpcenv->check($user, "/nodes/$node", [ 'Sys.Audit' ]); } @@ -380,7 +392,7 @@ __PACKAGE__->register_method({ $convert_token_task->($task); - if ($user ne $task->{user}) { + if (!$check_task_user->($task, $user)) { $rpcenv->check($user, "/nodes/$node", [ 'Sys.Audit' ]); } -- 2.20.1