From b4f7e1381d0f30b6368c72c4ffff683b7810e2f3 Mon Sep 17 00:00:00 2001 From: Valere Date: Fri, 30 Sep 2022 16:00:20 +0200 Subject: [PATCH] fix test post rebase --- .../crypto/crosssigning/XSigningTest.kt | 64 ++++++++----------- .../DefaultCrossSigningService.kt | 8 ++- 2 files changed, 35 insertions(+), 37 deletions(-) diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt index 1bf05b5190..c4fb896934 100644 --- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt +++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt @@ -18,7 +18,6 @@ package org.matrix.android.sdk.internal.crypto.crosssigning import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.LargeTest -import org.amshove.kluent.shouldBeEqualTo import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertNotNull @@ -34,7 +33,6 @@ import org.matrix.android.sdk.api.auth.UIABaseAuth import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor import org.matrix.android.sdk.api.auth.UserPasswordAuth import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse -import org.matrix.android.sdk.api.session.crypto.crosssigning.UserTrustResult import org.matrix.android.sdk.api.session.crypto.crosssigning.isCrossSignedVerified import org.matrix.android.sdk.api.session.crypto.crosssigning.isVerified import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo @@ -43,6 +41,7 @@ import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest import org.matrix.android.sdk.common.CommonTestHelper.Companion.runSessionTest import org.matrix.android.sdk.common.SessionTestParams import org.matrix.android.sdk.common.TestConstants +import timber.log.Timber import kotlin.coroutines.Continuation import kotlin.coroutines.resume @@ -231,14 +230,14 @@ class XSigningTest : InstrumentedTest { password = TestConstants.PASSWORD ) - testHelper.doSync { + testHelper.waitForCallback { aliceSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor { override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation) { promise.resume(aliceAuthParams) } }, it) } - testHelper.doSync { + testHelper.waitForCallback { bobSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor { override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation) { promise.resume(bobAuthParams) @@ -248,26 +247,27 @@ class XSigningTest : InstrumentedTest { cryptoTestHelper.verifySASCrossSign(aliceSession, bobSession, cryptoTestData.roomId) - testHelper.waitWithLatch { - testHelper.retryPeriodicallyWithLatch(it) { - aliceSession.cryptoService().crossSigningService().isUserTrusted(bobSession.myUserId) - } + testHelper.retryPeriodically { + aliceSession.cryptoService().crossSigningService().isUserTrusted(bobSession.myUserId) } - aliceSession.cryptoService().crossSigningService().checkUserTrust(bobSession.myUserId).let { - assertTrue(it is UserTrustResult.Success) + testHelper.retryPeriodically { + aliceSession.cryptoService().crossSigningService().checkUserTrust(bobSession.myUserId).isVerified() } + aliceSession.cryptoService() // Ensure also that bob device is trusted - aliceSession.cryptoService().getUserDevices(bobSession.myUserId).first().let { bobDeviceAlicePoc -> - bobDeviceAlicePoc.trustLevel!!.crossSigningVerified shouldBeEqualTo true + testHelper.retryPeriodically { + val deviceInfo = aliceSession.cryptoService().getUserDevices(bobSession.myUserId).firstOrNull() + Timber.v("#TEST device:${deviceInfo?.shortDebugString()} trust ${deviceInfo?.trustLevel}") + deviceInfo?.trustLevel?.crossSigningVerified == true } val currentBobMSK = aliceSession.cryptoService().crossSigningService() .getUserCrossSigningKeys(bobSession.myUserId)!! .masterKey()!!.unpaddedBase64PublicKey!! - testHelper.doSync { + testHelper.waitForCallback { bobSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor { override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation) { promise.resume(bobAuthParams) @@ -275,50 +275,42 @@ class XSigningTest : InstrumentedTest { }, it) } - testHelper.waitWithLatch { - testHelper.retryPeriodicallyWithLatch(it) { - val newBobMsk = aliceSession.cryptoService().crossSigningService() - .getUserCrossSigningKeys(bobSession.myUserId) - ?.masterKey()?.unpaddedBase64PublicKey - newBobMsk != null && newBobMsk != currentBobMSK - } + testHelper.retryPeriodically { + val newBobMsk = aliceSession.cryptoService().crossSigningService() + .getUserCrossSigningKeys(bobSession.myUserId) + ?.masterKey()?.unpaddedBase64PublicKey + newBobMsk != null && newBobMsk != currentBobMSK } // trick to force event to sync bobSession.roomService().getRoom(cryptoTestData.roomId)!!.typingService().userIsTyping() // assert that bob is not trusted anymore from alice s - testHelper.waitWithLatch { - testHelper.retryPeriodicallyWithLatch(it) { - val trust = aliceSession.cryptoService().crossSigningService().checkUserTrust(bobSession.myUserId) - !trust.isVerified() - } + testHelper.retryPeriodically { + val trust = aliceSession.cryptoService().crossSigningService().checkUserTrust(bobSession.myUserId) + !trust.isVerified() } // trick to force event to sync bobSession.roomService().getRoom(cryptoTestData.roomId)!!.typingService().userStopsTyping() bobSession.roomService().getRoom(cryptoTestData.roomId)!!.typingService().userIsTyping() - testHelper.waitWithLatch { - testHelper.retryPeriodicallyWithLatch(it) { - val info = aliceSession.cryptoService().crossSigningService().getUserCrossSigningKeys(bobSession.myUserId) - info?.wasTrustedOnce == true - } + testHelper.retryPeriodically { + val info = aliceSession.cryptoService().crossSigningService().getUserCrossSigningKeys(bobSession.myUserId) + info?.wasTrustedOnce == true } // trick to force event to sync bobSession.roomService().getRoom(cryptoTestData.roomId)!!.typingService().userStopsTyping() bobSession.roomService().getRoom(cryptoTestData.roomId)!!.typingService().userIsTyping() - testHelper.waitWithLatch { - testHelper.retryPeriodicallyWithLatch(it) { - !aliceSession.cryptoService().crossSigningService().isUserTrusted(bobSession.myUserId) - } + testHelper.retryPeriodically { + !aliceSession.cryptoService().crossSigningService().isUserTrusted(bobSession.myUserId) } // Ensure also that bob device are not trusted - aliceSession.cryptoService().getUserDevices(bobSession.myUserId).first().let { bobDeviceAlicePoc -> - bobDeviceAlicePoc.trustLevel!!.crossSigningVerified shouldBeEqualTo false + testHelper.retryPeriodically { + aliceSession.cryptoService().getUserDevices(bobSession.myUserId).first().trustLevel?.crossSigningVerified != true } } } diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt index 421dd8c244..f4796155c6 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt @@ -588,7 +588,6 @@ internal class DefaultCrossSigningService @Inject constructor( } cryptoStore.setUserKeysAsTrusted(otherUserId, true) - // TODO update local copy with new signature directly here? kind of local echo of trust? Timber.d("## CrossSigning - Upload signature of $otherUserId MSK signed by USK") val uploadQuery = UploadSignatureQueryBuilder() @@ -598,6 +597,13 @@ internal class DefaultCrossSigningService @Inject constructor( this.executionThread = TaskThread.CRYPTO this.callback = callback }.executeBy(taskExecutor) + + // Local echo for device cross trust, to avoid having to wait for a notification of key change + cryptoStore.getUserDeviceList(otherUserId)?.forEach { device -> + val updatedTrust = checkDeviceTrust(device.userId, device.deviceId, device.trustLevel?.isLocallyVerified() ?: false) + Timber.v("## CrossSigning - update trust for device ${device.deviceId} of user $otherUserId , verified=$updatedTrust") + cryptoStore.setDeviceTrust(device.userId, device.deviceId, updatedTrust.isCrossSignedVerified(), updatedTrust.isLocallyVerified()) + } } }