vw_small

commit a9a5706764a98fbcda1bc6ac2e0ef5f78ea6c202
parent e9ee8ac2fa4ea4bafdacd479c06acea0b53aac37
Author: Jeremy Lin <jeremy.lin@gmail.com>
Date:   Sat,  1 May 2021 01:06:06 -0700

Add support for password reprompt

Upstream PR: https://github.com/bitwarden/server/pull/1269

Diffstat:
A
migrations/mysql/2021-04-30-233251_add_reprompt/down.sql
 | 
0

A
migrations/mysql/2021-04-30-233251_add_reprompt/up.sql
 | 
2
++
A
migrations/postgresql/2021-04-30-233251_add_reprompt/down.sql
 | 
0

A
migrations/postgresql/2021-04-30-233251_add_reprompt/up.sql
 | 
2
++
A
migrations/sqlite/2021-04-30-233251_add_reprompt/down.sql
 | 
0

A
migrations/sqlite/2021-04-30-233251_add_reprompt/up.sql
 | 
2
++
M
src/api/core/ciphers.rs
 | 
2
++
M
src/db/models/cipher.rs
 | 
9
+++++++++
M
src/db/schemas/mysql/schema.rs
 | 
1
+
M
src/db/schemas/postgresql/schema.rs
 | 
1
+
M
src/db/schemas/sqlite/schema.rs
 | 
1
+

11 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/migrations/mysql/2021-04-30-233251_add_reprompt/down.sql b/migrations/mysql/2021-04-30-233251_add_reprompt/down.sql
diff --git a/migrations/mysql/2021-04-30-233251_add_reprompt/up.sql b/migrations/mysql/2021-04-30-233251_add_reprompt/up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE ciphers
+ADD COLUMN reprompt INTEGER;
diff --git a/migrations/postgresql/2021-04-30-233251_add_reprompt/down.sql b/migrations/postgresql/2021-04-30-233251_add_reprompt/down.sql
diff --git a/migrations/postgresql/2021-04-30-233251_add_reprompt/up.sql b/migrations/postgresql/2021-04-30-233251_add_reprompt/up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE ciphers
+ADD COLUMN reprompt INTEGER;
diff --git a/migrations/sqlite/2021-04-30-233251_add_reprompt/down.sql b/migrations/sqlite/2021-04-30-233251_add_reprompt/down.sql
diff --git a/migrations/sqlite/2021-04-30-233251_add_reprompt/up.sql b/migrations/sqlite/2021-04-30-233251_add_reprompt/up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE ciphers
+ADD COLUMN reprompt INTEGER;
diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs
@@ -199,6 +199,7 @@ pub struct CipherData {
     Identity: Option<Value>,
 
     Favorite: Option<bool>,
+    Reprompt: Option<i32>,
 
     PasswordHistory: Option<Value>,
 
@@ -415,6 +416,7 @@ pub fn update_cipher_from_data(
     cipher.fields = data.Fields.map(|f| _clean_cipher_data(f).to_string());
     cipher.data = type_data.to_string();
     cipher.password_history = data.PasswordHistory.map(|f| f.to_string());
+    cipher.reprompt = data.Reprompt;
 
     cipher.save(&conn)?;
     cipher.move_to_folder(data.FolderId, &headers.user.uuid, &conn)?;
diff --git a/src/db/models/cipher.rs b/src/db/models/cipher.rs
@@ -38,9 +38,16 @@ db_object! {
 
         pub password_history: Option<String>,
         pub deleted_at: Option<NaiveDateTime>,
+        pub reprompt: Option<i32>,
     }
 }
 
+#[allow(dead_code)]
+pub enum RepromptType {
+    None = 0,
+    Password = 1, // not currently used in server
+}
+
 /// Local methods
 impl Cipher {
     pub fn new(atype: i32, name: String) -> Self {
@@ -63,6 +70,7 @@ impl Cipher {
             data: String::new(),
             password_history: None,
             deleted_at: None,
+            reprompt: None,
         }
     }
 }
@@ -138,6 +146,7 @@ impl Cipher {
             "DeletedDate": self.deleted_at.map_or(Value::Null, |d| Value::String(format_date(&d))),
             "FolderId": self.get_folder_uuid(&user_uuid, conn),
             "Favorite": self.is_favorite(&user_uuid, conn),
+            "Reprompt": self.reprompt.unwrap_or(RepromptType::None as i32),
             "OrganizationId": self.organization_uuid,
             "Attachments": attachments_json,
             // We have UseTotp set to true by default within the Organization model.
diff --git a/src/db/schemas/mysql/schema.rs b/src/db/schemas/mysql/schema.rs
@@ -22,6 +22,7 @@ table! {
         data -> Text,
         password_history -> Nullable<Text>,
         deleted_at -> Nullable<Datetime>,
+        reprompt -> Nullable<Integer>,
     }
 }
 
diff --git a/src/db/schemas/postgresql/schema.rs b/src/db/schemas/postgresql/schema.rs
@@ -22,6 +22,7 @@ table! {
         data -> Text,
         password_history -> Nullable<Text>,
         deleted_at -> Nullable<Timestamp>,
+        reprompt -> Nullable<Integer>,
     }
 }
 
diff --git a/src/db/schemas/sqlite/schema.rs b/src/db/schemas/sqlite/schema.rs
@@ -22,6 +22,7 @@ table! {
         data -> Text,
         password_history -> Nullable<Text>,
         deleted_at -> Nullable<Timestamp>,
+        reprompt -> Nullable<Integer>,
     }
 }