OfficialDakari
/
matrix-dart-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: accidental OTK uploads on internal fakeSync

This commit is contained in:
Nicolas Werner 2021-08-02 20:51:18 +02:00
parent 0d72d20cf9
commit 162436cc8d
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/encryption/olm_manager.dart
View File

@ -274,6 +274,14 @@ class OlmManager {
unusedFallbackKey = false; unusedFallbackKey = false;
} }
// fixup accidental too many uploads. We delete only one of them so that the server has time to update the counts and because we will get rate limited anyway.
if (keyCount > _olmAccount.max_number_of_one_time_keys()) {
final requestingKeysFrom = {
client.userID: {client.deviceID: 'signed_curve25519'}
};
client.claimKeys(requestingKeysFrom, timeout: 10000);
}
// Only upload keys if they are less than half of the max or we have no unused fallback key // Only upload keys if they are less than half of the max or we have no unused fallback key
if (keyCount < (_olmAccount.max_number_of_one_time_keys() / 2) || if (keyCount < (_olmAccount.max_number_of_one_time_keys() / 2) ||
!unusedFallbackKey) { !unusedFallbackKey) {

10
lib/src/client.dart
View File

@ -1091,7 +1091,7 @@ class Client extends MatrixApi {
} }
if (database != null) { if (database != null) {
_currentTransaction = database.transaction(() async { _currentTransaction = database.transaction(() async {
await handleSync(syncResp); await _handleSync(syncResp);
if (prevBatch != syncResp.nextBatch) { if (prevBatch != syncResp.nextBatch) {
await database.storePrevBatch(syncResp.nextBatch, id); await database.storePrevBatch(syncResp.nextBatch, id);
} }
@ -1099,7 +1099,7 @@ class Client extends MatrixApi {
await _currentTransaction; await _currentTransaction;
onSyncStatus.add(SyncStatusUpdate(SyncStatus.cleaningUp)); onSyncStatus.add(SyncStatusUpdate(SyncStatus.cleaningUp));
} else { } else {
await handleSync(syncResp); await _handleSync(syncResp);
} }
if (_disposed || _aborted) return; if (_disposed || _aborted) return;
if (prevBatch == null) { if (prevBatch == null) {
@ -1145,6 +1145,12 @@ class Client extends MatrixApi {
/// Use this method only for testing utilities! /// Use this method only for testing utilities!
Future<void> handleSync(SyncUpdate sync, {bool sortAtTheEnd = false}) async { Future<void> handleSync(SyncUpdate sync, {bool sortAtTheEnd = false}) async {
// ensure we don't upload keys because someone forgot to set a key count
sync.deviceOneTimeKeysCount ??= {'signed_curve25519': 100};
await _handleSync(sync, sortAtTheEnd: sortAtTheEnd);
}
Future<void> _handleSync(SyncUpdate sync, {bool sortAtTheEnd = false}) async {
if (sync.toDevice != null) { if (sync.toDevice != null) {
await _handleToDeviceEvents(sync.toDevice); await _handleToDeviceEvents(sync.toDevice);
} }