rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always check master key when provided by verifying device

Browse Source
This commit is contained in:
Hugh Nimmo-Smith 2022-10-18 09:08:40 +01:00
parent f297117df2
commit a1d2944c32
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
View File

@ -165,21 +165,25 @@ class Rendezvous(
} }
verificationResponse.masterKey?.let { masterKeyFromVerifyingDevice -> verificationResponse.masterKey?.let { masterKeyFromVerifyingDevice ->
// check master key againt what the homeserver told us // verifying device provided us with a master key, so use it to check integrity
crypto.crossSigningService().getMyCrossSigningKeys()?.masterKey()?.let { localMasterKey ->
if (localMasterKey.unpaddedBase64PublicKey != masterKeyFromVerifyingDevice) {
Timber.tag(TAG).w("Master key from verifying device doesn't match: $masterKeyFromVerifyingDevice vs $localMasterKey")
// inform the other side
send(Payload(PayloadType.FINISH, outcome = Outcome.E2EE_SECURITY_ERROR))
throw RendezvousError("Master key from verifying device doesn't match", RendezvousFailureReason.E2EESecurityIssue)
}
// set other device as verified
Timber.tag(TAG).i("Setting device $verifyingDeviceId as verified")
crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, verifyingDeviceId)
Timber.tag(TAG).i("Setting master key as trusted") // see what the homeserver told us
crypto.crossSigningService().markMyMasterKeyAsTrusted() val localMasterKey = crypto.crossSigningService().getMyCrossSigningKeys()?.masterKey()
} ?: Timber.tag(TAG).w("No local master key so not verifying")
// n.b. if no local master key this is a problem, as well as it not matching
if (localMasterKey?.unpaddedBase64PublicKey != masterKeyFromVerifyingDevice) {
Timber.tag(TAG).w("Master key from verifying device doesn't match: $masterKeyFromVerifyingDevice vs $localMasterKey")
// inform the other side
send(Payload(PayloadType.FINISH, outcome = Outcome.E2EE_SECURITY_ERROR))
throw RendezvousError("Master key from verifying device doesn't match", RendezvousFailureReason.E2EESecurityIssue)
}
// set other device as verified
Timber.tag(TAG).i("Setting device $verifyingDeviceId as verified")
crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, verifyingDeviceId)
Timber.tag(TAG).i("Setting master key as trusted")
crypto.crossSigningService().markMyMasterKeyAsTrusted()
} ?: run { } ?: run {
// set other device as verified anyway // set other device as verified anyway
Timber.tag(TAG).i("Setting device $verifyingDeviceId as verified") Timber.tag(TAG).i("Setting device $verifyingDeviceId as verified")