π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Move mobile Legacy recovery to Rust
Manav Rathi557c125aa51b
diff --git a/mobile/apps/locker/lib/main.dart b/mobile/apps/locker/lib/main.dartindex b0d06c25c5..072bdad2c7 100644--- a/mobile/apps/locker/lib/main.dart+++ b/mobile/apps/locker/lib/main.dart@@ -9,7 +9,6 @@ import 'package:ente_components/ente_components.dart' as components;import 'package:ente_crypto_api/ente_crypto_api.dart';import 'package:ente_crypto_dart_adapter/ente_crypto_dart_adapter.dart';import 'package:ente_install_source/ente_install_source.dart';-import "package:ente_legacy/services/emergency_service.dart";import "package:ente_legacy/services/legacy_kit_share_file_service.dart";import 'package:ente_lock_screen/lock_screen_settings.dart';import 'package:ente_lock_screen/ui/app_lock.dart';@@ -219,7 +218,6 @@ Future<void> _init(bool bool, {String? via}) async {);await UpdateService.instance.init(preferences, packageInfo);await TrashService.instance.init(preferences);- EmergencyContactService.instance.init(Configuration.instance);await LockerContactsDisplayService.init(preferences: preferences);unawaited(cleanStaleLegacyKitShareFiles());unawaited(diff --git a/mobile/apps/locker/lib/services/legacy_api.dart b/mobile/apps/locker/lib/services/legacy_api.dartindex 12e212330b..cbb2234bc8 100644--- a/mobile/apps/locker/lib/services/legacy_api.dart+++ b/mobile/apps/locker/lib/services/legacy_api.dart@@ -5,6 +5,8 @@ import "package:locker/src/rust/third_party/ente_frb_lib/legacy/contact.dart"as contact;import "package:locker/src/rust/third_party/ente_frb_lib/legacy/kit.dart"as kit;+import "package:locker/src/rust/third_party/ente_frb_lib/legacy/recovery.dart"+ as recovery;class LockerLegacyApi implements LegacyApi {const LockerLegacyApi();@@ -44,6 +46,62 @@ class LockerLegacyApi implements LegacyApi {recoveryNoticeInDays: recoveryNoticeInDays,);+ @override+ Future<void> startRecovery({+ required int userId,+ required int emergencyContactId,+ }) => recovery.startRecovery(+ session: authenticatedSession(),+ userId: userId,+ emergencyContactId: emergencyContactId,+ );++ @override+ Future<void> stopRecovery({+ required String recoveryId,+ required int userId,+ required int emergencyContactId,+ }) => recovery.stopRecovery(+ session: authenticatedSession(),+ recoveryId: recoveryId,+ userId: userId,+ emergencyContactId: emergencyContactId,+ );++ @override+ Future<void> rejectRecovery({+ required String recoveryId,+ required int userId,+ required int emergencyContactId,+ }) => recovery.rejectRecovery(+ session: authenticatedSession(),+ recoveryId: recoveryId,+ userId: userId,+ emergencyContactId: emergencyContactId,+ );++ @override+ Future<void> approveRecovery({+ required String recoveryId,+ required int userId,+ required int emergencyContactId,+ }) => recovery.approveRecovery(+ session: authenticatedSession(),+ recoveryId: recoveryId,+ userId: userId,+ emergencyContactId: emergencyContactId,+ );++ @override+ Future<void> changePassword({+ required String recoveryId,+ required String newPassword,+ }) => recovery.changePassword(+ session: authenticatedSession(),+ recoveryId: recoveryId,+ newPassword: newPassword,+ );+@overrideFuture<List<LegacyKit>> kits() => kit.kits(session: authenticatedSession());diff --git a/mobile/apps/photos/lib/emergency/emergency_page.dart b/mobile/apps/photos/lib/emergency/emergency_page.dartindex 023ca4df8c..0562f70e32 100644--- a/mobile/apps/photos/lib/emergency/emergency_page.dart+++ b/mobile/apps/photos/lib/emergency/emergency_page.dart@@ -7,7 +7,6 @@ import "package:flutter/foundation.dart";import "package:flutter/material.dart";import "package:photos/emergency/components/email_action_sheet.dart";import "package:photos/emergency/components/trusted_contact_sheet.dart";-import "package:photos/emergency/emergency_service.dart";import "package:photos/emergency/model.dart";import "package:photos/emergency/other_contact_page.dart";import "package:photos/emergency/select_contact_page.dart";@@ -15,6 +14,8 @@ import "package:photos/services/authenticated_session.dart";import "package:photos/services/contacts/contact_identity_resolver.dart";import "package:photos/src/rust/third_party/ente_frb_lib/legacy/contact.dart"as legacy;+import "package:photos/src/rust/third_party/ente_frb_lib/legacy/recovery.dart"+ as legacy;import "package:photos/theme/ente_theme.dart";import "package:photos/ui/components/alert_bottom_sheet.dart";import "package:photos/ui/components/buttons/button_widget_v2.dart";@@ -524,7 +525,12 @@ class _EmergencyPageState extends State<EmergencyPage> {shouldSurfaceExecutionStates: false,onTap: () async {Navigator.of(context).pop();- await EmergencyContactService.instance.approveRecovery(session);+ await legacy.approveRecovery(+ session: authenticatedSession(),+ recoveryId: session.id,+ userId: session.user.id,+ emergencyContactId: session.emergencyContact.id,+ );if (mounted) {setState(() {});}@@ -535,7 +541,12 @@ class _EmergencyPageState extends State<EmergencyPage> {);if (confirmed == true) {- await EmergencyContactService.instance.rejectRecovery(session);+ await legacy.rejectRecovery(+ session: authenticatedSession(),+ recoveryId: session.id,+ userId: session.user.id,+ emergencyContactId: session.emergencyContact.id,+ );info?.recoverSessions.removeWhere((element) => element.id == session.id);if (mounted) {setState(() {});diff --git a/mobile/apps/photos/lib/emergency/emergency_service.dart b/mobile/apps/photos/lib/emergency/emergency_service.dartdeleted file mode 100644index 0f0f296a29..0000000000--- a/mobile/apps/photos/lib/emergency/emergency_service.dart+++ /dev/null@@ -1,172 +0,0 @@-import "dart:convert";-import "dart:math";-import "dart:typed_data";--import "package:ente_crypto/ente_crypto.dart";-import "package:ente_frb/legacy.dart";-import "package:logging/logging.dart";-import "package:photos/core/configuration.dart";-import "package:photos/gateways/emergency/emergency_gateway.dart";-import "package:photos/gateways/users/models/key_attributes.dart";-import "package:photos/gateways/users/models/set_keys_request.dart";-import "package:photos/gateways/users/models/srp.dart";-import "package:photos/service_locator.dart";-import "package:pointycastle/pointycastle.dart";-import "package:pointycastle/random/fortuna_random.dart";-import "package:pointycastle/srp/srp6_client.dart";-import "package:pointycastle/srp/srp6_standard_groups.dart";-import "package:pointycastle/srp/srp6_util.dart";-import "package:pointycastle/srp/srp6_verifier_generator.dart";-import "package:uuid/uuid.dart";--class EmergencyContactService {- late Configuration _config;- late final Logger _logger = Logger("EmergencyContactService");-- EmergencyGateway get _gateway => emergencyGateway;-- EmergencyContactService._privateConstructor() {- _config = Configuration.instance;- }-- static final EmergencyContactService instance =- EmergencyContactService._privateConstructor();-- Future<void> startRecovery(LegacyContactRecord contact) async {- try {- await _gateway.startRecovery(- userID: contact.user.id,- emergencyContactID: contact.emergencyContact.id,- );- } catch (e, s) {- Logger("EmergencyContact").severe('failed to start recovery', e, s);- rethrow;- }- }-- Future<void> stopRecovery(LegacyRecoverySession session) async {- try {- await _gateway.stopRecovery(- userID: session.user.id,- emergencyContactID: session.emergencyContact.id,- sessionID: session.id,- );- } catch (e, s) {- Logger("EmergencyContact").severe('failed to stop recovery', e, s);- rethrow;- }- }-- Future<void> rejectRecovery(LegacyRecoverySession session) async {- try {- await _gateway.rejectRecovery(- userID: session.user.id,- emergencyContactID: session.emergencyContact.id,- sessionID: session.id,- );- } catch (e, s) {- Logger("EmergencyContact").severe('failed to stop recovery', e, s);- rethrow;- }- }-- Future<void> approveRecovery(LegacyRecoverySession session) async {- try {- await _gateway.approveRecovery(- userID: session.user.id,- emergencyContactID: session.emergencyContact.id,- sessionID: session.id,- );- } catch (e, s) {- Logger("EmergencyContact").severe('failed to approve recovery', e, s);- rethrow;- }- }-- Future<(String, KeyAttributes)> getRecoveryInfo(- LegacyRecoverySession sessions,- ) async {- try {- final (encryptedKey, keyAttributes) = await _gateway.getRecoveryInfo(- sessions.id,- );- final decryptedKey = CryptoUtil.openSealSync(- CryptoUtil.base642bin(encryptedKey),- CryptoUtil.base642bin(_config.getKeyAttributes()!.publicKey),- _config.getSecretKey()!,- );- final String hexRecoveryKey = CryptoUtil.bin2hex(decryptedKey);- return (hexRecoveryKey, keyAttributes);- } catch (e, s) {- Logger("EmergencyContact").severe('failed to stop recovery', e, s);- rethrow;- }- }-- Future<void> changePasswordForOther(- Uint8List loginKey,- SetKeysRequest setKeysRequest,- LegacyRecoverySession recoverySessions,- ) async {- try {- final SRP6GroupParameters kDefaultSrpGroup =- SRP6StandardGroups.rfc5054_4096;- final String username = const Uuid().v4().toString();- final SecureRandom random = _getSecureRandom();- final Uint8List identity = Uint8List.fromList(utf8.encode(username));- final Uint8List password = loginKey;- final Uint8List salt = random.nextBytes(16);- final gen = SRP6VerifierGenerator(- group: kDefaultSrpGroup,- digest: Digest('SHA-256'),- );- final v = gen.generateVerifier(salt, identity, password);-- final client = SRP6Client(- group: kDefaultSrpGroup,- digest: Digest('SHA-256'),- random: random,- );-- final A = client.generateClientCredentials(salt, identity, password);- final request = SetupSRPRequest(- srpUserID: username,- srpSalt: base64Encode(salt),- srpVerifier: base64Encode(SRP6Util.encodeBigInt(v)),- srpA: base64Encode(SRP6Util.getPadded(A!, 512)),- isUpdate: false,- );- final setupSRPResponse = await _gateway.initPasswordChange(- recoveryID: recoverySessions.id,- setupSRPRequest: request,- );- final serverB = SRP6Util.decodeBigInt(- base64Decode(setupSRPResponse.srpB),- );-- // ignore: unused_local_variable- final clientS = client.calculateSecret(serverB);- final clientM = client.calculateClientEvidenceMessage();- await _gateway.changePassword(- recoveryID: recoverySessions.id,- setupID: setupSRPResponse.setupID,- srpM1: base64Encode(SRP6Util.getPadded(clientM!, 32)),- updatedKeyAttr: setKeysRequest.toMap(),- );- } catch (e, s) {- _logger.severe("failed to change password for other", e, s);- rethrow;- }- }-- SecureRandom _getSecureRandom() {- final List<int> seeds = [];- final random = Random.secure();- for (int i = 0; i < 32; i++) {- seeds.add(random.nextInt(255));- }- final secureRandom = FortunaRandom();- secureRandom.seed(KeyParameter(Uint8List.fromList(seeds)));- return secureRandom;- }-}diff --git a/mobile/apps/photos/lib/emergency/other_contact_page.dart b/mobile/apps/photos/lib/emergency/other_contact_page.dartindex 5451f50968..8d6060f92b 100644--- a/mobile/apps/photos/lib/emergency/other_contact_page.dart+++ b/mobile/apps/photos/lib/emergency/other_contact_page.dart@@ -4,13 +4,13 @@ import "package:ente_strings/ente_strings.dart";import "package:flutter/material.dart";import "package:logging/logging.dart";import "package:photos/core/configuration.dart";-import "package:photos/emergency/emergency_service.dart";import "package:photos/emergency/model.dart";import "package:photos/emergency/recover_others_account.dart";-import "package:photos/gateways/users/models/key_attributes.dart";import "package:photos/services/authenticated_session.dart";import "package:photos/src/rust/third_party/ente_frb_lib/legacy/contact.dart"as legacy;+import "package:photos/src/rust/third_party/ente_frb_lib/legacy/recovery.dart"+ as legacy;import "package:photos/theme/ente_theme.dart";import "package:photos/ui/components/alert_bottom_sheet.dart";import "package:photos/ui/components/buttons/button_widget_v2.dart";@@ -146,8 +146,11 @@ class _OtherContactPageState extends State<OtherContactPage> {return;}try {- await EmergencyContactService.instance.startRecovery(- widget.contact,+ await legacy.startRecovery(+ session: authenticatedSession(),+ userId: widget.contact.user.id,+ emergencyContactId:+ widget.contact.emergencyContact.id,);if (mounted) {_fetchData().ignore();@@ -178,23 +181,10 @@ class _OtherContactPageState extends State<OtherContactPage> {labelText: context.strings.recoverAccount,shouldSurfaceExecutionStates: false,onTap: () async {- try {- final (- String key,- KeyAttributes attributes,- ) = await EmergencyContactService.instance.getRecoveryInfo(- recoverySession!,- );- routeToPage(- context,- RecoverOthersAccount(key, attributes, recoverySession!),- ).ignore();- } catch (e) {- showGenericErrorBottomSheet(- context: context,- error: e,- ).ignore();- }+ routeToPage(+ context,+ RecoverOthersAccount(session: recoverySession!),+ ).ignore();},),if (recoverySession != null &&@@ -264,7 +254,12 @@ class _OtherContactPageState extends State<OtherContactPage> {);if (confirmed == true) {try {- await EmergencyContactService.instance.stopRecovery(recoverySession!);+ await legacy.stopRecovery(+ session: authenticatedSession(),+ recoveryId: recoverySession!.id,+ userId: recoverySession!.user.id,+ emergencyContactId: recoverySession!.emergencyContact.id,+ );if (mounted) {_fetchData().ignore();}diff --git a/mobile/apps/photos/lib/emergency/recover_others_account.dart b/mobile/apps/photos/lib/emergency/recover_others_account.dartindex 959ec518df..bbb29767de 100644--- a/mobile/apps/photos/lib/emergency/recover_others_account.dart+++ b/mobile/apps/photos/lib/emergency/recover_others_account.dart@@ -1,16 +1,13 @@import "dart:async";-import "dart:convert";-import "dart:typed_data";-import "package:ente_crypto/ente_crypto.dart";import "package:ente_strings/ente_strings.dart";import 'package:flutter/material.dart';import 'package:logging/logging.dart';import 'package:password_strength/password_strength.dart';-import "package:photos/emergency/emergency_service.dart";import "package:photos/emergency/model.dart";-import "package:photos/gateways/users/models/key_attributes.dart";-import "package:photos/gateways/users/models/set_keys_request.dart";+import "package:photos/services/authenticated_session.dart";+import "package:photos/src/rust/third_party/ente_frb_lib/legacy/recovery.dart"+ as legacy;import "package:photos/theme/colors.dart";import "package:photos/theme/ente_theme.dart";import "package:photos/theme/text_style.dart";@@ -21,16 +18,9 @@ import 'package:photos/ui/notification/toast.dart';import 'package:photos/utils/dialog_util.dart';class RecoverOthersAccount extends StatefulWidget {- final String recoveryKey;- final KeyAttributes attributes;- final LegacyRecoverySession sessions;+ final LegacyRecoverySession session;- const RecoverOthersAccount(- this.recoveryKey,- this.attributes,- this.sessions, {- super.key,- });+ const RecoverOthersAccount({required this.session, super.key});@overrideState<RecoverOthersAccount> createState() => _RecoverOthersAccountState();@@ -105,7 +95,7 @@ class _RecoverOthersAccountState extends State<RecoverOthersAccount> {}Widget _getBody(EnteColorScheme colorScheme, EnteTextTheme textTheme) {- final email = widget.sessions.user.email;+ final email = widget.session.user.email;String? passwordMessage;TextInputMessageType passwordMessageType = TextInputMessageType.guide;@@ -231,49 +221,10 @@ class _RecoverOthersAccountState extends State<RecoverOthersAccount> {);await dialog.show();try {- final String password = _passwordController1.text;- final KeyAttributes attributes = widget.attributes;- Uint8List? masterKey;- try {- masterKey = await CryptoUtil.decrypt(- CryptoUtil.base642bin(attributes.masterKeyEncryptedWithRecoveryKey!),- CryptoUtil.hex2bin(widget.recoveryKey),- CryptoUtil.base642bin(attributes.masterKeyDecryptionNonce!),- );- } catch (e) {- _logger.severe(e, "Failed to get master key using recoveryKey");- rethrow;- }-- final kekSalt = CryptoUtil.getSaltToDeriveKey();- final derivedKeyResult = await CryptoUtil.deriveSensitiveKey(- utf8.encode(password),- kekSalt,- );- final loginKey = await CryptoUtil.deriveLoginKey(derivedKeyResult.key);- final encryptedKeyData = CryptoUtil.encryptSync(- masterKey,- derivedKeyResult.key,- );-- final updatedAttributes = attributes.copyWith(- kekSalt: CryptoUtil.bin2base64(kekSalt),- encryptedKey: CryptoUtil.bin2base64(encryptedKeyData.encryptedData!),- keyDecryptionNonce: CryptoUtil.bin2base64(encryptedKeyData.nonce!),- memLimit: derivedKeyResult.memLimit,- opsLimit: derivedKeyResult.opsLimit,- );- final setKeyRequest = SetKeysRequest(- kekSalt: updatedAttributes.kekSalt,- encryptedKey: updatedAttributes.encryptedKey,- keyDecryptionNonce: updatedAttributes.keyDecryptionNonce,- memLimit: updatedAttributes.memLimit!,- opsLimit: updatedAttributes.opsLimit!,- );- await EmergencyContactService.instance.changePasswordForOther(- loginKey,- setKeyRequest,- widget.sessions,+ await legacy.changePassword(+ session: authenticatedSession(),+ recoveryId: widget.session.id,+ newPassword: _passwordController1.text,);await dialog.hide();if (!mounted) return;diff --git a/mobile/apps/photos/lib/gateways/emergency/emergency_gateway.dart b/mobile/apps/photos/lib/gateways/emergency/emergency_gateway.dartdeleted file mode 100644index 2c6ab2ff19..0000000000--- a/mobile/apps/photos/lib/gateways/emergency/emergency_gateway.dart+++ /dev/null@@ -1,108 +0,0 @@-import "package:dio/dio.dart";-import "package:photos/gateways/users/models/key_attributes.dart";-import "package:photos/gateways/users/models/srp.dart";--class EmergencyGateway {- final Dio _enteDio;-- EmergencyGateway(this._enteDio);-- Future<void> startRecovery({- required int? userID,- required int? emergencyContactID,- }) async {- await _enteDio.post(- "/emergency-contacts/start-recovery",- data: {"userID": userID, "emergencyContactID": emergencyContactID},- );- }-- Future<void> stopRecovery({- required int? userID,- required int? emergencyContactID,- required String sessionID,- }) async {- await _enteDio.post(- "/emergency-contacts/stop-recovery",- data: {- "userID": userID,- "emergencyContactID": emergencyContactID,- "id": sessionID,- },- );- }-- Future<void> rejectRecovery({- required int? userID,- required int? emergencyContactID,- required String sessionID,- }) async {- await _enteDio.post(- "/emergency-contacts/reject-recovery",- data: {- "userID": userID,- "emergencyContactID": emergencyContactID,- "id": sessionID,- },- );- }-- Future<void> approveRecovery({- required int? userID,- required int? emergencyContactID,- required String sessionID,- }) async {- await _enteDio.post(- "/emergency-contacts/approve-recovery",- data: {- "userID": userID,- "emergencyContactID": emergencyContactID,- "id": sessionID,- },- );- }-- Future<(String, KeyAttributes)> getRecoveryInfo(String sessionID) async {- final response = await _enteDio.get(- "/emergency-contacts/recovery-info/$sessionID",- );- final String encryptedKey = response.data["encryptedKey"]!;- final KeyAttributes keyAttributes = KeyAttributes.fromMap(- response.data['userKeyAttr'],- );- return (encryptedKey, keyAttributes);- }-- Future<SetupSRPResponse> initPasswordChange({- required String recoveryID,- required SetupSRPRequest setupSRPRequest,- }) async {- final response = await _enteDio.post(- "/emergency-contacts/init-change-password",- data: {- "recoveryID": recoveryID,- "setupSRPRequest": setupSRPRequest.toMap(),- },- );- return SetupSRPResponse.fromJson(response.data);- }-- Future<void> changePassword({- required String recoveryID,- required String setupID,- required String srpM1,- required Map<String, dynamic> updatedKeyAttr,- }) async {- await _enteDio.post(- "/emergency-contacts/change-password",- data: {- "recoveryID": recoveryID,- 'updateSrpAndKeysRequest': {- 'setupID': setupID,- 'srpM1': srpM1,- 'updatedKeyAttr': updatedKeyAttr,- },- },- );- }-}diff --git a/mobile/apps/photos/lib/service_locator.dart b/mobile/apps/photos/lib/service_locator.dartindex d7e182fba1..65490a954e 100644--- a/mobile/apps/photos/lib/service_locator.dart+++ b/mobile/apps/photos/lib/service_locator.dart@@ -12,7 +12,6 @@ import "package:photos/gateways/cast/cast_gateway.dart";import "package:photos/gateways/collections/collection_files_gateway.dart";import "package:photos/gateways/collections/collection_share_gateway.dart";import "package:photos/gateways/collections/collections_gateway.dart";-import "package:photos/gateways/emergency/emergency_gateway.dart";import "package:photos/gateways/entity/entity_gateway.dart";import "package:photos/gateways/files/file_data_gateway.dart";import "package:photos/gateways/files/file_magic_gateway.dart";@@ -333,12 +332,6 @@ PushGateway get pushGateway {return _pushGateway!;}-EmergencyGateway? _emergencyGateway;-EmergencyGateway get emergencyGateway {- _emergencyGateway ??= EmergencyGateway(ServiceLocator.instance.enteDio);- return _emergencyGateway!;-}-SocialGateway? _socialGateway;SocialGateway get socialGateway {_socialGateway ??= SocialGateway(ServiceLocator.instance.enteDio);diff --git a/mobile/packages/legacy/lib/ente_legacy.dart b/mobile/packages/legacy/lib/ente_legacy.dartindex ea14bdf36a..f47ebc9753 100644--- a/mobile/packages/legacy/lib/ente_legacy.dart+++ b/mobile/packages/legacy/lib/ente_legacy.dart@@ -8,4 +8,3 @@ export 'pages/legacy_congratulations_page.dart';export 'pages/other_contact_page.dart';export 'pages/recover_others_account.dart';export 'pages/share_legacy_kit_page.dart';-export 'services/emergency_service.dart';diff --git a/mobile/packages/legacy/lib/legacy_api.dart b/mobile/packages/legacy/lib/legacy_api.dartindex dbf4a45306..304bd9de86 100644--- a/mobile/packages/legacy/lib/legacy_api.dart+++ b/mobile/packages/legacy/lib/legacy_api.dart@@ -19,6 +19,34 @@ abstract interface class LegacyApi {required int recoveryNoticeInDays,});+ Future<void> startRecovery({+ required int userId,+ required int emergencyContactId,+ });++ Future<void> stopRecovery({+ required String recoveryId,+ required int userId,+ required int emergencyContactId,+ });++ Future<void> rejectRecovery({+ required String recoveryId,+ required int userId,+ required int emergencyContactId,+ });++ Future<void> approveRecovery({+ required String recoveryId,+ required int userId,+ required int emergencyContactId,+ });++ Future<void> changePassword({+ required String recoveryId,+ required String newPassword,+ });+Future<List<LegacyKit>> kits();Future<LegacyKitCreateResult> createKit({diff --git a/mobile/packages/legacy/lib/pages/emergency_page.dart b/mobile/packages/legacy/lib/pages/emergency_page.dartindex f639707c38..6deb627ca7 100644--- a/mobile/packages/legacy/lib/pages/emergency_page.dart+++ b/mobile/packages/legacy/lib/pages/emergency_page.dart@@ -15,7 +15,6 @@ import "package:ente_legacy/pages/legacy_kit_intro_page.dart";import "package:ente_legacy/pages/other_contact_page.dart";import "package:ente_legacy/pages/select_contact_page.dart";import "package:ente_legacy/pages/share_legacy_kit_page.dart";-import "package:ente_legacy/services/emergency_service.dart";import "package:ente_sharing/user_avator_widget.dart";import "package:ente_strings/ente_strings.dart";import "package:ente_ui/components/alert_bottom_sheet.dart";@@ -746,7 +745,11 @@ class _EmergencyPageState extends State<EmergencyPage> {backgroundColor: colorScheme.primary700,onTap: () async {Navigator.of(context).pop();- await EmergencyContactService.instance.approveRecovery(session);+ await widget.legacy.approveRecovery(+ recoveryId: session.id,+ userId: session.user.id,+ emergencyContactId: session.emergencyContact.id,+ );if (mounted) {setState(() {});}@@ -758,7 +761,11 @@ class _EmergencyPageState extends State<EmergencyPage> {);if (confirmed == true) {- await EmergencyContactService.instance.rejectRecovery(session);+ await widget.legacy.rejectRecovery(+ recoveryId: session.id,+ userId: session.user.id,+ emergencyContactId: session.emergencyContact.id,+ );info?.recoverSessions.removeWhere((element) => element.id == session.id);if (mounted) {setState(() {});diff --git a/mobile/packages/legacy/lib/pages/other_contact_page.dart b/mobile/packages/legacy/lib/pages/other_contact_page.dartindex 1db9c1ebea..fa99268a7b 100644--- a/mobile/packages/legacy/lib/pages/other_contact_page.dart+++ b/mobile/packages/legacy/lib/pages/other_contact_page.dart@@ -1,14 +1,12 @@import "dart:async";import "package:collection/collection.dart";-import "package:ente_base/models/key_attributes.dart";import "package:ente_components/ente_components.dart";import "package:ente_configuration/base_configuration.dart";import "package:ente_legacy/components/gradient_button.dart";import "package:ente_legacy/legacy_api.dart";import "package:ente_legacy/models/emergency_models.dart";import "package:ente_legacy/pages/recover_others_account.dart";-import "package:ente_legacy/services/emergency_service.dart";import "package:ente_pure_utils/ente_pure_utils.dart";import "package:ente_strings/ente_strings.dart";import "package:ente_ui/components/alert_bottom_sheet.dart";@@ -156,8 +154,11 @@ class _OtherContactPageState extends State<OtherContactPage> {if (confirmed == true) {try {- await EmergencyContactService.instance- .startRecovery(widget.contact);+ await widget.legacy.startRecovery(+ userId: widget.contact.user.id,+ emergencyContactId:+ widget.contact.emergencyContact.id,+ );if (context.mounted) {_fetchData().ignore();await showAlertBottomSheet(@@ -186,30 +187,13 @@ class _OtherContactPageState extends State<OtherContactPage> {GradientButton(text: context.strings.recoverAccount,backgroundColor: colorScheme.primary700,- onTap: () async {- try {- final (- String key,- KeyAttributes attributes,- ) = await EmergencyContactService.instance.getRecoveryInfo(- recoverySession!,- );- if (!context.mounted) {- return;- }- routeToPage(- context,- RecoverOthersAccount(key, attributes, recoverySession!),- ).ignore();- } catch (e) {- if (context.mounted) {- showGenericErrorDialog(- context: context,- error: e,- ).ignore();- }- }- },+ onTap: () => routeToPage(+ context,+ RecoverOthersAccount(+ session: recoverySession!,+ legacy: widget.legacy,+ ),+ ).ignore(),),if (recoverySession != null &&recoverySession!.status == LegacyRecoveryStatus.waiting)@@ -301,7 +285,11 @@ class _OtherContactPageState extends State<OtherContactPage> {if (confirmed == true) {try {- await EmergencyContactService.instance.stopRecovery(recoverySession!);+ await widget.legacy.stopRecovery(+ recoveryId: recoverySession!.id,+ userId: recoverySession!.user.id,+ emergencyContactId: recoverySession!.emergencyContact.id,+ );if (mounted) {_fetchData().ignore();}diff --git a/mobile/packages/legacy/lib/pages/recover_others_account.dart b/mobile/packages/legacy/lib/pages/recover_others_account.dartindex 5d7d931698..33ee045007 100644--- a/mobile/packages/legacy/lib/pages/recover_others_account.dart+++ b/mobile/packages/legacy/lib/pages/recover_others_account.dart@@ -1,10 +1,5 @@-import "dart:convert";--import "package:ente_accounts/models/set_keys_request.dart";-import "package:ente_base/models/key_attributes.dart";-import "package:ente_crypto_api/ente_crypto_api.dart";+import "package:ente_legacy/legacy_api.dart";import "package:ente_legacy/models/emergency_models.dart";-import "package:ente_legacy/services/emergency_service.dart";import "package:ente_strings/ente_strings.dart";import "package:ente_ui/components/buttons/dynamic_fab.dart";import "package:ente_ui/utils/dialog_util.dart";@@ -14,14 +9,12 @@ import "package:logging/logging.dart";import "package:password_strength/password_strength.dart";class RecoverOthersAccount extends StatefulWidget {- final String recoveryKey;- final KeyAttributes attributes;- final LegacyRecoverySession sessions;+ final LegacyRecoverySession session;+ final LegacyApi legacy;- const RecoverOthersAccount(- this.recoveryKey,- this.attributes,- this.sessions, {+ const RecoverOthersAccount({+ required this.session,+ required this.legacy,super.key,});@@ -107,7 +100,7 @@ class _RecoverOthersAccountState extends State<RecoverOthersAccount> {}Widget _getBody(String buttonTextAndHeading) {- final email = widget.sessions.user.email;+ final email = widget.session.user.email;var passwordStrengthText = context.strings.weakStrength;var passwordStrengthColor = Colors.redAccent;if (_passwordStrength > kStrongPasswordStrengthThreshold) {@@ -291,49 +284,9 @@ class _RecoverOthersAccountState extends State<RecoverOthersAccount> {);await dialog.show();try {- final String password = _passwordController1.text;- final KeyAttributes attributes = widget.attributes;- Uint8List? masterKey;- try {- masterKey = await CryptoUtil.decrypt(- CryptoUtil.base642bin(attributes.masterKeyEncryptedWithRecoveryKey),- CryptoUtil.hex2bin(widget.recoveryKey),- CryptoUtil.base642bin(attributes.masterKeyDecryptionNonce),- );- } catch (e) {- _logger.severe(e, "Failed to get master key using recoveryKey");- rethrow;- }-- final kekSalt = CryptoUtil.getSaltToDeriveKey();- final derivedKeyResult = await CryptoUtil.deriveSensitiveKey(- utf8.encode(password),- kekSalt,- );- final loginKey = await CryptoUtil.deriveLoginKey(derivedKeyResult.key);- final encryptedKeyData = CryptoUtil.encryptSync(- masterKey,- derivedKeyResult.key,- );-- final updatedAttributes = attributes.copyWith(- kekSalt: CryptoUtil.bin2base64(kekSalt),- encryptedKey: CryptoUtil.bin2base64(encryptedKeyData.encryptedData!),- keyDecryptionNonce: CryptoUtil.bin2base64(encryptedKeyData.nonce!),- memLimit: derivedKeyResult.memLimit,- opsLimit: derivedKeyResult.opsLimit,- );- final setKeyRequest = SetKeysRequest(- kekSalt: updatedAttributes.kekSalt,- encryptedKey: updatedAttributes.encryptedKey,- keyDecryptionNonce: updatedAttributes.keyDecryptionNonce,- memLimit: updatedAttributes.memLimit,- opsLimit: updatedAttributes.opsLimit,- );- await EmergencyContactService.instance.changePasswordForOther(- Uint8List.fromList(loginKey),- setKeyRequest,- widget.sessions,+ await widget.legacy.changePassword(+ recoveryId: widget.session.id,+ newPassword: _passwordController1.text,);await dialog.hide();if (mounted) {diff --git a/mobile/packages/legacy/lib/services/emergency_service.dart b/mobile/packages/legacy/lib/services/emergency_service.dartdeleted file mode 100644index 1319c0ddf7..0000000000--- a/mobile/packages/legacy/lib/services/emergency_service.dart+++ /dev/null@@ -1,205 +0,0 @@-import "dart:convert";-import "dart:math";-import "dart:typed_data";--import "package:dio/dio.dart";-import "package:ente_accounts/models/set_keys_request.dart";-import "package:ente_accounts/models/srp.dart";-import "package:ente_base/models/key_attributes.dart";-import "package:ente_configuration/base_configuration.dart";-import "package:ente_crypto_api/ente_crypto_api.dart";-import "package:ente_frb/legacy.dart";-import "package:ente_network/network.dart";-import "package:logging/logging.dart";-import "package:pointycastle/pointycastle.dart";-import "package:pointycastle/random/fortuna_random.dart";-import "package:pointycastle/srp/srp6_client.dart";-import "package:pointycastle/srp/srp6_standard_groups.dart";-import "package:pointycastle/srp/srp6_util.dart";-import "package:pointycastle/srp/srp6_verifier_generator.dart";-import "package:uuid/uuid.dart";--class EmergencyContactService {- final Dio _enteDio = Network.instance.enteDio;- late BaseConfiguration _config;- late final Logger _logger = Logger("EmergencyContactService");-- EmergencyContactService._privateConstructor();- static final EmergencyContactService instance =- EmergencyContactService._privateConstructor();-- void init(BaseConfiguration config) {- _config = config;- }-- Future<void> startRecovery(LegacyContactRecord contact) async {- try {- await _enteDio.post(- "/emergency-contacts/start-recovery",- data: {- "userID": contact.user.id,- "emergencyContactID": contact.emergencyContact.id,- },- );- } catch (e, s) {- Logger("EmergencyContact").severe('failed to start recovery', e, s);- rethrow;- }- }-- Future<void> stopRecovery(LegacyRecoverySession session) async {- try {- await _enteDio.post(- "/emergency-contacts/stop-recovery",- data: {- "userID": session.user.id,- "emergencyContactID": session.emergencyContact.id,- "id": session.id,- },- );- } catch (e, s) {- Logger("EmergencyContact").severe('failed to stop recovery', e, s);- rethrow;- }- }-- Future<void> rejectRecovery(LegacyRecoverySession session) async {- try {- await _enteDio.post(- "/emergency-contacts/reject-recovery",- data: {- "userID": session.user.id,- "emergencyContactID": session.emergencyContact.id,- "id": session.id,- },- );- } catch (e, s) {- Logger("EmergencyContact").severe('failed to stop recovery', e, s);- rethrow;- }- }-- Future<void> approveRecovery(LegacyRecoverySession session) async {- try {- await _enteDio.post(- "/emergency-contacts/approve-recovery",- data: {- "userID": session.user.id,- "emergencyContactID": session.emergencyContact.id,- "id": session.id,- },- );- } catch (e, s) {- Logger("EmergencyContact").severe('failed to approve recovery', e, s);- rethrow;- }- }-- Future<(String, KeyAttributes)> getRecoveryInfo(- LegacyRecoverySession sessions,- ) async {- try {- final resp = await _enteDio.get(- "/emergency-contacts/recovery-info/${sessions.id}",- );- final String encryptedKey = resp.data["encryptedKey"]!;- final decryptedKey = CryptoUtil.openSealSync(- CryptoUtil.base642bin(encryptedKey),- CryptoUtil.base642bin(_config.getKeyAttributes()!.publicKey),- _config.getSecretKey()!,- );- final String hexRecoveryKey = CryptoUtil.bin2hex(decryptedKey);- final KeyAttributes keyAttributes = KeyAttributes.fromMap(- resp.data['userKeyAttr'],- );- return (hexRecoveryKey, keyAttributes);- } catch (e, s) {- Logger("EmergencyContact").severe('failed to stop recovery', e, s);- rethrow;- }- }-- Future<void> changePasswordForOther(- Uint8List loginKey,- SetKeysRequest setKeysRequest,- LegacyRecoverySession recoverySessions,- ) async {- try {- final SRP6GroupParameters kDefaultSrpGroup =- SRP6StandardGroups.rfc5054_4096;- final String username = const Uuid().v4().toString();- final SecureRandom random = _getSecureRandom();- final Uint8List identity = Uint8List.fromList(utf8.encode(username));- final Uint8List password = loginKey;- final Uint8List salt = random.nextBytes(16);- final gen = SRP6VerifierGenerator(- group: kDefaultSrpGroup,- digest: Digest('SHA-256'),- );- final v = gen.generateVerifier(salt, identity, password);-- final client = SRP6Client(- group: kDefaultSrpGroup,- digest: Digest('SHA-256'),- random: random,- );-- final A = client.generateClientCredentials(salt, identity, password);- final request = SetupSRPRequest(- srpUserID: username,- srpSalt: base64Encode(salt),- srpVerifier: base64Encode(SRP6Util.encodeBigInt(v)),- srpA: base64Encode(SRP6Util.getPadded(A!, 512)),- isUpdate: false,- );- final response = await _enteDio.post(- "/emergency-contacts/init-change-password",- data: {- "recoveryID": recoverySessions.id,- "setupSRPRequest": request.toMap(),- },- );- if (response.statusCode == 200) {- final SetupSRPResponse setupSRPResponse = SetupSRPResponse.fromJson(- response.data,- );- final serverB = SRP6Util.decodeBigInt(- base64Decode(setupSRPResponse.srpB),- );-- // ignore: unused_local_variable- final clientS = client.calculateSecret(serverB);- final clientM = client.calculateClientEvidenceMessage();- // ignore: unused_local_variable- late Response srpCompleteResponse;- srpCompleteResponse = await _enteDio.post(- "/emergency-contacts/change-password",- data: {- "recoveryID": recoverySessions.id,- 'updateSrpAndKeysRequest': {- 'setupID': setupSRPResponse.setupID,- 'srpM1': base64Encode(SRP6Util.getPadded(clientM!, 32)),- 'updatedKeyAttr': setKeysRequest.toMap(),- },- },- );- } else {- throw Exception("register-srp action failed");- }- } catch (e, s) {- _logger.severe("failed to change password for other", e, s);- rethrow;- }- }-- SecureRandom _getSecureRandom() {- final List<int> seeds = [];- final random = Random.secure();- for (int i = 0; i < 32; i++) {- seeds.add(random.nextInt(255));- }- final secureRandom = FortunaRandom();- secureRandom.seed(KeyParameter(Uint8List.fromList(seeds)));- return secureRandom;- }-}diff --git a/mobile/packages/legacy/pubspec.yaml b/mobile/packages/legacy/pubspec.yamlindex 184edbe247..47a3c969be 100644--- a/mobile/packages/legacy/pubspec.yaml+++ b/mobile/packages/legacy/pubspec.yaml@@ -8,26 +8,19 @@ environment:dependencies:collection: 1.19.1- dio: 5.9.2email_validator: 3.0.0ente_accounts:path: ../accounts- ente_base:- path: ../baseente_components:path: ../ente_componentsente_configuration:path: ../configurationente_contacts:path: ../contacts- ente_crypto_api:- path: ../ente_crypto_apiente_events:path: ../eventsente_frb:path: ../frb- ente_network:- path: ../networkente_pure_utils:path: ../ente_pure_utilsente_sharing:@@ -45,11 +38,9 @@ dependencies:password_strength: 0.2.0path_provider: 2.1.5pdf: 3.12.0- pointycastle: 3.9.1rive: 0.14.0-dev.13share_plus: 12.0.0shared_preferences: 2.5.3- uuid: 4.5.3dev_dependencies:flutter_lints: 6.0.0diff --git a/rust/bindings/frb/lib/src/legacy.rs b/rust/bindings/frb/lib/src/legacy.rsindex f1e82fe0a0..9b9472207a 100644--- a/rust/bindings/frb/lib/src/legacy.rs+++ b/rust/bindings/frb/lib/src/legacy.rs@@ -1,3 +1,4 @@pub mod contact;pub mod kit;+pub mod recovery;pub mod types;diff --git a/rust/bindings/frb/lib/src/legacy/recovery.rs b/rust/bindings/frb/lib/src/legacy/recovery.rsnew file mode 100644index 0000000000..1aa27946a0--- /dev/null+++ b/rust/bindings/frb/lib/src/legacy/recovery.rs@@ -0,0 +1,71 @@+use crate::session::Session;++use super::types::LegacyError;++pub async fn start_recovery(+ session: &Session,+ user_id: i64,+ emergency_contact_id: i64,+) -> Result<(), LegacyError> {+ ente_legacy::start_recovery(session.as_ref(), user_id, emergency_contact_id)+ .await+ .map_err(Into::into)+}++pub async fn stop_recovery(+ session: &Session,+ recovery_id: String,+ user_id: i64,+ emergency_contact_id: i64,+) -> Result<(), LegacyError> {+ ente_legacy::stop_recovery(+ session.as_ref(),+ &recovery_id,+ user_id,+ emergency_contact_id,+ )+ .await+ .map_err(Into::into)+}++pub async fn reject_recovery(+ session: &Session,+ recovery_id: String,+ user_id: i64,+ emergency_contact_id: i64,+) -> Result<(), LegacyError> {+ ente_legacy::reject_recovery(+ session.as_ref(),+ &recovery_id,+ user_id,+ emergency_contact_id,+ )+ .await+ .map_err(Into::into)+}++pub async fn approve_recovery(+ session: &Session,+ recovery_id: String,+ user_id: i64,+ emergency_contact_id: i64,+) -> Result<(), LegacyError> {+ ente_legacy::approve_recovery(+ session.as_ref(),+ &recovery_id,+ user_id,+ emergency_contact_id,+ )+ .await+ .map_err(Into::into)+}++pub async fn change_password(+ session: &Session,+ recovery_id: String,+ new_password: String,+) -> Result<(), LegacyError> {+ ente_legacy::change_password(session.as_ref(), &recovery_id, &new_password)+ .await+ .map_err(Into::into)+}