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 56FF072A69 for ; Tue, 24 May 2022 10:28:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3E6541C019 for ; Tue, 24 May 2022 10:28:23 +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 9E3FA1BFB6 for ; Tue, 24 May 2022 10:28:21 +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 752104381B for ; Tue, 24 May 2022 10:28:21 +0200 (CEST) From: Stefan Sterz To: pbs-devel@lists.proxmox.com Date: Tue, 24 May 2022 10:28:16 +0200 Message-Id: <20220524082816.97270-6-s.sterz@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220524082816.97270-1-s.sterz@proxmox.com> References: <20220524082816.97270-1-s.sterz@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.043 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. [datastore.rs] Subject: [pbs-devel] [PATCH proxmox-backup v3 5/5] fix: api: avoid race condition in set_backup_owner 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, 24 May 2022 08:28:23 -0000 when two clients change the owner of a backup store, a race condition arose. add locking to avoid this. Signed-off-by: Stefan Sterz --- src/api2/admin/datastore.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 932ed35f..eaff1677 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -2174,10 +2174,9 @@ pub fn set_backup_owner( let datastore = DataStore::lookup_datastore(&store, Some(Operation::Write))?; let backup_group = datastore.backup_group(ns, backup_group); + let owner = backup_group.get_owner()?; if owner_check_required { - let owner = backup_group.get_owner()?; - let allowed = match (owner.is_token(), new_owner.is_token()) { (true, true) => { // API token to API token, owned by same user @@ -2224,6 +2223,12 @@ pub fn set_backup_owner( ); } + let _guard = backup_group.lock()?; + + if owner != backup_group.get_owner()? { + bail!("{owner} does not own this group anymore"); + } + backup_group.set_owner(&new_owner, true)?; Ok(()) -- 2.30.2