Gracefully handle NotPushRegisteredException

2026-04-20 16:18:03 +01:00 · 2024-06-25 11:23:16 -04:00
parent 2619569549
commit cb5cd64c05
7 changed files with 66 additions and 154 deletions
--- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
@@ -112,7 +112,6 @@ import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
 import org.whispersystems.textsecuregcm.metrics.UserAgentTagUtil;
 import org.whispersystems.textsecuregcm.providers.MultiRecipientMessageProvider;
 import org.whispersystems.textsecuregcm.push.MessageSender;
-import org.whispersystems.textsecuregcm.push.NotPushRegisteredException;
 import org.whispersystems.textsecuregcm.push.PushNotificationManager;
 import org.whispersystems.textsecuregcm.push.ReceiptSender;
 import org.whispersystems.textsecuregcm.spam.ReportSpamTokenProvider;
@@ -180,7 +179,6 @@ public class MessageController {
  private static final String RATE_LIMITED_MESSAGE_COUNTER_NAME = name(MessageController.class, "rateLimitedMessage");

  private static final String REJECT_INVALID_ENVELOPE_TYPE = name(MessageController.class, "rejectInvalidEnvelopeType");
-  private static final String UNEXPECTED_MISSING_USER_COUNTER_NAME = name(MessageController.class, "unexpectedMissingDestinationForMultiRecipientMessage");
  private static final Timer SEND_MESSAGE_LATENCY_TIMER =
      Timer.builder(MetricsUtil.name(MessageController.class, "sendMessageLatency"))
          .publishPercentileHistogram(true)
@@ -434,8 +432,6 @@ public class MessageController {
        }

        return Response.ok(new SendMessageResponse(needsSync)).build();
-      } catch (NoSuchUserException e) {
-        throw new WebApplicationException(Response.status(404).build());
      } catch (MismatchedDevicesException e) {
        throw new WebApplicationException(Response.status(409)
            .type(MediaType.APPLICATION_JSON_TYPE)
@@ -627,8 +623,6 @@ public class MessageController {
          .build();
    }

-    List<ServiceIdentifier> uuids404 = Collections.synchronizedList(new ArrayList<>());
-
    try {
      CompletableFuture.allOf(
              recipients.values().stream()
@@ -649,19 +643,12 @@ public class MessageController {

                              // we asserted this must exist in validateCompleteDeviceList
                              final Device destinationDevice = destinationAccount.getDevice(deviceId).orElseThrow();
-                              try {
-                                sentMessageCounter.increment();
-                                sendCommonPayloadMessage(
-                                    destinationAccount, destinationDevice, recipientData.serviceIdentifier(), timestamp,
-                                    online,
-                                    isStory, isUrgent, payload);
-                              } catch (NoSuchUserException e) {
-                                // this should never happen, because we already asserted the device is present and enabled
-                                Metrics.counter(
-                                    UNEXPECTED_MISSING_USER_COUNTER_NAME,
-                                    Tags.of("isPrimary", String.valueOf(destinationDevice.isPrimary()))).increment();
-                                uuids404.add(recipientData.serviceIdentifier());
-                              }
+
+                              sentMessageCounter.increment();
+                              sendCommonPayloadMessage(
+                                  destinationAccount, destinationDevice, recipientData.serviceIdentifier(), timestamp,
+                                  online,
+                                  isStory, isUrgent, payload);
                            },
                            multiRecipientMessageExecutor));
                  })
@@ -677,7 +664,7 @@ public class MessageController {
      logger.error("partial failure while delivering multi-recipient messages", e.getCause());
      return Response.serverError().entity("failure during delivery").build();
    }
-    return Response.ok(new SendMultiRecipientMessageResponse(uuids404)).build();
+    return Response.ok(new SendMultiRecipientMessageResponse(Collections.emptyList())).build();
  }

  private void checkGroupSendToken(
@@ -858,32 +845,27 @@ public class MessageController {
      boolean urgent,
      IncomingMessage incomingMessage,
      String userAgentString,
-      Optional<byte[]> spamReportToken)
-      throws NoSuchUserException {
+      Optional<byte[]> spamReportToken) {
+
+    final Envelope envelope;
+
    try {
-      final Envelope envelope;
-
-      try {
-        Account sourceAccount = source.map(AuthenticatedAccount::getAccount).orElse(null);
-        Byte sourceDeviceId = source.map(account -> account.getAuthenticatedDevice().getId()).orElse(null);
-        envelope = incomingMessage.toEnvelope(
-            destinationIdentifier,
-            sourceAccount,
-            sourceDeviceId,
-            timestamp == 0 ? System.currentTimeMillis() : timestamp,
-            story,
-            urgent,
-            spamReportToken.orElse(null));
-      } catch (final IllegalArgumentException e) {
-        logger.warn("Received bad envelope type {} from {}", incomingMessage.type(), userAgentString);
-        throw new BadRequestException(e);
-      }
-
-      messageSender.sendMessage(destinationAccount, destinationDevice, envelope, online);
-    } catch (NotPushRegisteredException e) {
-      if (destinationDevice.isPrimary()) throw new NoSuchUserException(e);
-      else                              logger.debug("Not registered", e);
+      final Account sourceAccount = source.map(AuthenticatedAccount::getAccount).orElse(null);
+      final Byte sourceDeviceId = source.map(account -> account.getAuthenticatedDevice().getId()).orElse(null);
+      envelope = incomingMessage.toEnvelope(
+          destinationIdentifier,
+          sourceAccount,
+          sourceDeviceId,
+          timestamp == 0 ? System.currentTimeMillis() : timestamp,
+          story,
+          urgent,
+          spamReportToken.orElse(null));
+    } catch (final IllegalArgumentException e) {
+      logger.warn("Received bad envelope type {} from {}", incomingMessage.type(), userAgentString);
+      throw new BadRequestException(e);
    }
+
+    messageSender.sendMessage(destinationAccount, destinationDevice, envelope, online);
  }

  private void sendCommonPayloadMessage(Account destinationAccount,
@@ -893,28 +875,21 @@ public class MessageController {
      boolean online,
      boolean story,
      boolean urgent,
-      byte[] payload) throws NoSuchUserException {
-    try {
-      Envelope.Builder messageBuilder = Envelope.newBuilder();
-      long serverTimestamp = System.currentTimeMillis();
+      byte[] payload) {

-      messageBuilder
-          .setType(Type.UNIDENTIFIED_SENDER)
-          .setTimestamp(timestamp == 0 ? serverTimestamp : timestamp)
-          .setServerTimestamp(serverTimestamp)
-          .setContent(ByteString.copyFrom(payload))
-          .setStory(story)
-          .setUrgent(urgent)
-          .setDestinationUuid(serviceIdentifier.toServiceIdentifierString());
+    final Envelope.Builder messageBuilder = Envelope.newBuilder();
+    final long serverTimestamp = System.currentTimeMillis();

-      messageSender.sendMessage(destinationAccount, destinationDevice, messageBuilder.build(), online);
-    } catch (NotPushRegisteredException e) {
-      if (destinationDevice.isPrimary()) {
-        throw new NoSuchUserException(e);
-      } else {
-        logger.debug("Not registered", e);
-      }
-    }
+    messageBuilder
+        .setType(Type.UNIDENTIFIED_SENDER)
+        .setTimestamp(timestamp == 0 ? serverTimestamp : timestamp)
+        .setServerTimestamp(serverTimestamp)
+        .setContent(ByteString.copyFrom(payload))
+        .setStory(story)
+        .setUrgent(urgent)
+        .setDestinationUuid(serviceIdentifier.toServiceIdentifierString());
+
+    messageSender.sendMessage(destinationAccount, destinationDevice, messageBuilder.build(), online);
  }

  private void checkMessageRateLimit(AuthenticatedAccount source, Account destination, String userAgent)
--- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/NoSuchUserException.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/NoSuchUserException.java
@@ -1,18 +0,0 @@
-/*
- * Copyright 2013-2020 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-package org.whispersystems.textsecuregcm.controllers;
-
-import java.util.UUID;
-
-public class NoSuchUserException extends Exception {
-
-  public NoSuchUserException(final UUID uuid) {
-    super(uuid.toString());
-  }
-
-  public NoSuchUserException(Exception e) {
-    super(e);
-  }
-}
--- a/service/src/main/java/org/whispersystems/textsecuregcm/push/MessageSender.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/push/MessageSender.java
@@ -52,8 +52,7 @@ public class MessageSender {
    this.pushLatencyManager = pushLatencyManager;
  }

-  public void sendMessage(final Account account, final Device device, final Envelope message, final boolean online)
-      throws NotPushRegisteredException {
+  public void sendMessage(final Account account, final Device device, final Envelope message, final boolean online) {

    final String channel;

@@ -64,7 +63,7 @@ public class MessageSender {
    } else if (device.getFetchesMessages()) {
      channel = "websocket";
    } else {
-      throw new AssertionError();
+      channel = "none";
    }

    final boolean clientPresent;
@@ -89,10 +88,7 @@ public class MessageSender {

          final boolean useVoip = StringUtils.isNotBlank(device.getVoipApnId());
          RedisOperation.unchecked(() -> pushLatencyManager.recordPushSent(account.getUuid(), device.getId(), useVoip, message.getUrgent()));
-        } catch (final NotPushRegisteredException e) {
-          if (!device.getFetchesMessages()) {
-            throw e;
-          }
+        } catch (final NotPushRegisteredException ignored) {
        }
      }
    }
--- a/service/src/main/java/org/whispersystems/textsecuregcm/push/ReceiptSender.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/push/ReceiptSender.java
@@ -55,8 +55,6 @@ public class ReceiptSender {
              for (final Device destinationDevice : destinationAccount.getDevices()) {
                try {
                  messageSender.sendMessage(destinationAccount, destinationDevice, message.build(), false);
-                } catch (final NotPushRegisteredException e) {
-                  logger.debug("User no longer push registered for delivery receipt: {}", e.getMessage());
                } catch (final Exception e) {
                  logger.warn("Could not send delivery receipt", e);
                }
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/ChangeNumberManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/ChangeNumberManager.java
@@ -130,23 +130,20 @@ public class ChangeNumberManager {
      logger.debug("destination device not present");
      return;
    }
-    try {
-      long serverTimestamp = System.currentTimeMillis();
-      Envelope envelope = Envelope.newBuilder()
-          .setType(Envelope.Type.forNumber(message.type()))
-          .setTimestamp(serverTimestamp)
-          .setServerTimestamp(serverTimestamp)
-          .setDestinationUuid(new AciServiceIdentifier(sourceAndDestinationAccount.getUuid()).toServiceIdentifierString())
-          .setContent(ByteString.copyFrom(contents.get()))
-          .setSourceUuid(new AciServiceIdentifier(sourceAndDestinationAccount.getUuid()).toServiceIdentifierString())
-          .setSourceDevice((int) Device.PRIMARY_ID)
-          .setUpdatedPni(sourceAndDestinationAccount.getPhoneNumberIdentifier().toString())
-          .setUrgent(true)
-          .build();

-      messageSender.sendMessage(sourceAndDestinationAccount, destinationDevice.get(), envelope, false);
-    } catch (NotPushRegisteredException e) {
-      logger.debug("Not registered", e);
-    }
+    final long serverTimestamp = System.currentTimeMillis();
+    final Envelope envelope = Envelope.newBuilder()
+        .setType(Envelope.Type.forNumber(message.type()))
+        .setTimestamp(serverTimestamp)
+        .setServerTimestamp(serverTimestamp)
+        .setDestinationUuid(new AciServiceIdentifier(sourceAndDestinationAccount.getUuid()).toServiceIdentifierString())
+        .setContent(ByteString.copyFrom(contents.get()))
+        .setSourceUuid(new AciServiceIdentifier(sourceAndDestinationAccount.getUuid()).toServiceIdentifierString())
+        .setSourceDevice((int) Device.PRIMARY_ID)
+        .setUpdatedPni(sourceAndDestinationAccount.getPhoneNumberIdentifier().toString())
+        .setUrgent(true)
+        .build();
+
+    messageSender.sendMessage(sourceAndDestinationAccount, destinationDevice.get(), envelope, false);
  }
 }