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

MessageReceiver: Drop blocked senders only after processing SKDMs

Browse source
This commit is contained in:
Scott Nonnenberg 2021-08-17 11:40:55 -07:00 • committed by GitHub
parent 5f3af9f123
commit 4a6d28e118
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

56
ts/textsecure/MessageReceiver.ts
View file

@ -290,16 +290,6 @@ export default class MessageReceiver
// fault, and we should handle them gracefully and tell the // fault, and we should handle them gracefully and tell the
// user they received an invalid message // user they received an invalid message
if (envelope.source && this.isBlocked(envelope.source)) {
request.respond(200, 'OK');
return;
}
if (envelope.sourceUuid && this.isUuidBlocked(envelope.sourceUuid)) {
request.respond(200, 'OK');
return;
}
this.decryptAndCache(envelope, plaintext, request); this.decryptAndCache(envelope, plaintext, request);
this.processedCount += 1; this.processedCount += 1;
} catch (e) { } catch (e) {
@ -937,7 +927,7 @@ export default class MessageReceiver
const task = createTaskWithTimeout(async (): Promise<DecryptResult> => { const task = createTaskWithTimeout(async (): Promise<DecryptResult> => {
const unsealedEnvelope = await this.unsealEnvelope(stores, envelope); const unsealedEnvelope = await this.unsealEnvelope(stores, envelope);
if (!unsealedEnvelope) { if (!unsealedEnvelope) {
// Envelope was dropped or sender is blocked // Envelope was dropped
return { envelope, plaintext: undefined }; return { envelope, plaintext: undefined };
} }
@ -1065,11 +1055,8 @@ export default class MessageReceiver
unsealedContent: messageContent, unsealedContent: messageContent,
}; };
const validationResult = await this.validateUnsealedEnvelope(newEnvelope); // This will throw if there's a problem
if (validationResult && validationResult.isBlocked) { this.validateUnsealedEnvelope(newEnvelope);
this.removeFromCache(envelope);
return undefined;
}
return newEnvelope; return newEnvelope;
} }
@ -1144,12 +1131,20 @@ export default class MessageReceiver
); );
} }
if (
(envelope.source && this.isBlocked(envelope.source)) ||
(envelope.sourceUuid && this.isUuidBlocked(envelope.sourceUuid))
) {
window.log.info(
'MessageReceiver.decryptEnvelope: Dropping message from blocked sender'
);
return { plaintext: undefined, envelope };
}
return { plaintext, envelope }; return { plaintext, envelope };
} }
private async validateUnsealedEnvelope( private validateUnsealedEnvelope(envelope: UnsealedEnvelope): void {
envelope: UnsealedEnvelope
): Promise<{ isBlocked: true } | void> {
const { unsealedContent: messageContent, certificate } = envelope; const { unsealedContent: messageContent, certificate } = envelope;
strictAssert( strictAssert(
messageContent !== undefined, messageContent !== undefined,
@ -1160,17 +1155,6 @@ export default class MessageReceiver
'Missing sender certificate for sealed sender message' 'Missing sender certificate for sealed sender message'
); );
if (
(envelope.source && this.isBlocked(envelope.source)) ||
(envelope.sourceUuid && this.isUuidBlocked(envelope.sourceUuid))
) {
window.log.info(
'MessageReceiver.validateUnsealedEnvelope: Dropping blocked message ' +
'after partial sealed sender decryption'
);
return { isBlocked: true };
}
if (!envelope.serverTimestamp) { if (!envelope.serverTimestamp) {
throw new Error( throw new Error(
'MessageReceiver.decryptSealedSender: ' + 'MessageReceiver.decryptSealedSender: ' +
@ -1486,7 +1470,7 @@ export default class MessageReceiver
const uuid = envelope.sourceUuid; const uuid = envelope.sourceUuid;
const deviceId = envelope.sourceDevice; const deviceId = envelope.sourceDevice;
// We don't do a light session reset if it's just a duplicated message // We don't do anything if it's just a duplicated message
if ( if (
error?.message?.includes && error?.message?.includes &&
error.message.includes('message with old counter') error.message.includes('message with old counter')
@ -1503,6 +1487,16 @@ export default class MessageReceiver
throw error; throw error;
} }
if (
(envelope.source && this.isBlocked(envelope.source)) ||
(envelope.sourceUuid && this.isUuidBlocked(envelope.sourceUuid))
) {
window.log.info(
'MessageReceiver.decrypt: Error from blocked sender; no further processing'
);
throw error;
}
if (uuid && deviceId) { if (uuid && deviceId) {
const { usmc } = envelope; const { usmc } = envelope;
const event = new DecryptionErrorEvent({ const event = new DecryptionErrorEvent({