mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Add logging to other bulk key delete operations

Browse source
This commit is contained in:
Jamie Kyle 2023-10-20 09:39:28 -07:00 • committed by GitHub
parent 44136741c3
commit 0d2e0bfa28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

33
ts/SignalProtocolStore.ts
View file

@ -100,6 +100,20 @@ function validateIdentityKey(attrs: unknown): attrs is IdentityKeyType {
identityKeySchema.parse(attrs); identityKeySchema.parse(attrs);
return true; return true;
} }
/*
* Potentially hundreds of items, so we'll group together sequences,
* take the first 10 of the sequences, format them as ranges,
* and log that once.
* => '1-10, 12, 14-20'
*/
function formatKeys(keys: Array<number>): string {
return formatGroups(
groupWhile(keys.sort(), (a, b) => a + 1 === b).slice(0, 10),
'-',
', ',
String
);
}
type HasIdType<T> = { type HasIdType<T> = {
id: T; id: T;
@ -527,6 +541,7 @@ export class SignalProtocolStore extends EventEmitter {
const ids = keyIds.map(keyId => this._getKeyId(ourServiceId, keyId)); const ids = keyIds.map(keyId => this._getKeyId(ourServiceId, keyId));
log.info('removeKyberPreKeys: Removing kyber prekeys:', formatKeys(keyIds));
const changes = await window.Signal.Data.removeKyberPreKeyById(ids); const changes = await window.Signal.Data.removeKyberPreKeyById(ids);
log.info(`removeKyberPreKeys: Removed ${changes} kyber prekeys`); log.info(`removeKyberPreKeys: Removed ${changes} kyber prekeys`);
ids.forEach(id => { ids.forEach(id => {
@ -647,19 +662,7 @@ export class SignalProtocolStore extends EventEmitter {
const ids = keyIds.map(keyId => this._getKeyId(ourServiceId, keyId)); const ids = keyIds.map(keyId => this._getKeyId(ourServiceId, keyId));
log.info( log.info('removePreKeys: Removing prekeys:', formatKeys(keyIds));
'removePreKeys: Removing prekeys:',
// Potentially hundreds of items, so we'll group together sequences,
// take the first 10 of the sequences, format them as ranges,
// and log that once.
// => '1-10, 12, 14-20'
formatGroups(
groupWhile(keyIds.sort(), (a, b) => a + 1 === b).slice(0, 10),
'-',
', ',
String
)
);
const changes = await window.Signal.Data.removePreKeyById(ids); const changes = await window.Signal.Data.removePreKeyById(ids);
log.info(`removePreKeys: Removed ${changes} prekeys`); log.info(`removePreKeys: Removed ${changes} prekeys`);
@ -807,6 +810,10 @@ export class SignalProtocolStore extends EventEmitter {
const ids = keyIds.map(keyId => this._getKeyId(ourServiceId, keyId)); const ids = keyIds.map(keyId => this._getKeyId(ourServiceId, keyId));
log.info(
'removeSignedPreKeys: Removing signed prekeys:',
formatKeys(keyIds)
);
await window.Signal.Data.removeSignedPreKeyById(ids); await window.Signal.Data.removeSignedPreKeyById(ids);
ids.forEach(id => { ids.forEach(id => {
signedPreKeyCache.delete(id); signedPreKeyCache.delete(id);