π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Align CLI TOTP recovery encoding with web and mobile
Neeraj Guptadfc3726be559
diff --git a/rust/crates/accounts/src/lifecycle.rs b/rust/crates/accounts/src/lifecycle.rsindex ac138002cc..863e81a50c 100644--- a/rust/crates/accounts/src/lifecycle.rs+++ b/rust/crates/accounts/src/lifecycle.rs@@ -334,7 +334,7 @@ fn encrypt_two_factor_secret(let recovery_key =hex::decode(recovery_key_hex).map_err(|e| Error::Decode(format!("recovery_key: {e}")))?;let encrypted = secretbox::encrypt(- secret_code.as_bytes(),+ &b64::decode(secret_code)?,&crypto::Key::try_from_slice(&recovery_key)?,);diff --git a/rust/crates/accounts/src/lifecycle/tests.rs b/rust/crates/accounts/src/lifecycle/tests.rsindex 9950928c62..5376f77d97 100644--- a/rust/crates/accounts/src/lifecycle/tests.rs+++ b/rust/crates/accounts/src/lifecycle/tests.rs@@ -25,10 +25,13 @@ struct ConfigurePasskeyRecoveryPayload {#[tokio::test]async fn setup_two_factor_encrypts_secret_with_recovery_key() {let password = "pw";+ let secret_code = "JBSWY3DPEHPK3PXPJBSWY3DPEHPK3PXP";let key_gen =auth::generate_keys_with_strength(password, auth::KeyDerivationStrength::Interactive).unwrap();let recovery_key = key_gen.private_key_attributes.recovery_key.into_string();+ let expected_recovery_key =+ crypto::Key::try_from_slice(&hex::decode(&recovery_key).unwrap()).unwrap();let master_key = b64::decode(&key_gen.private_key_attributes.key).unwrap();let key_attributes = key_gen.key_attributes.clone();@@ -41,7 +44,7 @@ async fn setup_two_factor_encrypts_secret_with_recovery_key() {.with_status(200).with_body(serde_json::json!({- "secretCode": "JBSWY3DPEHPK3PXP",+ "secretCode": secret_code,"qrCode": "qr-png-b64"}).to_string(),@@ -53,8 +56,21 @@ async fn setup_two_factor_encrypts_secret_with_recovery_key() {.mock("POST", "/users/two-factor/enable").match_header("x-auth-token", "session-token").match_header("x-client-package", "io.ente.photos")- .match_body(Matcher::Regex("\"encryptedTwoFactorSecret\"".into())).with_status(200)+ .match_request(move |request| {+ let payload: serde_json::Value = parse_request_body(request);+ let ciphertext =+ b64::decode(payload["encryptedTwoFactorSecret"].as_str().unwrap()).unwrap();+ let nonce =+ b64::decode(payload["twoFactorSecretDecryptionNonce"].as_str().unwrap()).unwrap();+ let decrypted = secretbox::decrypt(+ &ciphertext,+ &crypto::Nonce::try_from_slice(&nonce).unwrap(),+ &expected_recovery_key,+ )+ .unwrap();+ b64::encode(&decrypted) == secret_code+ }).create_async().await;@@ -76,7 +92,7 @@ async fn setup_two_factor_encrypts_secret_with_recovery_key() {.await.unwrap();- assert_eq!(result.secret_code, "JBSWY3DPEHPK3PXP");+ assert_eq!(result.secret_code, secret_code);assert_eq!(result.recovery_key, recovery_key);setup.assert_async().await;