mirror of
https://github.com/lennart-k/rustical.git
synced 2025-12-14 07:02:24 +00:00
store auth: Fix bug that app tokens were only usable when password is set
This commit is contained in:
@@ -44,11 +44,6 @@ impl AuthenticationProvider for StaticUserStore {
|
||||
None => return Ok(None),
|
||||
};
|
||||
|
||||
let password = match &user_entry.user.password {
|
||||
Some(password) => password,
|
||||
None => return Ok(None),
|
||||
};
|
||||
|
||||
// Try app tokens first since they are cheaper to calculate
|
||||
// They can afford less iterations since they can be generated with high entropy
|
||||
for app_token in &user_entry.app_tokens {
|
||||
@@ -56,6 +51,12 @@ impl AuthenticationProvider for StaticUserStore {
|
||||
return Ok(Some(user_entry.user));
|
||||
}
|
||||
}
|
||||
|
||||
let password = match &user_entry.user.password {
|
||||
Some(password) => password,
|
||||
None => return Ok(None),
|
||||
};
|
||||
|
||||
if password_auth::verify_password(token, password).is_ok() {
|
||||
return Ok(Some(user_entry.user));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user