crypto: Remove the requestRoomKeyForEvent method
This method doesn't seem to be used anywhere, only a single tests seems to call it. The funcionality has been moved to the rust-sdk and tested there.
This commit is contained in:
Damir Jelić
parent
515c9be2d9
commit
981e6b65b0
@ -66,139 +66,6 @@ class KeyShareTests : InstrumentedTest {
|
|||||||
private val mTestHelper = CommonTestHelper(context())
|
private val mTestHelper = CommonTestHelper(context())
|
||||||
private val mCryptoTestHelper = CryptoTestHelper(mTestHelper)
|
private val mCryptoTestHelper = CryptoTestHelper(mTestHelper)
|
||||||
|
|
||||||
@Test
|
|
||||||
fun test_DoNotSelfShareIfNotTrusted() {
|
|
||||||
val aliceSession = mTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
|
|
||||||
|
|
||||||
// Create an encrypted room and add a message
|
|
||||||
val roomId = mTestHelper.doSync<String> {
|
|
||||||
aliceSession.createRoom(
|
|
||||||
CreateRoomParams().apply {
|
|
||||||
visibility = RoomDirectoryVisibility.PRIVATE
|
|
||||||
enableEncryption()
|
|
||||||
},
|
|
||||||
it
|
|
||||||
)
|
|
||||||
}
|
|
||||||
val room = aliceSession.getRoom(roomId)
|
|
||||||
assertNotNull(room)
|
|
||||||
Thread.sleep(4_000)
|
|
||||||
assertTrue(room?.isEncrypted() == true)
|
|
||||||
val sentEventId = mTestHelper.sendTextMessage(room!!, "My Message", 1).first().eventId
|
|
||||||
|
|
||||||
// Open a new sessionx
|
|
||||||
|
|
||||||
val aliceSession2 = mTestHelper.logIntoAccount(aliceSession.myUserId, SessionTestParams(true))
|
|
||||||
|
|
||||||
val roomSecondSessionPOV = aliceSession2.getRoom(roomId)
|
|
||||||
|
|
||||||
val receivedEvent = roomSecondSessionPOV?.getTimeLineEvent(sentEventId)
|
|
||||||
assertNotNull(receivedEvent)
|
|
||||||
assert(receivedEvent!!.isEncrypted())
|
|
||||||
|
|
||||||
try {
|
|
||||||
aliceSession2.cryptoService().decryptEvent(receivedEvent.root, "foo")
|
|
||||||
fail("should fail")
|
|
||||||
} catch (failure: Throwable) {
|
|
||||||
}
|
|
||||||
|
|
||||||
val outgoingRequestsBefore = aliceSession2.cryptoService().getOutgoingRoomKeyRequests()
|
|
||||||
// Try to request
|
|
||||||
aliceSession2.cryptoService().requestRoomKeyForEvent(receivedEvent.root)
|
|
||||||
|
|
||||||
val waitLatch = CountDownLatch(1)
|
|
||||||
val eventMegolmSessionId = receivedEvent.root.content.toModel<EncryptedEventContent>()?.sessionId
|
|
||||||
|
|
||||||
var outGoingRequestId: String? = null
|
|
||||||
|
|
||||||
mTestHelper.retryPeriodicallyWithLatch(waitLatch) {
|
|
||||||
aliceSession2.cryptoService().getOutgoingRoomKeyRequests()
|
|
||||||
.filter { req ->
|
|
||||||
// filter out request that was known before
|
|
||||||
!outgoingRequestsBefore.any { req.requestId == it.requestId }
|
|
||||||
}
|
|
||||||
.let {
|
|
||||||
val outgoing = it.firstOrNull { it.sessionId == eventMegolmSessionId }
|
|
||||||
outGoingRequestId = outgoing?.requestId
|
|
||||||
outgoing != null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
mTestHelper.await(waitLatch)
|
|
||||||
|
|
||||||
Log.v("TEST", "=======> Outgoing requet Id is $outGoingRequestId")
|
|
||||||
|
|
||||||
val outgoingRequestAfter = aliceSession2.cryptoService().getOutgoingRoomKeyRequests()
|
|
||||||
|
|
||||||
// We should have a new request
|
|
||||||
Assert.assertTrue(outgoingRequestAfter.size > outgoingRequestsBefore.size)
|
|
||||||
Assert.assertNotNull(outgoingRequestAfter.first { it.sessionId == eventMegolmSessionId })
|
|
||||||
|
|
||||||
// The first session should see an incoming request
|
|
||||||
// the request should be refused, because the device is not trusted
|
|
||||||
mTestHelper.waitWithLatch { latch ->
|
|
||||||
mTestHelper.retryPeriodicallyWithLatch(latch) {
|
|
||||||
// DEBUG LOGS
|
|
||||||
aliceSession.cryptoService().getIncomingRoomKeyRequests().let {
|
|
||||||
Log.v("TEST", "Incoming request Session 1 (looking for $outGoingRequestId)")
|
|
||||||
Log.v("TEST", "=========================")
|
|
||||||
it.forEach { keyRequest ->
|
|
||||||
Log.v("TEST", "[ts${keyRequest.localCreationTimestamp}] requestId ${keyRequest.requestId}, for sessionId ${keyRequest.requestBody?.sessionId} is ${keyRequest.state}")
|
|
||||||
}
|
|
||||||
Log.v("TEST", "=========================")
|
|
||||||
}
|
|
||||||
|
|
||||||
val incoming = aliceSession.cryptoService().getIncomingRoomKeyRequests().firstOrNull { it.requestId == outGoingRequestId }
|
|
||||||
incoming?.state == GossipingRequestState.REJECTED
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
aliceSession2.cryptoService().decryptEvent(receivedEvent.root, "foo")
|
|
||||||
fail("should fail")
|
|
||||||
} catch (failure: Throwable) {
|
|
||||||
}
|
|
||||||
|
|
||||||
// Mark the device as trusted
|
|
||||||
aliceSession.cryptoService().setDeviceVerification(DeviceTrustLevel(crossSigningVerified = false, locallyVerified = true), aliceSession.myUserId,
|
|
||||||
aliceSession2.sessionParams.deviceId ?: "")
|
|
||||||
|
|
||||||
// Re request
|
|
||||||
aliceSession2.cryptoService().reRequestRoomKeyForEvent(receivedEvent.root)
|
|
||||||
|
|
||||||
mTestHelper.waitWithLatch { latch ->
|
|
||||||
mTestHelper.retryPeriodicallyWithLatch(latch) {
|
|
||||||
aliceSession.cryptoService().getIncomingRoomKeyRequests().let {
|
|
||||||
Log.v("TEST", "Incoming request Session 1")
|
|
||||||
Log.v("TEST", "=========================")
|
|
||||||
it.forEach {
|
|
||||||
Log.v("TEST", "requestId ${it.requestId}, for sessionId ${it.requestBody?.sessionId} is ${it.state}")
|
|
||||||
}
|
|
||||||
Log.v("TEST", "=========================")
|
|
||||||
|
|
||||||
it.any { it.requestBody?.sessionId == eventMegolmSessionId && it.state == GossipingRequestState.ACCEPTED }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Thread.sleep(6_000)
|
|
||||||
mTestHelper.waitWithLatch { latch ->
|
|
||||||
mTestHelper.retryPeriodicallyWithLatch(latch) {
|
|
||||||
aliceSession2.cryptoService().getOutgoingRoomKeyRequests().let {
|
|
||||||
it.any { it.requestBody?.sessionId == eventMegolmSessionId && it.state == OutgoingGossipingRequestState.CANCELLED }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
aliceSession2.cryptoService().decryptEvent(receivedEvent.root, "foo")
|
|
||||||
} catch (failure: Throwable) {
|
|
||||||
fail("should have been able to decrypt")
|
|
||||||
}
|
|
||||||
|
|
||||||
mTestHelper.signOutAndClose(aliceSession)
|
|
||||||
mTestHelper.signOutAndClose(aliceSession2)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun test_ShareSSSSSecret() {
|
fun test_ShareSSSSSecret() {
|
||||||
val aliceSession1 = mTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
|
val aliceSession1 = mTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
|
||||||
|
|||||||
@ -92,8 +92,6 @@ interface CryptoService {
|
|||||||
|
|
||||||
fun getDeviceInfo(userId: String, deviceId: String?): CryptoDeviceInfo?
|
fun getDeviceInfo(userId: String, deviceId: String?): CryptoDeviceInfo?
|
||||||
|
|
||||||
fun requestRoomKeyForEvent(event: Event)
|
|
||||||
|
|
||||||
fun reRequestRoomKeyForEvent(event: Event)
|
fun reRequestRoomKeyForEvent(event: Event)
|
||||||
|
|
||||||
fun cancelRoomKeyRequest(requestBody: RoomKeyRequestBody)
|
fun cancelRoomKeyRequest(requestBody: RoomKeyRequestBody)
|
||||||
|
|||||||
@ -1191,24 +1191,6 @@ internal class DefaultCryptoService @Inject constructor(
|
|||||||
outgoingGossipingRequestManager.resendRoomKeyRequest(requestBody)
|
outgoingGossipingRequestManager.resendRoomKeyRequest(requestBody)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun requestRoomKeyForEvent(event: Event) {
|
|
||||||
val wireContent = event.content.toModel<EncryptedEventContent>() ?: return Unit.also {
|
|
||||||
Timber.e("## CRYPTO | requestRoomKeyForEvent Failed to request key, null content eventId: ${event.eventId}")
|
|
||||||
}
|
|
||||||
|
|
||||||
cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
|
|
||||||
// if (!isStarted()) {
|
|
||||||
// Timber.v("## CRYPTO | requestRoomKeyForEvent() : wait after e2e init")
|
|
||||||
// internalStart(false)
|
|
||||||
// }
|
|
||||||
roomDecryptorProvider
|
|
||||||
.getOrCreateRoomDecryptor(event.roomId, wireContent.algorithm)
|
|
||||||
?.requestKeysForEvent(event, false) ?: run {
|
|
||||||
Timber.v("## CRYPTO | requestRoomKeyForEvent() : No room decryptor for roomId:${event.roomId} algorithm:${wireContent.algorithm}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add a GossipingRequestListener listener.
|
* Add a GossipingRequestListener listener.
|
||||||
*
|
*
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user