Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Move SRP login key derivation to Rust

Manav Rathidc2a97e3186f
diff --git a/rust/bindings/wasm/lib/src/prelogin.rs b/rust/bindings/wasm/lib/src/prelogin.rs
index 771f75bef0..3c87b0bc08 100644
--- a/rust/bindings/wasm/lib/src/prelogin.rs
+++ b/rust/bindings/wasm/lib/src/prelogin.rs
@@ -1,7 +1,4 @@
-use crate::{
- accounts::{Error as AccountsError, GeneratedKek},
- crypto::Error as CryptoError,
-};
+use crate::accounts::{Error as AccountsError, GeneratedKek};
use ente_accounts::auth;
use ente_core::{b64, crypto};
use wasm_bindgen::prelude::*;
@@ -27,6 +24,13 @@ pub fn auth_derive_kek(
Ok(b64::encode(&kek))
}
+#[wasm_bindgen(js_name = authDeriveSrpLoginKey)]
+pub fn auth_derive_srp_login_key(kek_b64: &str) -> Result<String, AccountsError> {
+ let kek =
+ b64::decode(kek_b64).map_err(|e| ente_accounts::Error::Decode(format!("kek: {e}")))?;
+ Ok(b64::encode(&auth::derive_srp_login_key(&kek)?))
+}
+
#[wasm_bindgen(js_name = authGenerateSensitiveKek)]
pub fn auth_generate_sensitive_kek(password: &str) -> Result<GeneratedKek, AccountsError> {
Ok(auth::generate_sensitive_kek(password)?.into())
@@ -117,23 +121,3 @@ pub fn crypto_generate_key_pair() -> CryptoKeyPair {
private_key: b64::encode(secret_key.as_bytes()),
}
}
-
-#[wasm_bindgen(js_name = cryptoDeriveSubKey)]
-pub fn crypto_derive_sub_key(
- key_b64: &str,
- sub_key_length: usize,
- sub_key_id: u64,
- context: &str,
-) -> Result<String, CryptoError> {
- let key = b64::decode(key_b64)?;
- let context: [u8; 8] = context.as_bytes().try_into().map_err(|_| {
- crypto::Error::InvalidKeyDerivationParams("KDF context must be exactly 8 bytes".into())
- })?;
- let sub_key = crypto::kdf::derive_subkey(
- &crypto::Key::try_from_slice(&key)?,
- sub_key_length,
- sub_key_id,
- &context,
- )?;
- Ok(b64::encode(&sub_key))
-}
diff --git a/rust/crates/accounts/src/auth/api.rs b/rust/crates/accounts/src/auth/api.rs
index 2c7e528143..2af33e5c75 100644
--- a/rust/crates/accounts/src/auth/api.rs
+++ b/rust/crates/accounts/src/auth/api.rs
@@ -139,8 +139,12 @@ fn generated_kek(derived: argon::DerivedKey) -> GeneratedKek {
}
}
+pub fn derive_srp_login_key(kek: &[u8]) -> Result<SecretVec> {
+ Ok(kdf::derive_login_key(&crypto::Key::try_from_slice(kek)?))
+}
+
pub fn generate_srp_setup(kek: &[u8], srp_user_id: &str) -> Result<GeneratedSrpSetup> {
- let login_sub_key = kdf::derive_login_key(&crypto::Key::try_from_slice(kek)?);
+ let login_sub_key = derive_srp_login_key(kek)?;
generate_srp_setup_with_login_key(&login_sub_key, srp_user_id)
}
diff --git a/rust/crates/accounts/src/auth/mod.rs b/rust/crates/accounts/src/auth/mod.rs
index 3c40a06de3..b397925a77 100644
--- a/rust/crates/accounts/src/auth/mod.rs
+++ b/rust/crates/accounts/src/auth/mod.rs
@@ -8,7 +8,7 @@ pub use srp::SrpSession;
pub use api::{DecryptedSecrets, GeneratedKek, GeneratedSrpSetup, SrpCredentials};
pub use api::{
- decrypt_keys_only, decrypt_secrets, derive_kek, derive_srp_credentials,
+ decrypt_keys_only, decrypt_secrets, derive_kek, derive_srp_credentials, derive_srp_login_key,
generate_interactive_kek, generate_sensitive_kek, generate_srp_setup,
generate_srp_setup_with_login_key,
};
diff --git a/rust/crates/core/src/crypto/kdf.rs b/rust/crates/core/src/crypto/kdf.rs
index a82eebac8b..dee676acf3 100644
--- a/rust/crates/core/src/crypto/kdf.rs
+++ b/rust/crates/core/src/crypto/kdf.rs
@@ -48,14 +48,9 @@ pub fn derive_subkey(
Ok(SecretVec::new(hash.as_bytes()[..subkey_len].to_vec()))
}
-pub fn derive_login_key(master_key: &Key) -> SecretVec {
- let subkey = derive_subkey(
- master_key,
- LOGIN_SUBKEY_LEN,
- LOGIN_SUBKEY_ID,
- LOGIN_SUBKEY_CONTEXT,
- )
- .expect("login subkey parameters are statically valid");
+pub fn derive_login_key(kek: &Key) -> SecretVec {
+ let subkey = derive_subkey(kek, LOGIN_SUBKEY_LEN, LOGIN_SUBKEY_ID, LOGIN_SUBKEY_CONTEXT)
+ .expect("login subkey parameters are statically valid");
SecretVec::new(subkey[..16].to_vec())
}
diff --git a/web/packages/accounts/services/crypto/index.ts b/web/packages/accounts/services/crypto/index.ts
index dfc7a9ab14..3329a8ae99 100644
--- a/web/packages/accounts/services/crypto/index.ts
+++ b/web/packages/accounts/services/crypto/index.ts
@@ -7,11 +7,9 @@ import type { KDFWorker } from "./kdf.worker";
export {
boxSealOpenBytes,
decryptBox,
- deriveSubKeyBytes,
encryptBox,
generateKey,
generateKeyPair,
- generateSRPSetup,
recoveryKeyFromMnemonicOrHex,
} from "ente-prelogin-wasm";
export type {
diff --git a/web/packages/accounts/services/srp.ts b/web/packages/accounts/services/srp.ts
index a148fefff7..6a718e75a5 100644
--- a/web/packages/accounts/services/srp.ts
+++ b/web/packages/accounts/services/srp.ts
@@ -1,8 +1,3 @@
-import {
- deriveSubKeyBytes,
- generateSRPSetup,
- toB64,
-} from "ente-accounts/services/crypto";
import { namedError } from "ente-base/error";
import {
authenticatedRequestHeaders,
@@ -10,7 +5,11 @@ import {
publicRequestHeaders,
} from "ente-base/http";
import { apiURL } from "ente-base/origins";
-import { createSRPSession } from "ente-prelogin-wasm";
+import {
+ createSRPSession,
+ deriveSRPLoginKey,
+ generateSRPSetup,
+} from "ente-prelogin-wasm";
import { ensure } from "ente-utils/ensure";
import { v4 as uuidv4 } from "uuid";
import { z } from "zod";
@@ -183,11 +182,6 @@ const updateSRPAndKeys = async (
return UpdateSRPAndKeysResponse.parse(await res.json());
};
-const deriveSRPLoginSubKey = async (kek: string) => {
- const kekSubKeyBytes = await deriveSubKeyBytes(kek, 32, 1, "loginctx");
- return toB64(kekSubKeyBytes.slice(0, 16));
-};
-
export const verifySRP = async (
{ srpUserID, srpSalt }: SRPAttributes,
kek: string,
@@ -195,7 +189,7 @@ export const verifySRP = async (
const session = await createSRPSession(
srpSalt,
srpUserID,
- await deriveSRPLoginSubKey(kek),
+ await deriveSRPLoginKey(kek),
);
const { srpB, sessionID } = await createSRPSessionOnRemote({
diff --git a/web/packages/wasm/prelogin/index.ts b/web/packages/wasm/prelogin/index.ts
index d2e6077df4..e57ceedf0d 100644
--- a/web/packages/wasm/prelogin/index.ts
+++ b/web/packages/wasm/prelogin/index.ts
@@ -49,6 +49,9 @@ export const deriveInteractiveKey = async (
derivedKeyValue,
);
+export const deriveSRPLoginKey = async (kekB64: string) =>
+ (await wasm()).authDeriveSrpLoginKey(kekB64);
+
export const generateSRPSetup = async (
kekB64: string,
srpUserID: string,
@@ -115,21 +118,6 @@ export const boxSealOpenBytes = async (
): Promise<Uint8Array<ArrayBuffer>> =>
fromB64String(await boxSealOpen(encryptedData, keyPair));
-export const deriveSubKeyBytes = async (
- keyB64: string,
- subKeyLength: number,
- subKeyID: number,
- context: string,
-): Promise<Uint8Array<ArrayBuffer>> =>
- fromB64String(
- (await wasm()).cryptoDeriveSubKey(
- keyB64,
- subKeyLength,
- BigInt(subKeyID),
- context,
- ),
- );
-
const derivedKeyValue = (key: DerivedKey): DerivedKey => ({
key: key.key,
salt: key.salt,
diff --git a/web/packages/wasm/prelogin/tests/auth.test.ts b/web/packages/wasm/prelogin/tests/auth.test.ts
index 1bb2cad095..24d970f8b8 100644
--- a/web/packages/wasm/prelogin/tests/auth.test.ts
+++ b/web/packages/wasm/prelogin/tests/auth.test.ts
@@ -1,5 +1,6 @@
import { expect, test } from "vitest";
import {
+ authDeriveSrpLoginKey,
authGenerateInteractiveKek,
authGenerateSrpSetup,
cryptoGenerateKey,
@@ -21,6 +22,7 @@ test("generates SRP setup attributes from a kek", () => {
const generated = authGenerateSrpSetup(kek, "test-user-id");
expect(Buffer.from(generated.srpSalt, "base64")).toHaveLength(16);
+ expect(authDeriveSrpLoginKey(kek)).toBe(generated.loginSubKey);
expect(Buffer.from(generated.loginSubKey, "base64")).toHaveLength(16);
expect(Buffer.from(generated.srpVerifier, "base64").length).toBeGreaterThan(
0,