Allow unsealed-sender messages to be addressed by PNI

service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java

@@ -190,14 +190,16 @@ public class MessageController {
 
     final String senderType;
 
-    if (source.isPresent() && !source.get().getAccount().getUuid().equals(destinationUuid)) {
-      identifiedMeter.mark();
-      senderType = "identified";
-    } else if (source.isEmpty()) {
+    if (source.isPresent()) {
+      if (source.get().getAccount().isIdentifiedBy(destinationUuid)) {
+        senderType = "self";
+      } else {
+        identifiedMeter.mark();
+        senderType = "identified";
+      }
+    } else {
       unidentifiedMeter.mark();
       senderType = "unidentified";
-    } else {
-      senderType = "self";
     }
 
     for (final IncomingMessage message : messages.getMessages()) {
@@ -220,12 +222,13 @@ public class MessageController {
     }
 
     try {
-      boolean isSyncMessage = source.isPresent() && source.get().getAccount().getUuid().equals(destinationUuid);
+      boolean isSyncMessage = source.isPresent() && source.get().getAccount().isIdentifiedBy(destinationUuid);
 
       Optional<Account> destination;
 
       if (!isSyncMessage) {
-        destination = accountsManager.getByAccountIdentifier(destinationUuid);
+        destination = accountsManager.getByAccountIdentifier(destinationUuid)
+            .or(() -> accountsManager.getByPhoneNumberIdentifier(destinationUuid));
       } else {
         destination = source.map(AuthenticatedAccount::getAccount);
       }
@@ -233,7 +236,7 @@ public class MessageController {
       OptionalAccess.verify(source.map(AuthenticatedAccount::getAccount), accessKey, destination);
       assert (destination.isPresent());
 
-      if (source.isPresent() && !source.get().getAccount().getUuid().equals(destinationUuid)) {
+      if (source.isPresent() && !source.get().getAccount().isIdentifiedBy(destinationUuid)) {
         final String senderCountryCode = Util.getCountryCode(source.get().getAccount().getNumber());
 
         try {
@@ -278,8 +281,8 @@ public class MessageController {
 
         if (destinationDevice.isPresent()) {
           Metrics.counter(SENT_MESSAGE_COUNTER_NAME, tags).increment();
-          sendMessage(source, destination.get(), destinationDevice.get(), messages.getTimestamp(), messages.isOnline(),
-              incomingMessage, userAgent);
+          sendMessage(source, destination.get(), destinationDevice.get(), destinationUuid, messages.getTimestamp(),
+              messages.isOnline(), incomingMessage, userAgent);
         }
       }
 
@@ -522,6 +525,7 @@ public class MessageController {
   private void sendMessage(Optional<AuthenticatedAccount> source,
       Account destinationAccount,
       Device destinationDevice,
+      UUID destinationUuid,
       long timestamp,
       boolean online,
       IncomingMessage incomingMessage,
@@ -557,22 +561,20 @@ public class MessageController {
 
       messageBuilder.setType(envelopeType)
           .setTimestamp(timestamp == 0 ? System.currentTimeMillis() : timestamp)
-          .setServerTimestamp(System.currentTimeMillis());
+          .setServerTimestamp(System.currentTimeMillis())
+          .setDestinationUuid(destinationUuid.toString());
 
-      if (source.isPresent()) {
-        messageBuilder.setSource(source.get().getAccount().getNumber())
-            .setSourceUuid(source.get().getAccount().getUuid().toString())
-            .setSourceDevice((int) source.get().getAuthenticatedDevice().getId());
-      }
+      source.ifPresent(authenticatedAccount ->
+          messageBuilder.setSource(authenticatedAccount.getAccount().getNumber())
+              .setSourceUuid(authenticatedAccount.getAccount().getUuid().toString())
+              .setSourceDevice((int) authenticatedAccount.getAuthenticatedDevice().getId()));
 
-      if (messageBody.isPresent()) {
+      messageBody.ifPresent(bytes -> {
         Metrics.counter(LEGACY_MESSAGE_SENT_COUNTER).increment();
         messageBuilder.setLegacyMessage(ByteString.copyFrom(messageBody.get()));
-      }
+      });
 
-      if (messageContent.isPresent()) {
-        messageBuilder.setContent(ByteString.copyFrom(messageContent.get()));
-      }
+      messageContent.ifPresent(bytes -> messageBuilder.setContent(ByteString.copyFrom(bytes)));
 
       messageSender.sendMessage(destinationAccount, destinationDevice, messageBuilder.build(), online);
     } catch (NotPushRegisteredException e) {
@@ -581,8 +583,12 @@ public class MessageController {
     }
   }
 
-  private void sendMessage(Account destinationAccount, Device destinationDevice, long timestamp, boolean online,
-      Recipient recipient, byte[] commonPayload) throws NoSuchUserException {
+  private void sendMessage(Account destinationAccount,
+      Device destinationDevice,
+      long timestamp,
+      boolean online,
+      Recipient recipient,
+      byte[] commonPayload) throws NoSuchUserException {
     try (final Timer.Context ignored = sendCommonMessageInternalTimer.time()) {
       Envelope.Builder messageBuilder = Envelope.newBuilder();
       long serverTimestamp = System.currentTimeMillis();
@@ -597,7 +603,8 @@ public class MessageController {
           .setType(Type.UNIDENTIFIED_SENDER)
           .setTimestamp(timestamp == 0 ? serverTimestamp : timestamp)
           .setServerTimestamp(serverTimestamp)
-          .setContent(ByteString.copyFrom(payload));
+          .setContent(ByteString.copyFrom(payload))
+          .setDestinationUuid(destinationAccount.getUuid().toString());
 
       messageSender.sendMessage(destinationAccount, destinationDevice, messageBuilder.build(), online);
     } catch (NotPushRegisteredException e) {

service/src/main/java/org/whispersystems/textsecuregcm/entities/OutgoingMessageEntity.java

@@ -5,6 +5,7 @@
 
 package org.whispersystems.textsecuregcm.entities;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -15,47 +16,58 @@ import java.util.UUID;
 public class OutgoingMessageEntity {
 
   @JsonIgnore
-  private long id;
+  private final long id;
 
   @JsonIgnore
-  private boolean cached;
+  private final boolean cached;
 
   @JsonProperty
-  private UUID guid;
+  private final UUID guid;
 
   @JsonProperty
-  private int type;
+  private final int type;
 
   @JsonProperty
-  private String relay;
+  private final String relay;
 
   @JsonProperty
-  private long timestamp;
+  private final long timestamp;
 
   @JsonProperty
-  private String source;
+  private final String source;
 
   @JsonProperty
-  private UUID sourceUuid;
+  private final UUID sourceUuid;
 
   @JsonProperty
-  private int sourceDevice;
+  private final int sourceDevice;
 
   @JsonProperty
-  private byte[] message;
+  private final UUID destinationUuid;
 
   @JsonProperty
-  private byte[] content;
+  private final byte[] message;
 
   @JsonProperty
-  private long serverTimestamp;
+  private final byte[] content;
 
-  public OutgoingMessageEntity() {}
+  @JsonProperty
+  private final long serverTimestamp;
 
-  public OutgoingMessageEntity(long id, boolean cached,
-                               UUID guid, int type, String relay, long timestamp,
-                               String source, UUID sourceUuid, int sourceDevice,
-                               byte[] message, byte[] content, long serverTimestamp)
+  @JsonCreator
+  public OutgoingMessageEntity(@JsonProperty("id") final long id,
+      @JsonProperty("cached") final boolean cached,
+      @JsonProperty("guid") final UUID guid,
+      @JsonProperty("type") final int type,
+      @JsonProperty("relay") final String relay,
+      @JsonProperty("timestamp") final long timestamp,
+      @JsonProperty("source") final String source,
+      @JsonProperty("sourceUuid") final UUID sourceUuid,
+      @JsonProperty("sourceDevice") final int sourceDevice,
+      @JsonProperty("destinationUuid") final UUID destinationUuid,
+      @JsonProperty("message") final byte[] message,
+      @JsonProperty("content") final byte[] content,
+      @JsonProperty("serverTimestamp") final long serverTimestamp)
   {
     this.id              = id;
     this.cached          = cached;
@@ -66,6 +78,7 @@ public class OutgoingMessageEntity {
     this.source          = source;
     this.sourceUuid      = sourceUuid;
     this.sourceDevice    = sourceDevice;
+    this.destinationUuid = destinationUuid;
     this.message         = message;
     this.content         = content;
     this.serverTimestamp = serverTimestamp;
@@ -99,6 +112,10 @@ public class OutgoingMessageEntity {
     return sourceDevice;
   }
 
+  public UUID getDestinationUuid() {
+    return destinationUuid;
+  }
+
   public byte[] getMessage() {
     return message;
   }

service/src/main/java/org/whispersystems/textsecuregcm/storage/Account.java

@@ -112,6 +112,16 @@ public class Account {
     return Optional.ofNullable(phoneNumberIdentifier);
   }
 
+  /**
+   * Tests whether this account's account identifier or phone number identifier matches the given UUID.
+   *
+   * @param identifier the identifier to test
+   * @return {@code true} if this account's identifier or phone number identifier matches
+   */
+  public boolean isIdentifiedBy(final UUID identifier) {
+    return uuid.equals(identifier) || (phoneNumberIdentifier != null && phoneNumberIdentifier.equals(identifier));
+  }
+
   public String getNumber() {
     requireNotStale();
 

service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java

@@ -385,6 +385,7 @@ public class MessagesCache extends RedisClusterPubSubAdapter<String, String> imp
         envelope.getSource(),
         envelope.hasSourceUuid() ? UUID.fromString(envelope.getSourceUuid()) : null,
         envelope.getSourceDevice(),
+        envelope.hasDestinationUuid() ? UUID.fromString(envelope.getDestinationUuid()) : null,
         envelope.hasLegacyMessage() ? envelope.getLegacyMessage().toByteArray() : null,
         envelope.hasContent() ? envelope.getContent().toByteArray() : null,
         envelope.hasServerTimestamp() ? envelope.getServerTimestamp() : 0);

service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesDynamoDb.java

@@ -46,6 +46,7 @@ public class MessagesDynamoDb extends AbstractDynamoDbStore {
   private static final String KEY_SOURCE = "SN";
   private static final String KEY_SOURCE_UUID = "SU";
   private static final String KEY_SOURCE_DEVICE = "SD";
+  private static final String KEY_DESTINATION_UUID = "DU";
   private static final String KEY_MESSAGE = "M";
   private static final String KEY_CONTENT = "C";
   private static final String KEY_TTL = "E";
@@ -224,9 +225,10 @@ public class MessagesDynamoDb extends AbstractDynamoDbStore {
     final String source = AttributeValues.getString(message, KEY_SOURCE, null);
     final UUID sourceUuid = AttributeValues.getUUID(message, KEY_SOURCE_UUID, null);
     final int sourceDevice = AttributeValues.getInt(message, KEY_SOURCE_DEVICE, 0);
+    final UUID destinationUuid = AttributeValues.getUUID(message, KEY_DESTINATION_UUID, null);
     final byte[] messageBytes = AttributeValues.getByteArray(message, KEY_MESSAGE, null);
     final byte[] content = AttributeValues.getByteArray(message, KEY_CONTENT, null);
-    return new OutgoingMessageEntity(-1L, false, messageUuid, type, relay, timestamp, source, sourceUuid, sourceDevice, messageBytes, content, sortKey.getServerTimestamp());
+    return new OutgoingMessageEntity(-1L, false, messageUuid, type, relay, timestamp, source, sourceUuid, sourceDevice, destinationUuid, messageBytes, content, sortKey.getServerTimestamp());
   }
 
   private void deleteRowsMatchingQuery(AttributeValue partitionKey, QueryRequest querySpec) {