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 5590691579 for ; Tue, 20 Dec 2022 15:57:52 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3434134E47 for ; Tue, 20 Dec 2022 15:57:22 +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 for ; Tue, 20 Dec 2022 15:57:20 +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 96F7944E41 for ; Tue, 20 Dec 2022 15:57:20 +0100 (CET) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Tue, 20 Dec 2022 15:57:11 +0100 Message-Id: <20221220145714.63985-3-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221220145714.63985-1-h.laimer@proxmox.com> References: <20221220145714.63985-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.034 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. [user.rs] Subject: [pbs-devel] [PATCH proxmox-backup 2/5] fix #4382: api2: remove permissions of token on deletion X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2022 14:57:52 -0000 Signed-off-by: Hannes Laimer --- src/api2/access/user.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/api2/access/user.rs b/src/api2/access/user.rs index 2264f8e8..ce676252 100644 --- a/src/api2/access/user.rs +++ b/src/api2/access/user.rs @@ -635,7 +635,8 @@ pub fn delete_token( token_name: Tokenname, digest: Option, ) -> Result<(), Error> { - let _lock = pbs_config::user::lock_config()?; + let _acl_lock = pbs_config::acl::lock_config()?; + let _user_lock = pbs_config::user::lock_config()?; let (mut config, expected_digest) = pbs_config::user::config()?; @@ -662,6 +663,10 @@ pub fn delete_token( pbs_config::user::save_config(&config)?; + let (mut tree, _digest) = pbs_config::acl::config()?; + tree.delete_authid(&Authid::from((userid, Some(token_name)))); + pbs_config::acl::save_config(&tree)?; + Ok(()) } -- 2.30.2