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 8963197DAC for ; Wed, 6 Mar 2024 13:36:50 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 68F7816EE2 for ; Wed, 6 Mar 2024 13:36:20 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 6 Mar 2024 13:36:19 +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 AE6754884B for ; Wed, 6 Mar 2024 13:36:18 +0100 (CET) From: Stefan Sterz To: pbs-devel@lists.proxmox.com Date: Wed, 6 Mar 2024 13:36:07 +0100 Message-Id: <20240306123609.164021-11-s.sterz@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240306123609.164021-1-s.sterz@proxmox.com> References: <20240306123609.164021-1-s.sterz@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.075 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-backup v2 10/12] auth: upgrade hashes on user log in 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: Wed, 06 Mar 2024 12:36:50 -0000 if a users password is not hashed with the latest password hashing function, re-hash the password with the newest hashing function. we can only do this on login and after the password has been validated, as this is the only point at which we have access to the plain text password and also know that it matched the original password. Signed-off-by: Stefan Sterz --- src/auth.rs | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/auth.rs b/src/auth.rs index c89314f5..5c45c331 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -28,20 +28,33 @@ pub const TERM_PREFIX: &str = "PBSTERM"; struct PbsAuthenticator; -const SHADOW_CONFIG_FILENAME: &str = configdir!("/shadow.json"); +pub(crate) const SHADOW_CONFIG_FILENAME: &str = configdir!("/shadow.json"); impl Authenticator for PbsAuthenticator { fn authenticate_user<'a>( - &self, + &'a self, username: &'a UsernameRef, password: &'a str, - _client_ip: Option<&'a IpAddr>, + client_ip: Option<&'a IpAddr>, ) -> Pin> + Send + 'a>> { Box::pin(async move { let data = proxmox_sys::fs::file_get_json(SHADOW_CONFIG_FILENAME, Some(json!({})))?; match data[username.as_str()].as_str() { None => bail!("no password set"), - Some(enc_password) => proxmox_sys::crypt::verify_crypt_pw(password, enc_password)?, + Some(enc_password) => { + proxmox_sys::crypt::verify_crypt_pw(password, enc_password)?; + + // if the password hash is not based on the current hashing function (as + // identified by its prefix), rehash the password. + if !enc_password.starts_with(proxmox_sys::crypt::HASH_PREFIX) { + // only log that we could not upgrade a password, we already know that the + // user has a valid password, no reason the deny to log in attempt. + if let Err(e) = self.store_password(username, password, client_ip) { + log::warn!("could not upgrade a users password! - {e}"); + } + } + + } } Ok(()) }) -- 2.39.2