commit 4fab4c74ffd48397b7b3cd2ed808fce59704d083
parent b17e2da2cfecc0cc318b7a2b656ac0ad06ea889b
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date: Tue, 24 Jan 2023 20:06:30 +0100
Merge branch 'BlackDex-update-kdf-config'
Diffstat:
6 files changed, 48 insertions(+), 18 deletions(-)
diff --git a/.env.template b/.env.template
@@ -298,9 +298,9 @@
## This setting applies globally to all users.
# INCOMPLETE_2FA_TIME_LIMIT=3
-## Controls the PBBKDF password iterations to apply on the server
-## The change only applies when the password is changed
-# PASSWORD_ITERATIONS=100000
+## Number of server-side passwords hashing iterations for the password hash.
+## The default for new users. If changed, it will be updated during login for existing users.
+# PASSWORD_ITERATIONS=350000
## Controls whether users can set password hints. This setting applies globally to all users.
# PASSWORD_HINTS_ALLOWED=true
diff --git a/src/api/core/accounts.rs b/src/api/core/accounts.rs
@@ -161,7 +161,7 @@ pub async fn _register(data: JsonUpcase<RegisterData>, mut conn: DbConn) -> Json
user.client_kdf_type = client_kdf_type;
}
- user.set_password(&data.MasterPasswordHash, &data.Key, None);
+ user.set_password(&data.MasterPasswordHash, Some(data.Key), true, None);
user.password_hint = password_hint;
// Add extra fields if present
@@ -317,7 +317,8 @@ async fn post_password(
user.set_password(
&data.NewMasterPasswordHash,
- &data.Key,
+ Some(data.Key),
+ true,
Some(vec![String::from("post_rotatekey"), String::from("get_contacts"), String::from("get_public_keys")]),
);
@@ -351,9 +352,13 @@ async fn post_kdf(data: JsonUpcase<ChangeKdfData>, headers: Headers, mut conn: D
err!("Invalid password")
}
+ if data.KdfIterations < 100_000 {
+ err!("KDF iterations lower then 100000 are not allowed.")
+ }
+
user.client_kdf_iter = data.KdfIterations;
user.client_kdf_type = data.Kdf;
- user.set_password(&data.NewMasterPasswordHash, &data.Key, None);
+ user.set_password(&data.NewMasterPasswordHash, Some(data.Key), true, None);
let save_result = user.save(&mut conn).await;
nt.send_logout(&user, Some(headers.device.uuid)).await;
@@ -571,7 +576,7 @@ async fn post_email(
user.email_new = None;
user.email_new_token = None;
- user.set_password(&data.NewMasterPasswordHash, &data.Key, None);
+ user.set_password(&data.NewMasterPasswordHash, Some(data.Key), true, None);
let save_result = user.save(&mut conn).await;
diff --git a/src/api/core/emergency_access.rs b/src/api/core/emergency_access.rs
@@ -644,7 +644,7 @@ async fn password_emergency_access(
let data: EmergencyAccessPasswordData = data.into_inner().data;
let new_master_password_hash = &data.NewMasterPasswordHash;
- let key = &data.Key;
+ //let key = &data.Key;
let requesting_user = headers.user;
let emergency_access = match EmergencyAccess::find_by_uuid(&emer_id, &mut conn).await {
@@ -662,7 +662,7 @@ async fn password_emergency_access(
};
// change grantor_user password
- grantor_user.set_password(new_master_password_hash, key, None);
+ grantor_user.set_password(new_master_password_hash, Some(data.Key), true, None);
grantor_user.save(&mut conn).await?;
// Disable TwoFactor providers since they will otherwise block logins
diff --git a/src/api/identity.rs b/src/api/identity.rs
@@ -130,7 +130,7 @@ async fn _password_login(
// Get the user
let username = data.username.as_ref().unwrap().trim();
- let user = match User::find_by_mail(username, conn).await {
+ let mut user = match User::find_by_mail(username, conn).await {
Some(user) => user,
None => err!("Username or password is incorrect. Try again", format!("IP: {}. Username: {}.", ip.ip, username)),
};
@@ -150,6 +150,16 @@ async fn _password_login(
)
}
+ // Change the KDF Iterations
+ if user.password_iterations != CONFIG.password_iterations() {
+ user.password_iterations = CONFIG.password_iterations();
+ user.set_password(password, None, false, None);
+
+ if let Err(e) = user.save(conn).await {
+ error!("Error updating user: {:#?}", e);
+ }
+ }
+
// Check if the user is disabled
if !user.enabled {
err!(
@@ -172,7 +182,6 @@ async fn _password_login(
if resend_limit == 0 || user.login_verify_count < resend_limit {
// We want to send another email verification if we require signups to verify
// their email address, and we haven't sent them a reminder in a while...
- let mut user = user;
user.last_verifying_at = Some(now);
user.login_verify_count += 1;
diff --git a/src/config.rs b/src/config.rs
@@ -463,9 +463,9 @@ make_config! {
invitation_expiration_hours: u32, false, def, 120;
/// Allow emergency access |> Controls whether users can enable emergency access to their accounts. This setting applies globally to all users.
emergency_access_allowed: bool, true, def, true;
- /// Password iterations |> Number of server-side passwords hashing iterations.
- /// The changes only apply when a user changes their password. Not recommended to lower the value
- password_iterations: i32, true, def, 100_000;
+ /// Password iterations |> Number of server-side passwords hashing iterations for the password hash.
+ /// The default for new users. If changed, it will be updated during login for existing users.
+ password_iterations: i32, true, def, 600_000;
/// Allow password hints |> Controls whether users can set password hints. This setting applies globally to all users.
password_hints_allowed: bool, true, def, true;
/// Show password hint |> Controls whether a password hint should be shown directly in the web page
@@ -673,6 +673,10 @@ fn validate_config(cfg: &ConfigItems) -> Result<(), Error> {
}
}
+ if cfg.password_iterations < 100_000 {
+ err!("PASSWORD_ITERATIONS should be at least 100000 or higher. The default is 600000!");
+ }
+
let limit = 256;
if cfg.database_max_conns < 1 || cfg.database_max_conns > limit {
err!(format!("`DATABASE_MAX_CONNS` contains an invalid value. Ensure it is between 1 and {limit}.",));
diff --git a/src/db/models/user.rs b/src/db/models/user.rs
@@ -74,7 +74,7 @@ pub struct UserStampException {
/// Local methods
impl User {
pub const CLIENT_KDF_TYPE_DEFAULT: i32 = 0; // PBKDF2: 0
- pub const CLIENT_KDF_ITER_DEFAULT: i32 = 100_000;
+ pub const CLIENT_KDF_ITER_DEFAULT: i32 = 600_000;
pub fn new(email: String) -> Self {
let now = Utc::now().naive_utc();
@@ -152,14 +152,26 @@ impl User {
/// These routes are able to use the previous stamp id for the next 2 minutes.
/// After these 2 minutes this stamp will expire.
///
- pub fn set_password(&mut self, password: &str, new_key: &str, allow_next_route: Option<Vec<String>>) {
+ pub fn set_password(
+ &mut self,
+ password: &str,
+ new_key: Option<String>,
+ reset_security_stamp: bool,
+ allow_next_route: Option<Vec<String>>,
+ ) {
self.password_hash = crypto::hash_password(password.as_bytes(), &self.salt, self.password_iterations as u32);
if let Some(route) = allow_next_route {
self.set_stamp_exception(route);
}
- self.akey = String::from(new_key);
- self.reset_security_stamp()
+
+ if let Some(new_key) = new_key {
+ self.akey = new_key;
+ }
+
+ if reset_security_stamp {
+ self.reset_security_stamp()
+ }
}
pub fn reset_security_stamp(&mut self) {
