[PM-1724] Sqlite WASM

.github/workflows/minimum-rust-version.yml

@@ -33,7 +33,7 @@ jobs:
         uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a # stable
         with:
           # Important: When updating this, make sure to update the Readme file
-          # and also the `rust-version` field in all the `Cargo.toml`.
+          # and also the `rust-version` field in the workspace `Cargo.toml`.
           toolchain: 1.75.0
           targets: ${{ matrix.settings.target }}
 

.gitignore

@@ -26,11 +26,10 @@ bld/
 .idea
 xcuserdata/
 
-# Added by cargo
-#
-# already existing elements were commented out
+# Databases
+*.sqlite
+crates/bitwarden-db-tests/pkg
 
-#/target
 node_modules/
 clients/python/env/
 

Cargo.toml

@@ -23,13 +23,16 @@ bitwarden-api-identity = { path = "crates/bitwarden-api-identity", version = "=0
 bitwarden-cli = { path = "crates/bitwarden-cli", version = "=0.5.0" }
 bitwarden-core = { path = "crates/bitwarden-core", version = "=0.5.0" }
 bitwarden-crypto = { path = "crates/bitwarden-crypto", version = "=0.5.0" }
+bitwarden-db = { path = "crates/bitwarden-db", version = "=0.5.0" }
 bitwarden-exporters = { path = "crates/bitwarden-exporters", version = "=0.5.0" }
 bitwarden-fido = { path = "crates/bitwarden-fido", version = "=0.5.0" }
 bitwarden-generators = { path = "crates/bitwarden-generators", version = "=0.5.0" }
 bitwarden-send = { path = "crates/bitwarden-send", version = "=0.5.0" }
 bitwarden-sm = { path = "crates/bitwarden-sm", version = "=0.5.0" }
 bitwarden-vault = { path = "crates/bitwarden-vault", version = "=0.5.0" }
 
+tokio = { version = "1.36.0", features = ["rt", "macros", "sync"] }
+
 [workspace.lints.clippy]
 unused_async = "deny"
 unwrap_used = "deny"

crates/bitwarden-c/Cargo.toml

@@ -15,7 +15,7 @@ crate-type = ["staticlib", "cdylib"]
 bench = false
 
 [target.'cfg(not(target_arch="wasm32"))'.dependencies]
-tokio = { version = ">=1.28.2, <2.0", features = ["rt-multi-thread", "macros"] }
+tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 bitwarden-json = { path = "../bitwarden-json", features = ["secrets"] }
 
 [dependencies]

crates/bitwarden-c/src/c.rs

@@ -39,7 +39,7 @@
         .build()
         .expect("Failed to build tokio runtime");
 
-    let client = if c_str_ptr.is_null() {
+    let client_future = if c_str_ptr.is_null() {
         Client::new(None)
     } else {
         let input_string = str::from_utf8(unsafe { CStr::from_ptr(c_str_ptr) }.to_bytes())
@@ -48,6 +48,8 @@
         Client::new(Some(input_string))
     };
 
+    let client = runtime.block_on(client_future);
+
     box_ptr!(CClient { runtime, client })
 }
 

crates/bitwarden-core/Cargo.toml

@@ -26,13 +26,15 @@ uniffi = [
     "dep:p256",
 ] # Uniffi bindings
 secrets = [] # Secrets manager API
+state = ["dep:bitwarden-db", "dep:tokio"] # Persistent state
 
 [dependencies]
 async-trait = ">=0.1.80, <0.2"
 base64 = ">=0.22.1, <0.23"
 bitwarden-api-api = { workspace = true }
 bitwarden-api-identity = { workspace = true }
 bitwarden-crypto = { workspace = true }
+bitwarden-db = { workspace = true, optional = true }
 chrono = { version = ">=0.4.26, <0.5", features = [
     "clock",
     "serde",
@@ -58,6 +60,7 @@ serde_repr = ">=0.1.12, <0.2"
 sha1 = ">=0.10.5, <0.11"
 sha2 = ">=0.10.6, <0.11"
 thiserror = ">=1.0.40, <2.0"
+tokio = { workspace = true, optional = true }
 uniffi = { version = "=0.28.1", optional = true, features = ["tokio"] }
 uuid = { version = ">=1.3.3, <2.0", features = ["serde"] }
 validator = { version = "0.18.1", features = ["derive"] }
@@ -79,9 +82,8 @@ reqwest = { version = ">=0.12.5, <0.13", features = [
 ], default-features = false }
 
 [dev-dependencies]
-bitwarden-crypto = { workspace = true }
 rand_chacha = "0.3.1"
-tokio = { version = "1.36.0", features = ["rt", "macros"] }
+tokio = { workspace = true }
 wiremock = "0.6.0"
 zeroize = { version = ">=1.7.0, <2.0", features = ["derive", "aarch64"] }
 

crates/bitwarden-core/src/auth/auth_request.rs

@@ -120,9 +120,9 @@ mod tests {
     use super::*;
     use crate::mobile::crypto::{AuthRequestMethod, InitUserCryptoMethod, InitUserCryptoRequest};
 
-    #[test]
-    fn test_approve() {
-        let client = Client::new(None);
+    #[tokio::test]
+    async fn test_approve() {
+        let client = Client::new(None).await;
 
         let master_key = MasterKey::derive(
             "asdfasdfasdf",
@@ -198,7 +198,7 @@ mod tests {
         let private_key = "2.yN7l00BOlUE0Sb0M//Q53w==|EwKG/BduQRQ33Izqc/ogoBROIoI5dmgrxSo82sgzgAMIBt3A2FZ9vPRMY+GWT85JiqytDitGR3TqwnFUBhKUpRRAq4x7rA6A1arHrFp5Tp1p21O3SfjtvB3quiOKbqWk6ZaU1Np9HwqwAecddFcB0YyBEiRX3VwF2pgpAdiPbSMuvo2qIgyob0CUoC/h4Bz1be7Qa7B0Xw9/fMKkB1LpOm925lzqosyMQM62YpMGkjMsbZz0uPopu32fxzDWSPr+kekNNyLt9InGhTpxLmq1go/pXR2uw5dfpXc5yuta7DB0EGBwnQ8Vl5HPdDooqOTD9I1jE0mRyuBpWTTI3FRnu3JUh3rIyGBJhUmHqGZvw2CKdqHCIrQeQkkEYqOeJRJVdBjhv5KGJifqT3BFRwX/YFJIChAQpebNQKXe/0kPivWokHWwXlDB7S7mBZzhaAPidZvnuIhalE2qmTypDwHy22FyqV58T8MGGMchcASDi/QXI6kcdpJzPXSeU9o+NC68QDlOIrMVxKFeE7w7PvVmAaxEo0YwmuAzzKy9QpdlK0aab/xEi8V4iXj4hGepqAvHkXIQd+r3FNeiLfllkb61p6WTjr5urcmDQMR94/wYoilpG5OlybHdbhsYHvIzYoLrC7fzl630gcO6t4nM24vdB6Ymg9BVpEgKRAxSbE62Tqacxqnz9AcmgItb48NiR/He3n3ydGjPYuKk/ihZMgEwAEZvSlNxYONSbYrIGDtOY+8Nbt6KiH3l06wjZW8tcmFeVlWv+tWotnTY9IqlAfvNVTjtsobqtQnvsiDjdEVtNy/s2ci5TH+NdZluca2OVEr91Wayxh70kpM6ib4UGbfdmGgCo74gtKvKSJU0rTHakQ5L9JlaSDD5FamBRyI0qfL43Ad9qOUZ8DaffDCyuaVyuqk7cz9HwmEmvWU3VQ+5t06n/5kRDXttcw8w+3qClEEdGo1KeENcnXCB32dQe3tDTFpuAIMLqwXs6FhpawfZ5kPYvLPczGWaqftIs/RXJ/EltGc0ugw2dmTLpoQhCqrcKEBDoYVk0LDZKsnzitOGdi9mOWse7Se8798ib1UsHFUjGzISEt6upestxOeupSTOh0v4+AjXbDzRUyogHww3V+Bqg71bkcMxtB+WM+pn1XNbVTyl9NR040nhP7KEf6e9ruXAtmrBC2ah5cFEpLIot77VFZ9ilLuitSz+7T8n1yAh1IEG6xxXxninAZIzi2qGbH69O5RSpOJuJTv17zTLJQIIc781JwQ2TTwTGnx5wZLbffhCasowJKd2EVcyMJyhz6ru0PvXWJ4hUdkARJs3Xu8dus9a86N8Xk6aAPzBDqzYb1vyFIfBxP0oO8xFHgd30Cgmz8UrSE3qeWRrF8ftrI6xQnFjHBGWD/JWSvd6YMcQED0aVuQkuNW9ST/DzQThPzRfPUoiL10yAmV7Ytu4fR3x2sF0Yfi87YhHFuCMpV/DsqxmUizyiJuD938eRcH8hzR/VO53Qo3UIsqOLcyXtTv6THjSlTopQ+JOLOnHm1w8dzYbLN44OG44rRsbihMUQp+wUZ6bsI8rrOnm9WErzkbQFbrfAINdoCiNa6cimYIjvvnMTaFWNymqY1vZxGztQiMiHiHYwTfwHTXrb9j0uPM=|09J28iXv9oWzYtzK2LBT6Yht4IT4MijEkk0fwFdrVQ4=";
 
         // Initialize an existing client which is unlocked
-        let existing_device = Client::new(None);
+        let existing_device = Client::new(None).await;
 
         let master_key = MasterKey::derive("asdfasdfasdf", email, &kdf).unwrap();
 
@@ -208,7 +208,7 @@ mod tests {
             .unwrap();
 
         // Initialize a new device which will request to be logged in
-        let new_device = Client::new(None);
+        let new_device = Client::new(None).await;
 
         // Initialize an auth request, and approve it on the existing device
         let auth_req = new_auth_request(email).unwrap();

crates/bitwarden-core/src/auth/password/validate.rs

@@ -82,13 +82,13 @@ mod tests {
 
     use crate::auth::password::{validate::validate_password_user_key, validate_password};
 
-    #[test]
-    fn test_validate_password() {
+    #[tokio::test]
+    async fn test_validate_password() {
         use std::num::NonZeroU32;
 
         use crate::client::{Client, LoginMethod, UserLoginMethod};
 
-        let client = Client::new(None);
+        let client = Client::new(None).await;
         client
             .internal
             .set_login_method(LoginMethod::User(UserLoginMethod::Username {
@@ -108,15 +108,15 @@ mod tests {
     }
 
     #[cfg(feature = "internal")]
-    #[test]
-    fn test_validate_password_user_key() {
+    #[tokio::test]
+    async fn test_validate_password_user_key() {
         use std::num::NonZeroU32;
 
         use bitwarden_crypto::{Kdf, MasterKey};
 
         use crate::client::{Client, LoginMethod, UserLoginMethod};
 
-        let client = Client::new(None);
+        let client = Client::new(None).await;
 
         let password = "asdfasdfasdf";
         let email = "[email protected]";
@@ -151,15 +151,15 @@ mod tests {
     }
 
     #[cfg(feature = "internal")]
-    #[test]
-    fn test_validate_password_user_key_wrong_password() {
+    #[tokio::test]
+    async fn test_validate_password_user_key_wrong_password() {
         use std::num::NonZeroU32;
 
         use bitwarden_crypto::{Kdf, MasterKey};
 
         use crate::client::{Client, LoginMethod, UserLoginMethod};
 
-        let client = Client::new(None);
+        let client = Client::new(None).await;
 
         let password = "asdfasdfasdf";
         let email = "[email protected]";