π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Share signup key and SRP preparation
Neeraj Guptad3d3520aa9fe
diff --git a/rust/bindings/frb/lib/src/accounts/types.rs b/rust/bindings/frb/lib/src/accounts/types.rsindex 582fcf940c..7655dc5115 100644--- a/rust/bindings/frb/lib/src/accounts/types.rs+++ b/rust/bindings/frb/lib/src/accounts/types.rs@@ -145,9 +145,7 @@ impl AccountsClient {password: String,srp_user_id: String,) -> Result<SignupKeys, AccountsError> {- let keys =- auth::generate_keys_with_strength(&password, auth::KeyDerivationStrength::Sensitive)?;- let srp = auth::generate_srp_setup_with_login_key(&keys.login_key, &srp_user_id)?;+ let (keys, srp) = signup::generate_keys(&password, &srp_user_id)?;Ok(SignupKeys {key_attributes: keys.key_attributes,master_key: keys.private_key_attributes.key.into_string(),diff --git a/rust/bindings/wasm/lib/src/prelogin.rs b/rust/bindings/wasm/lib/src/prelogin.rsindex 850d3167d4..d8a5f2f28f 100644--- a/rust/bindings/wasm/lib/src/prelogin.rs+++ b/rust/bindings/wasm/lib/src/prelogin.rs@@ -1,26 +1,31 @@use crate::accounts::Error as AccountsError;-use ente_accounts::auth;+use ente_accounts::{auth, signup};use ente_core::b64;use serde::Serialize;use tsify::Tsify;use wasm_bindgen::prelude::*;-#[derive(Serialize)]+#[derive(Serialize, Tsify)]#[serde(rename_all = "camelCase")]-struct GeneratedAccountKeys {+pub struct GeneratedSignupKeys {master_key: String,- kek: String,+ #[tsify(type = "unknown")]key_attributes: auth::KeyAttributes,+ srp: GeneratedSrpSetup,}-#[wasm_bindgen(js_name = authGenerateAccountKeys, unchecked_return_type = "unknown")]-pub fn auth_generate_account_keys(password: &str) -> Result<JsValue, AccountsError> {- let keys = auth::generate_keys_with_strength(password, auth::KeyDerivationStrength::Sensitive)?;- serde_wasm_bindgen::to_value(&GeneratedAccountKeys {+#[wasm_bindgen(js_name = authGenerateSignupKeys)]+pub fn auth_generate_signup_keys(+ password: &str,+ srp_user_id: &str,+) -> Result<<GeneratedSignupKeys as Tsify>::JsType, AccountsError> {+ let (keys, srp) = signup::generate_keys(password, srp_user_id)?;+ GeneratedSignupKeys {master_key: keys.private_key_attributes.key.to_string(),- kek: b64::encode(&keys.key_encryption_key),key_attributes: keys.key_attributes,- })+ srp: GeneratedSrpSetup::new(srp_user_id, srp),+ }+ .into_js().map_err(Into::into)}@@ -44,11 +49,24 @@ pub fn auth_generate_interactive_key_attributes(#[derive(Serialize, Tsify)]#[serde(rename_all = "camelCase")]pub struct GeneratedSrpSetup {+ #[serde(rename = "srpUserID")]+ pub srp_user_id: String,pub srp_salt: String,pub srp_verifier: String,pub login_sub_key: String,}+impl GeneratedSrpSetup {+ fn new(srp_user_id: &str, generated: auth::GeneratedSrpSetup) -> Self {+ Self {+ srp_user_id: srp_user_id.to_string(),+ srp_salt: b64::encode(&generated.srp_salt),+ srp_verifier: b64::encode(&generated.srp_verifier),+ login_sub_key: b64::encode(&generated.login_sub_key),+ }+ }+}+#[wasm_bindgen(js_name = authDeriveKek)]pub fn auth_derive_kek(password: &str,@@ -68,13 +86,9 @@ pub fn auth_generate_srp_setup(let kek =b64::decode(kek_b64).map_err(|e| ente_accounts::Error::Decode(format!("kek: {e}")))?;let generated = auth::generate_srp_setup(&kek, srp_user_id)?;- GeneratedSrpSetup {- srp_salt: b64::encode(&generated.srp_salt),- srp_verifier: b64::encode(&generated.srp_verifier),- login_sub_key: b64::encode(&generated.login_sub_key),- }- .into_js()- .map_err(Into::into)+ GeneratedSrpSetup::new(srp_user_id, generated)+ .into_js()+ .map_err(Into::into)}#[wasm_bindgen(js_name = authRecoveryKeyToMnemonic)]diff --git a/rust/crates/accounts/src/signup.rs b/rust/crates/accounts/src/signup.rsindex f5cee25fa1..f025a785f8 100644--- a/rust/crates/accounts/src/signup.rs+++ b/rust/crates/accounts/src/signup.rs@@ -9,9 +9,8 @@ use zeroize::ZeroizeOnDrop;use crate::{AccountSecrets, AccountsClient, AuthenticatedAccount, Error, KeyAttributes, Result,auth::{- GeneratedSrpSetup, KeyDerivationStrength, SrpAttributes, SrpSession, decrypt_keys_only,- derive_kek, generate_keys_with_strength, generate_srp_setup_with_login_key,- get_recovery_key,+ self, GeneratedSrpSetup, KeyDerivationStrength, KeyGenResult, SrpAttributes, SrpSession,+ decrypt_keys_only, derive_kek, generate_srp_setup_with_login_key, get_recovery_key,},models::{AuthResponse, SetupSrpRequest},};@@ -38,6 +37,23 @@ struct PreparedKeys {srp_verifier: Vec<u8>,}+pub fn generate_keys(+ password: &str,+ srp_user_id: &str,+) -> Result<(KeyGenResult, GeneratedSrpSetup)> {+ generate_keys_with_strength(password, srp_user_id, KeyDerivationStrength::Sensitive)+}++fn generate_keys_with_strength(+ password: &str,+ srp_user_id: &str,+ strength: KeyDerivationStrength,+) -> Result<(KeyGenResult, GeneratedSrpSetup)> {+ let keys = auth::generate_keys_with_strength(password, strength)?;+ let srp = generate_srp_setup_with_login_key(&keys.login_key, srp_user_id)?;+ Ok((keys, srp))+}+impl Signup {pub fn verified(email: String, response: AuthResponse) -> Result<Self> {if response.key_attributes.is_some()@@ -87,10 +103,9 @@ impl Signup {if remote.has_set_keys || remote.key_attributes.is_some() {return Err(Error::AccountAlreadyExists);}- let generated = generate_keys_with_strength(password, strength)?;let srp_user_id = Uuid::new_v4();- let srp =- generate_srp_setup_with_login_key(&generated.login_key, &srp_user_id.to_string())?;+ let (generated, srp) =+ generate_keys_with_strength(password, &srp_user_id.to_string(), strength)?;let mut prepared = self.clone();prepared.keys = Some(PreparedKeys {master_key: b64::decode(&generated.private_key_attributes.key)?,diff --git a/web/apps/space/src/services/signup.ts b/web/apps/space/src/services/signup.tsindex 02640b1073..e52ceac698 100644--- a/web/apps/space/src/services/signup.ts+++ b/web/apps/space/src/services/signup.ts@@ -10,13 +10,10 @@ import {stashSRPSetupAttributes,unstashReferralSource,} from "ente-accounts/services/accounts-db";-import {- completePendingSignup,- generateSRPSetupAttributes,-} from "ente-accounts/services/srp";+import { completePendingSignup } from "ente-accounts/services/srp";import {generateAndSaveInteractiveKeyAttributes,- generateKeysAndAttributes,+ generateSignupKeys,sendOTT,unlockAccountWithKey,verifyEmail,@@ -52,10 +49,10 @@ export const beginSpaceSignup = async ({await sendOTT(cleanedEmail, "signup");replaceSavedLocalUser({ email: cleanedEmail });- const { masterKey, kek, keyAttributes } =- await generateKeysAndAttributes(password);+ const { masterKey, keyAttributes, srp } =+ await generateSignupKeys(password);saveOriginalKeyAttributes(keyAttributes);- stashSRPSetupAttributes(await generateSRPSetupAttributes(kek));+ stashSRPSetupAttributes(srp);await generateAndSaveInteractiveKeyAttributes(password,keyAttributes,diff --git a/web/packages/accounts/components/SignUpContents.tsx b/web/packages/accounts/components/SignUpContents.tsxindex f3c0d44c4f..5cf0647a46 100644--- a/web/packages/accounts/components/SignUpContents.tsx+++ b/web/packages/accounts/components/SignUpContents.tsx@@ -7,10 +7,9 @@ import {stashSRPSetupAttributes,} from "ente-accounts/services/accounts-db";import { saveMasterKeyInSessionAndSafeStore } from "ente-accounts/services/prelogin-session";-import { generateSRPSetupAttributes } from "ente-accounts/services/srp";import {generateAndSaveInteractiveKeyAttributes,- generateKeysAndAttributes,+ generateSignupKeys,sendOTT,} from "ente-accounts/services/user";import {@@ -118,10 +117,10 @@ export const SignUpContents: React.FC<SignUpContentsProps> = ({await sendOTT(email, "signup");replaceSavedLocalUser({ email });- const { masterKey, kek, keyAttributes } =- await generateKeysAndAttributes(password);+ const { masterKey, keyAttributes, srp } =+ await generateSignupKeys(password);saveOriginalKeyAttributes(keyAttributes);- stashSRPSetupAttributes(await generateSRPSetupAttributes(kek));+ stashSRPSetupAttributes(srp);await generateAndSaveInteractiveKeyAttributes(password,keyAttributes,diff --git a/web/packages/accounts/pages/generate.tsx b/web/packages/accounts/pages/generate.tsxindex a52d058b9e..0ef91ca9ca 100644--- a/web/packages/accounts/pages/generate.tsx+++ b/web/packages/accounts/pages/generate.tsx@@ -16,13 +16,10 @@ import { deriveKey } from "ente-accounts/services/crypto";import { saveMasterKeyInSessionAndSafeStore } from "ente-accounts/services/prelogin-session";import { getPreloginRecoveryKeyMnemonic } from "ente-accounts/services/recovery-key";import { appHomeRoute } from "ente-accounts/services/redirect";-import {- completePendingSignup,- generateSRPSetupAttributes,-} from "ente-accounts/services/srp";+import { completePendingSignup } from "ente-accounts/services/srp";import {generateAndSaveInteractiveKeyAttributes,- generateKeysAndAttributes,+ generateSignupKeys,unlockAccountWithKEK,} from "ente-accounts/services/user";import { LoadingIndicator } from "ente-base/components/loaders";@@ -86,14 +83,11 @@ const Page: React.FC = () => {kek,));} else {- const generated = await generateKeysAndAttributes(password);+ const generated = await generateSignupKeys(password);({ masterKey, keyAttributes } = generated);- const setup = await generateSRPSetupAttributes(- generated.kek,- );saveOriginalKeyAttributes(keyAttributes);saveKeyAttributes(keyAttributes);- stashSRPSetupAttributes(setup);+ stashSRPSetupAttributes(generated.srp);saveIsFirstLogin();}await completePendingSignup(userEmail, await ensureAuthToken());diff --git a/web/packages/accounts/services/crypto/index.ts b/web/packages/accounts/services/crypto/index.tsindex bcd0ec9357..00d846786c 100644--- a/web/packages/accounts/services/crypto/index.ts+++ b/web/packages/accounts/services/crypto/index.ts@@ -48,10 +48,12 @@ export const deriveKey = (worker.deriveKey(password, saltB64, opsLimit, memLimit),);-export const generateAccountKeys = (password: string): Promise<unknown> =>+export const generateSignupKeys = (password: string, srpUserID: string) =>inWorker()- ? kdf.generateAccountKeys(password)- : withKDFWorker((worker) => worker.generateAccountKeys(password));+ ? kdf.generateSignupKeys(password, srpUserID)+ : withKDFWorker((worker) =>+ worker.generateSignupKeys(password, srpUserID),+ );export const generateInteractiveKeyAttributes = (password: string,diff --git a/web/packages/accounts/services/crypto/kdf.ts b/web/packages/accounts/services/crypto/kdf.tsindex 0dcbdc1395..f9f98057cb 100644--- a/web/packages/accounts/services/crypto/kdf.ts+++ b/web/packages/accounts/services/crypto/kdf.ts@@ -1,5 +1,5 @@export {deriveKey,- generateAccountKeys,generateInteractiveKeyAttributes,+ generateSignupKeys,} from "ente-prelogin-wasm";diff --git a/web/packages/accounts/services/crypto/kdf.worker.ts b/web/packages/accounts/services/crypto/kdf.worker.tsindex 43c7c3045f..33d2659785 100644--- a/web/packages/accounts/services/crypto/kdf.worker.ts+++ b/web/packages/accounts/services/crypto/kdf.worker.ts@@ -4,7 +4,7 @@ import * as kdf from "./kdf";export class KDFWorker {deriveKey = kdf.deriveKey;- generateAccountKeys = kdf.generateAccountKeys;+ generateSignupKeys = kdf.generateSignupKeys;generateInteractiveKeyAttributes = kdf.generateInteractiveKeyAttributes;}diff --git a/web/packages/accounts/services/srp.ts b/web/packages/accounts/services/srp.tsindex 20968f6a60..24eebc1f5a 100644--- a/web/packages/accounts/services/srp.ts+++ b/web/packages/accounts/services/srp.ts@@ -65,10 +65,7 @@ export type SRPSetupAttributes = z.infer<typeof SRPSetupAttributes>;export const generateSRPSetupAttributes = async (kek: string,-): Promise<SRPSetupAttributes> => {- const srpUserID = uuidv4();- return { srpUserID, ...(await generateSRPSetup(kek, srpUserID)) };-};+): Promise<SRPSetupAttributes> => generateSRPSetup(kek, uuidv4());export const setupSRP = async (srpSetupAttributes: SRPSetupAttributes) => {const token = await ensureAuthToken();diff --git a/web/packages/accounts/services/user.ts b/web/packages/accounts/services/user.tsindex 7b2f2a6ee0..123e34d1c7 100644--- a/web/packages/accounts/services/user.ts+++ b/web/packages/accounts/services/user.ts@@ -6,7 +6,7 @@ import {saveKeyAttributes,updateSavedLocalUser,} from "ente-accounts/services/accounts-db";-import { generateAccountKeys } from "ente-accounts/services/crypto";+import { generateSignupKeys as rustGenerateSignupKeys } from "ente-accounts/services/crypto";import { generateInteractiveKeyAttributes } from "ente-accounts/services/key-attributes";import { namedError } from "ente-base/error";import { authenticatedRequestHeaders, ensureOk } from "ente-base/http";@@ -32,6 +32,7 @@ import {type AccountsClient,} from "ente-prelogin-wasm";import { nullToUndefined } from "ente-utils/transform";+import { v4 as uuidv4 } from "uuid";import { z } from "zod";import { getAccountsClient, withAccountsClient } from "./accounts-client";import { clearInflightPasskeySessionID } from "./passkey";@@ -113,22 +114,13 @@ export const getTwoFactorStatus = async () => {return z.object({ status: z.boolean() }).parse(await res.json()).status;};-export interface GenerateKeysAndAttributesResult {- masterKey: string;- kek: string;- keyAttributes: KeyAttributes;-}--export const generateKeysAndAttributes = async (- password: string,-): Promise<GenerateKeysAndAttributesResult> =>- z- .object({- masterKey: z.string(),- kek: z.string(),- keyAttributes: RemoteKeyAttributes,- })- .parse(await generateAccountKeys(password));+export const generateSignupKeys = async (password: string) => {+ const generated = await rustGenerateSignupKeys(password, uuidv4());+ return {+ ...generated,+ keyAttributes: RemoteKeyAttributes.parse(generated.keyAttributes),+ };+};export const putUserKeyAttributes = async (keyAttributes: KeyAttributes) => {const token = await ensureAuthToken();diff --git a/web/packages/wasm/prelogin/index.ts b/web/packages/wasm/prelogin/index.tsindex 79f58fe3d9..e5f2345845 100644--- a/web/packages/wasm/prelogin/index.ts+++ b/web/packages/wasm/prelogin/index.ts@@ -102,8 +102,8 @@ export const unlockAccountWithMasterKey = async (): Promise<unknown> =>(await wasm()).unlockAccountWithMasterKey(response, masterKey);-export const generateAccountKeys = async (password: string): Promise<unknown> =>- (await wasm()).authGenerateAccountKeys(password);+export const generateSignupKeys = async (password: string, srpUserID: string) =>+ (await wasm()).authGenerateSignupKeys(password, srpUserID);export const generateInteractiveKeyAttributes = async (password: string,diff --git a/web/packages/wasm/prelogin/tests/auth.test.ts b/web/packages/wasm/prelogin/tests/auth.test.tsindex e1582bd7cd..828e97866e 100644--- a/web/packages/wasm/prelogin/tests/auth.test.ts+++ b/web/packages/wasm/prelogin/tests/auth.test.ts@@ -22,6 +22,7 @@ test("generates SRP setup attributes from a kek", () => {const kek = cryptoGenerateKey();const generated = authGenerateSrpSetup(kek, "test-user-id");+ expect(generated.srpUserID).toBe("test-user-id");expect(Buffer.from(generated.srpSalt, "base64")).toHaveLength(16);expect(Buffer.from(generated.loginSubKey, "base64")).toHaveLength(16);expect(Buffer.from(generated.srpVerifier, "base64").length).toBeGreaterThan(