From 91ef39e4826aa8225e0d23e96e23298e1ab79634 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Tue, 22 Jan 2019 14:49:36 -0800
Subject: [PATCH] Ensure that blocked messages are dropped even after sealed
 sender

---
 libtextsecure/message_receiver.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index 8ff44571b..c84c817a1 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -725,6 +725,13 @@ MessageReceiver.prototype.extend({
                 return { isMe: true };
               }
 
+              if (this.isBlocked(sender.getName())) {
+                window.log.info(
+                  'Dropping blocked message after sealed sender decryption'
+                );
+                return { isBlocked: true };
+              }
+
               // Here we take this sender information and attach it back to the envelope
               //   to make the rest of the app work properly.
 
@@ -747,6 +754,13 @@ MessageReceiver.prototype.extend({
               if (sender) {
                 const originalSource = envelope.source;
 
+                if (this.isBlocked(sender.getName())) {
+                  window.log.info(
+                    'Dropping blocked message with error after sealed sender decryption'
+                  );
+                  return { isBlocked: true };
+                }
+
                 // eslint-disable-next-line no-param-reassign
                 envelope.source = sender.getName();
                 // eslint-disable-next-line no-param-reassign
@@ -769,8 +783,8 @@ MessageReceiver.prototype.extend({
 
     return promise
       .then(plaintext => {
-        const { isMe } = plaintext || {};
-        if (isMe) {
+        const { isMe, isBlocked } = plaintext || {};
+        if (isMe || isBlocked) {
           return this.removeFromCache(envelope);
         }