From 99d5178058a6a9c334885cfc0dcce426a0d420bf Mon Sep 17 00:00:00 2001
From: Hinton <hinton@users.noreply.github.com>
Date: Mon, 25 Mar 2024 10:55:53 +0100
Subject: [PATCH] Expose argon2 in wasm

---
 Cargo.lock                          |  2 ++
 crates/bitwarden-wasm/Cargo.toml    | 14 +++++++++-----
 crates/bitwarden-wasm/src/client.rs | 28 ++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dfa714cc6..53e71bc95 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -521,6 +521,8 @@ dependencies = [
 name = "bitwarden-wasm"
 version = "0.1.0"
 dependencies = [
+ "argon2",
+ "base64",
  "bitwarden-json",
  "console_error_panic_hook",
  "console_log",
diff --git a/crates/bitwarden-wasm/Cargo.toml b/crates/bitwarden-wasm/Cargo.toml
index a688f12b6..f715ea11a 100644
--- a/crates/bitwarden-wasm/Cargo.toml
+++ b/crates/bitwarden-wasm/Cargo.toml
@@ -15,6 +15,15 @@ keywords.workspace = true
 crate-type = ["cdylib"]
 
 [dependencies]
+argon2 = { version = ">=0.5.0, <0.6", features = [
+    "alloc",
+    "zeroize",
+], default-features = false }
+base64 = ">=0.21.2, <0.22"
+bitwarden-json = { path = "../bitwarden-json", features = [
+    "secrets",
+    "internal",
+] }
 console_error_panic_hook = "0.1.7"
 console_log = { version = "1.0.0", features = ["color"] }
 js-sys = "0.3.68"
@@ -23,10 +32,5 @@ serde = { version = "1.0.196", features = ["derive"] }
 wasm-bindgen = { version = "0.2.91", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.4.41"
 
-bitwarden-json = { path = "../bitwarden-json", features = [
-    "secrets",
-    "internal",
-] }
-
 [dev-dependencies]
 wasm-bindgen-test = "0.3.41"
diff --git a/crates/bitwarden-wasm/src/client.rs b/crates/bitwarden-wasm/src/client.rs
index 542759731..c3599594b 100644
--- a/crates/bitwarden-wasm/src/client.rs
+++ b/crates/bitwarden-wasm/src/client.rs
@@ -1,6 +1,8 @@
 extern crate console_error_panic_hook;
 use std::rc::Rc;
 
+use argon2::{Algorithm, Argon2, Params, Version};
+use base64::{engine::general_purpose::STANDARD, Engine};
 use bitwarden_json::client::Client as JsonClient;
 use js_sys::Promise;
 use log::Level;
@@ -54,3 +56,29 @@ impl BitwardenClient {
         })
     }
 }
+
+#[wasm_bindgen]
+pub fn argon2(
+    password: &[u8],
+    salt: &[u8],
+    iterations: u32,
+    memory: u32,
+    parallelism: u32,
+) -> String {
+    let argon = Argon2::new(
+        Algorithm::Argon2id,
+        Version::V0x13,
+        Params::new(
+            memory * 1024, // Convert MiB to KiB
+            iterations,
+            parallelism,
+            Some(32),
+        )
+        .unwrap(),
+    );
+
+    let mut hash = [0u8; 32];
+    argon.hash_password_into(password, salt, &mut hash).unwrap();
+
+    STANDARD.encode(hash)
+}