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

Properly handle groupIds in incoming block sync

Browse source
This commit is contained in:
Scott Nonnenberg 2022-01-19 16:39:27 -08:00 • committed by GitHub
parent a802188f33
commit f1586578ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 58 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

34
ts/textsecure/MessageReceiver.ts
View file

@ -4,7 +4,7 @@
/* eslint-disable no-bitwise */
/* eslint-disable camelcase */
import { isNumber, map } from 'lodash';
import { isNumber } from 'lodash';
import PQueue from 'p-queue';
import { v4 as getGuid } from 'uuid';
@ -2626,24 +2626,40 @@ export default class MessageReceiver
envelope: ProcessedEnvelope,
blocked: Proto.SyncMessage.IBlocked
): Promise<void> {
log.info('Setting these numbers as blocked:', blocked.numbers);
if (blocked.numbers) {
log.info('handleBlocked: Blocking these numbers:', blocked.numbers);
await this.storage.put('blocked', blocked.numbers);
}
if (blocked.uuids) {
const uuids = blocked.uuids.map((uuid, index) => {
return normalizeUuid(uuid, `handleBlocked.uuids.${index}`);
});
log.info('Setting these uuids as blocked:', uuids);
log.info('handleBlocked: Blocking these uuids:', uuids);
await this.storage.put('blocked-uuids', uuids);
}
const groupIds = map(blocked.groupIds, groupId => Bytes.toBinary(groupId));
log.info(
'Setting these groups as blocked:',
groupIds.map(groupId => `group(${groupId})`)
);
await this.storage.put('blocked-groups', groupIds);
if (blocked.groupIds) {
const groupV1Ids: Array<string> = [];
const groupIds: Array<string> = [];
blocked.groupIds.forEach(groupId => {
if (groupId.byteLength === GROUPV1_ID_LENGTH) {
groupV1Ids.push(Bytes.toBinary(groupId));
groupIds.push(this.deriveGroupV2FromV1(groupId));
} else if (groupId.byteLength === GROUPV2_ID_LENGTH) {
groupIds.push(Bytes.toBase64(groupId));
} else {
log.error('handleBlocked: Received invalid groupId value');
}
});
log.info(
'handleBlocked: Blocking these groups - v2:',
groupIds.map(groupId => `groupv2(${groupId})`),
'v1:',
groupV1Ids.map(groupId => `group(${groupId})`)
);
await this.storage.put('blocked-groups', [...groupIds, ...groupV1Ids]);
}
this.removeFromCache(envelope);
}