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

handleBlocked: Continue on if we receive non-ACI

Browse source
This commit is contained in:
Scott Nonnenberg 2024-10-30 01:21:13 +10:00 • committed by GitHub
parent 85a7fc64bc
commit 7548e2adc2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ts/textsecure/MessageReceiver.ts
View file

@ -3881,9 +3881,19 @@ export default class MessageReceiver
}
if (blocked.acis) {
const previous = this.storage.get('blocked-uuids', []);
const acis = blocked.acis.map((aci, index) => {
return normalizeAci(aci, `handleBlocked.acis.${index}`);
});
const acis = blocked.acis
.map((aci, index) => {
try {
return normalizeAci(aci, `handleBlocked.acis.${index}`);
} catch (error) {
log.warn(
`${logId}: ACI ${aci} was malformed`,
Errors.toLogFormat(error)
);
return undefined;
}
})
.filter(isNotNil);
const { added, removed } = diffArraysAsSets(previous, acis);
if (added.length) {

5
ts/util/normalizeAci.ts
View file

@ -29,7 +29,10 @@ export function normalizeAci(
}
const result = rawAci.toLowerCase();
strictAssert(!result.startsWith('pni:'), 'ACI should not start with PNI:');
strictAssert(
!result.startsWith('pni:'),
`ACI should not start with 'PNI:' in ${context}`
);
if (!isAciString(result)) {
logger.warn(