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

fix up a few things with key verification

Browse source
This commit is contained in:
Sorunome 2020-06-06 13:38:19 +02:00
parent d4eabbb756
commit 060a772bfa
No known key found for this signature in database
GPG key ID: B19471D07FC9BE9C
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/encryption/encryption.dart
View file

@ -83,6 +83,10 @@ class Encryption {
// do this in the background // do this in the background
unawaited(keyVerificationManager.handleToDeviceEvent(event)); unawaited(keyVerificationManager.handleToDeviceEvent(event));
} }
if (event.type.startsWith('m.secret.')) {
// some ssss thing. We can do this in the background
unawaited(ssss.handleToDeviceEvent(event));
}
} }
Future<void> handleEventUpdate(EventUpdate update) async { Future<void> handleEventUpdate(EventUpdate update) async {

6
lib/encryption/key_verification_manager.dart
View file

@ -29,6 +29,7 @@ class KeyVerificationManager {
final Map<String, KeyVerification> _requests = {}; final Map<String, KeyVerification> _requests = {};
Future<void> cleanup() async { Future<void> cleanup() async {
Set<String> entriesToDispose = <String>{};
for (final entry in _requests.entries) { for (final entry in _requests.entries) {
var dispose = entry.value.canceled || var dispose = entry.value.canceled ||
entry.value.state == KeyVerificationState.done || entry.value.state == KeyVerificationState.done ||
@ -38,9 +39,12 @@ class KeyVerificationManager {
} }
if (dispose) { if (dispose) {
entry.value.dispose(); entry.value.dispose();
_requests.remove(entry.key); entriesToDispose.add(entry.key);
} }
} }
for (final k in entriesToDispose) {
_requests.remove(k);
}
} }
void addRequest(KeyVerification request) { void addRequest(KeyVerification request) {

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

@ -146,7 +146,6 @@ class KeyVerification {
this.onUpdate}) { this.onUpdate}) {
lastActivity = DateTime.now(); lastActivity = DateTime.now();
_deviceId ??= deviceId; _deviceId ??= deviceId;
print('Setting device id constructor: ' + _deviceId.toString());
} }
void dispose() { void dispose() {
@ -198,10 +197,10 @@ class KeyVerification {
[String eventId]) async { [String eventId]) async {
print('[Key Verification] Received type ${type}: ' + payload.toString()); print('[Key Verification] Received type ${type}: ' + payload.toString());
try { try {
var thisLastStep = lastStep;
switch (type) { switch (type) {
case 'm.key.verification.request': case 'm.key.verification.request':
_deviceId ??= payload['from_device']; _deviceId ??= payload['from_device'];
print('Setting device id request: ' + _deviceId.toString());
transactionId ??= eventId ?? payload['transaction_id']; transactionId ??= eventId ?? payload['transaction_id'];
// verify the timestamp // verify the timestamp
final now = DateTime.now(); final now = DateTime.now();
@ -231,6 +230,9 @@ class KeyVerification {
await cancel('m.unknown_method'); await cancel('m.unknown_method');
return; return;
} }
// as both parties can send a start, the last step being "ready" is race-condition prone
// as such, we better set it *before* we send our start
lastStep = type;
// TODO: Pick method? // TODO: Pick method?
method = _makeVerificationMethod(possibleMethods.first, this); method = _makeVerificationMethod(possibleMethods.first, this);
await method.sendStart(); await method.sendStart();
@ -238,7 +240,6 @@ class KeyVerification {
break; break;
case 'm.key.verification.start': case 'm.key.verification.start':
_deviceId ??= payload['from_device']; _deviceId ??= payload['from_device'];
print('Setting device id start: ' + _deviceId.toString());
transactionId ??= eventId ?? payload['transaction_id']; transactionId ??= eventId ?? payload['transaction_id'];
if (method != null) { if (method != null) {
// the other side sent us a start, even though we already sent one // the other side sent us a start, even though we already sent one
@ -253,7 +254,7 @@ class KeyVerification {
} else { } else {
// the other start won, let's hand off // the other start won, let's hand off
startedVerification = false; // it is now as if they started startedVerification = false; // it is now as if they started
lastStep = thisLastStep = lastStep =
'm.key.verification.request'; // we fake the last step 'm.key.verification.request'; // we fake the last step
method.dispose(); // in case anything got created already method.dispose(); // in case anything got created already
} }
@ -296,7 +297,9 @@ class KeyVerification {
await method.handlePayload(type, payload); await method.handlePayload(type, payload);
break; break;
} }
if (lastStep == thisLastStep) {
lastStep = type; lastStep = type;
}
} catch (err, stacktrace) { } catch (err, stacktrace) {
print('[Key Verification] An error occured: ' + err.toString()); print('[Key Verification] An error occured: ' + err.toString());
print(stacktrace); print(stacktrace);