Skip to content

Free, Open Source, Self-Hosted WhatsApp API Gateway

fix(engine): keep no text of a wwebjs message decrypted later

Yudhi Armyndharis2228481925ce
diff --git a/src/engine/adapters/wwebjs-message-changes.spec.ts b/src/engine/adapters/wwebjs-message-changes.spec.ts
index c7aaa83c9..290aad89c 100644
--- a/src/engine/adapters/wwebjs-message-changes.spec.ts
+++ b/src/engine/adapters/wwebjs-message-changes.spec.ts
@@ -1,4 +1,6 @@
import { EventEmitter } from 'events';
+import { setFlagsFromString } from 'v8';
+import { runInNewContext } from 'vm';
import { WAState, type Client } from 'whatsapp-web.js';
import type { Repository } from 'typeorm';
import { WhatsAppWebJsAdapter } from './whatsapp-web-js.adapter';
@@ -1241,4 +1243,26 @@ describe('changes kept while whatsapp-web.js processes a message (adapter level)
expect(order).toEqual(['edit c0 forgotten']);
});
+
+ it('keeps no text of the messages it remembers as decrypted in place', async () => {
+ // Process-wide: later suites in this jest worker also see a global gc in new vm contexts.
+ setFlagsFromString('--expose-gc');
+ const gc = runInNewContext('gc') as () => void;
+ const { client } = wire({ onMessage: () => undefined });
+ const MESSAGES = 256;
+ const LONGEST_TEXT = 65_536;
+ gc();
+ const before = process.memoryUsage().heapUsed;
+ for (let i = 0; i < MESSAGES; i++) {
+ ciphertextEvent(client, `c${i}`);
+ client.emit('message', {
+ ...incoming(`c${i}`, Buffer.alloc(LONGEST_TEXT, 97 + (i % 26)).toString('latin1')),
+ getContact: () => Promise.resolve(null),
+ });
+ }
+ await flush();
+ gc();
+
+ expect(process.memoryUsage().heapUsed - before).toBeLessThan((MESSAGES * LONGEST_TEXT) / 4);
+ });
});
diff --git a/src/engine/adapters/wwebjs-message-events.ts b/src/engine/adapters/wwebjs-message-events.ts
index d3ea108f9..fe2da65f9 100644
--- a/src/engine/adapters/wwebjs-message-events.ts
+++ b/src/engine/adapters/wwebjs-message-events.ts
@@ -1,3 +1,4 @@
+import { createHash } from 'crypto';
import { type Client, type Message, MessageTypes } from 'whatsapp-web.js';
import {
type InboundTicket,
@@ -152,19 +153,21 @@ export function registerWwebjsMessageEvents(client: Client, host: WwebjsEngineHo
// A message WhatsApp Web could not decrypt on arrival ("Waiting for this message") is decrypted in place later, and
// whatsapp-web.js delivers it from the update that fills in its text, which raises message_edit as well: no edit.
- // Kept by id until that change is seen: unset until the message is delivered, then the text it was delivered with.
+ // Kept by id until that change is seen: unset until the message is delivered, then a fingerprint of the text it was
+ // delivered with, so the entries kept hold no message text whatever its length.
const decryptedLater = new Map<string, string | undefined>();
+ const fingerprint = (text: string): string => createHash('sha256').update(text).digest('base64');
/** Whether a message_edit is the decryption of its message (see decryptedLater). Asked once per message. */
const isDecryption = (edit: EditedMessage): boolean => {
if (!decryptedLater.has(edit.messageId)) return false;
const delivered = decryptedLater.get(edit.messageId);
decryptedLater.delete(edit.messageId);
- return delivered === undefined || delivered === edit.body;
+ return delivered === undefined || delivered === fingerprint(edit.body);
};
const deliveredDecrypted = (message: IncomingMessage): void => {
- if (decryptedLater.has(message.id)) decryptedLater.set(message.id, message.body);
+ if (decryptedLater.has(message.id)) decryptedLater.set(message.id, fingerprint(message.body));
};
client.on('message_ciphertext', msg => {