π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Align two-factor recovery encoding
Neeraj Gupta72fe05c0d58e
diff --git a/rust/crates/accounts/src/lifecycle.rs b/rust/crates/accounts/src/lifecycle.rsindex 863e81a50c..da9108987a 100644--- a/rust/crates/accounts/src/lifecycle.rs+++ b/rust/crates/accounts/src/lifecycle.rs@@ -261,8 +261,7 @@ pub async fn recover_two_factor(.map_err(|_| Error::IncorrectRecoveryKey)?;let request = RemoveTwoFactorRequest {session_id: session_id.to_string(),- secret: String::from_utf8(secret)- .map_err(|e| Error::Protocol(format!("invalid recovery secret: {e}")))?,+ secret: b64::encode(&secret),two_factor_type,};client.remove_two_factor(&request).await@@ -275,7 +274,7 @@ pub async fn configure_passkey_recovery() -> Result<()> {let recovery_key = auth::recovery_key_from_mnemonic_or_hex(recovery_key_mnemonic_or_hex)?;let encrypted = secretbox::encrypt(- secret.as_bytes(),+ &b64::decode(secret)?,&crypto::Key::try_from_slice(&recovery_key)?,);let request = ConfigurePasskeyRecoveryRequest {diff --git a/rust/crates/accounts/src/lifecycle/tests.rs b/rust/crates/accounts/src/lifecycle/tests.rsindex 5376f77d97..b2555866b7 100644--- a/rust/crates/accounts/src/lifecycle/tests.rs+++ b/rust/crates/accounts/src/lifecycle/tests.rs@@ -5,6 +5,9 @@ use std::sync::{Arc, Mutex};use crate::test_support::{SetupSrpPayload, SrpState, make_client, parse_request_body, srp_proofs};+const TOTP_SECRET: &str = "JBSWY3DPEHPK3PXPJBSWY3DPEHPK3PXP";+const PASSKEY_SECRET: &str = "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=";+#[derive(Debug, Deserialize)]#[serde(rename_all = "camelCase")]struct UpdateSrpPayload {@@ -25,7 +28,7 @@ struct ConfigurePasskeyRecoveryPayload {#[tokio::test]async fn setup_two_factor_encrypts_secret_with_recovery_key() {let password = "pw";- let secret_code = "JBSWY3DPEHPK3PXPJBSWY3DPEHPK3PXP";+ let secret_code = TOTP_SECRET;let key_gen =auth::generate_keys_with_strength(password, auth::KeyDerivationStrength::Interactive).unwrap();@@ -130,7 +133,7 @@ async fn configure_passkey_recovery_accepts_hex_recovery_key() {.match_header("x-auth-token", "session-token").match_header("x-client-package", "io.ente.photos").with_status(200)- .with_body_from_request(move |request| {+ .match_request(move |request| {let payload: ConfigurePasskeyRecoveryPayload = parse_request_body(request);let cipher = b64::decode(&payload.user_secret_cipher).unwrap();let nonce = b64::decode(&payload.user_secret_nonce).unwrap();@@ -140,9 +143,7 @@ async fn configure_passkey_recovery_accepts_hex_recovery_key() {&crypto::Key::try_from_slice(&expected_recovery_key).unwrap(),).unwrap();- assert_eq!(payload.secret, "reset-secret");- assert_eq!(String::from_utf8(decrypted).unwrap(), "reset-secret");- Vec::new()+ payload.secret == PASSKEY_SECRET && b64::encode(&decrypted) == PASSKEY_SECRET}).create_async().await;@@ -150,13 +151,63 @@ async fn configure_passkey_recovery_accepts_hex_recovery_key() {let client = make_client(server.url());client.set_auth_token(Some("session-token".into()));- configure_passkey_recovery(&client, "reset-secret", &recovery_key_hex)+ configure_passkey_recovery(&client, PASSKEY_SECRET, &recovery_key_hex).await.unwrap();configure.assert_async().await;}+#[tokio::test]+async fn two_factor_recovery_preserves_secret_encoding() {+ let keys =+ auth::generate_keys_with_strength("pw", auth::KeyDerivationStrength::Interactive).unwrap();+ let recovery_key_hex = keys.private_key_attributes.recovery_key.into_string();+ let recovery_key =+ crypto::Key::try_from_slice(&hex::decode(&recovery_key_hex).unwrap()).unwrap();+ let mut server = Server::new_async().await;+ let client = make_client(server.url());++ for (factor, secret) in [+ (TwoFactorType::Totp, TOTP_SECRET),+ (TwoFactorType::Passkey, PASSKEY_SECRET),+ ] {+ let encrypted = secretbox::encrypt(&b64::decode(secret).unwrap(), &recovery_key);+ let remove = server+ .mock("POST", "/users/two-factor/remove")+ .match_body(Matcher::Json(serde_json::json!({+ "sessionId": "recovery-session",+ "secret": secret,+ "twoFactorType": factor,+ })))+ .with_status(200)+ .with_body(+ serde_json::json!({+ "id": 1,+ "keyAttributes": keys.key_attributes,+ "encryptedToken": "encrypted-token",+ })+ .to_string(),+ )+ .create_async()+ .await;++ recover_two_factor(+ &client,+ factor,+ "recovery-session",+ &TwoFactorRecoveryResponse {+ encrypted_secret: b64::encode(&encrypted.encrypted_data),+ secret_decryption_nonce: b64::encode(encrypted.nonce.as_bytes()),+ },+ &recovery_key_hex,+ )+ .await+ .unwrap();+ remove.assert_async().await;+ }+}+#[tokio::test]async fn change_password_updates_srp_and_keys() {let original =