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 27B2295826 for ; Fri, 12 Apr 2024 14:32:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 058CFA66D for ; Fri, 12 Apr 2024 14:32:30 +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 for ; Fri, 12 Apr 2024 14:32:29 +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 4404845025 for ; Fri, 12 Apr 2024 14:32:29 +0200 (CEST) From: Stefan Sterz To: pbs-devel@lists.proxmox.com Date: Fri, 12 Apr 2024 14:31:56 +0200 Message-Id: <20240412123155.178657-1-s.sterz@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.071 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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. [auth.rs] Subject: [pbs-devel] [PATCH proxmox-backup] auth: request a write lock when exposing the `LockedTfaConfig` 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: Fri, 12 Apr 2024 12:32:30 -0000 this function is called every time a user tries to log in to check whether a tfa challenge is required. since the tfa config may need to be written by the auth api (e.g. when a recovery key is used) this needs to use a write lock instead of a read lock in order to avoid potential races. Signed-off-by: Stefan Sterz --- src/auth.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/auth.rs b/src/auth.rs index 04fb3a1d..e27d90d5 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -327,7 +327,7 @@ impl proxmox_auth_api::api::AuthContext for PbsAuthContext { /// Access the TFA config with an exclusive lock. fn tfa_config_write_lock(&self) -> Result, Error> { Ok(Box::new(PbsLockedTfaConfig { - _lock: crate::config::tfa::read_lock()?, + _lock: crate::config::tfa::write_lock()?, config: crate::config::tfa::read()?, })) } -- 2.39.2