|
|
|
|
@ -0,0 +1,542 @@
|
|
|
|
|
// Copyright 2022 The Matrix.org Foundation C.I.C.
|
|
|
|
|
//
|
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
|
//
|
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
|
//
|
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
|
// limitations under the License.
|
|
|
|
|
|
|
|
|
|
use std::{collections::HashMap, sync::Arc};
|
|
|
|
|
|
|
|
|
|
use anyhow::Context;
|
|
|
|
|
use argon2::{password_hash::SaltString, Argon2, PasswordHash, PasswordHasher, PasswordVerifier};
|
|
|
|
|
use futures_util::future::OptionFuture;
|
|
|
|
|
use pbkdf2::Pbkdf2;
|
|
|
|
|
use rand::{CryptoRng, Rng, RngCore, SeedableRng};
|
|
|
|
|
use zeroize::Zeroizing;
|
|
|
|
|
|
|
|
|
|
pub type SchemeVersion = u32;
|
|
|
|
|
|
|
|
|
|
#[derive(Clone)]
|
|
|
|
|
pub struct PasswordManager {
|
|
|
|
|
hashers: Arc<HashMap<SchemeVersion, Hasher>>,
|
|
|
|
|
default_hasher: SchemeVersion,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl PasswordManager {
|
|
|
|
|
/// Creates a new [`PasswordManager`] from an iterator. The first item in
|
|
|
|
|
/// the iterator will be the default hashing scheme.
|
|
|
|
|
///
|
|
|
|
|
/// # Example
|
|
|
|
|
///
|
|
|
|
|
/// ```rust
|
|
|
|
|
/// pub use mas_handlers::passwords::{PasswordManager, Hasher};
|
|
|
|
|
///
|
|
|
|
|
/// PasswordManager::new([
|
|
|
|
|
/// (3, Hasher::argon2id(Some(b"a-secret-pepper".to_vec()))),
|
|
|
|
|
/// (2, Hasher::argon2id(None)),
|
|
|
|
|
/// (1, Hasher::bcrypt(10, None)),
|
|
|
|
|
/// ]).unwrap();
|
|
|
|
|
/// ```
|
|
|
|
|
///
|
|
|
|
|
/// # Errors
|
|
|
|
|
///
|
|
|
|
|
/// Returns an error if the iterator was empty
|
|
|
|
|
pub fn new<I: IntoIterator<Item = (SchemeVersion, Hasher)>>(
|
|
|
|
|
iter: I,
|
|
|
|
|
) -> Result<Self, anyhow::Error> {
|
|
|
|
|
let mut iter = iter.into_iter().peekable();
|
|
|
|
|
let (default_hasher, _) = iter
|
|
|
|
|
.peek()
|
|
|
|
|
.context("Iterator must have at least one item")?;
|
|
|
|
|
let default_hasher = *default_hasher;
|
|
|
|
|
|
|
|
|
|
let hashers = iter.collect();
|
|
|
|
|
|
|
|
|
|
Ok(Self {
|
|
|
|
|
hashers: Arc::new(hashers),
|
|
|
|
|
default_hasher,
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Hash a password with the default hashing scheme.
|
|
|
|
|
/// Returns the version of the hashing scheme used and the hashed password.
|
|
|
|
|
///
|
|
|
|
|
/// # Errors
|
|
|
|
|
///
|
|
|
|
|
/// Returns an error if the hashing failed
|
|
|
|
|
pub async fn hash<R: CryptoRng + RngCore + Send>(
|
|
|
|
|
&self,
|
|
|
|
|
rng: R,
|
|
|
|
|
password: Zeroizing<Vec<u8>>,
|
|
|
|
|
) -> Result<(SchemeVersion, String), anyhow::Error> {
|
|
|
|
|
// Seed a future-local RNG so the RNG passed in parameters doesn't have to be
|
|
|
|
|
// 'static
|
|
|
|
|
let mut rng = rand_chacha::ChaChaRng::from_rng(rng)?;
|
|
|
|
|
let hashers = self.hashers.clone();
|
|
|
|
|
let default_hasher_version = self.default_hasher;
|
|
|
|
|
|
|
|
|
|
let hashed = tokio::task::spawn_blocking(move || {
|
|
|
|
|
let default_hasher = hashers
|
|
|
|
|
.get(&default_hasher_version)
|
|
|
|
|
.context("Default hasher not found")?;
|
|
|
|
|
|
|
|
|
|
default_hasher.hash_blocking(&mut rng, &password)
|
|
|
|
|
})
|
|
|
|
|
.await??;
|
|
|
|
|
|
|
|
|
|
Ok((default_hasher_version, hashed))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Verify a password hash for the given hashing scheme.
|
|
|
|
|
async fn verify(
|
|
|
|
|
&self,
|
|
|
|
|
scheme: SchemeVersion,
|
|
|
|
|
password: Zeroizing<Vec<u8>>,
|
|
|
|
|
hashed_password: String,
|
|
|
|
|
) -> Result<(), anyhow::Error> {
|
|
|
|
|
let hashers = self.hashers.clone();
|
|
|
|
|
|
|
|
|
|
tokio::task::spawn_blocking(move || {
|
|
|
|
|
let hasher = hashers.get(&scheme).context("Hashing scheme not found")?;
|
|
|
|
|
hasher.verify_blocking(&hashed_password, &password)
|
|
|
|
|
})
|
|
|
|
|
.await??;
|
|
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Verify a password hash for the given hashing scheme, and upgrade it on
|
|
|
|
|
/// the fly, if it was not hashed with the default scheme
|
|
|
|
|
///
|
|
|
|
|
/// # Errors
|
|
|
|
|
///
|
|
|
|
|
/// Returns an error if the password hash verification failed
|
|
|
|
|
pub async fn verify_and_upgrade<R: CryptoRng + RngCore + Send>(
|
|
|
|
|
&self,
|
|
|
|
|
rng: R,
|
|
|
|
|
scheme: SchemeVersion,
|
|
|
|
|
password: Zeroizing<Vec<u8>>,
|
|
|
|
|
hashed_password: String,
|
|
|
|
|
) -> Result<Option<(SchemeVersion, String)>, anyhow::Error> {
|
|
|
|
|
// If the current scheme isn't the default one, we also hash with the default
|
|
|
|
|
// one so that
|
|
|
|
|
let new_hash_fut: OptionFuture<_> = (scheme != self.default_hasher)
|
|
|
|
|
.then(|| self.hash(rng, password.clone()))
|
|
|
|
|
.into();
|
|
|
|
|
|
|
|
|
|
let verify_fut = self.verify(scheme, password, hashed_password);
|
|
|
|
|
|
|
|
|
|
let (new_hash_res, verify_res) = tokio::join!(new_hash_fut, verify_fut);
|
|
|
|
|
verify_res?;
|
|
|
|
|
|
|
|
|
|
let new_hash = new_hash_res.transpose()?;
|
|
|
|
|
|
|
|
|
|
Ok(new_hash)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// A hashing scheme, with an optional pepper
|
|
|
|
|
pub struct Hasher {
|
|
|
|
|
algorithm: Algorithm,
|
|
|
|
|
pepper: Option<Vec<u8>>,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl Hasher {
|
|
|
|
|
/// Creates a new hashing scheme based on the bcrypt algorithm
|
|
|
|
|
#[must_use]
|
|
|
|
|
pub const fn bcrypt(cost: u32, pepper: Option<Vec<u8>>) -> Self {
|
|
|
|
|
let algorithm = Algorithm::Bcrypt { cost };
|
|
|
|
|
Self { algorithm, pepper }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Creates a new hashing scheme based on the argon2id algorithm
|
|
|
|
|
#[must_use]
|
|
|
|
|
pub const fn argon2id(pepper: Option<Vec<u8>>) -> Self {
|
|
|
|
|
let algorithm = Algorithm::Argon2id;
|
|
|
|
|
Self { algorithm, pepper }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Creates a new hashing scheme based on the pbkdf2 algorithm
|
|
|
|
|
#[must_use]
|
|
|
|
|
pub const fn pbkdf2(pepper: Option<Vec<u8>>) -> Self {
|
|
|
|
|
let algorithm = Algorithm::Pbkdf2;
|
|
|
|
|
Self { algorithm, pepper }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn hash_blocking<R: CryptoRng + RngCore>(
|
|
|
|
|
&self,
|
|
|
|
|
rng: &mut R,
|
|
|
|
|
password: &[u8],
|
|
|
|
|
) -> Result<String, anyhow::Error> {
|
|
|
|
|
self.algorithm
|
|
|
|
|
.hash_blocking(rng, password, self.pepper.as_deref())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn verify_blocking(&self, hashed_password: &str, password: &[u8]) -> Result<(), anyhow::Error> {
|
|
|
|
|
self.algorithm
|
|
|
|
|
.verify_blocking(hashed_password, password, self.pepper.as_deref())
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[derive(Debug, Clone, Copy)]
|
|
|
|
|
enum Algorithm {
|
|
|
|
|
Bcrypt { cost: u32 },
|
|
|
|
|
Argon2id,
|
|
|
|
|
Pbkdf2,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl Algorithm {
|
|
|
|
|
fn hash_blocking<R: CryptoRng + RngCore>(
|
|
|
|
|
self,
|
|
|
|
|
rng: &mut R,
|
|
|
|
|
password: &[u8],
|
|
|
|
|
pepper: Option<&[u8]>,
|
|
|
|
|
) -> Result<String, anyhow::Error> {
|
|
|
|
|
match self {
|
|
|
|
|
Self::Bcrypt { cost } => {
|
|
|
|
|
let mut password = Zeroizing::new(password.to_vec());
|
|
|
|
|
if let Some(pepper) = pepper {
|
|
|
|
|
password.extend_from_slice(pepper);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let salt = rng.gen();
|
|
|
|
|
|
|
|
|
|
let hashed = bcrypt::hash_with_salt(password, cost, salt)?;
|
|
|
|
|
Ok(hashed.format_for_version(bcrypt::Version::TwoB))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Self::Argon2id => {
|
|
|
|
|
let algorithm = argon2::Algorithm::default();
|
|
|
|
|
let version = argon2::Version::default();
|
|
|
|
|
let params = argon2::Params::default();
|
|
|
|
|
|
|
|
|
|
let phf = if let Some(secret) = pepper {
|
|
|
|
|
Argon2::new_with_secret(secret, algorithm, version, params)?
|
|
|
|
|
} else {
|
|
|
|
|
Argon2::new(algorithm, version, params)
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let salt = SaltString::generate(rng);
|
|
|
|
|
let hashed = phf.hash_password(password.as_ref(), &salt)?;
|
|
|
|
|
Ok(hashed.to_string())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Self::Pbkdf2 => {
|
|
|
|
|
let mut password = Zeroizing::new(password.to_vec());
|
|
|
|
|
if let Some(pepper) = pepper {
|
|
|
|
|
password.extend_from_slice(pepper);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let salt = SaltString::generate(rng);
|
|
|
|
|
let hashed = Pbkdf2.hash_password(password.as_ref(), &salt)?;
|
|
|
|
|
Ok(hashed.to_string())
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn verify_blocking(
|
|
|
|
|
self,
|
|
|
|
|
hashed_password: &str,
|
|
|
|
|
password: &[u8],
|
|
|
|
|
pepper: Option<&[u8]>,
|
|
|
|
|
) -> Result<(), anyhow::Error> {
|
|
|
|
|
match self {
|
|
|
|
|
Algorithm::Bcrypt { .. } => {
|
|
|
|
|
let mut password = Zeroizing::new(password.to_vec());
|
|
|
|
|
if let Some(pepper) = pepper {
|
|
|
|
|
password.extend_from_slice(pepper);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let result = bcrypt::verify(password, hashed_password)?;
|
|
|
|
|
anyhow::ensure!(result, "wrong password");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Algorithm::Argon2id => {
|
|
|
|
|
let algorithm = argon2::Algorithm::default();
|
|
|
|
|
let version = argon2::Version::default();
|
|
|
|
|
let params = argon2::Params::default();
|
|
|
|
|
|
|
|
|
|
let phf = if let Some(secret) = pepper {
|
|
|
|
|
Argon2::new_with_secret(secret, algorithm, version, params)?
|
|
|
|
|
} else {
|
|
|
|
|
Argon2::new(algorithm, version, params)
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let hashed_password = PasswordHash::new(hashed_password)?;
|
|
|
|
|
|
|
|
|
|
phf.verify_password(password.as_ref(), &hashed_password)?;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Algorithm::Pbkdf2 => {
|
|
|
|
|
let mut password = Zeroizing::new(password.to_vec());
|
|
|
|
|
if let Some(pepper) = pepper {
|
|
|
|
|
password.extend_from_slice(pepper);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let hashed_password = PasswordHash::new(hashed_password)?;
|
|
|
|
|
|
|
|
|
|
Pbkdf2.verify_password(password.as_ref(), &hashed_password)?;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
|
mod tests {
|
|
|
|
|
use rand::SeedableRng;
|
|
|
|
|
|
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn hashing_bcrypt() {
|
|
|
|
|
let mut rng = rand_chacha::ChaChaRng::seed_from_u64(42);
|
|
|
|
|
let password = b"hunter2";
|
|
|
|
|
let password2 = b"wrong-password";
|
|
|
|
|
let pepper = b"a-secret-pepper";
|
|
|
|
|
let pepper2 = b"the-wrong-pepper";
|
|
|
|
|
|
|
|
|
|
let alg = Algorithm::Bcrypt { cost: 10 };
|
|
|
|
|
// Hash with a pepper
|
|
|
|
|
let hash = alg
|
|
|
|
|
.hash_blocking(&mut rng, password, Some(pepper))
|
|
|
|
|
.expect("Couldn't hash password");
|
|
|
|
|
insta::assert_snapshot!(hash);
|
|
|
|
|
|
|
|
|
|
assert!(alg.verify_blocking(&hash, password, Some(pepper)).is_ok());
|
|
|
|
|
assert!(alg.verify_blocking(&hash, password2, Some(pepper)).is_err());
|
|
|
|
|
assert!(alg.verify_blocking(&hash, password, Some(pepper2)).is_err());
|
|
|
|
|
assert!(alg.verify_blocking(&hash, password, None).is_err());
|
|
|
|
|
|
|
|
|
|
// Hash without pepper
|
|
|
|
|
let hash = alg
|
|
|
|
|
.hash_blocking(&mut rng, password, None)
|
|
|
|
|
.expect("Couldn't hash password");
|
|
|
|
|
insta::assert_snapshot!(hash);
|
|
|
|
|
|
|
|
|
|
assert!(alg.verify_blocking(&hash, password, None).is_ok());
|
|
|
|
|
assert!(alg.verify_blocking(&hash, password2, None).is_err());
|
|
|
|
|
assert!(alg.verify_blocking(&hash, password, Some(pepper)).is_err());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn hashing_argon2id() {
|
|
|
|
|
let mut rng = rand_chacha::ChaChaRng::seed_from_u64(42);
|
|
|
|
|
let password = b"hunter2";
|
|
|
|
|
let password2 = b"wrong-password";
|
|
|
|
|
let pepper = b"a-secret-pepper";
|
|
|
|
|
let pepper2 = b"the-wrong-pepper";
|
|
|
|
|
|
|
|
|
|
let alg = Algorithm::Argon2id;
|
|
|
|
|
// Hash with a pepper
|
|
|
|
|
let hash = alg
|
|
|
|
|
.hash_blocking(&mut rng, password, Some(pepper))
|
|
|
|
|
.expect("Couldn't hash password");
|
|
|
|
|
insta::assert_snapshot!(hash);
|
|
|
|
|
|
|
|
|
|
assert!(alg.verify_blocking(&hash, password, Some(pepper)).is_ok());
|
|
|
|
|
assert!(alg.verify_blocking(&hash, password2, Some(pepper)).is_err());
|
|
|
|
|
assert!(alg.verify_blocking(&hash, password, Some(pepper2)).is_err());
|
|
|
|
|
assert!(alg.verify_blocking(&hash, password, None).is_err());
|
|
|
|
|
|
|
|
|
|
// Hash without pepper
|
|
|
|
|
let hash = alg
|
|
|
|
|
.hash_blocking(&mut rng, password, None)
|
|
|
|
|
.expect("Couldn't hash password");
|
|
|
|
|
insta::assert_snapshot!(hash);
|
|
|
|
|
|
|
|
|
|
assert!(alg.verify_blocking(&hash, password, None).is_ok());
|
|
|
|
|
assert!(alg.verify_blocking(&hash, password2, None).is_err());
|
|
|
|
|
assert!(alg.verify_blocking(&hash, password, Some(pepper)).is_err());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn hashing_pbkdf2() {
|
|
|
|
|
let mut rng = rand_chacha::ChaChaRng::seed_from_u64(42);
|
|
|
|
|
let password = b"hunter2";
|
|
|
|
|
let password2 = b"wrong-password";
|
|
|
|
|
let pepper = b"a-secret-pepper";
|
|
|
|
|
let pepper2 = b"the-wrong-pepper";
|
|
|
|
|
|
|
|
|
|
let alg = Algorithm::Pbkdf2;
|
|
|
|
|
// Hash with a pepper
|
|
|
|
|
let hash = alg
|
|
|
|
|
.hash_blocking(&mut rng, password, Some(pepper))
|
|
|
|
|
.expect("Couldn't hash password");
|
|
|
|
|
insta::assert_snapshot!(hash);
|
|
|
|
|
|
|
|
|
|
assert!(alg.verify_blocking(&hash, password, Some(pepper)).is_ok());
|
|
|
|
|
assert!(alg.verify_blocking(&hash, password2, Some(pepper)).is_err());
|
|
|
|
|
assert!(alg.verify_blocking(&hash, password, Some(pepper2)).is_err());
|
|
|
|
|
assert!(alg.verify_blocking(&hash, password, None).is_err());
|
|
|
|
|
|
|
|
|
|
// Hash without pepper
|
|
|
|
|
let hash = alg
|
|
|
|
|
.hash_blocking(&mut rng, password, None)
|
|
|
|
|
.expect("Couldn't hash password");
|
|
|
|
|
insta::assert_snapshot!(hash);
|
|
|
|
|
|
|
|
|
|
assert!(alg.verify_blocking(&hash, password, None).is_ok());
|
|
|
|
|
assert!(alg.verify_blocking(&hash, password2, None).is_err());
|
|
|
|
|
assert!(alg.verify_blocking(&hash, password, Some(pepper)).is_err());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[tokio::test]
|
|
|
|
|
async fn hash_verify_and_upgrade() {
|
|
|
|
|
// Tests the whole password manager, by hashing a password and upgrading it
|
|
|
|
|
// after changing the hashing schemes. The salt generation is done with a seeded
|
|
|
|
|
// RNG, so that we can do stable snapshots of hashed passwords
|
|
|
|
|
let mut rng = rand_chacha::ChaChaRng::seed_from_u64(42);
|
|
|
|
|
let password = Zeroizing::new(b"hunter2".to_vec());
|
|
|
|
|
let wrong_password = Zeroizing::new(b"wrong-password".to_vec());
|
|
|
|
|
|
|
|
|
|
let manager = PasswordManager::new([
|
|
|
|
|
// Start with one hashing scheme: the one used by synapse, bcrypt + pepper
|
|
|
|
|
(1, Hasher::bcrypt(10, Some(b"a-secret-pepper".to_vec()))),
|
|
|
|
|
])
|
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
|
|
let (version, hash) = manager
|
|
|
|
|
.hash(&mut rng, password.clone())
|
|
|
|
|
.await
|
|
|
|
|
.expect("Failed to hash");
|
|
|
|
|
|
|
|
|
|
assert_eq!(version, 1);
|
|
|
|
|
insta::assert_snapshot!(hash);
|
|
|
|
|
|
|
|
|
|
// Just verifying works
|
|
|
|
|
manager
|
|
|
|
|
.verify(version, password.clone(), hash.clone())
|
|
|
|
|
.await
|
|
|
|
|
.expect("Failed to verify");
|
|
|
|
|
|
|
|
|
|
// And doesn't work with the wrong password
|
|
|
|
|
manager
|
|
|
|
|
.verify(version, wrong_password.clone(), hash.clone())
|
|
|
|
|
.await
|
|
|
|
|
.expect_err("Verification should have failed");
|
|
|
|
|
|
|
|
|
|
// Verifying with the wrong version doesn't work
|
|
|
|
|
manager
|
|
|
|
|
.verify(2, password.clone(), hash.clone())
|
|
|
|
|
.await
|
|
|
|
|
.expect_err("Verification should have failed");
|
|
|
|
|
|
|
|
|
|
// Upgrading does nothing
|
|
|
|
|
let res = manager
|
|
|
|
|
.verify_and_upgrade(&mut rng, version, password.clone(), hash.clone())
|
|
|
|
|
.await
|
|
|
|
|
.expect("Failed to verify");
|
|
|
|
|
|
|
|
|
|
assert!(res.is_none());
|
|
|
|
|
|
|
|
|
|
// Upgrading still verify that the password matches
|
|
|
|
|
manager
|
|
|
|
|
.verify_and_upgrade(&mut rng, version, wrong_password.clone(), hash.clone())
|
|
|
|
|
.await
|
|
|
|
|
.expect_err("Verification should have failed");
|
|
|
|
|
|
|
|
|
|
let manager = PasswordManager::new([
|
|
|
|
|
(2, Hasher::argon2id(None)),
|
|
|
|
|
(1, Hasher::bcrypt(10, Some(b"a-secret-pepper".to_vec()))),
|
|
|
|
|
])
|
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
|
|
// Verifying still works
|
|
|
|
|
manager
|
|
|
|
|
.verify(version, password.clone(), hash.clone())
|
|
|
|
|
.await
|
|
|
|
|
.expect("Failed to verify");
|
|
|
|
|
|
|
|
|
|
// And doesn't work with the wrong password
|
|
|
|
|
manager
|
|
|
|
|
.verify(version, wrong_password.clone(), hash.clone())
|
|
|
|
|
.await
|
|
|
|
|
.expect_err("Verification should have failed");
|
|
|
|
|
|
|
|
|
|
// Upgrading does re-hash
|
|
|
|
|
let res = manager
|
|
|
|
|
.verify_and_upgrade(&mut rng, version, password.clone(), hash.clone())
|
|
|
|
|
.await
|
|
|
|
|
.expect("Failed to verify");
|
|
|
|
|
|
|
|
|
|
assert!(res.is_some());
|
|
|
|
|
let (version, hash) = res.unwrap();
|
|
|
|
|
|
|
|
|
|
assert_eq!(version, 2);
|
|
|
|
|
insta::assert_snapshot!(hash);
|
|
|
|
|
|
|
|
|
|
// Upgrading works with the new hash, but does not upgrade
|
|
|
|
|
let res = manager
|
|
|
|
|
.verify_and_upgrade(&mut rng, version, password.clone(), hash.clone())
|
|
|
|
|
.await
|
|
|
|
|
.expect("Failed to verify");
|
|
|
|
|
|
|
|
|
|
assert!(res.is_none());
|
|
|
|
|
|
|
|
|
|
// Upgrading still verify that the password matches
|
|
|
|
|
manager
|
|
|
|
|
.verify_and_upgrade(&mut rng, version, wrong_password.clone(), hash.clone())
|
|
|
|
|
.await
|
|
|
|
|
.expect_err("Verification should have failed");
|
|
|
|
|
|
|
|
|
|
// Upgrading still verify that the password matches
|
|
|
|
|
manager
|
|
|
|
|
.verify_and_upgrade(&mut rng, version, wrong_password.clone(), hash.clone())
|
|
|
|
|
.await
|
|
|
|
|
.expect_err("Verification should have failed");
|
|
|
|
|
|
|
|
|
|
let manager = PasswordManager::new([
|
|
|
|
|
(3, Hasher::argon2id(Some(b"a-secret-pepper".to_vec()))),
|
|
|
|
|
(2, Hasher::argon2id(None)),
|
|
|
|
|
(1, Hasher::bcrypt(10, Some(b"a-secret-pepper".to_vec()))),
|
|
|
|
|
])
|
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
|
|
// Verifying still works
|
|
|
|
|
manager
|
|
|
|
|
.verify(version, password.clone(), hash.clone())
|
|
|
|
|
.await
|
|
|
|
|
.expect("Failed to verify");
|
|
|
|
|
|
|
|
|
|
// And doesn't work with the wrong password
|
|
|
|
|
manager
|
|
|
|
|
.verify(version, wrong_password.clone(), hash.clone())
|
|
|
|
|
.await
|
|
|
|
|
.expect_err("Verification should have failed");
|
|
|
|
|
|
|
|
|
|
// Upgrading does re-hash
|
|
|
|
|
let res = manager
|
|
|
|
|
.verify_and_upgrade(&mut rng, version, password.clone(), hash.clone())
|
|
|
|
|
.await
|
|
|
|
|
.expect("Failed to verify");
|
|
|
|
|
|
|
|
|
|
assert!(res.is_some());
|
|
|
|
|
let (version, hash) = res.unwrap();
|
|
|
|
|
|
|
|
|
|
assert_eq!(version, 3);
|
|
|
|
|
insta::assert_snapshot!(hash);
|
|
|
|
|
|
|
|
|
|
// Upgrading works with the new hash, but does not upgrade
|
|
|
|
|
let res = manager
|
|
|
|
|
.verify_and_upgrade(&mut rng, version, password.clone(), hash.clone())
|
|
|
|
|
.await
|
|
|
|
|
.expect("Failed to verify");
|
|
|
|
|
|
|
|
|
|
assert!(res.is_none());
|
|
|
|
|
|
|
|
|
|
// Upgrading still verify that the password matches
|
|
|
|
|
manager
|
|
|
|
|
.verify_and_upgrade(&mut rng, version, wrong_password.clone(), hash.clone())
|
|
|
|
|
.await
|
|
|
|
|
.expect_err("Verification should have failed");
|
|
|
|
|
}
|
|
|
|
|
}
|
Quentin Gliech