Put safeguards around Recipient creation in the IdentityStore.

signalapp · Dec 5, 2019 · 5e2a4fb · 5e2a4fb
1 parent a16242b
commit 5e2a4fb
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 18 deletions.
diff --git a/src/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java b/src/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java
@@ -92,30 +92,44 @@ public boolean saveIdentity(SignalProtocolAddress address, IdentityKey identityK
   @Override
   public boolean isTrustedIdentity(SignalProtocolAddress address, IdentityKey identityKey, Direction direction) {
     synchronized (LOCK) {
-      IdentityDatabase identityDatabase = DatabaseFactory.getIdentityDatabase(context);
-      RecipientId      ourRecipientId   = Recipient.self().getId();
-      RecipientId      theirRecipientId = Recipient.external(context, address.getName()).getId();
+      if (DatabaseFactory.getRecipientDatabase(context).containsPhoneOrUuid(address.getName())) {
+        IdentityDatabase identityDatabase = DatabaseFactory.getIdentityDatabase(context);
+        RecipientId      ourRecipientId   = Recipient.self().getId();
+        RecipientId      theirRecipientId = Recipient.external(context, address.getName()).getId();
 
-      if (ourRecipientId.equals(theirRecipientId)) {
-        return identityKey.equals(IdentityKeyUtil.getIdentityKey(context));
-      }
+        if (ourRecipientId.equals(theirRecipientId)) {
+          return identityKey.equals(IdentityKeyUtil.getIdentityKey(context));
+        }
 
-      switch (direction) {
-        case SENDING:   return isTrustedForSending(identityKey, identityDatabase.getIdentity(theirRecipientId));
-        case RECEIVING: return true;
-        default:        throw new AssertionError("Unknown direction: " + direction);
+        switch (direction) {
+          case SENDING:   return isTrustedForSending(identityKey, identityDatabase.getIdentity(theirRecipientId));
+          case RECEIVING: return true;
+          default:        throw new AssertionError("Unknown direction: " + direction);
+        }
+      } else {
+        Log.w(TAG, "Tried to check if identity is trusted for " + address.getName() + ", but no matching recipient existed!");
+        switch (direction) {
+          case SENDING:   return false;
+          case RECEIVING: return true;
+          default:        throw new AssertionError("Unknown direction: " + direction);
+        }
       }
     }
   }
 
   @Override
   public IdentityKey getIdentity(SignalProtocolAddress address) {
-    RecipientId              recipientId = Recipient.external(context, address.getName()).getId();
-    Optional<IdentityRecord> record      = DatabaseFactory.getIdentityDatabase(context).getIdentity(recipientId);
-
-    if (record.isPresent()) {
-      return record.get().getIdentityKey();
+    if (DatabaseFactory.getRecipientDatabase(context).containsPhoneOrUuid(address.getName())) {
+      RecipientId              recipientId = Recipient.external(context, address.getName()).getId();
+      Optional<IdentityRecord> record      = DatabaseFactory.getIdentityDatabase(context).getIdentity(recipientId);
+
+      if (record.isPresent()) {
+        return record.get().getIdentityKey();
+      } else {
+        return null;
+      }
     } else {
+      Log.w(TAG, "Tried to get identity for " + address.getName() + ", but no matching recipient existed!");
       return null;
     }
   }

diff --git a/src/org/thoughtcrime/securesms/database/RecipientDatabase.java b/src/org/thoughtcrime/securesms/database/RecipientDatabase.java
@@ -8,7 +8,6 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
 
 import com.annimon.stream.Stream;
 import com.google.android.gms.common.util.ArrayUtils;
@@ -39,7 +38,6 @@
 
 import java.io.Closeable;
 import java.io.IOException;
-import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;

diff --git a/...me/securesms/database/SqliteUtilTest.java → ...crime/securesms/database/SqlUtilTest.java b/...me/securesms/database/SqliteUtilTest.java → ...crime/securesms/database/SqlUtilTest.java
@@ -15,7 +15,7 @@
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE, application = Application.class)
-public class SqliteUtilTest {
+public class SqlUtilTest {
 
   @Test
   public void buildTrueUpdateQuery_simple() {