diff --git a/migrations/mysql/2023-10-21-221242_add_cipher_key/down.sql b/migrations/mysql/2023-10-21-221242_add_cipher_key/down.sql
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/migrations/mysql/2023-10-21-221242_add_cipher_key/up.sql b/migrations/mysql/2023-10-21-221242_add_cipher_key/up.sql
new file mode 100644
index 0000000000000000000000000000000000000000..717ff3747a9dd3f16c32f34613031f4d686e7261
--- /dev/null
+++ b/migrations/mysql/2023-10-21-221242_add_cipher_key/up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE ciphers
+ADD COLUMN "key" TEXT;
diff --git a/migrations/postgresql/2023-10-21-221242_add_cipher_key/down.sql b/migrations/postgresql/2023-10-21-221242_add_cipher_key/down.sql
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/migrations/postgresql/2023-10-21-221242_add_cipher_key/up.sql b/migrations/postgresql/2023-10-21-221242_add_cipher_key/up.sql
new file mode 100644
index 0000000000000000000000000000000000000000..1b060b601a4f025f5264f5f1bfd336eeaa590aca
--- /dev/null
+++ b/migrations/postgresql/2023-10-21-221242_add_cipher_key/up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE ciphers
+ADD COLUMN "key" TEXT;
diff --git a/migrations/sqlite/2023-10-21-221242_add_cipher_key/down.sql b/migrations/sqlite/2023-10-21-221242_add_cipher_key/down.sql
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/migrations/sqlite/2023-10-21-221242_add_cipher_key/up.sql b/migrations/sqlite/2023-10-21-221242_add_cipher_key/up.sql
new file mode 100644
index 0000000000000000000000000000000000000000..1b060b601a4f025f5264f5f1bfd336eeaa590aca
--- /dev/null
+++ b/migrations/sqlite/2023-10-21-221242_add_cipher_key/up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE ciphers
+ADD COLUMN "key" TEXT;
diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs
index 43e007ab4aa7e7770924a78209235e293b052e7f..b9f3ef63661f4aa5d98fb041405424d9613d6aa6 100644
--- a/src/api/core/ciphers.rs
+++ b/src/api/core/ciphers.rs
@@ -206,6 +206,8 @@ pub struct CipherData {
// TODO: Some of these might appear all the time, no need for Option
OrganizationId: Option<String>,
+ Key: Option<String>,
+
/*
Login = 1,
SecureNote = 2,
@@ -483,6 +485,7 @@ pub async fn update_cipher_from_data(
None => err!("Data missing"),
};
+ cipher.key = data.Key;
cipher.name = data.Name;
cipher.notes = data.Notes;
cipher.fields = data.Fields.map(|f| _clean_cipher_data(f).to_string());
diff --git a/src/api/core/mod.rs b/src/api/core/mod.rs
index f1424688ae212d229ee4373459dad9abb173a3e6..62a601973fb6cd80c761aa2af5192772bddfeadc 100644
--- a/src/api/core/mod.rs
+++ b/src/api/core/mod.rs
@@ -194,7 +194,12 @@ fn version() -> Json<&'static str> {
fn config() -> Json<Value> {
let domain = crate::CONFIG.domain();
Json(json!({
- "version": crate::VERSION,
+ // Note: The clients use this version to handle backwards compatibility concerns
+ // This means they expect a version that closely matches the Bitwarden server version
+ // We should make sure that we keep this updated when we support the new server features
+ // Version history:
+ // - Individual cipher key encryption: 2023.9.1
+ "version": "2023.9.1",
"gitHash": option_env!("GIT_REV"),
"server": {
"name": "Vaultwarden",
@@ -207,6 +212,12 @@ fn config() -> Json<Value> {
"notifications": format!("{domain}/notifications"),
"sso": "",
},
+ "featureStates": {
+ // Any feature flags that we want the clients to use
+ // Can check the enabled ones at:
+ // https://vault.bitwarden.com/api/config
+ "autofill-v2": true
+ },
"object": "config",
}))
}
diff --git a/src/db/models/cipher.rs b/src/db/models/cipher.rs
index f76490b4ab1f3701e041aeab33dcfb04e7a41bf4..6bc98b90a376c692d37db548286229befd10e0dc 100644
--- a/src/db/models/cipher.rs
+++ b/src/db/models/cipher.rs
@@ -23,6 +23,8 @@ db_object! {
pub user_uuid: Option<String>,
pub organization_uuid: Option<String>,
+ pub key: Option<String>,
+
/*
Login = 1,
SecureNote = 2,
@@ -62,6 +64,8 @@ impl Cipher {
user_uuid: None,
organization_uuid: None,
+ key: None,
+
atype,
name,
@@ -203,6 +207,7 @@ impl Cipher {
"DeletedDate": self.deleted_at.map_or(Value::Null, |d| Value::String(format_date(&d))),
"Reprompt": self.reprompt.unwrap_or(RepromptType::None as i32),
"OrganizationId": self.organization_uuid,
+ "Key": self.key,
"Attachments": attachments_json,
// We have UseTotp set to true by default within the Organization model.
// This variable together with UsersGetPremium is used to show or hide the TOTP counter.
diff --git a/src/db/schemas/mysql/schema.rs b/src/db/schemas/mysql/schema.rs
index f1a001fd58a9a0d13141cce1a6da01fe4e834a8b..d10c9fcf590b56d0708a53c5d9c6389eb0770bda 100644
--- a/src/db/schemas/mysql/schema.rs
+++ b/src/db/schemas/mysql/schema.rs
@@ -15,6 +15,7 @@ table! {
updated_at -> Datetime,
user_uuid -> Nullable<Text>,
organization_uuid -> Nullable<Text>,
+ key -> Nullable<Text>,
atype -> Integer,
name -> Text,
notes -> Nullable<Text>,
diff --git a/src/db/schemas/postgresql/schema.rs b/src/db/schemas/postgresql/schema.rs
index 64786fb917683f024ef54c8f2b484d06fe1d3433..518a7c03024e74dd0ce7f34071892c80e429ebdc 100644
--- a/src/db/schemas/postgresql/schema.rs
+++ b/src/db/schemas/postgresql/schema.rs
@@ -15,6 +15,7 @@ table! {
updated_at -> Timestamp,
user_uuid -> Nullable<Text>,
organization_uuid -> Nullable<Text>,
+ key -> Nullable<Text>,
atype -> Integer,
name -> Text,
notes -> Nullable<Text>,
diff --git a/src/db/schemas/sqlite/schema.rs b/src/db/schemas/sqlite/schema.rs
index 64786fb917683f024ef54c8f2b484d06fe1d3433..518a7c03024e74dd0ce7f34071892c80e429ebdc 100644
--- a/src/db/schemas/sqlite/schema.rs
+++ b/src/db/schemas/sqlite/schema.rs
@@ -15,6 +15,7 @@ table! {
updated_at -> Timestamp,
user_uuid -> Nullable<Text>,
organization_uuid -> Nullable<Text>,
+ key -> Nullable<Text>,
atype -> Integer,
name -> Text,
notes -> Nullable<Text>,