inex/famedlysdk
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixes a racing condition in key verification

Browse source
This commit is contained in:
Sorunome 2020-07-20 06:31:05 +00:00 committed by Christian Pauly
parent 26510173de
commit 2214ac2d0a
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/encryption/utils/key_verification.dart
View file

@ -194,8 +194,14 @@ class KeyVerification {
} }
} }
bool _handlePayloadLock = false;
Future<void> handlePayload(String type, Map<String, dynamic> payload, Future<void> handlePayload(String type, Map<String, dynamic> payload,
[String eventId]) async { [String eventId]) async {
while (_handlePayloadLock) {
await Future.delayed(Duration(milliseconds: 50));
}
_handlePayloadLock = true;
print('[Key Verification] Received type ${type}: ' + payload.toString()); print('[Key Verification] Received type ${type}: ' + payload.toString());
try { try {
var thisLastStep = lastStep; var thisLastStep = lastStep;
@ -307,6 +313,8 @@ class KeyVerification {
if (deviceId != null) { if (deviceId != null) {
await cancel('m.invalid_message'); await cancel('m.invalid_message');
} }
} finally {
_handlePayloadLock = false;
} }
} }
@ -529,8 +537,8 @@ class KeyVerification {
Future<void> send(String type, Map<String, dynamic> payload) async { Future<void> send(String type, Map<String, dynamic> payload) async {
makePayload(payload); makePayload(payload);
print('[Key Verification] Sending type ${type}: ' + payload.toString()); print('[Key Verification] Sending type ${type}: ' + payload.toString());
print('[Key Verification] Sending to ${userId} device ${deviceId}');
if (room != null) { if (room != null) {
print('[Key Verification] Sending to ${userId} in room ${room.id}');
if (['m.key.verification.request'].contains(type)) { if (['m.key.verification.request'].contains(type)) {
payload['msgtype'] = type; payload['msgtype'] = type;
payload['to'] = userId; payload['to'] = userId;
@ -544,6 +552,7 @@ class KeyVerification {
encryption.keyVerificationManager.addRequest(this); encryption.keyVerificationManager.addRequest(this);
} }
} else { } else {
print('[Key Verification] Sending to ${userId} device ${deviceId}');
await client.sendToDevice( await client.sendToDevice(
[client.userDeviceKeys[userId].deviceKeys[deviceId]], type, payload); [client.userDeviceKeys[userId].deviceKeys[deviceId]], type, payload);
} }