π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Use the Session recovery key when adding emergency contacts
Manav Rathif95a693174b2
diff --git a/rust/Cargo.lock b/rust/Cargo.lockindex 5307c278f7..c0e8c447bf 100644--- a/rust/Cargo.lock+++ b/rust/Cargo.lock@@ -2609,7 +2609,6 @@ dependencies = [name = "ente-legacy-wasm"version = "0.0.0"dependencies = [- "ente-accounts","ente-core","ente-legacy","ente-wasm-lib",diff --git a/rust/bindings/wasm/legacy/Cargo.toml b/rust/bindings/wasm/legacy/Cargo.tomlindex 9b01048cc3..73dfd863c6 100644--- a/rust/bindings/wasm/legacy/Cargo.toml+++ b/rust/bindings/wasm/legacy/Cargo.toml@@ -6,7 +6,6 @@ edition.workspace = truecrate-type = ["cdylib"][dependencies]-ente-accounts.workspace = trueente-core.workspace = trueente-legacy.workspace = trueente-wasm-lib = { workspace = true, features = ["session"] }diff --git a/rust/bindings/wasm/legacy/src/lib.rs b/rust/bindings/wasm/legacy/src/lib.rsindex 0180c3dde1..d65ab573c6 100644--- a/rust/bindings/wasm/legacy/src/lib.rs+++ b/rust/bindings/wasm/legacy/src/lib.rs@@ -6,8 +6,7 @@ use ente_wasm_lib::session::Session;use serde_wasm_bindgen as swb;use tsify::Tsify;use types::{- KeyAttributes, LegacyContactState, LegacyInfo, LegacyKitRecoverySession, LegacyKitShare,- OpenKitRecoveryInput,+ LegacyContactState, LegacyInfo, LegacyKitRecoverySession, LegacyKitShare, OpenKitRecoveryInput,};use wasm_bindgen::prelude::*;@@ -75,18 +74,11 @@ pub fn legacy_verification_id(public_key_b64: String) -> Result<String, Error> {pub async fn legacy_add_contact(session: &Session,email: String,- current_user_key_attrs: <KeyAttributes as Tsify>::JsType,recovery_notice_in_days: Option<i32>,) -> Result<(), Error> {- let current_user_key_attrs = KeyAttributes::from_js(current_user_key_attrs)?;- ente_legacy::add_contact(- session.inner(),- &email,- ¤t_user_key_attrs.into(),- recovery_notice_in_days,- )- .await- .map_err(Into::into)+ ente_legacy::add_contact(session.inner(), &email, recovery_notice_in_days)+ .await+ .map_err(Into::into)}#[wasm_bindgen(js_name = legacyUpdateContact)]diff --git a/rust/bindings/wasm/legacy/src/types.rs b/rust/bindings/wasm/legacy/src/types.rsindex 48cdde3071..ca6c091ed4 100644--- a/rust/bindings/wasm/legacy/src/types.rs+++ b/rust/bindings/wasm/legacy/src/types.rs@@ -146,49 +146,6 @@ impl From<ente_legacy::LegacyUser> for LegacyUser {}}-#[derive(Deserialize, Tsify)]-#[serde(rename_all = "camelCase")]-pub struct KeyAttributes {- kek_salt: String,- #[tsify(optional)]- kek_hash: Option<String>,- encrypted_key: String,- key_decryption_nonce: String,- public_key: String,- encrypted_secret_key: String,- secret_key_decryption_nonce: String,- mem_limit: u32,- ops_limit: u32,- #[tsify(optional)]- master_key_encrypted_with_recovery_key: Option<String>,- #[tsify(optional)]- master_key_decryption_nonce: Option<String>,- #[tsify(optional)]- recovery_key_encrypted_with_master_key: Option<String>,- #[tsify(optional)]- recovery_key_decryption_nonce: Option<String>,-}--impl From<KeyAttributes> for ente_accounts::auth::KeyAttributes {- fn from(value: KeyAttributes) -> Self {- Self {- kek_salt: value.kek_salt,- kek_hash: value.kek_hash,- encrypted_key: value.encrypted_key,- key_decryption_nonce: value.key_decryption_nonce,- public_key: value.public_key,- encrypted_secret_key: value.encrypted_secret_key,- secret_key_decryption_nonce: value.secret_key_decryption_nonce,- mem_limit: value.mem_limit,- ops_limit: value.ops_limit,- master_key_encrypted_with_recovery_key: value.master_key_encrypted_with_recovery_key,- master_key_decryption_nonce: value.master_key_decryption_nonce,- recovery_key_encrypted_with_master_key: value.recovery_key_encrypted_with_master_key,- recovery_key_decryption_nonce: value.recovery_key_decryption_nonce,- }- }-}-#[derive(Deserialize, Tsify)]#[serde(rename_all = "camelCase")]pub struct OpenKitRecoveryInput {diff --git a/rust/crates/contacts/tests/contacts.rs b/rust/crates/contacts/tests/contacts.rsindex 289b2b24fa..dc6766fe19 100644--- a/rust/crates/contacts/tests/contacts.rs+++ b/rust/crates/contacts/tests/contacts.rs@@ -230,14 +230,9 @@ async fn run_legacy_reinvite_stage(pair: &legacy::LegacyPair) {legacy::trusted_contact(&trusted_info, pair.owner.user_id, pair.trusted.user_id).is_none());- ente_legacy::add_contact(- &pair.owner_session,- &pair.trusted.email,- &pair.owner.key_attributes,- Some(14),- )- .await- .unwrap();+ ente_legacy::add_contact(&pair.owner_session, &pair.trusted.email, Some(14))+ .await+ .unwrap();ente_legacy::update_contact(&pair.trusted_session,pair.owner.user_id,@@ -381,13 +376,10 @@ async fn run_legacy_kit_stage(endpoint: &str, owner: &auth::TestAccount) {.expect("legacy kit invalid create request failed");assert_eq!(invalid_create.status(), 400);- let waiting_kit = ente_legacy::create_kit(- &session,- ["North".into(), "East".into(), "West".into()],- 24,- )- .await- .expect("waiting legacy kit create failed");+ let waiting_kit =+ ente_legacy::create_kit(&session, ["North".into(), "East".into(), "West".into()], 24)+ .await+ .expect("waiting legacy kit create failed");assert_eq!(waiting_kit.kit.notice_period_in_hours, 24);assert_eq!(waiting_kit.kit.metadata.parts.len(), 3);assert_eq!(waiting_kit.shares.len(), 3);@@ -402,10 +394,9 @@ async fn run_legacy_kit_stage(endpoint: &str, owner: &auth::TestAccount) {assert_eq!(listed_waiting_kit.metadata.parts.len(), 3);assert_eq!(listed_waiting_kit.metadata.parts[0].name, "North");- let downloaded_shares =- ente_legacy::download_kit_shares(&session, &waiting_kit.kit.id)- .await- .expect("legacy kit share download failed");+ let downloaded_shares = ente_legacy::download_kit_shares(&session, &waiting_kit.kit.id)+ .await+ .expect("legacy kit share download failed");assert_eq!(downloaded_shares.len(), 3);assert_eq!(downloaded_shares[0].kit_id, waiting_kit.kit.id);assert_eq!(@@ -494,8 +485,7 @@ async fn run_legacy_kit_stage(endpoint: &str, owner: &auth::TestAccount) {LegacyKitRecoveryStatus::Waiting);assert!(matches!(- ente_legacy::update_kit_recovery_notice(&session, &waiting_kit.kit.id, 168)- .await,+ ente_legacy::update_kit_recovery_notice(&session, &waiting_kit.kit.id, 168).await,Err(ente_legacy::Error::ActiveRecoverySession)));assert!(@@ -536,10 +526,9 @@ async fn run_legacy_kit_stage(endpoint: &str, owner: &auth::TestAccount) {.await.expect("resumed legacy kit session fetch failed");assert_eq!(resumed_session.status, LegacyKitRecoveryStatus::Waiting);- let owner_recovery_session =- ente_legacy::kit_recovery_session(&session, &waiting_kit.kit.id)- .await- .expect("owner legacy kit recovery session fetch failed");+ let owner_recovery_session = ente_legacy::kit_recovery_session(&session, &waiting_kit.kit.id)+ .await+ .expect("owner legacy kit recovery session fetch failed");let owner_active_session = owner_recovery_session.session.as_ref()@@ -649,10 +638,9 @@ async fn run_legacy_kit_stage(endpoint: &str, owner: &auth::TestAccount) {other => panic!("expected old legacy kit password login to fail, got {other:?}"),}- let recovered_login =- auth::login_without_totp(endpoint, &owner.email, &recovery_password)- .await- .expect("new password login should succeed after legacy kit recovery");+ let recovered_login = auth::login_without_totp(endpoint, &owner.email, &recovery_password)+ .await+ .expect("new password login should succeed after legacy kit recovery");assert_eq!(recovered_login.user_id, owner.user_id);assert_eq!(recovered_login.secrets.master_key, owner.master_key);diff --git a/rust/crates/contacts/tests/support/legacy.rs b/rust/crates/contacts/tests/support/legacy.rsindex 42deb48529..65903fb89f 100644--- a/rust/crates/contacts/tests/support/legacy.rs+++ b/rust/crates/contacts/tests/support/legacy.rs@@ -50,7 +50,6 @@ pub async fn create_accepted_pair_state(ente_legacy::add_contact(&owner_session,&trusted.email,- &owner.key_attributes,Some(recovery_notice_in_days),).awaitdiff --git a/rust/crates/legacy/src/client/contact.rs b/rust/crates/legacy/src/client/contact.rsindex b646a2f100..95f251eaf2 100644--- a/rust/crates/legacy/src/client/contact.rs+++ b/rust/crates/legacy/src/client/contact.rs@@ -1,10 +1,9 @@-use ente_accounts::auth::KeyAttributes;use ente_core::crypto::{self, sealed};use ente_core::{Session, b64};use serde::{Deserialize, Serialize};use sha2::{Digest, Sha256};-use super::{current_recovery_key, map_recovery_notice_error};+use super::map_recovery_notice_error;use crate::{Error, Result};#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]@@ -103,16 +102,14 @@ pub fn verification_id(public_key_b64: &str) -> Result<String> {pub async fn add_contact(session: &Session,email: &str,- current_user_key_attrs: &KeyAttributes,recovery_notice_in_days: Option<i32>,) -> Result<()> {let public_key = public_key(session, email).await?.ok_or(Error::ContactNotOnEnte)?;- let recovery_key = current_recovery_key(session, current_user_key_attrs)?;let recipient_public_key = b64::decode(&public_key)?;let encrypted_key = sealed::seal(- &recovery_key,+ session.recovery_key.as_bytes(),&crypto::PublicKey::try_from_slice(&recipient_public_key)?,)?;diff --git a/rust/crates/legacy/src/client/mod.rs b/rust/crates/legacy/src/client/mod.rsindex 4cdc3f92fb..398f2ee46c 100644--- a/rust/crates/legacy/src/client/mod.rs+++ b/rust/crates/legacy/src/client/mod.rs@@ -16,10 +16,9 @@ pub use recovery::{start_recovery, stop_recovery,};-use ente_accounts::auth::{self, KeyAttributes};-use ente_core::{Session, crypto::SecretVec, http};+use ente_core::http;-use crate::{Error, Result};+use crate::Error;fn map_recovery_notice_error(error: http::Error) -> Error {match &error {@@ -29,8 +28,3 @@ fn map_recovery_notice_error(error: http::Error) -> Error {_ => error.into(),}}--fn current_recovery_key(session: &Session, key_attributes: &KeyAttributes) -> Result<SecretVec> {- let recovery_key = auth::get_recovery_key(&session.master_key, key_attributes)?;- Ok(auth::recovery_key_from_mnemonic_or_hex(&recovery_key)?)-}diff --git a/web/packages/contacts/legacy/service.ts b/web/packages/contacts/legacy/service.tsindex 4731c51d2e..99a4e93ae8 100644--- a/web/packages/contacts/legacy/service.ts+++ b/web/packages/contacts/legacy/service.ts@@ -1,33 +1,15 @@-import { savedKeyAttributes } from "ente-accounts/services/accounts-db";import {- addContact,- changePassword,publicKey,verificationID,type Session,} from "ente-legacy-wasm/authenticated";+export {+ addContact as legacyAddContact,+ changePassword as legacyChangePassword,+} from "ente-legacy-wasm/authenticated";+export const legacyVerificationID = async (session: Session, email: string) => {const key = await publicKey(session, email);return key ? verificationID(key) : undefined;};--export const legacyAddContact = (- session: Session,- email: string,- recoveryNoticeInDays?: number,-) => addContact(session, email, currentKeyAttributes(), recoveryNoticeInDays);--export const legacyChangePassword = (- session: Session,- recoveryID: string,- newPassword: string,-) => changePassword(session, recoveryID, newPassword);--const currentKeyAttributes = () => {- const keyAttributes = savedKeyAttributes();- if (!keyAttributes) {- throw new Error("Missing current key attributes");- }- return keyAttributes;-};diff --git a/web/packages/contacts/wasm.test.ts b/web/packages/contacts/wasm.test.tsindex 264d89cbcb..ddd424c666 100644--- a/web/packages/contacts/wasm.test.ts+++ b/web/packages/contacts/wasm.test.ts@@ -207,24 +207,10 @@ describe("Legacy", () => {}});- test("uses the typed key attributes to share a decryptable recovery key", async () => {+ test("shares the Session recovery key with the recipient", async () => {const masterKey = await generateKey();const recoveryKey = await generateKey();- const encryptedRecoveryKey = await encryptBox(recoveryKey, masterKey);const recipient = await generateKeyPair();- const keyAttributes = {- kekSalt: "",- encryptedKey: "",- keyDecryptionNonce: "",- publicKey: "",- encryptedSecretKey: "",- secretKeyDecryptionNonce: "",- memLimit: 0,- opsLimit: 0,- recoveryKeyEncryptedWithMasterKey:- encryptedRecoveryKey.encryptedData,- recoveryKeyDecryptionNonce: encryptedRecoveryKey.nonce,- };let sharedRecoveryKey: string | undefined;mockFetch(async (request) => {switch (new URL(request.url).pathname) {@@ -252,15 +238,10 @@ describe("Legacy", () => {baseUrl: "http://localhost",authToken: "token",masterKeyB64: masterKey,- ...(await sessionKeyAttributes(masterKey)),+ ...(await sessionKeyAttributes(masterKey, recoveryKey)),});try {- await legacy.addContact(- session,- "[email protected]",- keyAttributes,- 30,- );+ await legacy.addContact(session, "[email protected]", 30);expect(sharedRecoveryKey).toBe(recoveryKey);} finally {session.free();@@ -278,11 +259,14 @@ const mockFetch = (return response;});-const sessionKeyAttributes = async (masterKey: string) => {+const sessionKeyAttributes = async (+ masterKey: string,+ recoveryKey?: string,+) => {const { publicKey, privateKey } = await generateKeyPair();const encryptedSecretKey = await encryptBox(privateKey, masterKey);const encryptedRecoveryKey = await encryptBox(- await generateKey(),+ recoveryKey ?? (await generateKey()),masterKey,);return {diff --git a/web/packages/wasm/legacy/authenticated.ts b/web/packages/wasm/legacy/authenticated.tsindex 27e9a8a55f..0c538ef4b7 100644--- a/web/packages/wasm/legacy/authenticated.ts+++ b/web/packages/wasm/legacy/authenticated.ts@@ -1,5 +1,4 @@import type {- KeyAttributes,LegacyContactState,OpenSessionInput,Session,@@ -30,15 +29,8 @@ export const verificationID = async (publicKeyB64: string) =>export const addContact = async (session: Session,email: string,- currentUserKeyAttributes: KeyAttributes,recoveryNoticeInDays?: number,-) =>- (await wasm()).legacyAddContact(- session,- email,- currentUserKeyAttributes,- recoveryNoticeInDays,- );+) => (await wasm()).legacyAddContact(session, email, recoveryNoticeInDays);export const updateContact = async (session: Session,