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

Check for duplicate and send delivery receipts in per-convo queue

Browse source
This commit is contained in:
Scott Nonnenberg 2019-12-13 13:25:36 -08:00
parent 5f58be1a29
commit 3aba4d0d06
2 changed files with 47 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
js/background.js
View file

@ -17,11 +17,11 @@
'use strict';
const eventHandlerQueue = new window.PQueue({ concurrency: 1 });
const deliveryReceiptQueue = new window.PQueue({
Whisper.deliveryReceiptQueue = new window.PQueue({
concurrency: 1,
});
deliveryReceiptQueue.pause();
const deliveryReceiptBatcher = window.Signal.Util.createBatcher({
Whisper.deliveryReceiptQueue.pause();
Whisper.deliveryReceiptBatcher = window.Signal.Util.createBatcher({
wait: 500,
maxSize: 500,
processBatch: async items => {
@ -1481,7 +1481,7 @@
serverTrustRoot: window.getServerTrustRoot(),
};
deliveryReceiptQueue.pause(); // avoid flood of delivery receipts until we catch up
Whisper.deliveryReceiptQueue.pause(); // avoid flood of delivery receipts until we catch up
Whisper.Notifications.disable(); // avoid notification flood until empty
// initialize the socket and start listening for messages
@ -1669,7 +1669,7 @@
}
}, 500);
deliveryReceiptQueue.start();
Whisper.deliveryReceiptQueue.start();
Whisper.Notifications.enable();
}
function onReconnect() {
@ -1677,7 +1677,7 @@
// scenarios where we're coming back from sleep, we can get offline/online events
// very fast, and it looks like a network blip. But we need to suppress
// notifications in these scenarios too. So we listen for 'reconnect' events.
deliveryReceiptQueue.pause();
Whisper.deliveryReceiptQueue.pause();
Whisper.Notifications.disable();
}
@ -2028,21 +2028,6 @@
return;
}
const isDuplicate = await isMessageDuplicate({
source: data.source,
sourceDevice: data.sourceDevice,
sent_at: data.timestamp,
});
if (isDuplicate) {
window.log.warn(
'Received duplicate message',
`${data.source}.${data.sourceDevice} ${data.timestamp}`
);
confirm();
return;
}
// We do this after the duplicate check because it might send a delivery receipt
const message = await initIncomingMessage(data);
const ourNumber = textsecure.storage.user.getNumber();
@ -2219,15 +2204,8 @@
}
}
async function isMessageDuplicate(data) {
const result = await getExistingMessage(data);
return Boolean(result);
}
async function initIncomingMessage(data, options = {}) {
const { isError } = options;
const message = new Whisper.Message({
async function initIncomingMessage(data) {
return new Whisper.Message({
source: data.source,
sourceDevice: data.sourceDevice,
sent_at: data.timestamp,
@ -2237,24 +2215,6 @@
type: 'incoming',
unread: 1,
});
// If we don't return early here, we can get into infinite error loops. So, no
// delivery receipts for sealed sender errors.
if (isError || !data.unidentifiedDeliveryReceived) {
return message;
}
// Note: We both queue and batch because we want to wait until we are done processing
// incoming messages to start sending outgoing delivery receipts. The queue can be
// paused easily.
deliveryReceiptQueue.add(() => {
deliveryReceiptBatcher.add({
source: data.source,
timestamp: data.timestamp,
});
});
return message;
}
async function unlinkAndDisconnect() {
@ -2350,15 +2310,7 @@
return;
}
const envelope = ev.proto;
const message = await initIncomingMessage(envelope, { isError: true });
const isDuplicate = await isMessageDuplicate(message.attributes);
if (isDuplicate) {
ev.confirm();
window.log.warn(
`Got duplicate error for message ${message.idForLogging()}`
);
return;
}
const message = await initIncomingMessage(envelope);
const conversationId = message.get('conversationId');
const conversation = await ConversationController.getOrCreateAndWait(
@ -2368,6 +2320,15 @@
// This matches the queueing behavior used in Message.handleDataMessage
conversation.queueJob(async () => {
const existingMessage = await getExistingMessage(message.attributes);
if (existingMessage) {
ev.confirm();
window.log.warn(
`Got duplicate error for message ${message.idForLogging()}`
);
return;
}
const model = new Whisper.Message({
...message.attributes,
id: window.getGuid(),

30
js/models/messages.js
View file

@ -38,7 +38,7 @@
} = window.Signal.Stickers;
const { GoogleChrome } = window.Signal.Util;
const { addStickerPackReference } = window.Signal.Data;
const { addStickerPackReference, getMessageBySender } = window.Signal.Data;
const { bytesFromString } = window.Signal.Crypto;
window.AccountCache = Object.create(null);
@ -1836,6 +1836,34 @@
window.log.info(
`Starting handleDataMessage for message ${message.idForLogging()} in conversation ${conversation.idForLogging()}`
);
// First, check for duplicates. If we find one, stop processing here.
const existingMessage = await getMessageBySender(this.attributes, {
Message: Whisper.Message,
});
if (existingMessage) {
window.log.warn('Received duplicate message', this.idForLogging());
confirm();
return;
}
// Send delivery receipts, but only for incoming sealed sender messages
if (
type === 'incoming' &&
this.get('unidentifiedDeliveryReceived') &&
!this.hasErrors()
) {
// Note: We both queue and batch because we want to wait until we are done
// processing incoming messages to start sending outgoing delivery receipts.
// The queue can be paused easily.
Whisper.deliveryReceiptQueue.add(() => {
Whisper.deliveryReceiptBatcher.add({
source,
timestamp: this.get('sent_at'),
});
});
}
const withQuoteReference = await this.copyFromQuotedMessage(
initialMessage
);