mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-01 01:03:01 +00:00
a520d94760
* Enable Swift 6.2 with default main actor isolation for the app target Turn on SWIFT_VERSION 6.2, SWIFT_APPROACHABLE_CONCURRENCY and SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor for the ElementX target, matching the NSE and Share Extension (which already use 6.2 without the main actor default). # Conflicts: # ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved * Update the code generation templates for Swift 6 Emit nonisolated/@unchecked Sendable mocks and nonisolated string enums, and mark async mock methods @concurrent so they keep suspending like the real implementations (otherwise intermediate states are unobservable in tests). Includes the regenerated mocks and strings. # Conflicts: # ElementX/Sources/Mocks/Generated/GeneratedMocks.swift * Make the data layer and services nonisolated and Sendable Annotate the value-type models, Rust SDK proxy wrappers, timeline item graph, settings, logging and NSE-shared types as nonisolated, and conform the service protocols to Sendable so their existentials can cross isolation boundaries. These types run off the main actor and no longer inherit the target's default main actor isolation. * Adopt the new isolation across call sites, mocks and signatures Update call sites, closure signatures and mock configuration helpers to match the nonisolated/Sendable data layer, including the main actor isolated mock inits and the @Sendable filter on recentlyVisitedRooms. ^ Conflicts: ^ ElementX/Sources/Services/SecureBackup/SecureBackupController.swift * Remove redundant @MainActor annotations With the app target defaulting to main actor isolation, the explicit @MainActor on view models, coordinators, views and their protocols is no longer required. * Fix concurrency hotspots surfaced by the migration Resolve the room summary main-thread deadlock by moving diff processing onto AsyncStreams, add the SDKListener.onMainActor FIFO bridge for SDK callbacks, hop KVO/timer/UIKit callbacks to the main actor via assumeIsolated, add isolated deinits, and apply the few justified nonisolated(unsafe) escapes for queue-confined Apple APIs. * Fix the unit tests for Swift 6 concurrency Hop the waitForConfirmation body onto the caller's actor (Swift Testing runs confirmation closures off-actor), and adjust the affected suites and async signatures. * offload diffs on concurrent threads instead of main actor * make room info protocols sendable * use a task group for fetching data so that everything runs concurrently in the TextRoomTimelineView when getting the preview. * use the generic onMainActor implementation, which already makes a stream and send the continuation on the main actor. * small pr comments issues being addressed * update enterprise * Update StaticCode to 1.1.0 and specify the required Swift isolation. * fix ElementCallServiceTests * update enterprise * re-generate mocks * update enterprise * enterprise new code conformed to swift 6 --------- Co-authored-by: Doug <douglase@element.io>
216 lines
8.2 KiB
Swift
216 lines
8.2 KiB
Swift
//
|
|
// Copyright 2025 Element Creations Ltd.
|
|
// Copyright 2023-2025 New Vector Ltd.
|
|
//
|
|
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
|
|
// Please see LICENSE files in the repository root for full details.
|
|
//
|
|
|
|
import Combine
|
|
import Foundation
|
|
import MatrixRustSDK
|
|
import Synchronization
|
|
|
|
class SecureBackupController: SecureBackupControllerProtocol {
|
|
private let encryption: Encryption
|
|
|
|
private let recoveryStateSubject = CurrentValueSubject<SecureBackupRecoveryState, Never>(.unknown)
|
|
private let keyBackupStateSubject = CurrentValueSubject<SecureBackupKeyBackupState, Never>(.unknown)
|
|
|
|
// periphery:ignore - retaining purpose
|
|
private var backupStateListenerTaskHandle: TaskHandle?
|
|
// periphery:ignore - retaining purpose
|
|
private var recoveryStateListenerTaskHandle: TaskHandle?
|
|
|
|
// periphery:ignore - auto cancels when reassigned
|
|
/// Used to dedupe remote backup state requests
|
|
@CancellableTask private var remoteBackupStateTask: Task<Void, Error>?
|
|
|
|
var recoveryState: CurrentValuePublisher<SecureBackupRecoveryState, Never> {
|
|
recoveryStateSubject.asCurrentValuePublisher()
|
|
}
|
|
|
|
var keyBackupState: CurrentValuePublisher<SecureBackupKeyBackupState, Never> {
|
|
keyBackupStateSubject.asCurrentValuePublisher()
|
|
}
|
|
|
|
init(encryption: Encryption) {
|
|
self.encryption = encryption
|
|
|
|
backupStateListenerTaskHandle = encryption.backupStateListener(listener: SDKListener.onMainActor { [weak self] state in
|
|
guard let self else { return }
|
|
|
|
switch state {
|
|
case .unknown:
|
|
keyBackupStateSubject.send(.unknown)
|
|
case .creating:
|
|
keyBackupStateSubject.send(.enabling)
|
|
case .enabling:
|
|
keyBackupStateSubject.send(.enabling)
|
|
case .resuming:
|
|
keyBackupStateSubject.send(.enabled)
|
|
case .enabled:
|
|
keyBackupStateSubject.send(.enabled)
|
|
case .downloading:
|
|
keyBackupStateSubject.send(.enabled)
|
|
case .disabling:
|
|
keyBackupStateSubject.send(.disabling)
|
|
}
|
|
|
|
MXLog.info("Key backup state changed to: \(state), setting local state to \(keyBackupStateSubject.value)")
|
|
|
|
if case .unknown = state {
|
|
updateBackupStateFromRemote()
|
|
}
|
|
})
|
|
|
|
recoveryStateListenerTaskHandle = encryption.recoveryStateListener(listener: SDKListener.onMainActor { [weak self] state in
|
|
guard let self else { return }
|
|
|
|
switch state {
|
|
case .unknown:
|
|
recoveryStateSubject.send(.unknown)
|
|
case .enabled:
|
|
recoveryStateSubject.send(.enabled)
|
|
case .disabled:
|
|
recoveryStateSubject.send(.disabled)
|
|
case .incomplete:
|
|
recoveryStateSubject.send(.incomplete)
|
|
}
|
|
|
|
MXLog.info("Recovery state changed to: \(state), setting local state to \(recoveryStateSubject.value)")
|
|
})
|
|
|
|
updateBackupStateFromRemote()
|
|
}
|
|
|
|
func enable() async -> Result<Void, SecureBackupControllerError> {
|
|
MXLog.info("Enabling secure backup")
|
|
|
|
do {
|
|
try await encryption.enableBackups()
|
|
} catch {
|
|
MXLog.error("Failed enabling secure backup with error: \(error)")
|
|
|
|
return .failure(.failedEnablingBackup)
|
|
}
|
|
|
|
return .success(())
|
|
}
|
|
|
|
func disable() async -> Result<Void, SecureBackupControllerError> {
|
|
MXLog.info("Disabling secure backup")
|
|
|
|
do {
|
|
try await encryption.disableRecovery()
|
|
} catch {
|
|
MXLog.error("Failed disabling secure backup with error: \(error)")
|
|
return .failure(.failedDisablingBackup)
|
|
}
|
|
|
|
return .success(())
|
|
}
|
|
|
|
func generateRecoveryKey(withPassphrase passphrase: String?) async -> Result<String, SecureBackupControllerError> {
|
|
do {
|
|
if recoveryState.value == .disabled {
|
|
MXLog.info("Enabling recovery")
|
|
} else {
|
|
MXLog.info("Resetting recovery key")
|
|
}
|
|
|
|
let keyUploadErrored = Mutex(false)
|
|
// Note: `enableRecovery` also handles the reset case (equivalent to `resetRecoveryKey`).
|
|
// Despite the name, it is the correct call for both initial setup and key rotation.
|
|
let recoveryKey = try await encryption.enableRecovery(waitForBackupsToUpload: false, passphrase: passphrase, progressListener: SDKListener.onMainActor { [weak self] state in
|
|
guard let self else { return }
|
|
|
|
switch state {
|
|
case .starting, .creatingBackup, .creatingRecoveryKey, .backingUp:
|
|
recoveryStateSubject.send(.settingUp)
|
|
case .done:
|
|
recoveryStateSubject.send(.enabled)
|
|
case .roomKeyUploadError:
|
|
MXLog.error("Failed enabling recovery: room key upload error")
|
|
keyUploadErrored.withLock { $0 = true }
|
|
}
|
|
})
|
|
|
|
return keyUploadErrored.withLock { $0 } ? .failure(.failedGeneratingRecoveryKey) : .success(recoveryKey)
|
|
} catch {
|
|
MXLog.error("Failed generating recovery key with error: \(error)")
|
|
|
|
return .failure(.failedGeneratingRecoveryKey)
|
|
}
|
|
}
|
|
|
|
func confirmRecoveryKey(_ key: String) async -> Result<Void, SecureBackupControllerError> {
|
|
do {
|
|
MXLog.info("Confirming recovery key")
|
|
try await encryption.recoverAndFixBackup(recoveryKey: key)
|
|
return .success(())
|
|
} catch {
|
|
MXLog.info("Failed confirming recovery key with error: \(error)")
|
|
return .failure(.failedConfirmingRecoveryKey)
|
|
}
|
|
}
|
|
|
|
func waitForKeyBackupUpload(uploadStateSubject: CurrentValueSubject<SecureBackupSteadyState, Never>) async -> Result<Void, SecureBackupControllerError> {
|
|
do {
|
|
MXLog.info("Waiting for backup upload steady state")
|
|
try await encryption.waitForBackupUploadSteadyState(progressListener: SDKListener.onMainActor { state in
|
|
let uploadState: SecureBackupSteadyState = switch state {
|
|
case .waiting: .waiting
|
|
case .uploading(let backedUpCount, let totalCount): .uploading(uploadedKeyCount: Int(backedUpCount), totalKeyCount: Int(totalCount))
|
|
case .error: .error
|
|
case .done: .done
|
|
}
|
|
|
|
uploadStateSubject.send(uploadState)
|
|
})
|
|
return .success(())
|
|
} catch let error as SteadyStateError {
|
|
MXLog.error("Failed waiting for backup upload steady state with error: \(error)")
|
|
|
|
switch error {
|
|
case .BackupDisabled:
|
|
MXLog.error("Key backup disabled, continuing logout.")
|
|
return .success(())
|
|
case .Connection, .Lagged:
|
|
MXLog.error("Key backup upload failure: \(error)")
|
|
return .failure(.failedUploadingForBackup)
|
|
}
|
|
} catch {
|
|
MXLog.error("Unknown key backup upload failure")
|
|
return .failure(.failedUploadingForBackup)
|
|
}
|
|
}
|
|
|
|
// MARK: - Private
|
|
|
|
private func updateBackupStateFromRemote(retry: Bool = true) {
|
|
remoteBackupStateTask = Task { [weak self] in
|
|
guard let self else { return }
|
|
|
|
do {
|
|
MXLog.info("Checking if backup exists on the server")
|
|
let backupExists = try await self.encryption.backupExistsOnServer()
|
|
|
|
if Task.isCancelled {
|
|
return
|
|
}
|
|
|
|
if !backupExists {
|
|
keyBackupStateSubject.send(.unknown)
|
|
}
|
|
} catch {
|
|
MXLog.error("Failed retrieving remote backup state with error: \(error)")
|
|
|
|
if retry {
|
|
updateBackupStateFromRemote(retry: false)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|