aboutsummaryrefslogtreecommitdiff
path: root/src/login
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-05-19 15:17:58 +0200
committerAlex Auvolat <alex@adnab.me>2022-05-19 15:17:58 +0200
commitf254f3370df1da79552401e54e50987aa59890ca (patch)
treee5dcd3164f2ee94126c072551e6b276e443139ed /src/login
parent1dcb11643c783096e1b52bf48d6b76121504e6bd (diff)
downloadaerogramme-f254f3370df1da79552401e54e50987aa59890ca.tar.gz
aerogramme-f254f3370df1da79552401e54e50987aa59890ca.zip
cleanup
Diffstat (limited to 'src/login')
-rw-r--r--src/login/static_provider.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/login/static_provider.rs b/src/login/static_provider.rs
index 3ef8d89..cc0c8cb 100644
--- a/src/login/static_provider.rs
+++ b/src/login/static_provider.rs
@@ -32,8 +32,7 @@ impl LoginProvider for StaticLoginProvider {
match self.users.get(username) {
None => bail!("User {} does not exist", username),
Some(u) => {
- if u.password != password {
- // TODO cryptographic password compare
+ if !verify_password(password, &u.password) {
bail!("Wrong password");
}
let bucket = u
@@ -56,7 +55,7 @@ impl LoginProvider for StaticLoginProvider {
(Some(m), Some(s)) => {
let master_key = Key::from_slice(&base64::decode(m)?)
.ok_or(anyhow!("Invalid master key"))?;
- let secret_key = SecretKey::from_slice(&base64::decode(m)?)
+ let secret_key = SecretKey::from_slice(&base64::decode(s)?)
.ok_or(anyhow!("Invalid secret key"))?;
CryptoKeys::open_without_password(&storage, &master_key, &secret_key).await?
}