From b7b4bd21471dd3ac48f5f3b3b245cc56723e529f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 10:17:52 +0000 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20bulletproofing=20crypto=20box=20to?= =?UTF-8?q?=20cc=20migration=20(WPB-14250)=20=F0=9F=8D=92=20(#3129)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: bulletproofing crypto box to cc migration (WPB-14250) (#3123) * feat: cleaning all data if failure * feat: cleaning all data if failure * feat: clean up code * feat: clean up code * chore: add plan b, logout user * chore: add plan b, logout user, cleanup code * chore: cleanup code * chore: cleanup code * chore: cleanup code detekt * chore: cleanup code detekt * chore: remove exception for testing * chore: tests for new branches * chore: tests for new branches * chore: solve layer issue * chore: more test covereage * chore: layering * chore: solve missing reference * fix: deadlock while cleanup * fix: tests * fix: tests detekt * chore: empty commit bump --------- Co-authored-by: Yamil Medina --- .../ProteusClientCoreCryptoImpl.kt | 47 +++++++----- .../exceptions/ProteusException.kt | 5 +- .../kalium/logic/data/logout/LogoutReason.kt | 8 +- .../data/client/ProteusClientProvider.kt | 44 ++++++++--- .../client/ProteusMigrationRecoveryHandler.kt | 30 ++++++++ .../logic/data/session/SessionMapper.kt | 2 + .../kalium/logic/feature/UserSessionScope.kt | 20 +++-- .../logic/feature/auth/LogoutUseCase.kt | 12 +++ .../ProteusMigrationRecoveryHandlerImpl.kt | 52 +++++++++++++ .../feature/client/RegisterClientUseCase.kt | 10 ++- .../sync/slow/SlowSyncCriteriaProvider.kt | 1 + .../logic/feature/auth/LogoutUseCaseTest.kt | 34 ++++++++- .../data/client/ProteusClientProviderTest.kt | 73 +++++++++++++++++++ .../ProteusMigrationRecoveryHandlerTest.kt | 36 +++++++++ .../kalium/persistence/model/LogoutReason.kt | 7 +- 15 files changed, 340 insertions(+), 41 deletions(-) create mode 100644 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/client/ProteusMigrationRecoveryHandler.kt create mode 100644 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/client/ProteusMigrationRecoveryHandlerImpl.kt create mode 100644 logic/src/jvmTest/kotlin/com/wire/kalium/logic/data/client/ProteusClientProviderTest.kt create mode 100644 logic/src/jvmTest/kotlin/com/wire/kalium/logic/feature/client/ProteusMigrationRecoveryHandlerTest.kt diff --git a/cryptography/src/commonJvmAndroid/kotlin/com.wire.kalium.cryptography/ProteusClientCoreCryptoImpl.kt b/cryptography/src/commonJvmAndroid/kotlin/com.wire.kalium.cryptography/ProteusClientCoreCryptoImpl.kt index c6f2a91bd6f..fdc9bc2b69c 100644 --- a/cryptography/src/commonJvmAndroid/kotlin/com.wire.kalium.cryptography/ProteusClientCoreCryptoImpl.kt +++ b/cryptography/src/commonJvmAndroid/kotlin/com.wire.kalium.cryptography/ProteusClientCoreCryptoImpl.kt @@ -22,6 +22,7 @@ import com.wire.crypto.CoreCrypto import com.wire.crypto.CoreCryptoException import com.wire.crypto.client.toByteArray import com.wire.kalium.cryptography.exceptions.ProteusException +import com.wire.kalium.cryptography.exceptions.ProteusStorageMigrationException import io.ktor.util.decodeBase64Bytes import io.ktor.util.encodeBase64 import kotlinx.coroutines.sync.Mutex @@ -178,36 +179,44 @@ class ProteusClientCoreCryptoImpl private constructor( acc && File(rootDir).resolve(file).deleteRecursively() } - private suspend fun migrateFromCryptoBoxIfNecessary(coreCrypto: CoreCrypto, rootDir: String) { - if (cryptoBoxFilesExists(File(rootDir))) { - kaliumLogger.i("migrating from crypto box at: $rootDir") - coreCrypto.proteusCryptoboxMigrate(rootDir) - kaliumLogger.i("migration successful") - - if (deleteCryptoBoxFiles(rootDir)) { - kaliumLogger.i("successfully deleted old crypto box files") - } else { - kaliumLogger.e("Failed to deleted old crypto box files at $rootDir") - } - } - } - - @Suppress("TooGenericExceptionCaught") + @Suppress("TooGenericExceptionCaught", "ThrowsCount") suspend operator fun invoke(coreCrypto: CoreCrypto, rootDir: String): ProteusClientCoreCryptoImpl { try { migrateFromCryptoBoxIfNecessary(coreCrypto, rootDir) coreCrypto.proteusInit() return ProteusClientCoreCryptoImpl(coreCrypto) + } catch (exception: ProteusStorageMigrationException) { + throw exception } catch (e: CoreCryptoException) { throw ProteusException( - e.message, - ProteusException.fromProteusCode(coreCrypto.proteusLastErrorCode().toInt()), - coreCrypto.proteusLastErrorCode().toInt(), - e.cause + message = e.message, + code = ProteusException.fromProteusCode(coreCrypto.proteusLastErrorCode().toInt()), + intCode = coreCrypto.proteusLastErrorCode().toInt(), + cause = e.cause ) } catch (e: Exception) { throw ProteusException(e.message, ProteusException.Code.UNKNOWN_ERROR, null, e.cause) } } + + @Suppress("TooGenericExceptionCaught") + private suspend fun migrateFromCryptoBoxIfNecessary(coreCrypto: CoreCrypto, rootDir: String) { + try { + if (cryptoBoxFilesExists(File(rootDir))) { + kaliumLogger.i("migrating from crypto box at: $rootDir") + coreCrypto.proteusCryptoboxMigrate(rootDir) + kaliumLogger.i("migration successful") + + if (deleteCryptoBoxFiles(rootDir)) { + kaliumLogger.i("successfully deleted old crypto box files") + } else { + kaliumLogger.e("Failed to deleted old crypto box files at $rootDir") + } + } + } catch (exception: Exception) { + kaliumLogger.e("Failed to migrate from crypto box to core crypto, exception: $exception") + throw ProteusStorageMigrationException("Failed to migrate from crypto box at $rootDir", exception) + } + } } } diff --git a/cryptography/src/commonMain/kotlin/com/wire/kalium/cryptography/exceptions/ProteusException.kt b/cryptography/src/commonMain/kotlin/com/wire/kalium/cryptography/exceptions/ProteusException.kt index 5a67b9d9e35..547d0deefa9 100644 --- a/cryptography/src/commonMain/kotlin/com/wire/kalium/cryptography/exceptions/ProteusException.kt +++ b/cryptography/src/commonMain/kotlin/com/wire/kalium/cryptography/exceptions/ProteusException.kt @@ -18,7 +18,7 @@ package com.wire.kalium.cryptography.exceptions -class ProteusException(message: String?, val code: Code, val intCode: Int?, cause: Throwable? = null) : Exception(message, cause) { +open class ProteusException(message: String?, val code: Code, val intCode: Int?, cause: Throwable? = null) : Exception(message, cause) { constructor(message: String?, code: Int, cause: Throwable? = null) : this( message, @@ -199,3 +199,6 @@ class ProteusException(message: String?, val code: Code, val intCode: Int?, caus } } } + +class ProteusStorageMigrationException(override val message: String, val rootCause: Throwable? = null) : + ProteusException(message, Int.MIN_VALUE, null) diff --git a/data/src/commonMain/kotlin/com/wire/kalium/logic/data/logout/LogoutReason.kt b/data/src/commonMain/kotlin/com/wire/kalium/logic/data/logout/LogoutReason.kt index 578ce4d1617..3cfd14e6525 100644 --- a/data/src/commonMain/kotlin/com/wire/kalium/logic/data/logout/LogoutReason.kt +++ b/data/src/commonMain/kotlin/com/wire/kalium/logic/data/logout/LogoutReason.kt @@ -46,5 +46,11 @@ enum class LogoutReason { /** * Session Expired. */ - SESSION_EXPIRED; + SESSION_EXPIRED, + + /** + * The migration to CC failed. + * This will trigger a cleanup of the local client data and prepare for a fresh start without losing data. + */ + MIGRATION_TO_CC_FAILED } diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/client/ProteusClientProvider.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/client/ProteusClientProvider.kt index 013deac601f..26f2f6ece6d 100644 --- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/client/ProteusClientProvider.kt +++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/client/ProteusClientProvider.kt @@ -18,9 +18,11 @@ package com.wire.kalium.logic.data.client +import com.wire.kalium.cryptography.CoreCryptoCentral import com.wire.kalium.cryptography.ProteusClient import com.wire.kalium.cryptography.coreCryptoCentral import com.wire.kalium.cryptography.cryptoboxProteusClient +import com.wire.kalium.cryptography.exceptions.ProteusStorageMigrationException import com.wire.kalium.logger.KaliumLogLevel import com.wire.kalium.logger.obfuscateId import com.wire.kalium.logic.CoreFailure @@ -58,20 +60,15 @@ class ProteusClientProviderImpl( private val userId: UserId, private val passphraseStorage: PassphraseStorage, private val kaliumConfigs: KaliumConfigs, - private val dispatcher: KaliumDispatcher = KaliumDispatcherImpl + private val dispatcher: KaliumDispatcher = KaliumDispatcherImpl, + private val proteusMigrationRecoveryHandler: ProteusMigrationRecoveryHandler ) : ProteusClientProvider { private var _proteusClient: ProteusClient? = null private val mutex = Mutex() override suspend fun clearLocalFiles() { - mutex.withLock { - withContext(dispatcher.io) { - _proteusClient?.close() - _proteusClient = null - FileUtil.deleteDirectory(rootProteusPath) - } - } + mutex.withLock { removeLocalFiles() } } override suspend fun getOrCreate(): ProteusClient { @@ -109,7 +106,6 @@ class ProteusClientProviderImpl( databaseKey = SecurityHelperImpl(passphraseStorage).proteusDBSecret(userId).value ) } catch (e: Exception) { - val logMap = mapOf( "userId" to userId.value.obfuscateId(), "exception" to e, @@ -119,7 +115,7 @@ class ProteusClientProviderImpl( kaliumLogger.logStructuredJson(KaliumLogLevel.ERROR, TAG, logMap) throw e } - central.proteusClient() + getCentralProteusClientOrError(central) } else { cryptoboxProteusClient( rootDir = rootProteusPath, @@ -129,6 +125,34 @@ class ProteusClientProviderImpl( } } + private suspend fun getCentralProteusClientOrError(central: CoreCryptoCentral): ProteusClient { + return try { + central.proteusClient() + } catch (exception: ProteusStorageMigrationException) { + proteusMigrationRecoveryHandler.clearClientData { removeLocalFiles() } + val logMap = mapOf( + "userId" to userId.value.obfuscateId(), + "exception" to exception, + "message" to exception.message, + "stackTrace" to exception.stackTraceToString() + ) + kaliumLogger.withTextTag(TAG).logStructuredJson(KaliumLogLevel.ERROR, "Proteus storage migration failed", logMap) + throw exception + } + } + + /** + * Actually deletes the proteus local files. + * Important! It is the caller responsibility to use the mutex, DON'T add a mutex here or it will be dead lock it. + */ + private suspend fun removeLocalFiles() { + withContext(dispatcher.io) { + _proteusClient?.close() + _proteusClient = null + FileUtil.deleteDirectory(rootProteusPath) + } + } + private companion object { const val TAG = "ProteusClientProvider" } diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/client/ProteusMigrationRecoveryHandler.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/client/ProteusMigrationRecoveryHandler.kt new file mode 100644 index 00000000000..9fe6880ecc4 --- /dev/null +++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/client/ProteusMigrationRecoveryHandler.kt @@ -0,0 +1,30 @@ +/* + * Wire + * Copyright (C) 2024 Wire Swiss GmbH + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ +package com.wire.kalium.logic.data.client + +import com.wire.kalium.logic.data.logout.LogoutReason + +/** + * Handles the migration error of a proteus client storage from CryptoBox to CoreCrypto. + * It will perform a logout, using [LogoutReason.MIGRATION_TO_CC_FAILED] as the reason. + * + * This achieves that the client data is cleared and the user is logged out without losing content. + */ +interface ProteusMigrationRecoveryHandler { + suspend fun clearClientData(clearLocalFiles: suspend () -> Unit) +} diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/session/SessionMapper.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/session/SessionMapper.kt index 8092e6f3e4b..ef9c8eee0de 100644 --- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/session/SessionMapper.kt +++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/session/SessionMapper.kt @@ -107,6 +107,7 @@ internal class SessionMapperImpl : SessionMapper { LogoutReason.REMOVED_CLIENT -> LogoutReasonEntity.REMOVED_CLIENT LogoutReason.DELETED_ACCOUNT -> LogoutReasonEntity.DELETED_ACCOUNT LogoutReason.SESSION_EXPIRED -> LogoutReasonEntity.SESSION_EXPIRED + LogoutReason.MIGRATION_TO_CC_FAILED -> LogoutReasonEntity.MIGRATION_TO_CC_FAILED } override fun toSsoIdEntity(ssoId: SsoId?): SsoIdEntity? = @@ -140,6 +141,7 @@ internal class SessionMapperImpl : SessionMapper { LogoutReasonEntity.REMOVED_CLIENT -> LogoutReason.REMOVED_CLIENT LogoutReasonEntity.DELETED_ACCOUNT -> LogoutReason.DELETED_ACCOUNT LogoutReasonEntity.SESSION_EXPIRED -> LogoutReason.SESSION_EXPIRED + LogoutReasonEntity.MIGRATION_TO_CC_FAILED -> LogoutReason.MIGRATION_TO_CC_FAILED } override fun fromEntityToProxyCredentialsDTO(proxyCredentialsEntity: ProxyCredentialsEntity): ProxyCredentialsDTO = diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt index af2eb6eb898..f29d98f0ce9 100644 --- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt +++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt @@ -51,6 +51,7 @@ import com.wire.kalium.logic.data.client.MLSClientProvider import com.wire.kalium.logic.data.client.MLSClientProviderImpl import com.wire.kalium.logic.data.client.ProteusClientProvider import com.wire.kalium.logic.data.client.ProteusClientProviderImpl +import com.wire.kalium.logic.data.client.ProteusMigrationRecoveryHandler import com.wire.kalium.logic.data.client.remote.ClientRemoteDataSource import com.wire.kalium.logic.data.client.remote.ClientRemoteRepository import com.wire.kalium.logic.data.connection.ConnectionDataSource @@ -189,6 +190,7 @@ import com.wire.kalium.logic.feature.client.IsAllowedToRegisterMLSClientUseCase import com.wire.kalium.logic.feature.client.IsAllowedToRegisterMLSClientUseCaseImpl import com.wire.kalium.logic.feature.client.MLSClientManager import com.wire.kalium.logic.feature.client.MLSClientManagerImpl +import com.wire.kalium.logic.feature.client.ProteusMigrationRecoveryHandlerImpl import com.wire.kalium.logic.feature.client.RegisterMLSClientUseCase import com.wire.kalium.logic.feature.client.RegisterMLSClientUseCaseImpl import com.wire.kalium.logic.feature.connection.ConnectionScope @@ -633,12 +635,17 @@ class UserSessionScope internal constructor( private val updateKeyingMaterialThresholdProvider: UpdateKeyingMaterialThresholdProvider get() = UpdateKeyingMaterialThresholdProviderImpl(kaliumConfigs) + private val proteusMigrationRecoveryHandler: ProteusMigrationRecoveryHandler by lazy { + ProteusMigrationRecoveryHandlerImpl(lazy { logout }) + } + val proteusClientProvider: ProteusClientProvider by lazy { ProteusClientProviderImpl( rootProteusPath = rootPathsProvider.rootProteusPath(userId), userId = userId, passphraseStorage = globalPreferences.passphraseStorage, - kaliumConfigs = kaliumConfigs + kaliumConfigs = kaliumConfigs, + proteusMigrationRecoveryHandler = proteusMigrationRecoveryHandler ) } @@ -936,11 +943,12 @@ class UserSessionScope internal constructor( kaliumFileSystem = kaliumFileSystem ) - private val eventGatherer: EventGatherer get() = EventGathererImpl( - eventRepository = eventRepository, - incrementalSyncRepository = incrementalSyncRepository, - logger = userScopedLogger - ) + private val eventGatherer: EventGatherer + get() = EventGathererImpl( + eventRepository = eventRepository, + incrementalSyncRepository = incrementalSyncRepository, + logger = userScopedLogger + ) private val eventProcessor: EventProcessor by lazy { EventProcessorImpl( diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/auth/LogoutUseCase.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/auth/LogoutUseCase.kt index d3be95db8b5..4609d23c225 100644 --- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/auth/LogoutUseCase.kt +++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/auth/LogoutUseCase.kt @@ -31,6 +31,7 @@ import com.wire.kalium.logic.feature.call.usecase.ObserveEstablishedCallsUseCase import com.wire.kalium.logic.feature.client.ClearClientDataUseCase import com.wire.kalium.logic.feature.session.DeregisterTokenUseCase import com.wire.kalium.logic.featureFlags.KaliumConfigs +import com.wire.kalium.logic.kaliumLogger import com.wire.kalium.logic.sync.UserSessionWorkScheduler import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.cancel @@ -106,6 +107,9 @@ internal class LogoutUseCaseImpl @Suppress("LongParameterList") constructor( } LogoutReason.SELF_SOFT_LOGOUT -> clearCurrentClientIdAndFirebaseTokenFlag() + LogoutReason.MIGRATION_TO_CC_FAILED -> prepareForCoreCryptoMigrationRecovery() + }.also { + kaliumLogger.withTextTag(TAG).d("Logout reason: $reason") } userConfigRepository.clearE2EISettings() @@ -115,6 +119,13 @@ internal class LogoutUseCaseImpl @Suppress("LongParameterList") constructor( }.let { if (waitUntilCompletes) it.join() else it } } + private suspend fun prepareForCoreCryptoMigrationRecovery() { + clearClientDataUseCase() + logoutRepository.clearClientRelatedLocalMetadata() + clientRepository.clearRetainedClientId() + pushTokenRepository.setUpdateFirebaseTokenFlag(true) + } + private suspend fun clearCurrentClientIdAndFirebaseTokenFlag() { clientRepository.clearCurrentClientId() clientRepository.clearNewClients() @@ -146,5 +157,6 @@ internal class LogoutUseCaseImpl @Suppress("LongParameterList") constructor( companion object { const val CLEAR_DATA_DELAY = 1000L + const val TAG = "LogoutUseCase" } } diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/client/ProteusMigrationRecoveryHandlerImpl.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/client/ProteusMigrationRecoveryHandlerImpl.kt new file mode 100644 index 00000000000..c2b7e42bfbb --- /dev/null +++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/client/ProteusMigrationRecoveryHandlerImpl.kt @@ -0,0 +1,52 @@ +/* + * Wire + * Copyright (C) 2024 Wire Swiss GmbH + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ +package com.wire.kalium.logic.feature.client + +import com.wire.kalium.logic.data.client.ProteusMigrationRecoveryHandler +import com.wire.kalium.logic.data.logout.LogoutReason +import com.wire.kalium.logic.feature.auth.LogoutUseCase +import com.wire.kalium.logic.kaliumLogger + +internal class ProteusMigrationRecoveryHandlerImpl( + private val logoutUseCase: Lazy +) : ProteusMigrationRecoveryHandler { + + /** + * Handles the migration error of a proteus client storage from CryptoBox to CoreCrypto. + * It will perform a logout, using [LogoutReason.MIGRATION_TO_CC_FAILED] as the reason. + * + * This achieves that the client data is cleared and the user is logged out without losing content. + */ + @Suppress("TooGenericExceptionCaught") + override suspend fun clearClientData(clearLocalFiles: suspend () -> Unit) { + try { + kaliumLogger.withTextTag(TAG).i("Starting the recovery from failed Proteus storage migration") + clearLocalFiles() + logoutUseCase.value(LogoutReason.MIGRATION_TO_CC_FAILED, true) + } catch (e: Exception) { + kaliumLogger.withTextTag(TAG).e("Fatal, error while clearing client data: $e") + throw e + } finally { + kaliumLogger.withTextTag(TAG).i("Finished the recovery from failed Proteus storage migration") + } + } + + private companion object { + const val TAG = "ProteusMigrationRecoveryHandler" + } +} diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/client/RegisterClientUseCase.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/client/RegisterClientUseCase.kt index 9b2a097ddc8..c92236cf238 100644 --- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/client/RegisterClientUseCase.kt +++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/client/RegisterClientUseCase.kt @@ -36,6 +36,7 @@ import com.wire.kalium.logic.functional.Either import com.wire.kalium.logic.functional.flatMap import com.wire.kalium.logic.functional.fold import com.wire.kalium.logic.functional.map +import com.wire.kalium.logic.kaliumLogger import com.wire.kalium.network.exceptions.AuthenticationCodeFailure import com.wire.kalium.network.exceptions.KaliumException import com.wire.kalium.network.exceptions.authenticationCodeFailure @@ -146,8 +147,9 @@ class RegisterClientUseCaseImpl @OptIn(DelicateKaliumApi::class) internal constr verificationCode, modelPostfix, ) - }.fold({ - RegisterClientResult.Failure.Generic(it) + }.fold({ error -> + kaliumLogger.withTextTag(TAG).e("There was an error while registering the client $error") + RegisterClientResult.Failure.Generic(error) }, { registerClientParam -> clientRepository.registerClient(registerClientParam) // todo? separate this in mls client usesCase register! separate everything @@ -241,4 +243,8 @@ class RegisterClientUseCaseImpl @OptIn(DelicateKaliumApi::class) internal constr } } } + + private companion object { + const val TAG = "RegisterClientUseCase" + } } diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/slow/SlowSyncCriteriaProvider.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/slow/SlowSyncCriteriaProvider.kt index 49f0567d0a1..fb9f20448c0 100644 --- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/slow/SlowSyncCriteriaProvider.kt +++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/slow/SlowSyncCriteriaProvider.kt @@ -116,6 +116,7 @@ internal class SlowSlowSyncCriteriaProviderImpl( LogoutReason.SESSION_EXPIRED -> "Logout: SESSION_EXPIRED" LogoutReason.REMOVED_CLIENT -> "Logout: REMOVED_CLIENT" LogoutReason.DELETED_ACCOUNT -> "Logout: DELETED_ACCOUNT" + LogoutReason.MIGRATION_TO_CC_FAILED -> "Logout: MIGRATION_TO_CC_FAILED" null -> null }?.let { MissingRequirement(it) } diff --git a/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/auth/LogoutUseCaseTest.kt b/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/auth/LogoutUseCaseTest.kt index c680b29fa84..f443b8a5914 100644 --- a/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/auth/LogoutUseCaseTest.kt +++ b/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/auth/LogoutUseCaseTest.kt @@ -51,7 +51,6 @@ import io.mockative.every import io.mockative.mock import io.mockative.once import io.mockative.time -import io.mockative.verify import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.test.TestScope @@ -342,6 +341,39 @@ class LogoutUseCaseTest { }.wasInvoked(exactly = calls.size.time) } + @Test + fun givenAMigrationFailedLogout_whenLoggingOut_thenExecuteAllRequiredActions() = runTest { + val reason = LogoutReason.MIGRATION_TO_CC_FAILED + val (arrangement, logoutUseCase) = Arrangement() + .withLogoutResult(Either.Right(Unit)) + .withSessionLogoutResult(Either.Right(Unit)) + .withAllValidSessionsResult(Either.Right(listOf(Arrangement.VALID_ACCOUNT_INFO))) + .withDeregisterTokenResult(DeregisterTokenUseCase.Result.Success) + .withClearCurrentClientIdResult(Either.Right(Unit)) + .withClearRetainedClientIdResult(Either.Right(Unit)) + .withUserSessionScopeGetResult(null) + .withFirebaseTokenUpdate() + .withNoOngoingCalls() + .arrange() + + logoutUseCase.invoke(reason) + arrangement.globalTestScope.advanceUntilIdle() + + coVerify { + arrangement.clearClientDataUseCase.invoke() + }.wasInvoked(exactly = once) + coVerify { + arrangement.logoutRepository.clearClientRelatedLocalMetadata() + }.wasInvoked(exactly = once) + + coVerify { + arrangement.clientRepository.clearRetainedClientId() + }.wasInvoked(exactly = once) + coVerify { + arrangement.pushTokenRepository.setUpdateFirebaseTokenFlag(eq(true)) + }.wasInvoked(exactly = once) + } + private class Arrangement { @Mock val logoutRepository = mock(LogoutRepository::class) diff --git a/logic/src/jvmTest/kotlin/com/wire/kalium/logic/data/client/ProteusClientProviderTest.kt b/logic/src/jvmTest/kotlin/com/wire/kalium/logic/data/client/ProteusClientProviderTest.kt new file mode 100644 index 00000000000..8d4c8caa2f5 --- /dev/null +++ b/logic/src/jvmTest/kotlin/com/wire/kalium/logic/data/client/ProteusClientProviderTest.kt @@ -0,0 +1,73 @@ +package com.wire.kalium.logic.data.client + +import com.wire.kalium.cryptography.exceptions.ProteusStorageMigrationException +import com.wire.kalium.logic.featureFlags.KaliumConfigs +import com.wire.kalium.logic.framework.TestUser +import com.wire.kalium.persistence.dbPassphrase.PassphraseStorage +import com.wire.kalium.util.FileUtil +import com.wire.kalium.util.KaliumDispatcherImpl +import io.mockative.Mock +import io.mockative.any +import io.mockative.coVerify +import io.mockative.every +import io.mockative.mock +import io.mockative.once +import kotlinx.coroutines.test.runTest +import org.junit.Test +import java.nio.file.Paths +import kotlin.io.path.createDirectory +import kotlin.io.path.createFile +import kotlin.io.path.exists + +class ProteusClientProviderTest { + + @Test + fun givenGettingOrCreatingAProteusClient_whenMigrationPerformedAndFails_thenCatchErrorAndStartRecovery() = runTest { + // given + val (arrangement, proteusClientProvider) = Arrangement() + .withCorruptedProteusStorage() + .arrange() + + // when - then + try { + proteusClientProvider.getOrCreate() + } catch (e: ProteusStorageMigrationException) { + coVerify { arrangement.proteusMigrationRecoveryHandler.clearClientData(any()) }.wasInvoked(once) + } + } + + private class Arrangement { + + @Mock + val passphraseStorage = mock(PassphraseStorage::class) + + @Mock + val proteusMigrationRecoveryHandler = mock(ProteusMigrationRecoveryHandler::class) + + init { + every { passphraseStorage.getPassphrase(any()) }.returns("passphrase") + } + + /** + * Corrupted because it's just an empty file called "prekeys". + * But nothing to migrate, this is just to test that we are calling recovery. + */ + fun withCorruptedProteusStorage() = apply { + val rootProteusPath = Paths.get("/tmp/rootProteusPath") + if (rootProteusPath.exists()) { + FileUtil.deleteDirectory(rootProteusPath.toString()) + } + rootProteusPath.createDirectory() + rootProteusPath.resolve("prekeys").createFile() + } + + fun arrange() = this to ProteusClientProviderImpl( + rootProteusPath = "/tmp/rootProteusPath", + userId = TestUser.USER_ID, + passphraseStorage = passphraseStorage, + kaliumConfigs = KaliumConfigs(encryptProteusStorage = true), + dispatcher = KaliumDispatcherImpl, + proteusMigrationRecoveryHandler = proteusMigrationRecoveryHandler + ) + } +} diff --git a/logic/src/jvmTest/kotlin/com/wire/kalium/logic/feature/client/ProteusMigrationRecoveryHandlerTest.kt b/logic/src/jvmTest/kotlin/com/wire/kalium/logic/feature/client/ProteusMigrationRecoveryHandlerTest.kt new file mode 100644 index 00000000000..7a52607adb6 --- /dev/null +++ b/logic/src/jvmTest/kotlin/com/wire/kalium/logic/feature/client/ProteusMigrationRecoveryHandlerTest.kt @@ -0,0 +1,36 @@ +package com.wire.kalium.logic.feature.client + +import com.wire.kalium.logic.data.logout.LogoutReason +import com.wire.kalium.logic.feature.auth.LogoutUseCase +import io.mockative.Mock +import io.mockative.coVerify +import io.mockative.mock +import io.mockative.once +import kotlinx.coroutines.test.runTest +import org.junit.Test + +class ProteusMigrationRecoveryHandlerTest { + + @Test + fun givenGettingOrCreatingAProteusClient_whenMigrationPerformedAndFails_thenCatchErrorAndStartRecovery() = runTest { + // given + val (arrangement, proteusMigrationRecoveryHandler) = Arrangement().arrange() + + // when + val clearLocalFiles: suspend () -> Unit = { } + proteusMigrationRecoveryHandler.clearClientData(clearLocalFiles) + + // then + coVerify { arrangement.logoutUseCase(LogoutReason.MIGRATION_TO_CC_FAILED, true) }.wasInvoked(once) + } + + private class Arrangement { + + @Mock + val logoutUseCase = mock(LogoutUseCase::class) + + fun arrange() = this to ProteusMigrationRecoveryHandlerImpl( + lazy { logoutUseCase } + ) + } +} diff --git a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/model/LogoutReason.kt b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/model/LogoutReason.kt index 6d0ed44cc61..dc306760bab 100644 --- a/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/model/LogoutReason.kt +++ b/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/model/LogoutReason.kt @@ -38,5 +38,10 @@ enum class LogoutReason { /** * Session Expired. */ - SESSION_EXPIRED; + SESSION_EXPIRED, + + /** + * The migration to CC failed. + */ + MIGRATION_TO_CC_FAILED } From a02f920b26324eaf187fa7bcb0fc48d128475a59 Mon Sep 17 00:00:00 2001 From: boris Date: Wed, 27 Nov 2024 18:45:01 +0200 Subject: [PATCH 2/2] feat: Move API V6 to supported (#3135) --- .../kotlin/com/wire/kalium/network/BackendMetaDataUtil.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/network/src/commonMain/kotlin/com/wire/kalium/network/BackendMetaDataUtil.kt b/network/src/commonMain/kotlin/com/wire/kalium/network/BackendMetaDataUtil.kt index ac9a4767514..be435578cf3 100644 --- a/network/src/commonMain/kotlin/com/wire/kalium/network/BackendMetaDataUtil.kt +++ b/network/src/commonMain/kotlin/com/wire/kalium/network/BackendMetaDataUtil.kt @@ -23,11 +23,11 @@ import com.wire.kalium.network.api.unbound.versioning.VersionInfoDTO // They are not truly constants as set is not a primitive type, yet are treated as one in this context @Suppress("MagicNumber") -val SupportedApiVersions = setOf(0, 1, 2, 4, 5) +val SupportedApiVersions = setOf(0, 1, 2, 4, 5, 6) // They are not truly constants as set is not a primitive type, yet are treated as one in this context @Suppress("MagicNumber") -val DevelopmentApiVersions = setOf(6, 7) +val DevelopmentApiVersions = setOf(7) // You can use scripts/generate_new_api_version.sh or gradle task network:generateNewApiVersion to // bump API version and generate all needed classes