Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-30 15:50:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

crypto: Introduce some locks for some of our e2ee operations

Browse Source
This commit is contained in:
Damir Jelić 2021-04-09 12:42:22 +02:00
parent 8692f05e34
commit 74a1c226a4
1 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
View File

@ -24,6 +24,7 @@ import com.squareup.moshi.Types
import dagger.Lazy
import java.io.File
import java.util.concurrent.atomic.AtomicBoolean
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
import kotlin.jvm.Throws
import kotlin.math.max
@ -32,6 +33,8 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.cancelChildren
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import kotlinx.coroutines.withContext
import org.matrix.android.sdk.api.MatrixCallback
import org.matrix.android.sdk.api.NoOpMatrixCallback
@ -152,6 +155,11 @@ internal class DefaultCryptoService @Inject constructor(
private var olmMachine: OlmMachine? = null
private val deviceObserver: DeviceUpdateObserver = DeviceUpdateObserver()
// Locks for some of our operations
private val keyClaimLock: Mutex = Mutex()
private val outgointRequestsLock: Mutex = Mutex()
private val roomKeyShareLocks: ConcurrentHashMap<String, Mutex> = ConcurrentHashMap()
suspend fun onStateEvent(roomId: String, event: Event) {
when (event.getClearType()) {
EventType.STATE_ROOM_ENCRYPTION -> onRoomEncryptionEvent(roomId, event)
@ -650,9 +658,8 @@ internal class DefaultCryptoService @Inject constructor(
}
private suspend fun preshareGroupSession(roomId: String, roomMembers: List<String>) {
// TODO this needs to be locked per room
keyClaimLock.withLock {
val request = olmMachine!!.getMissingSessions(roomMembers)
if (request != null) {
// This request can only be a keys claim request.
when (request) {
@ -661,8 +668,13 @@ internal class DefaultCryptoService @Inject constructor(
}
}
}
}
val keyShareLock = roomKeyShareLocks.getOrDefault(roomId, Mutex())
keyShareLock.withLock {
for (toDeviceRequest in olmMachine!!.shareGroupSession(roomId, roomMembers)) {
// TODO these requests should be sent out in parallel
// This request can only be a to-device request.
when (toDeviceRequest) {
is Request.ToDevice -> {
@ -671,6 +683,7 @@ internal class DefaultCryptoService @Inject constructor(
}
}
}
}
private suspend fun encrypt(roomId: String, eventType: String, content: Content): Content {
return olmMachine!!.encrypt(roomId, eventType, content)
@ -699,7 +712,6 @@ internal class DefaultCryptoService @Inject constructor(
}
private suspend fun queryKeys(outgoingRequest: Request.KeysQuery) {
Timber.v("HELLO KEYS QUERY REQUEST ${outgoingRequest.users}")
val params = DownloadKeysForUsersTask.Params(outgoingRequest.users, null)
try {
@ -729,7 +741,6 @@ internal class DefaultCryptoService @Inject constructor(
}
private suspend fun claimKeys(request: Request.KeysClaim) {
// TODO this needs to be locked per call
val claimParams = ClaimOneTimeKeysForUsersDeviceTask.Params(request.oneTimeKeys)
val response = oneTimeKeysForUsersDeviceTask.execute(claimParams)
val adapter = MoshiProvider
@ -741,7 +752,7 @@ internal class DefaultCryptoService @Inject constructor(
}
private suspend fun sendOutgoingRequests() {
// TODO this needs to be locked per call
outgointRequestsLock.withLock {
// TODO these requests should be sent out in parallel
for (outgoingRequest in olmMachine!!.outgoingRequests()) {
when (outgoingRequest) {
@ -757,6 +768,7 @@ internal class DefaultCryptoService @Inject constructor(
}
}
}
}
/**
* Export the crypto keys