Better handling of calling messages

2022-11-19 00:31:31 -08:00
parent a2f1b469ea
commit b26f60d2fc
2 changed files with 47 additions and 1 deletions
--- a/ts/textsecure/MessageReceiver.ts
+++ b/ts/textsecure/MessageReceiver.ts
@@ -2529,6 +2529,18 @@ export default class MessageReceiver
    logUnexpectedUrgentValue(envelope, 'callingMessage');

    this.removeFromCache(envelope);
+
+    if (
+      (envelope.source && this.isBlocked(envelope.source)) ||
+      (envelope.sourceUuid && this.isUuidBlocked(envelope.sourceUuid))
+    ) {
+      const logId = getEnvelopeId(envelope);
+
+      log.info(`${logId}: Dropping calling message from blocked sender`);
+      this.removeFromCache(envelope);
+      return;
+    }
+
    await window.Signal.Services.calling.handleCallingMessage(
      envelope,
      callingMessage