Option<i32> for client_kdf_memory and client_kdf_parallelism

dani-garcia · Feb 7, 2023 · 17c334d · 17c334d
1 parent 1399737
commit 17c334d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/api/core/accounts.rs b/src/api/core/accounts.rs
@@ -156,11 +156,11 @@ pub async fn _register(data: JsonUpcase<RegisterData>, mut conn: DbConn) -> Json
     Invitation::take(&email, &mut conn).await;
 
     if let Some(client_kdf_parallelism) = data.KdfParallelism {
-        user.client_kdf_parallelism = client_kdf_parallelism;
+        user.client_kdf_parallelism = Some(client_kdf_parallelism);
     }
 
     if let Some(client_kdf_memory) = data.KdfMemory {
-        user.client_kdf_memory = client_kdf_memory;
+        user.client_kdf_memory = Some(client_kdf_memory);
     }
 
     if let Some(client_kdf_iter) = data.KdfIterations {
@@ -376,15 +376,15 @@ async fn post_kdf(data: JsonUpcase<ChangeKdfData>, headers: Headers, mut conn: D
             if m < 15 || m > 1024 {
                 err!("Argon2 memory must be between 15 MB and 1024 MB.")
             }
-            user.client_kdf_memory = m;
+            user.client_kdf_memory = data.KdfMemory;
         } else {
             err!("Argon2 memory parameter is required.")
         }
         if let Some(p) = data.KdfParallelism {
             if p < 1 || p > 16 {
                 err!("Argon2 parallelism must be between 1 and 16.")
             }
-            user.client_kdf_parallelism = p;
+            user.client_kdf_parallelism = data.KdfParallelism;
         } else {
             err!("Argon2 parallelism parameter is required.")
         }
@@ -808,8 +808,8 @@ pub async fn _prelogin(data: JsonUpcase<PreloginData>, mut conn: DbConn) -> Json
         None => (
             User::CLIENT_KDF_TYPE_DEFAULT,
             User::CLIENT_KDF_ITER_DEFAULT,
-            0, // This value is irrelevant, because it won't be in the JSON return value anyway
-            0, // This value is irrelevant, because it won't be in the JSON return value anyway
+            None,
+            None,
         ),
     };
 

diff --git a/src/db/models/user.rs b/src/db/models/user.rs
@@ -44,8 +44,8 @@ db_object! {
 
         pub client_kdf_type: i32,
         pub client_kdf_iter: i32,
-        pub client_kdf_memory: i32,
-        pub client_kdf_parallelism: i32,
+        pub client_kdf_memory: Option<i32>,
+        pub client_kdf_parallelism: Option<i32>,
 
         pub api_key: Option<String>,
 
@@ -82,8 +82,6 @@ pub struct UserStampException {
 impl User {
     pub const CLIENT_KDF_TYPE_DEFAULT: i32 = UserKdfType::Pbkdf2 as i32;
     pub const CLIENT_KDF_ITER_DEFAULT: i32 = 600_000;
-    pub const CLIENT_KDF_MEMO_DEFAULT: i32 = 19;
-    pub const CLIENT_KDF_PARA_DEFAULT: i32 = 1;
 
     pub fn new(email: String) -> Self {
         let now = Utc::now().naive_utc();
@@ -122,8 +120,8 @@ impl User {
 
             client_kdf_type: Self::CLIENT_KDF_TYPE_DEFAULT,
             client_kdf_iter: Self::CLIENT_KDF_ITER_DEFAULT,
-            client_kdf_memory: Self::CLIENT_KDF_MEMO_DEFAULT,
-            client_kdf_parallelism: Self::CLIENT_KDF_PARA_DEFAULT,
+            client_kdf_memory: None,
+            client_kdf_parallelism: None,
 
             api_key: None,