pom.xml

@@ -46,7 +46,7 @@
     <!-- can be updated to latest version with Dropwizard 5 (Jetty 12); will then need to disable telemetry -->
     <dynamodblocal.version>2.2.1</dynamodblocal.version>
     <google-cloud-libraries.version>26.57.0</google-cloud-libraries.version>
-    <grpc.version>1.70.0</grpc.version> <!-- should be kept in sync with the value from Google libraries-bom -->
+    <grpc.version>1.69.0</grpc.version> <!-- should be kept in sync with the value from Google libraries-bom -->
     <gson.version>2.12.1</gson.version>
     <!-- several libraries (AWS, Google Cloud) use Apache http components transitively, and we need to align them -->
     <httpcore.version>4.4.16</httpcore.version>
@@ -65,9 +65,9 @@
     <luajava.version>3.5.0</luajava.version>
     <micrometer.version>1.14.5</micrometer.version>
     <netty.version>4.1.119.Final</netty.version>
-    <!-- Must be less than or equal to the value from Google libraries-bom which controls the protobuf runtime version.
-    See https://protobuf.dev/support/cross-version-runtime-guarantee/. -->
-    <protoc.version>4.29.4</protoc.version>
+    <!-- Must be greater than or equal to the value from Google libraries-bom
+    since some of its libraries generate code. See https://protobuf.dev/support/cross-version-runtime-guarantee/. -->
+    <protobuf.version>3.25.5</protobuf.version>
     <pushy.version>0.15.4</pushy.version>
     <reactive.grpc.version>1.2.4</reactive.grpc.version>
     <reactor-bom.version>2024.0.4</reactor-bom.version> <!-- 3.7.4, see https://github.com/reactor/reactor#bom-versioning-scheme -->
@@ -127,7 +127,7 @@
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
-        <artifactId>libraries-bom</artifactId>
+        <artifactId>libraries-bom-protobuf3</artifactId>
         <version>${google-cloud-libraries.version}</version>
         <type>pom</type>
         <scope>import</scope>
@@ -175,6 +175,11 @@
         <artifactId>pushy-dropwizard-metrics-listener</artifactId>
         <version>${pushy.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-java</artifactId>
+        <version>${protobuf.version}</version>
+      </dependency>
       <dependency>
         <groupId>com.googlecode.libphonenumber</groupId>
         <artifactId>libphonenumber</artifactId>
@@ -438,7 +443,7 @@
         <version>0.6.1</version>
         <configuration>
           <checkStaleness>false</checkStaleness>
-          <protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
+          <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
           <pluginId>grpc-java</pluginId>
           <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
 

service/config/sample.yml

@@ -482,8 +482,7 @@ turn:
       - turn:%s
       - turn:%s:80?transport=tcp
       - turns:%s:443?transport=tcp
-    requestedCredentialTtl: PT24H
-    clientCredentialTtl: PT12H
+    ttl: 86400
     hostname: turn.cloudflare.example.com
     numHttpClients: 1
 

service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java

@@ -673,8 +673,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     final CloudflareTurnCredentialsManager cloudflareTurnCredentialsManager = new CloudflareTurnCredentialsManager(
         config.getTurnConfiguration().cloudflare().apiToken().value(),
         config.getTurnConfiguration().cloudflare().endpoint(),
-        config.getTurnConfiguration().cloudflare().requestedCredentialTtl(),
-        config.getTurnConfiguration().cloudflare().clientCredentialTtl(),
+        config.getTurnConfiguration().cloudflare().ttl(),
         config.getTurnConfiguration().cloudflare().urls(),
         config.getTurnConfiguration().cloudflare().urlsWithIps(),
         config.getTurnConfiguration().cloudflare().hostname(),
@@ -694,7 +693,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     PushChallengeManager pushChallengeManager = new PushChallengeManager(pushNotificationManager,
         pushChallengeDynamoDb);
 
-    ChangeNumberManager changeNumberManager = new ChangeNumberManager(messageSender, accountsManager, Clock.systemUTC());
+    ChangeNumberManager changeNumberManager = new ChangeNumberManager(messageSender, accountsManager);
 
     HttpClient currencyClient = HttpClient.newBuilder().version(HttpClient.Version.HTTP_2).connectTimeout(Duration.ofSeconds(10)).build();
     FixerClient fixerClient = config.getPaymentsServiceConfiguration().externalClients()

service/src/main/java/org/whispersystems/textsecuregcm/auth/CloudflareTurnCredentialsManager.java

@@ -15,7 +15,6 @@ import java.net.Inet6Address;
 import java.net.URI;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.time.Duration;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletionException;
@@ -40,18 +39,16 @@ public class CloudflareTurnCredentialsManager {
   private final List<String> cloudflareTurnUrls;
   private final List<String> cloudflareTurnUrlsWithIps;
   private final String cloudflareTurnHostname;
-  private final HttpRequest getCredentialsRequest;
+  private final HttpRequest request;
 
   private final FaultTolerantHttpClient cloudflareTurnClient;
   private final DnsNameResolver dnsNameResolver;
 
-  private final Duration clientCredentialTtl;
+  record CredentialRequest(long ttl) {}
 
-  private record CredentialRequest(long ttl) {}
+  record CloudflareTurnResponse(IceServer iceServers) {
 
-  private record CloudflareTurnResponse(IceServer iceServers) {
-
-    private record IceServer(
+    record IceServer(
         String username,
         String credential,
         List<String> urls) {
@@ -59,17 +56,10 @@ public class CloudflareTurnCredentialsManager {
   }
 
   public CloudflareTurnCredentialsManager(final String cloudflareTurnApiToken,
-      final String cloudflareTurnEndpoint,
-      final Duration requestedCredentialTtl,
-      final Duration clientCredentialTtl,
-      final List<String> cloudflareTurnUrls,
-      final List<String> cloudflareTurnUrlsWithIps,
-      final String cloudflareTurnHostname,
-      final int cloudflareTurnNumHttpClients,
-      final CircuitBreakerConfiguration circuitBreaker,
-      final ExecutorService executor,
-      final RetryConfiguration retry,
-      final ScheduledExecutorService retryExecutor,
+      final String cloudflareTurnEndpoint, final long cloudflareTurnTtl, final List<String> cloudflareTurnUrls,
+      final List<String> cloudflareTurnUrlsWithIps, final String cloudflareTurnHostname,
+      final int cloudflareTurnNumHttpClients, final CircuitBreakerConfiguration circuitBreaker,
+      final ExecutorService executor, final RetryConfiguration retry, final ScheduledExecutorService retryExecutor,
       final DnsNameResolver dnsNameResolver) {
 
     this.cloudflareTurnClient = FaultTolerantHttpClient.newBuilder()
@@ -85,24 +75,17 @@ public class CloudflareTurnCredentialsManager {
     this.cloudflareTurnHostname = cloudflareTurnHostname;
     this.dnsNameResolver = dnsNameResolver;
 
-    final String credentialsRequestBody;
-
     try {
-      credentialsRequestBody =
-          SystemMapper.jsonMapper().writeValueAsString(new CredentialRequest(requestedCredentialTtl.toSeconds()));
-    } catch (final JsonProcessingException e) {
+      final String body = SystemMapper.jsonMapper().writeValueAsString(new CredentialRequest(cloudflareTurnTtl));
+      this.request = HttpRequest.newBuilder()
+          .uri(URI.create(cloudflareTurnEndpoint))
+          .header("Content-Type", "application/json")
+          .header("Authorization", String.format("Bearer %s", cloudflareTurnApiToken))
+          .POST(HttpRequest.BodyPublishers.ofString(body))
+          .build();
+    } catch (JsonProcessingException e) {
       throw new IllegalArgumentException(e);
     }
-
-    // We repeat the same request to Cloudflare every time, so we can construct it once and re-use it
-    this.getCredentialsRequest = HttpRequest.newBuilder()
-        .uri(URI.create(cloudflareTurnEndpoint))
-        .header("Content-Type", "application/json")
-        .header("Authorization", String.format("Bearer %s", cloudflareTurnApiToken))
-        .POST(HttpRequest.BodyPublishers.ofString(credentialsRequestBody))
-        .build();
-
-    this.clientCredentialTtl = clientCredentialTtl;
   }
 
   public TurnToken retrieveFromCloudflare() throws IOException {
@@ -122,7 +105,7 @@ public class CloudflareTurnCredentialsManager {
     final Timer.Sample sample = Timer.start();
     final HttpResponse<String> response;
     try {
-      response = cloudflareTurnClient.sendAsync(getCredentialsRequest, HttpResponse.BodyHandlers.ofString()).join();
+      response = cloudflareTurnClient.sendAsync(request, HttpResponse.BodyHandlers.ofString()).join();
       sample.stop(Timer.builder(CREDENTIAL_FETCH_TIMER_NAME)
           .publishPercentileHistogram(true)
           .tags("outcome", "success")
@@ -147,7 +130,6 @@ public class CloudflareTurnCredentialsManager {
     return new TurnToken(
         cloudflareTurnResponse.iceServers().username(),
         cloudflareTurnResponse.iceServers().credential(),
-        clientCredentialTtl.toSeconds(),
         cloudflareTurnUrls == null ? Collections.emptyList() : cloudflareTurnUrls,
         cloudflareTurnComposedUrls,
         cloudflareTurnHostname

service/src/main/java/org/whispersystems/textsecuregcm/auth/TurnToken.java

@@ -5,15 +5,13 @@
 
 package org.whispersystems.textsecuregcm.auth;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.List;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.List;
 
 public record TurnToken(
     String username,
     String password,
-    @JsonProperty("ttl") long ttlSeconds,
     @Nonnull List<String> urls,
     @Nonnull List<String> urlsWithIps,
     @Nullable String hostname) {

service/src/main/java/org/whispersystems/textsecuregcm/auth/grpc/AbstractAuthenticationInterceptor.java

@@ -1,22 +1,34 @@
 package org.whispersystems.textsecuregcm.auth.grpc;
 
+import io.grpc.Grpc;
+import io.grpc.Metadata;
 import io.grpc.ServerCall;
 import io.grpc.ServerInterceptor;
-import java.util.Optional;
-import org.whispersystems.textsecuregcm.grpc.ChannelNotFoundException;
+import io.grpc.Status;
+import io.netty.channel.local.LocalAddress;
 import org.whispersystems.textsecuregcm.grpc.net.GrpcClientConnectionManager;
+import java.util.Optional;
 
 abstract class AbstractAuthenticationInterceptor implements ServerInterceptor {
 
   private final GrpcClientConnectionManager grpcClientConnectionManager;
 
+  private static final Metadata EMPTY_TRAILERS = new Metadata();
+
   AbstractAuthenticationInterceptor(final GrpcClientConnectionManager grpcClientConnectionManager) {
     this.grpcClientConnectionManager = grpcClientConnectionManager;
   }
 
-  protected Optional<AuthenticatedDevice> getAuthenticatedDevice(final ServerCall<?, ?> call)
-      throws ChannelNotFoundException {
+  protected Optional<AuthenticatedDevice> getAuthenticatedDevice(final ServerCall<?, ?> call) {
+    if (call.getAttributes().get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR) instanceof LocalAddress localAddress) {
+      return grpcClientConnectionManager.getAuthenticatedDevice(localAddress);
+    } else {
+      throw new AssertionError("Unexpected channel type: " + call.getAttributes().get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR));
+    }
+  }
 
-    return grpcClientConnectionManager.getAuthenticatedDevice(call);
+  protected <ReqT, RespT> ServerCall.Listener<ReqT> closeAsUnauthenticated(final ServerCall<ReqT, RespT> call) {
+    call.close(Status.UNAUTHENTICATED, EMPTY_TRAILERS);
+    return new ServerCall.Listener<>() {};
   }
 }

service/src/main/java/org/whispersystems/textsecuregcm/auth/grpc/ProhibitAuthenticationInterceptor.java

@@ -3,17 +3,12 @@ package org.whispersystems.textsecuregcm.auth.grpc;
 import io.grpc.Metadata;
 import io.grpc.ServerCall;
 import io.grpc.ServerCallHandler;
-import io.grpc.Status;
-import org.whispersystems.textsecuregcm.grpc.ChannelNotFoundException;
-import org.whispersystems.textsecuregcm.grpc.ServerInterceptorUtil;
 import org.whispersystems.textsecuregcm.grpc.net.GrpcClientConnectionManager;
 
 /**
  * A "prohibit authentication" interceptor ensures that requests to endpoints that should be invoked anonymously do not
  * originate from a channel that is associated with an authenticated device. Calls with an associated authenticated
- * device are closed with an {@code UNAUTHENTICATED} status. If a call's authentication status cannot be determined
- * (i.e. because the underlying remote channel closed before the {@code ServerCall} started), the interceptor will
- * reject the call with a status of {@code UNAVAILABLE}.
+ * device are closed with an {@code UNAUTHENTICATED} status.
  */
 public class ProhibitAuthenticationInterceptor extends AbstractAuthenticationInterceptor {
 
@@ -26,15 +21,8 @@ public class ProhibitAuthenticationInterceptor extends AbstractAuthenticationInt
       final Metadata headers,
       final ServerCallHandler<ReqT, RespT> next) {
 
-    try {
-      return getAuthenticatedDevice(call)
-          // Status.INTERNAL may seem a little surprising here, but if a caller is reaching an authentication-prohibited
-          // service via an authenticated connection, then that's actually a server configuration issue and not a
-          // problem with the client's request.
-          .map(ignored -> ServerInterceptorUtil.closeWithStatus(call, Status.INTERNAL))
-          .orElseGet(() -> next.startCall(call, headers));
-    } catch (final ChannelNotFoundException e) {
-      return ServerInterceptorUtil.closeWithStatus(call, Status.UNAVAILABLE);
-    }
+    return getAuthenticatedDevice(call)
+        .map(ignored -> closeAsUnauthenticated(call))
+        .orElseGet(() -> next.startCall(call, headers));
   }
 }

service/src/main/java/org/whispersystems/textsecuregcm/auth/grpc/RequireAuthenticationInterceptor.java

@@ -5,16 +5,12 @@ import io.grpc.Contexts;
 import io.grpc.Metadata;
 import io.grpc.ServerCall;
 import io.grpc.ServerCallHandler;
-import io.grpc.Status;
-import org.whispersystems.textsecuregcm.grpc.ChannelNotFoundException;
-import org.whispersystems.textsecuregcm.grpc.ServerInterceptorUtil;
 import org.whispersystems.textsecuregcm.grpc.net.GrpcClientConnectionManager;
 
 /**
  * A "require authentication" interceptor requires that requests be issued from a connection that is associated with an
  * authenticated device. Calls without an associated authenticated device are closed with an {@code UNAUTHENTICATED}
- * status. If a call's authentication status cannot be determined (i.e. because the underlying remote channel closed
- * before the {@code ServerCall} started), the interceptor will reject the call with a status of {@code UNAVAILABLE}.
+ * status.
  */
 public class RequireAuthenticationInterceptor extends AbstractAuthenticationInterceptor {
 
@@ -27,17 +23,10 @@ public class RequireAuthenticationInterceptor extends AbstractAuthenticationInte
       final Metadata headers,
       final ServerCallHandler<ReqT, RespT> next) {
 
-    try {
-      return getAuthenticatedDevice(call)
-          .map(authenticatedDevice -> Contexts.interceptCall(Context.current()
-                  .withValue(AuthenticationUtil.CONTEXT_AUTHENTICATED_DEVICE, authenticatedDevice),
-              call, headers, next))
-          // Status.INTERNAL may seem a little surprising here, but if a caller is reaching an authentication-required
-          // service via an unauthenticated connection, then that's actually a server configuration issue and not a
-          // problem with the client's request.
-          .orElseGet(() -> ServerInterceptorUtil.closeWithStatus(call, Status.INTERNAL));
-    } catch (final ChannelNotFoundException e) {
-      return ServerInterceptorUtil.closeWithStatus(call, Status.UNAVAILABLE);
-    }
+    return getAuthenticatedDevice(call)
+        .map(authenticatedDevice -> Contexts.interceptCall(Context.current()
+                .withValue(AuthenticationUtil.CONTEXT_AUTHENTICATED_DEVICE, authenticatedDevice),
+            call, headers, next))
+        .orElseGet(() -> closeAsUnauthenticated(call));
   }
 }

service/src/main/java/org/whispersystems/textsecuregcm/configuration/CloudflareTurnConfiguration.java

@@ -6,36 +6,16 @@
 package org.whispersystems.textsecuregcm.configuration;
 
 import jakarta.validation.Valid;
-import jakarta.validation.constraints.AssertTrue;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
-import java.time.Duration;
 import java.util.List;
 import jakarta.validation.constraints.Positive;
 import org.whispersystems.textsecuregcm.configuration.secrets.SecretString;
 
-/**
- * Configuration properties for Cloudflare TURN integration.
- *
- * @param apiToken the API token to use when requesting TURN tokens from Cloudflare
- * @param endpoint the URI of the Cloudflare API endpoint that vends TURN tokens
- * @param requestedCredentialTtl the lifetime of TURN tokens to request from Cloudflare
- * @param clientCredentialTtl the time clients may cache a TURN token; must be less than or equal to {@link #requestedCredentialTtl}
- * @param urls a collection of TURN URLs to include verbatim in responses to clients
- * @param urlsWithIps a collection of {@link String#format(String, Object...)} patterns to be populated with resolved IP
- *                    addresses for {@link #hostname} in responses to clients; each pattern must include a single
- *                    {@code %s} placeholder for the IP address
- * @param circuitBreaker a circuit breaker for requests to Cloudflare
- * @param retry a retry policy for requests to Cloudflare
- * @param hostname the hostname to resolve to IP addresses for use with {@link #urlsWithIps}; also transmitted to
- *                 clients for use as an SNI when connecting to pre-resolved hosts
- * @param numHttpClients the number of parallel HTTP clients to use to communicate with Cloudflare
- */
 public record CloudflareTurnConfiguration(@NotNull SecretString apiToken,
                                           @NotBlank String endpoint,
-                                          @NotNull Duration requestedCredentialTtl,
-                                          @NotNull Duration clientCredentialTtl,
+                                          @NotBlank long ttl,
                                           @NotNull @NotEmpty @Valid List<@NotBlank String> urls,
                                           @NotNull @NotEmpty @Valid List<@NotBlank String> urlsWithIps,
                                           @NotNull @Valid CircuitBreakerConfiguration circuitBreaker,
@@ -55,9 +35,4 @@ public record CloudflareTurnConfiguration(@NotNull SecretString apiToken,
       retry = new RetryConfiguration();
     }
   }
-
-  @AssertTrue
-  public boolean isClientTtlShorterThanRequestedTtl() {
-    return clientCredentialTtl.compareTo(requestedCredentialTtl) <= 0;
-  }
 }

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

@@ -15,12 +15,16 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.MediaType;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import org.whispersystems.textsecuregcm.auth.AuthenticatedDevice;
 import org.whispersystems.textsecuregcm.auth.CloudflareTurnCredentialsManager;
+import org.whispersystems.textsecuregcm.auth.TurnToken;
 import org.whispersystems.textsecuregcm.limits.RateLimiters;
 import org.whispersystems.websocket.auth.ReadOnly;
 
@@ -28,16 +32,14 @@ import org.whispersystems.websocket.auth.ReadOnly;
 @Path("/v2/calling")
 public class CallRoutingControllerV2 {
 
+  private static final Counter CLOUDFLARE_TURN_ERROR_COUNTER = Metrics.counter(name(CallRoutingControllerV2.class, "cloudflareTurnError"));
   private final RateLimiters rateLimiters;
   private final CloudflareTurnCredentialsManager cloudflareTurnCredentialsManager;
 
-  private static final Counter CLOUDFLARE_TURN_ERROR_COUNTER =
-      Metrics.counter(name(CallRoutingControllerV2.class, "cloudflareTurnError"));
-
   public CallRoutingControllerV2(
       final RateLimiters rateLimiters,
-      final CloudflareTurnCredentialsManager cloudflareTurnCredentialsManager) {
-
+      final CloudflareTurnCredentialsManager cloudflareTurnCredentialsManager
+  ) {
     this.rateLimiters = rateLimiters;
     this.cloudflareTurnCredentialsManager = cloudflareTurnCredentialsManager;
   }
@@ -56,17 +58,25 @@ public class CallRoutingControllerV2 {
   @ApiResponse(responseCode = "401", description = "Account authentication check failed.")
   @ApiResponse(responseCode = "422", description = "Invalid request format.")
   @ApiResponse(responseCode = "429", description = "Rate limited.")
-  public GetCallingRelaysResponse getCallingRelays(final @ReadOnly @Auth AuthenticatedDevice auth)
-      throws RateLimitExceededException, IOException {
-
-    final UUID aci = auth.getAccount().getUuid();
+  public GetCallingRelaysResponse getCallingRelays(
+      final @ReadOnly @Auth AuthenticatedDevice auth
+  ) throws RateLimitExceededException, IOException {
+    UUID aci = auth.getAccount().getUuid();
     rateLimiters.getCallEndpointLimiter().validate(aci);
 
+    List<TurnToken> tokens = new ArrayList<>();
     try {
-      return new GetCallingRelaysResponse(List.of(cloudflareTurnCredentialsManager.retrieveFromCloudflare()));
-    } catch (final Exception e) {
-      CLOUDFLARE_TURN_ERROR_COUNTER.increment();
+      tokens.add(cloudflareTurnCredentialsManager.retrieveFromCloudflare());
+    } catch (Exception e) {
+      CallRoutingControllerV2.CLOUDFLARE_TURN_ERROR_COUNTER.increment();
       throw e;
     }
+
+    return new GetCallingRelaysResponse(tokens);
+  }
+
+  public record GetCallingRelaysResponse(
+      List<TurnToken> relays
+  ) {
   }
 }

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

@@ -402,7 +402,7 @@ public class DeviceController {
 
   private AtomicInteger getCounterForLinkedDeviceListeners(final String userAgent) {
     try {
-      return linkedDeviceListenersByPlatform.get(UserAgentUtil.parseUserAgentString(userAgent).platform());
+      return linkedDeviceListenersByPlatform.get(UserAgentUtil.parseUserAgentString(userAgent).getPlatform());
     } catch (final UnrecognizedUserAgentException ignored) {
       return linkedDeviceListenersForUnrecognizedPlatforms;
     }

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

@@ -97,20 +97,21 @@ public class DonationController {
       return redeemedReceiptsManager.put(
               receiptSerial, receiptExpiration.getEpochSecond(), receiptLevel, auth.getAccount().getUuid())
           .thenCompose(receiptMatched -> {
-            if (!receiptMatched) {
+        if (!receiptMatched) {
+          return CompletableFuture.completedFuture(
+              Response.status(Status.BAD_REQUEST).entity("receipt serial is already redeemed")
+                  .type(MediaType.TEXT_PLAIN_TYPE).build());
+        }
 
-              return CompletableFuture.completedFuture(
-                  Response.status(Status.BAD_REQUEST).entity("receipt serial is already redeemed")
-                      .type(MediaType.TEXT_PLAIN_TYPE).build());
-            }
-
-            return accountsManager.updateAsync(auth.getAccount(), a -> {
+        return accountsManager.getByAccountIdentifierAsync(auth.getAccount().getUuid())
+            .thenCompose(optionalAccount ->
+                optionalAccount.map(account -> accountsManager.updateAsync(account, a -> {
                   a.addBadge(clock, new AccountBadge(badgeId, receiptExpiration, request.isVisible()));
                   if (request.isPrimary()) {
                     a.makeBadgePrimaryIfExists(clock, badgeId);
                   }
-                })
-                .thenApply(ignored -> Response.ok().build());
+                })).orElse(CompletableFuture.completedFuture(null)))
+            .thenApply(ignored -> Response.ok().build());
       });
     }).thenCompose(Function.identity());
   }

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

@@ -1,13 +0,0 @@
-/*
- * Copyright 2025 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.controllers;
-
-import org.whispersystems.textsecuregcm.auth.TurnToken;
-
-import java.util.List;
-
-public record GetCallingRelaysResponse(List<TurnToken> relays) {
-}

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

@@ -436,16 +436,11 @@ public class MessageController {
     final Map<Byte, Integer> registrationIdsByDeviceId = messages.messages().stream()
         .collect(Collectors.toMap(IncomingMessage::destinationDeviceId, IncomingMessage::destinationRegistrationId));
 
-    final Optional<Byte> syncMessageSenderDeviceId = messageType == MessageType.SYNC
-        ? Optional.ofNullable(sender).map(authenticatedDevice -> authenticatedDevice.getAuthenticatedDevice().getId())
-        : Optional.empty();
-
     try {
       messageSender.sendMessages(destination,
           destinationIdentifier,
           messagesByDeviceId,
           registrationIdsByDeviceId,
-          syncMessageSenderDeviceId,
           userAgent);
     } catch (final MismatchedDevicesException e) {
       if (!e.getMismatchedDevices().staleDeviceIds().isEmpty()) {

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

@@ -428,7 +428,7 @@ public class OneTimeDonationController {
   @Nullable
   private static ClientPlatform getClientPlatform(@Nullable final String userAgentString) {
     try {
-      return UserAgentUtil.parseUserAgentString(userAgentString).platform();
+      return UserAgentUtil.parseUserAgentString(userAgentString).getPlatform();
     } catch (final UnrecognizedUserAgentException e) {
       return null;
     }

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

@@ -204,12 +204,11 @@ public class ProfileController {
           .build()));
     }
 
+    final List<AccountBadge> updatedBadges = request.badges()
+        .map(badges -> ProfileHelper.mergeBadgeIdsWithExistingAccountBadges(clock, badgeConfigurationMap, badges, auth.getAccount().getBadges()))
+        .orElseGet(() -> auth.getAccount().getBadges());
+
     accountsManager.update(auth.getAccount(), a -> {
-
-      final List<AccountBadge> updatedBadges = request.badges()
-          .map(badges -> ProfileHelper.mergeBadgeIdsWithExistingAccountBadges(clock, badgeConfigurationMap, badges, a.getBadges()))
-          .orElseGet(a::getBadges);
-
       a.setBadges(clock, updatedBadges);
       a.setCurrentProfileVersion(request.version());
     });

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

@@ -755,7 +755,7 @@ public class SubscriptionController {
   @Nullable
   private static ClientPlatform getClientPlatform(@Nullable final String userAgentString) {
     try {
-      return UserAgentUtil.parseUserAgentString(userAgentString).platform();
+      return UserAgentUtil.parseUserAgentString(userAgentString).getPlatform();
     } catch (final UnrecognizedUserAgentException e) {
       return null;
     }

service/src/main/java/org/whispersystems/textsecuregcm/filters/RemoteDeprecationFilter.java

@@ -81,16 +81,7 @@ public class RemoteDeprecationFilter implements Filter, ServerInterceptor {
       final Metadata headers,
       final ServerCallHandler<ReqT, RespT> next) {
 
-    @Nullable final UserAgent userAgent = RequestAttributesUtil.getUserAgent()
-        .map(userAgentString -> {
-          try {
-            return UserAgentUtil.parseUserAgentString(userAgentString);
-          } catch (final UnrecognizedUserAgentException e) {
-            return null;
-          }
-        }).orElse(null);
-
-    if (shouldBlock(userAgent)) {
+    if (shouldBlock(RequestAttributesUtil.getUserAgent().orElse(null))) {
       call.close(StatusConstants.UPGRADE_NEEDED_STATUS, new Metadata());
       return new ServerCall.Listener<>() {};
     } else {
@@ -117,28 +108,28 @@ public class RemoteDeprecationFilter implements Filter, ServerInterceptor {
       return true;
     }
 
-    if (blockedVersionsByPlatform.containsKey(userAgent.platform())) {
-      if (blockedVersionsByPlatform.get(userAgent.platform()).contains(userAgent.version())) {
+    if (blockedVersionsByPlatform.containsKey(userAgent.getPlatform())) {
+      if (blockedVersionsByPlatform.get(userAgent.getPlatform()).contains(userAgent.getVersion())) {
         recordDeprecation(userAgent, BLOCKED_CLIENT_REASON);
         shouldBlock = true;
       }
     }
 
-    if (minimumVersionsByPlatform.containsKey(userAgent.platform())) {
-      if (userAgent.version().isLowerThan(minimumVersionsByPlatform.get(userAgent.platform()))) {
+    if (minimumVersionsByPlatform.containsKey(userAgent.getPlatform())) {
+      if (userAgent.getVersion().isLowerThan(minimumVersionsByPlatform.get(userAgent.getPlatform()))) {
         recordDeprecation(userAgent, EXPIRED_CLIENT_REASON);
         shouldBlock = true;
       }
     }
 
-    if (versionsPendingBlockByPlatform.containsKey(userAgent.platform())) {
-      if (versionsPendingBlockByPlatform.get(userAgent.platform()).contains(userAgent.version())) {
+    if (versionsPendingBlockByPlatform.containsKey(userAgent.getPlatform())) {
+      if (versionsPendingBlockByPlatform.get(userAgent.getPlatform()).contains(userAgent.getVersion())) {
         recordPendingDeprecation(userAgent, BLOCKED_CLIENT_REASON);
       }
     }
 
-    if (versionsPendingDeprecationByPlatform.containsKey(userAgent.platform())) {
-      if (userAgent.version().isLowerThan(versionsPendingDeprecationByPlatform.get(userAgent.platform()))) {
+    if (versionsPendingDeprecationByPlatform.containsKey(userAgent.getPlatform())) {
+      if (userAgent.getVersion().isLowerThan(versionsPendingDeprecationByPlatform.get(userAgent.getPlatform()))) {
         recordPendingDeprecation(userAgent, EXPIRED_CLIENT_REASON);
       }
     }
@@ -148,13 +139,13 @@ public class RemoteDeprecationFilter implements Filter, ServerInterceptor {
 
   private void recordDeprecation(final UserAgent userAgent, final String reason) {
     Metrics.counter(DEPRECATED_CLIENT_COUNTER_NAME,
-        PLATFORM_TAG, userAgent != null ? userAgent.platform().name().toLowerCase() : "unrecognized",
+        PLATFORM_TAG, userAgent != null ? userAgent.getPlatform().name().toLowerCase() : "unrecognized",
         REASON_TAG_NAME, reason).increment();
   }
 
   private void recordPendingDeprecation(final UserAgent userAgent, final String reason) {
     Metrics.counter(PENDING_DEPRECATION_COUNTER_NAME,
-        PLATFORM_TAG, userAgent.platform().name().toLowerCase(),
+        PLATFORM_TAG, userAgent.getPlatform().name().toLowerCase(),
         REASON_TAG_NAME, reason).increment();
   }
 }

service/src/main/java/org/whispersystems/textsecuregcm/filters/RestDeprecationFilter.java

@@ -15,6 +15,8 @@ import jakarta.ws.rs.container.ContainerRequestFilter;
 import jakarta.ws.rs.core.SecurityContext;
 import java.io.IOException;
 import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.textsecuregcm.auth.AuthenticatedDevice;
@@ -68,8 +70,8 @@ public class RestDeprecationFilter implements ContainerRequestFilter {
 
     try {
       final UserAgent userAgent = UserAgentUtil.parseUserAgentString(userAgentString);
-      final ClientPlatform platform = userAgent.platform();
-      final Semver version = userAgent.version();
+      final ClientPlatform platform = userAgent.getPlatform();
+      final Semver version = userAgent.getVersion();
       if (!minimumRestFreeVersion.containsKey(platform)) {
         return;
       }

service/src/main/java/org/whispersystems/textsecuregcm/grpc/ChannelNotFoundException.java

@@ -1,12 +0,0 @@
-/*
- * Copyright 2025 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.grpc;
-
-/**
- * Indicates that a remote channel was not found for a given server call or remote address.
- */
-public class ChannelNotFoundException extends Exception {
-}

service/src/main/java/org/whispersystems/textsecuregcm/grpc/MessagesAnonymousGrpcService.java

@@ -5,7 +5,6 @@
 
 package org.whispersystems.textsecuregcm.grpc;
 
-import com.google.protobuf.ByteString;
 import io.grpc.Status;
 import io.grpc.StatusException;
 import java.time.Clock;
@@ -13,6 +12,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import org.signal.chat.messages.IndividualRecipientMessageBundle;
+import org.signal.chat.messages.MismatchedDevices;
 import org.signal.chat.messages.MultiRecipientMismatchedDevices;
 import org.signal.chat.messages.SendMessageResponse;
 import org.signal.chat.messages.SendMultiRecipientMessageRequest;
@@ -25,6 +25,7 @@ import org.signal.libsignal.protocol.InvalidMessageException;
 import org.signal.libsignal.protocol.InvalidVersionException;
 import org.signal.libsignal.protocol.SealedSenderMultiRecipientMessage;
 import org.whispersystems.textsecuregcm.auth.UnidentifiedAccessUtil;
+import org.whispersystems.textsecuregcm.controllers.MismatchedDevicesException;
 import org.whispersystems.textsecuregcm.controllers.MultiRecipientMismatchedDevicesException;
 import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException;
 import org.whispersystems.textsecuregcm.entities.MessageProtos;
@@ -160,22 +161,16 @@ public class MessagesAnonymousGrpcService extends SimpleMessagesAnonymousGrpc.Me
         .stream()
         .collect(Collectors.toMap(
             entry -> DeviceIdUtil.validate(entry.getKey()),
-            entry -> {
-              final MessageProtos.Envelope.Builder envelopeBuilder = MessageProtos.Envelope.newBuilder()
-                  .setType(MessageProtos.Envelope.Type.UNIDENTIFIED_SENDER)
-                  .setClientTimestamp(messages.getTimestamp())
-                  .setServerTimestamp(clock.millis())
-                  .setDestinationServiceId(destinationServiceIdentifier.toServiceIdentifierString())
-                  .setEphemeral(ephemeral)
-                  .setUrgent(urgent)
-                  .setStory(story)
-                  .setContent(entry.getValue().getPayload());
-
-              spamCheckResult.token().ifPresent(reportSpamToken ->
-                  envelopeBuilder.setReportSpamToken(ByteString.copyFrom(reportSpamToken)));
-
-              return envelopeBuilder.build();
-            }
+            entry -> MessageProtos.Envelope.newBuilder()
+                .setType(MessageProtos.Envelope.Type.UNIDENTIFIED_SENDER)
+                .setClientTimestamp(messages.getTimestamp())
+                .setServerTimestamp(clock.millis())
+                .setDestinationServiceId(destinationServiceIdentifier.toServiceIdentifierString())
+                .setEphemeral(ephemeral)
+                .setUrgent(urgent)
+                .setStory(story)
+                .setContent(entry.getValue().getPayload())
+                .build()
         ));
 
     final Map<Byte, Integer> registrationIdsByDeviceId = messages.getMessagesMap().entrySet().stream()
@@ -183,12 +178,21 @@ public class MessagesAnonymousGrpcService extends SimpleMessagesAnonymousGrpc.Me
             entry -> entry.getKey().byteValue(),
             entry -> entry.getValue().getRegistrationId()));
 
-    return MessagesGrpcHelper.sendMessage(messageSender,
-        destination,
-        destinationServiceIdentifier,
-        messagesByDeviceId,
-        registrationIdsByDeviceId,
-        Optional.empty());
+    try {
+      messageSender.sendMessages(destination,
+          destinationServiceIdentifier,
+          messagesByDeviceId,
+          registrationIdsByDeviceId,
+          RequestAttributesUtil.getRawUserAgent().orElse(null));
+
+      return SEND_MESSAGE_SUCCESS_RESPONSE;
+    } catch (final MismatchedDevicesException e) {
+      return SendMessageResponse.newBuilder()
+          .setMismatchedDevices(buildMismatchedDevices(destinationServiceIdentifier, e.getMismatchedDevices()))
+          .build();
+    } catch (final MessageTooLargeException e) {
+      throw Status.INVALID_ARGUMENT.withDescription("Message too large").withCause(e).asException();
+    }
   }
 
   @Override
@@ -253,7 +257,7 @@ public class MessagesAnonymousGrpcService extends SimpleMessagesAnonymousGrpc.Me
           story,
           ephemeral,
           urgent,
-          RequestAttributesUtil.getUserAgent().orElse(null));
+          RequestAttributesUtil.getRawUserAgent().orElse(null));
 
       final SendMultiRecipientMessageResponse.Builder responseBuilder = SendMultiRecipientMessageResponse.newBuilder();
 
@@ -272,7 +276,7 @@ public class MessagesAnonymousGrpcService extends SimpleMessagesAnonymousGrpc.Me
           MultiRecipientMismatchedDevices.newBuilder();
 
       e.getMismatchedDevicesByServiceIdentifier().forEach((serviceIdentifier, mismatchedDevices) ->
-          mismatchedDevicesBuilder.addMismatchedDevices(MessagesGrpcHelper.buildMismatchedDevices(serviceIdentifier, mismatchedDevices)));
+          mismatchedDevicesBuilder.addMismatchedDevices(buildMismatchedDevices(serviceIdentifier, mismatchedDevices)));
 
       return SendMultiRecipientMessageResponse.newBuilder()
           .setMismatchedDevices(mismatchedDevicesBuilder)
@@ -299,4 +303,17 @@ public class MessagesAnonymousGrpcService extends SimpleMessagesAnonymousGrpc.Me
 
     return multiRecipientMessage;
   }
+
+  private MismatchedDevices buildMismatchedDevices(final ServiceIdentifier serviceIdentifier,
+      org.whispersystems.textsecuregcm.controllers.MismatchedDevices mismatchedDevices) {
+
+    final MismatchedDevices.Builder mismatchedDevicesBuilder = MismatchedDevices.newBuilder()
+        .setServiceIdentifier(ServiceIdentifierUtil.toGrpcServiceIdentifier(serviceIdentifier));
+
+    mismatchedDevices.missingDeviceIds().forEach(mismatchedDevicesBuilder::addMissingDevices);
+    mismatchedDevices.extraDeviceIds().forEach(mismatchedDevicesBuilder::addExtraDevices);
+    mismatchedDevices.staleDeviceIds().forEach(mismatchedDevicesBuilder::addStaleDevices);
+
+    return mismatchedDevicesBuilder.build();
+  }
 }

service/src/main/java/org/whispersystems/textsecuregcm/grpc/MessagesGrpcHelper.java

@@ -1,91 +0,0 @@
-/*
- * Copyright 2025 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.grpc;
-
-import io.grpc.Status;
-import io.grpc.StatusException;
-import java.util.Map;
-import java.util.Optional;
-import org.signal.chat.messages.MismatchedDevices;
-import org.signal.chat.messages.SendMessageResponse;
-import org.whispersystems.textsecuregcm.controllers.MismatchedDevicesException;
-import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException;
-import org.whispersystems.textsecuregcm.entities.MessageProtos;
-import org.whispersystems.textsecuregcm.identity.ServiceIdentifier;
-import org.whispersystems.textsecuregcm.push.MessageSender;
-import org.whispersystems.textsecuregcm.push.MessageTooLargeException;
-import org.whispersystems.textsecuregcm.storage.Account;
-
-public class MessagesGrpcHelper {
-
-  private static final SendMessageResponse SEND_MESSAGE_SUCCESS_RESPONSE = SendMessageResponse.newBuilder().build();
-
-  /**
-   * Sends a "bundle" of messages to an individual destination account, mapping common exceptions to appropriate gRPC
-   * statuses.
-   *
-   * @param messageSender the {@code MessageSender} instance to use to send the messages
-   * @param destination the destination account for the messages
-   * @param destinationServiceIdentifier the service identifier for the destination account
-   * @param messagesByDeviceId a map of device IDs to message payloads
-   * @param registrationIdsByDeviceId a map of device IDs to device registration IDs
-   * @param syncMessageSenderDeviceId if the message is a sync message (i.e. a message to other devices linked to the
-   *                                  caller's own account), contains the ID of the device that sent the message
-   *
-   * @return a response object to send to callers
-   *
-   * @throws StatusException if the message bundle could not be sent due to an out-of-date device set or an invalid
-   * message payload
-   * @throws RateLimitExceededException if the message bundle could not be sent due to a violated rated limit
-   */
-  public static SendMessageResponse sendMessage(final MessageSender messageSender,
-      final Account destination,
-      final ServiceIdentifier destinationServiceIdentifier,
-      final Map<Byte, MessageProtos.Envelope> messagesByDeviceId,
-      final Map<Byte, Integer> registrationIdsByDeviceId,
-      @SuppressWarnings("OptionalUsedAsFieldOrParameterType") final Optional<Byte> syncMessageSenderDeviceId)
-      throws StatusException, RateLimitExceededException {
-
-    try {
-      messageSender.sendMessages(destination,
-          destinationServiceIdentifier,
-          messagesByDeviceId,
-          registrationIdsByDeviceId,
-          syncMessageSenderDeviceId,
-          RequestAttributesUtil.getUserAgent().orElse(null));
-
-      return SEND_MESSAGE_SUCCESS_RESPONSE;
-    } catch (final MismatchedDevicesException e) {
-      return SendMessageResponse.newBuilder()
-          .setMismatchedDevices(buildMismatchedDevices(destinationServiceIdentifier, e.getMismatchedDevices()))
-          .build();
-    } catch (final MessageTooLargeException e) {
-      throw Status.INVALID_ARGUMENT.withDescription("Message too large").withCause(e).asException();
-    }
-  }
-
-  /**
-   * Translates an internal {@link org.whispersystems.textsecuregcm.controllers.MismatchedDevices} entity to a gRPC
-   * {@link MismatchedDevices} entity.
-   *
-   * @param serviceIdentifier the service identifier to which the mismatched device response applies
-   * @param mismatchedDevices the mismatched device entity to translate to gRPC
-   *
-   * @return a gRPC {@code MismatchedDevices} representation of the given mismatched devices
-   */
-  public static MismatchedDevices buildMismatchedDevices(final ServiceIdentifier serviceIdentifier,
-      final org.whispersystems.textsecuregcm.controllers.MismatchedDevices mismatchedDevices) {
-
-    final MismatchedDevices.Builder mismatchedDevicesBuilder = MismatchedDevices.newBuilder()
-        .setServiceIdentifier(ServiceIdentifierUtil.toGrpcServiceIdentifier(serviceIdentifier));
-
-    mismatchedDevices.missingDeviceIds().forEach(mismatchedDevicesBuilder::addMissingDevices);
-    mismatchedDevices.extraDeviceIds().forEach(mismatchedDevicesBuilder::addExtraDevices);
-    mismatchedDevices.staleDeviceIds().forEach(mismatchedDevicesBuilder::addStaleDevices);
-
-    return mismatchedDevicesBuilder.build();
-  }
-}

service/src/main/java/org/whispersystems/textsecuregcm/grpc/MessagesGrpcService.java

@@ -1,188 +0,0 @@
-/*
- * Copyright 2025 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.grpc;
-
-import com.google.protobuf.ByteString;
-import io.grpc.Status;
-import io.grpc.StatusException;
-import java.time.Clock;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import org.signal.chat.messages.AuthenticatedSenderMessageType;
-import org.signal.chat.messages.IndividualRecipientMessageBundle;
-import org.signal.chat.messages.SendAuthenticatedSenderMessageRequest;
-import org.signal.chat.messages.SendMessageResponse;
-import org.signal.chat.messages.SendSyncMessageRequest;
-import org.signal.chat.messages.SimpleMessagesGrpc;
-import org.whispersystems.textsecuregcm.auth.grpc.AuthenticatedDevice;
-import org.whispersystems.textsecuregcm.auth.grpc.AuthenticationUtil;
-import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException;
-import org.whispersystems.textsecuregcm.entities.MessageProtos;
-import org.whispersystems.textsecuregcm.identity.AciServiceIdentifier;
-import org.whispersystems.textsecuregcm.identity.ServiceIdentifier;
-import org.whispersystems.textsecuregcm.limits.CardinalityEstimator;
-import org.whispersystems.textsecuregcm.limits.RateLimiters;
-import org.whispersystems.textsecuregcm.push.MessageSender;
-import org.whispersystems.textsecuregcm.spam.GrpcResponse;
-import org.whispersystems.textsecuregcm.spam.MessageType;
-import org.whispersystems.textsecuregcm.spam.SpamCheckResult;
-import org.whispersystems.textsecuregcm.spam.SpamChecker;
-import org.whispersystems.textsecuregcm.storage.Account;
-import org.whispersystems.textsecuregcm.storage.AccountsManager;
-
-public class MessagesGrpcService extends SimpleMessagesGrpc.MessagesImplBase {
-
-  private final AccountsManager accountsManager;
-  private final RateLimiters rateLimiters;
-  private final MessageSender messageSender;
-  private final CardinalityEstimator messageByteLimitEstimator;
-  private final SpamChecker spamChecker;
-  private final Clock clock;
-
-  public MessagesGrpcService(final AccountsManager accountsManager,
-      final RateLimiters rateLimiters,
-      final MessageSender messageSender,
-      final CardinalityEstimator messageByteLimitEstimator,
-      final SpamChecker spamChecker,
-      final Clock clock) {
-
-    this.accountsManager = accountsManager;
-    this.rateLimiters = rateLimiters;
-    this.messageSender = messageSender;
-    this.messageByteLimitEstimator = messageByteLimitEstimator;
-    this.spamChecker = spamChecker;
-    this.clock = clock;
-  }
-
-  @Override
-  public SendMessageResponse sendMessage(final SendAuthenticatedSenderMessageRequest request)
-      throws StatusException, RateLimitExceededException {
-
-    final AuthenticatedDevice authenticatedDevice = AuthenticationUtil.requireAuthenticatedDevice();
-    final AciServiceIdentifier senderServiceIdentifier = new AciServiceIdentifier(authenticatedDevice.accountIdentifier());
-    final Account sender =
-        accountsManager.getByServiceIdentifier(senderServiceIdentifier).orElseThrow(Status.UNAUTHENTICATED::asException);
-
-    final ServiceIdentifier destinationServiceIdentifier =
-        ServiceIdentifierUtil.fromGrpcServiceIdentifier(request.getDestination());
-
-    if (sender.isIdentifiedBy(destinationServiceIdentifier)) {
-      throw Status.INVALID_ARGUMENT
-          .withDescription("Use `sendSyncMessage` to send messages to own account")
-          .asException();
-    }
-
-    final Account destination = accountsManager.getByServiceIdentifier(destinationServiceIdentifier)
-        .orElseThrow(Status.NOT_FOUND::asException);
-
-    rateLimiters.getMessagesLimiter().validate(authenticatedDevice.accountIdentifier(), destination.getUuid());
-
-    return sendMessage(destination,
-        destinationServiceIdentifier,
-        authenticatedDevice,
-        request.getType(),
-        MessageType.INDIVIDUAL_IDENTIFIED_SENDER,
-        request.getMessages(),
-        request.getEphemeral(),
-        request.getUrgent());
-  }
-
-  @Override
-  public SendMessageResponse sendSyncMessage(final SendSyncMessageRequest request)
-      throws StatusException, RateLimitExceededException {
-
-    final AuthenticatedDevice authenticatedDevice = AuthenticationUtil.requireAuthenticatedDevice();
-    final AciServiceIdentifier senderServiceIdentifier = new AciServiceIdentifier(authenticatedDevice.accountIdentifier());
-    final Account sender =
-        accountsManager.getByServiceIdentifier(senderServiceIdentifier).orElseThrow(Status.UNAUTHENTICATED::asException);
-
-    return sendMessage(sender,
-        senderServiceIdentifier,
-        authenticatedDevice,
-        request.getType(),
-        MessageType.SYNC,
-        request.getMessages(),
-        false,
-        request.getUrgent());
-  }
-
-  private SendMessageResponse sendMessage(final Account destination,
-      final ServiceIdentifier destinationServiceIdentifier,
-      final AuthenticatedDevice sender,
-      final AuthenticatedSenderMessageType envelopeType,
-      final MessageType messageType,
-      final IndividualRecipientMessageBundle messages,
-      final boolean ephemeral,
-      final boolean urgent) throws StatusException, RateLimitExceededException {
-
-    try {
-      final int totalPayloadLength = messages.getMessagesMap().values().stream()
-          .mapToInt(message -> message.getPayload().size())
-          .sum();
-
-      rateLimiters.getInboundMessageBytes().validate(destinationServiceIdentifier.uuid(), totalPayloadLength);
-    } catch (final RateLimitExceededException e) {
-      messageByteLimitEstimator.add(destinationServiceIdentifier.uuid().toString());
-      throw e;
-    }
-
-    final SpamCheckResult<GrpcResponse<SendMessageResponse>> spamCheckResult =
-        spamChecker.checkForIndividualRecipientSpamGrpc(messageType,
-            Optional.of(sender),
-            Optional.of(destination),
-            destinationServiceIdentifier);
-
-    if (spamCheckResult.response().isPresent()) {
-      return spamCheckResult.response().get().getResponseOrThrowStatus();
-    }
-
-    final Map<Byte, MessageProtos.Envelope> messagesByDeviceId = messages.getMessagesMap().entrySet()
-        .stream()
-        .collect(Collectors.toMap(
-            entry -> DeviceIdUtil.validate(entry.getKey()),
-            entry -> {
-              final MessageProtos.Envelope.Builder envelopeBuilder = MessageProtos.Envelope.newBuilder()
-                  .setType(getEnvelopeType(envelopeType))
-                  .setClientTimestamp(messages.getTimestamp())
-                  .setServerTimestamp(clock.millis())
-                  .setDestinationServiceId(destinationServiceIdentifier.toServiceIdentifierString())
-                  .setSourceServiceId(new AciServiceIdentifier(sender.accountIdentifier()).toServiceIdentifierString())
-                  .setSourceDevice(sender.deviceId())
-                  .setEphemeral(ephemeral)
-                  .setUrgent(urgent)
-                  .setContent(entry.getValue().getPayload());
-
-              spamCheckResult.token().ifPresent(reportSpamToken ->
-                  envelopeBuilder.setReportSpamToken(ByteString.copyFrom(reportSpamToken)));
-
-              return envelopeBuilder.build();
-            }
-        ));
-
-    final Map<Byte, Integer> registrationIdsByDeviceId = messages.getMessagesMap().entrySet().stream()
-        .collect(Collectors.toMap(
-            entry -> entry.getKey().byteValue(),
-            entry -> entry.getValue().getRegistrationId()));
-
-    return MessagesGrpcHelper.sendMessage(messageSender,
-        destination,
-        destinationServiceIdentifier,
-        messagesByDeviceId,
-        registrationIdsByDeviceId,
-        messageType == MessageType.SYNC ? Optional.of(sender.deviceId()) : Optional.empty());
-  }
-
-  private static MessageProtos.Envelope.Type getEnvelopeType(final AuthenticatedSenderMessageType type) {
-    return switch (type) {
-      case DOUBLE_RATCHET -> MessageProtos.Envelope.Type.CIPHERTEXT;
-      case PREKEY_MESSAGE -> MessageProtos.Envelope.Type.PREKEY_BUNDLE;
-      case PLAINTEXT_CONTENT -> MessageProtos.Envelope.Type.PLAINTEXT_CONTENT;
-      case UNSPECIFIED, UNRECOGNIZED ->
-          throw Status.INVALID_ARGUMENT.withDescription("Unrecognized envelope type").asRuntimeException();
-    };
-  }
-}

service/src/main/java/org/whispersystems/textsecuregcm/grpc/ProfileGrpcService.java

@@ -145,13 +145,11 @@ public class ProfileGrpcService extends ReactorProfileGrpc.ProfileImplBase {
                   request.getCommitment().toByteArray())));
 
           final List<Mono<?>> updates = new ArrayList<>(2);
+          final List<AccountBadge> updatedBadges = Optional.of(request.getBadgeIdsList())
+              .map(badges -> ProfileHelper.mergeBadgeIdsWithExistingAccountBadges(clock, badgeConfigurationMap, badges, account.getBadges()))
+              .orElseGet(account::getBadges);
 
           updates.add(Mono.fromFuture(() -> accountsManager.updateAsync(account, a -> {
-
-            final List<AccountBadge> updatedBadges = Optional.of(request.getBadgeIdsList())
-                .map(badges -> ProfileHelper.mergeBadgeIdsWithExistingAccountBadges(clock, badgeConfigurationMap, badges, a.getBadges()))
-                .orElseGet(a::getBadges);
-
             a.setBadges(clock, updatedBadges);
             a.setCurrentProfileVersion(request.getVersion());
           })));

service/src/main/java/org/whispersystems/textsecuregcm/grpc/RequestAttributes.java

@@ -1,16 +0,0 @@
-/*
- * Copyright 2025 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.grpc;
-
-import java.net.InetAddress;
-import java.util.List;
-import java.util.Locale;
-import javax.annotation.Nullable;
-
-public record RequestAttributes(InetAddress remoteAddress,
-                                @Nullable String userAgent,
-                                List<Locale.LanguageRange> acceptLanguage) {
-}

service/src/main/java/org/whispersystems/textsecuregcm/grpc/RequestAttributesInterceptor.java

@@ -2,25 +2,28 @@ package org.whispersystems.textsecuregcm.grpc;
 
 import io.grpc.Context;
 import io.grpc.Contexts;
+import io.grpc.Grpc;
 import io.grpc.Metadata;
 import io.grpc.ServerCall;
 import io.grpc.ServerCallHandler;
 import io.grpc.ServerInterceptor;
 import io.grpc.Status;
+import io.netty.channel.local.LocalAddress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.whispersystems.textsecuregcm.grpc.net.GrpcClientConnectionManager;
+import org.whispersystems.textsecuregcm.util.ua.UserAgent;
+import java.net.InetAddress;
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
 
-/**
- * The request attributes interceptor makes request attributes from the underlying remote channel available to service
- * implementations by attaching them to a {@link Context} attribute that can be read via {@link RequestAttributesUtil}.
- * All server calls should have request attributes, and calls will be rejected with a status of {@code UNAVAILABLE} if
- * request attributes are unavailable (i.e. the underlying channel closed before the {@code ServerCall} started).
- *
- * @see RequestAttributesUtil
- */
 public class RequestAttributesInterceptor implements ServerInterceptor {
 
   private final GrpcClientConnectionManager grpcClientConnectionManager;
 
+  private static final Logger log = LoggerFactory.getLogger(RequestAttributesInterceptor.class);
+
   public RequestAttributesInterceptor(final GrpcClientConnectionManager grpcClientConnectionManager) {
     this.grpcClientConnectionManager = grpcClientConnectionManager;
   }
@@ -30,12 +33,52 @@ public class RequestAttributesInterceptor implements ServerInterceptor {
       final Metadata headers,
       final ServerCallHandler<ReqT, RespT> next) {
 
-    try {
-      return Contexts.interceptCall(Context.current()
-              .withValue(RequestAttributesUtil.REQUEST_ATTRIBUTES_CONTEXT_KEY,
-                  grpcClientConnectionManager.getRequestAttributes(call)), call, headers, next);
-    } catch (final ChannelNotFoundException e) {
-      return ServerInterceptorUtil.closeWithStatus(call, Status.UNAVAILABLE);
+    if (call.getAttributes().get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR) instanceof LocalAddress localAddress) {
+      Context context = Context.current();
+
+      {
+        final Optional<InetAddress> maybeRemoteAddress = grpcClientConnectionManager.getRemoteAddress(localAddress);
+
+        if (maybeRemoteAddress.isEmpty()) {
+          // We should never have a call from a party whose remote address we can't identify
+          log.warn("No remote address available");
+
+          call.close(Status.INTERNAL, new Metadata());
+          return new ServerCall.Listener<>() {};
+        }
+
+        context = context.withValue(RequestAttributesUtil.REMOTE_ADDRESS_CONTEXT_KEY, maybeRemoteAddress.get());
+      }
+
+      {
+        final Optional<List<Locale.LanguageRange>> maybeAcceptLanguage =
+            grpcClientConnectionManager.getAcceptableLanguages(localAddress);
+
+        if (maybeAcceptLanguage.isPresent()) {
+          context = context.withValue(RequestAttributesUtil.ACCEPT_LANGUAGE_CONTEXT_KEY, maybeAcceptLanguage.get());
+        }
+      }
+
+      {
+        final Optional<String> maybeRawUserAgent =
+            grpcClientConnectionManager.getRawUserAgent(localAddress);
+
+        if (maybeRawUserAgent.isPresent()) {
+          context = context.withValue(RequestAttributesUtil.RAW_USER_AGENT_CONTEXT_KEY, maybeRawUserAgent.get());
+        }
+      }
+
+      {
+        final Optional<UserAgent> maybeUserAgent = grpcClientConnectionManager.getUserAgent(localAddress);
+
+        if (maybeUserAgent.isPresent()) {
+          context = context.withValue(RequestAttributesUtil.USER_AGENT_CONTEXT_KEY, maybeUserAgent.get());
+        }
+      }
+
+      return Contexts.interceptCall(context, call, headers, next);
+    } else {
+      throw new AssertionError("Unexpected channel type: " + call.getAttributes().get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR));
     }
   }
 }

service/src/main/java/org/whispersystems/textsecuregcm/grpc/RequestAttributesUtil.java

@@ -3,13 +3,18 @@ package org.whispersystems.textsecuregcm.grpc;
 import io.grpc.Context;
 import java.net.InetAddress;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
+import org.whispersystems.textsecuregcm.util.ua.UserAgent;
 
 public class RequestAttributesUtil {
 
-  static final Context.Key<RequestAttributes> REQUEST_ATTRIBUTES_CONTEXT_KEY = Context.key("request-attributes");
+  static final Context.Key<List<Locale.LanguageRange>> ACCEPT_LANGUAGE_CONTEXT_KEY = Context.key("accept-language");
+  static final Context.Key<InetAddress> REMOTE_ADDRESS_CONTEXT_KEY = Context.key("remote-address");
+  static final Context.Key<String> RAW_USER_AGENT_CONTEXT_KEY = Context.key("unparsed-user-agent");
+  static final Context.Key<UserAgent> USER_AGENT_CONTEXT_KEY = Context.key("parsed-user-agent");
 
   private static final List<Locale> AVAILABLE_LOCALES = Arrays.asList(Locale.getAvailableLocales());
 
@@ -18,8 +23,8 @@ public class RequestAttributesUtil {
    *
    * @return the acceptable languages listed by the remote client; may be empty if unparseable or not specified
    */
-  public static List<Locale.LanguageRange> getAcceptableLanguages() {
-    return REQUEST_ATTRIBUTES_CONTEXT_KEY.get().acceptLanguage();
+  public static Optional<List<Locale.LanguageRange>> getAcceptableLanguages() {
+    return Optional.ofNullable(ACCEPT_LANGUAGE_CONTEXT_KEY.get());
   }
 
   /**
@@ -30,7 +35,9 @@ public class RequestAttributesUtil {
    * @return a list of distinct locales acceptable to the remote client and available in this JVM
    */
   public static List<Locale> getAvailableAcceptedLocales() {
-    return Locale.filter(getAcceptableLanguages(), AVAILABLE_LOCALES);
+    return getAcceptableLanguages()
+        .map(languageRanges -> Locale.filter(languageRanges, AVAILABLE_LOCALES))
+        .orElseGet(Collections::emptyList);
   }
 
   /**
@@ -39,7 +46,16 @@ public class RequestAttributesUtil {
    * @return the remote address of the remote client
    */
   public static InetAddress getRemoteAddress() {
-    return REQUEST_ATTRIBUTES_CONTEXT_KEY.get().remoteAddress();
+    return REMOTE_ADDRESS_CONTEXT_KEY.get();
+  }
+
+  /**
+   * Returns the parsed user-agent of the remote client in the current gRPC request context.
+   *
+   * @return the parsed user-agent of the remote client; may be empty if unparseable or not specified
+   */
+  public static Optional<UserAgent> getUserAgent() {
+    return Optional.ofNullable(USER_AGENT_CONTEXT_KEY.get());
   }
 
   /**
@@ -47,7 +63,7 @@ public class RequestAttributesUtil {
    *
    * @return the unparsed user-agent of the remote client; may be empty if not specified
    */
-  public static Optional<String> getUserAgent() {
-    return Optional.ofNullable(REQUEST_ATTRIBUTES_CONTEXT_KEY.get().userAgent());
+  public static Optional<String> getRawUserAgent() {
+    return Optional.ofNullable(RAW_USER_AGENT_CONTEXT_KEY.get());
   }
 }

service/src/main/java/org/whispersystems/textsecuregcm/grpc/ServerInterceptorUtil.java

@@ -1,39 +0,0 @@
-/*
- * Copyright 2025 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.grpc;
-
-import io.grpc.Metadata;
-import io.grpc.ServerCall;
-import io.grpc.Status;
-
-public class ServerInterceptorUtil {
-
-  @SuppressWarnings("rawtypes")
-  private static final ServerCall.Listener NO_OP_LISTENER = new ServerCall.Listener<>() {};
-
-  private static final Metadata EMPTY_TRAILERS = new Metadata();
-
-  private ServerInterceptorUtil() {
-  }
-
-  /**
-   * Closes the given server call with the given status, returning a no-op listener.
-   *
-   * @param call the server call to close
-   * @param status the status with which to close the call
-   *
-   * @return a no-op server call listener
-   *
-   * @param <ReqT> the type of request object handled by the server call
-   * @param <RespT> the type of response object returned by the server call
-   */
-  public static <ReqT, RespT> ServerCall.Listener<ReqT> closeWithStatus(final ServerCall<ReqT, RespT> call, final Status status) {
-    call.close(status, EMPTY_TRAILERS);
-
-    //noinspection unchecked
-    return NO_OP_LISTENER;
-  }
-}

service/src/main/java/org/whispersystems/textsecuregcm/grpc/ValidatingInterceptor.java

@@ -8,7 +8,7 @@ package org.whispersystems.textsecuregcm.grpc;
 import static org.whispersystems.textsecuregcm.grpc.validators.ValidatorUtils.internalError;
 
 import com.google.protobuf.Descriptors;
-import com.google.protobuf.Message;
+import com.google.protobuf.GeneratedMessageV3;
 import io.grpc.ForwardingServerCallListener;
 import io.grpc.Metadata;
 import io.grpc.ServerCall;
@@ -75,7 +75,7 @@ public class ValidatingInterceptor implements ServerInterceptor {
   }
 
   private void validateMessage(final Object message) throws StatusException {
-    if (message instanceof Message msg) {
+    if (message instanceof GeneratedMessageV3 msg) {
       try {
         for (final Descriptors.FieldDescriptor fd: msg.getDescriptorForType().getFields()) {
           for (final Map.Entry<Descriptors.FieldDescriptor, Object> entry: fd.getOptions().getAllFields().entrySet()) {

service/src/main/java/org/whispersystems/textsecuregcm/grpc/net/EstablishLocalGrpcConnectionHandler.java

@@ -12,10 +12,8 @@ import io.netty.handler.codec.http.websocketx.WebSocketCloseStatus;
 import io.netty.util.ReferenceCountUtil;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.textsecuregcm.auth.grpc.AuthenticatedDevice;
 
 /**
  * An "establish local connection" handler waits for a Noise handshake to complete upstream in the pipeline, buffering
@@ -50,12 +48,12 @@ class EstablishLocalGrpcConnectionHandler extends ChannelInboundHandlerAdapter {
 
   @Override
   public void userEventTriggered(final ChannelHandlerContext remoteChannelContext, final Object event) {
-    if (event instanceof NoiseIdentityDeterminedEvent(final Optional<AuthenticatedDevice> authenticatedDevice)) {
+    if (event instanceof NoiseIdentityDeterminedEvent noiseIdentityDeterminedEvent) {
       // We assume that we'll only get a completed handshake event if the handshake met all authentication requirements
       // for the requested service. If the handshake doesn't have an authenticated device, we assume we're trying to
       // connect to the anonymous service. If it does have an authenticated device, we assume we're aiming for the
       // authenticated service.
-      final LocalAddress grpcServerAddress = authenticatedDevice.isPresent()
+      final LocalAddress grpcServerAddress = noiseIdentityDeterminedEvent.authenticatedDevice().isPresent()
           ? authenticatedGrpcServerAddress
           : anonymousGrpcServerAddress;
 
@@ -74,7 +72,7 @@ class EstablishLocalGrpcConnectionHandler extends ChannelInboundHandlerAdapter {
             if (localChannelFuture.isSuccess()) {
               grpcClientConnectionManager.handleConnectionEstablished((LocalChannel) localChannelFuture.channel(),
                   remoteChannelContext.channel(),
-                  authenticatedDevice);
+                  noiseIdentityDeterminedEvent.authenticatedDevice());
 
               // Close the local connection if the remote channel closes and vice versa
               remoteChannelContext.channel().closeFuture().addListener(closeFuture -> localChannelFuture.channel().close());

service/src/main/java/org/whispersystems/textsecuregcm/grpc/net/GrpcClientConnectionManager.java

@@ -1,8 +1,6 @@
 package org.whispersystems.textsecuregcm.grpc.net;
 
 import com.google.common.annotations.VisibleForTesting;
-import io.grpc.Grpc;
-import io.grpc.ServerCall;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.local.LocalAddress;
@@ -25,25 +23,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.textsecuregcm.auth.DisconnectionRequestListener;
 import org.whispersystems.textsecuregcm.auth.grpc.AuthenticatedDevice;
-import org.whispersystems.textsecuregcm.grpc.ChannelNotFoundException;
-import org.whispersystems.textsecuregcm.grpc.RequestAttributes;
+import org.whispersystems.textsecuregcm.util.ua.UnrecognizedUserAgentException;
+import org.whispersystems.textsecuregcm.util.ua.UserAgent;
+import org.whispersystems.textsecuregcm.util.ua.UserAgentUtil;
 
 /**
  * A client connection manager associates a local connection to a local gRPC server with a remote connection through a
- * Noise tunnel. It provides access to metadata associated with the remote connection, including the authenticated
- * identity of the device that opened the connection (for non-anonymous connections). It can also close connections
- * associated with a given device if that device's credentials have changed and clients must reauthenticate.
- * <p>
- * In general, all {@link ServerCall}s <em>must</em> have a local address that in turn <em>should</em> be resolvable to
- * a remote channel, which <em>must</em> have associated request attributes and authentication status. It is possible
- * that a server call's local address may not be resolvable to a remote channel if the remote channel closed in the
- * narrow window between a server call being created and the start of call execution, in which case accessor methods
- * in this class will throw a {@link ChannelNotFoundException}.
- * <p>
- * A gRPC client connection manager's methods for getting request attributes accept {@link ServerCall} entities to
- * identify connections. In general, these methods should only be called from {@link io.grpc.ServerInterceptor}s.
- * Methods for requesting connection closure accept an {@link AuthenticatedDevice} to identify the connection and may
- * be called from any application code.
+ * Noise-over-WebSocket tunnel. It provides access to metadata associated with the remote connection, including the
+ * authenticated identity of the device that opened the connection (for non-anonymous connections). It can also close
+ * connections associated with a given device if that device's credentials have changed and clients must reauthenticate.
  */
 public class GrpcClientConnectionManager implements DisconnectionRequestListener {
 
@@ -55,56 +43,94 @@ public class GrpcClientConnectionManager implements DisconnectionRequestListener
       AttributeKey.valueOf(GrpcClientConnectionManager.class, "authenticatedDevice");
 
   @VisibleForTesting
-  public static final AttributeKey<RequestAttributes> REQUEST_ATTRIBUTES_KEY =
-      AttributeKey.valueOf(GrpcClientConnectionManager.class, "requestAttributes");
+  static final AttributeKey<InetAddress> REMOTE_ADDRESS_ATTRIBUTE_KEY =
+      AttributeKey.valueOf(WebsocketHandshakeCompleteHandler.class, "remoteAddress");
+
+  @VisibleForTesting
+  static final AttributeKey<String> RAW_USER_AGENT_ATTRIBUTE_KEY =
+      AttributeKey.valueOf(WebsocketHandshakeCompleteHandler.class, "rawUserAgent");
+
+  @VisibleForTesting
+  static final AttributeKey<UserAgent> PARSED_USER_AGENT_ATTRIBUTE_KEY =
+      AttributeKey.valueOf(WebsocketHandshakeCompleteHandler.class, "userAgent");
+
+  @VisibleForTesting
+  static final AttributeKey<List<Locale.LanguageRange>> ACCEPT_LANGUAGE_ATTRIBUTE_KEY =
+      AttributeKey.valueOf(WebsocketHandshakeCompleteHandler.class, "acceptLanguage");
 
   private static final Logger log = LoggerFactory.getLogger(GrpcClientConnectionManager.class);
 
   /**
-   * Returns the authenticated device associated with the given server call, if any. If the connection is anonymous
-   * (i.e. unauthenticated), the returned value will be empty.
+   * Returns the authenticated device associated with the given local address, if any. An authenticated device is
+   * available if and only if the given local address maps to an active local connection and that connection is
+   * authenticated (i.e. not anonymous).
    *
-   * @param serverCall the gRPC server call for which to find an authenticated device
+   * @param localAddress the local address for which to find an authenticated device
    *
    * @return the authenticated device associated with the given local address, if any
-   *
-   * @throws ChannelNotFoundException if the server call is not associated with a known channel; in practice, this
-   * generally indicates that the channel has closed while request processing is still in progress
    */
-  public Optional<AuthenticatedDevice> getAuthenticatedDevice(final ServerCall<?, ?> serverCall)
-      throws ChannelNotFoundException {
-
-    return getAuthenticatedDevice(getRemoteChannel(serverCall));
+  public Optional<AuthenticatedDevice> getAuthenticatedDevice(final LocalAddress localAddress) {
+    return getAuthenticatedDevice(remoteChannelsByLocalAddress.get(localAddress));
   }
 
-  @VisibleForTesting
-  Optional<AuthenticatedDevice> getAuthenticatedDevice(final Channel remoteChannel) {
-    return Optional.ofNullable(remoteChannel.attr(AUTHENTICATED_DEVICE_ATTRIBUTE_KEY).get());
+  private Optional<AuthenticatedDevice> getAuthenticatedDevice(@Nullable final Channel remoteChannel) {
+    return Optional.ofNullable(remoteChannel)
+        .map(channel -> channel.attr(AUTHENTICATED_DEVICE_ATTRIBUTE_KEY).get());
   }
 
   /**
-   * Returns the request attributes associated with the given server call.
+   * Returns the parsed acceptable languages associated with the given local address, if any. Acceptable languages may
+   * be unavailable if the local connection associated with the given local address has already closed, if the client
+   * did not provide a list of acceptable languages, or the list provided by the client could not be parsed.
    *
-   * @param serverCall the gRPC server call for which to retrieve request attributes
+   * @param localAddress the local address for which to find acceptable languages
    *
-   * @return the request attributes associated with the given server call
-   *
-   * @throws ChannelNotFoundException if the server call is not associated with a known channel; in practice, this
-   * generally indicates that the channel has closed while request processing is still in progress
+   * @return the acceptable languages associated with the given local address, if any
    */
-  public RequestAttributes getRequestAttributes(final ServerCall<?, ?> serverCall) throws ChannelNotFoundException {
-    return getRequestAttributes(getRemoteChannel(serverCall));
+  public Optional<List<Locale.LanguageRange>> getAcceptableLanguages(final LocalAddress localAddress) {
+    return Optional.ofNullable(remoteChannelsByLocalAddress.get(localAddress))
+        .map(remoteChannel -> remoteChannel.attr(ACCEPT_LANGUAGE_ATTRIBUTE_KEY).get());
   }
 
-  @VisibleForTesting
-  RequestAttributes getRequestAttributes(final Channel remoteChannel) {
-    final RequestAttributes requestAttributes = remoteChannel.attr(REQUEST_ATTRIBUTES_KEY).get();
+  /**
+   * Returns the remote address associated with the given local address, if any. A remote address may be unavailable if
+   * the local connection associated with the given local address has already closed.
+   *
+   * @param localAddress the local address for which to find a remote address
+   *
+   * @return the remote address associated with the given local address, if any
+   */
+  public Optional<InetAddress> getRemoteAddress(final LocalAddress localAddress) {
+    return Optional.ofNullable(remoteChannelsByLocalAddress.get(localAddress))
+        .map(remoteChannel -> remoteChannel.attr(REMOTE_ADDRESS_ATTRIBUTE_KEY).get());
+  }
 
-    if (requestAttributes == null) {
-      throw new IllegalStateException("Channel does not have request attributes");
-    }
+  /**
+   * Returns the unparsed user agent provided by the client that opened the connection associated with the given local
+   * address. This method may return an empty value if no active local connection is associated with the given local
+   * address.
+   *
+   * @param localAddress the local address for which to find a User-Agent string
+   *
+   * @return the user agent string associated with the given local address
+   */
+  public Optional<String> getRawUserAgent(final LocalAddress localAddress) {
+    return Optional.ofNullable(remoteChannelsByLocalAddress.get(localAddress))
+        .map(remoteChannel -> remoteChannel.attr(RAW_USER_AGENT_ATTRIBUTE_KEY).get());
+  }
 
-    return requestAttributes;
+  /**
+   * Returns the parsed user agent provided by the client that opened the connection associated with the given local
+   * address. This method may return an empty value if no active local connection is associated with the given local
+   * address or if the client's user-agent string was not recognized.
+   *
+   * @param localAddress the local address for which to find a User-Agent string
+   *
+   * @return the user agent associated with the given local address
+   */
+  public Optional<UserAgent> getUserAgent(final LocalAddress localAddress) {
+    return Optional.ofNullable(remoteChannelsByLocalAddress.get(localAddress))
+        .map(remoteChannel -> remoteChannel.attr(PARSED_USER_AGENT_ATTRIBUTE_KEY).get());
   }
 
   /**
@@ -113,13 +139,8 @@ public class GrpcClientConnectionManager implements DisconnectionRequestListener
    * @param authenticatedDevice the authenticated device for which to close connections
    */
   public void closeConnection(final AuthenticatedDevice authenticatedDevice) {
-    // Channels will actually get removed from the list/map by their closeFuture listeners. We copy the list to avoid
-    // concurrent modification; it's possible (though practically unlikely) that a channel can close and remove itself
-    // from the list while we're still iterating, resulting in a `ConcurrentModificationException`.
-    final List<Channel> channelsToClose =
-        new ArrayList<>(remoteChannelsByAuthenticatedDevice.getOrDefault(authenticatedDevice, Collections.emptyList()));
-
-    channelsToClose.forEach(channel ->
+    // Channels will actually get removed from the list/map by their closeFuture listeners
+    remoteChannelsByAuthenticatedDevice.getOrDefault(authenticatedDevice, Collections.emptyList()).forEach(channel ->
         channel.writeAndFlush(new CloseWebSocketFrame(ApplicationWebSocketCloseReason.REAUTHENTICATION_REQUIRED
                 .toWebSocketCloseStatus("Reauthentication required")))
             .addListener(ChannelFutureListener.CLOSE_ON_FAILURE));
@@ -130,32 +151,11 @@ public class GrpcClientConnectionManager implements DisconnectionRequestListener
     return remoteChannelsByAuthenticatedDevice.get(authenticatedDevice);
   }
 
-  private Channel getRemoteChannel(final ServerCall<?, ?> serverCall) throws ChannelNotFoundException {
-    return getRemoteChannel(getLocalAddress(serverCall));
-  }
-
   @VisibleForTesting
-  Channel getRemoteChannel(final LocalAddress localAddress) throws ChannelNotFoundException {
-    final Channel remoteChannel = remoteChannelsByLocalAddress.get(localAddress);
-
-    if (remoteChannel == null) {
-      throw new ChannelNotFoundException();
-    }
-
+  Channel getRemoteChannelByLocalAddress(final LocalAddress localAddress) {
     return remoteChannelsByLocalAddress.get(localAddress);
   }
 
-  private static LocalAddress getLocalAddress(final ServerCall<?, ?> serverCall) {
-    // In this server, gRPC's "remote" channel is actually a local channel that proxies to a distinct Noise channel.
-    // The gRPC "remote" address is the "local address" for the proxy connection, and the local address uniquely maps to
-    // a proxied Noise channel.
-    if (!(serverCall.getAttributes().get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR) instanceof LocalAddress localAddress)) {
-      throw new IllegalArgumentException("Unexpected channel type: " + serverCall.getAttributes().get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR));
-    }
-
-    return localAddress;
-  }
-
   /**
    * Handles successful completion of a WebSocket handshake and associates attributes and headers from the handshake
    * request with the channel via which the handshake took place.
@@ -166,23 +166,30 @@ public class GrpcClientConnectionManager implements DisconnectionRequestListener
    * @param acceptLanguageHeader the value of the Accept-Language header provided in the handshake request; may be
    * {@code null}
    */
-  static void handleHandshakeComplete(final Channel channel,
+  static void handleWebSocketHandshakeComplete(final Channel channel,
       final InetAddress preferredRemoteAddress,
       @Nullable final String userAgentHeader,
       @Nullable final String acceptLanguageHeader) {
 
-    @Nullable List<Locale.LanguageRange> acceptLanguages = Collections.emptyList();
+    channel.attr(GrpcClientConnectionManager.REMOTE_ADDRESS_ATTRIBUTE_KEY).set(preferredRemoteAddress);
+
+    if (StringUtils.isNotBlank(userAgentHeader)) {
+      channel.attr(GrpcClientConnectionManager.RAW_USER_AGENT_ATTRIBUTE_KEY).set(userAgentHeader);
+
+      try {
+        channel.attr(GrpcClientConnectionManager.PARSED_USER_AGENT_ATTRIBUTE_KEY)
+            .set(UserAgentUtil.parseUserAgentString(userAgentHeader));
+      } catch (final UnrecognizedUserAgentException ignored) {
+      }
+    }
 
     if (StringUtils.isNotBlank(acceptLanguageHeader)) {
       try {
-        acceptLanguages = Locale.LanguageRange.parse(acceptLanguageHeader);
+        channel.attr(GrpcClientConnectionManager.ACCEPT_LANGUAGE_ATTRIBUTE_KEY).set(Locale.LanguageRange.parse(acceptLanguageHeader));
       } catch (final IllegalArgumentException e) {
         log.debug("Invalid Accept-Language header from User-Agent {}: {}", userAgentHeader, acceptLanguageHeader, e);
       }
     }
-
-    channel.attr(REQUEST_ATTRIBUTES_KEY)
-        .set(new RequestAttributes(preferredRemoteAddress, userAgentHeader, acceptLanguages));
   }
 
   /**

service/src/main/java/org/whispersystems/textsecuregcm/grpc/net/WebsocketHandshakeCompleteHandler.java

@@ -74,7 +74,7 @@ class WebsocketHandshakeCompleteHandler extends ChannelInboundHandlerAdapter {
         preferredRemoteAddress = maybePreferredRemoteAddress.get();
       }
 
-      GrpcClientConnectionManager.handleHandshakeComplete(context.channel(),
+      GrpcClientConnectionManager.handleWebSocketHandshakeComplete(context.channel(),
           preferredRemoteAddress,
           handshakeCompleteEvent.requestHeaders().getAsString(HttpHeaderNames.USER_AGENT),
           handshakeCompleteEvent.requestHeaders().getAsString(HttpHeaderNames.ACCEPT_LANGUAGE));

service/src/main/java/org/whispersystems/textsecuregcm/grpc/validators/BaseFieldValidator.java

@@ -11,6 +11,7 @@ import static org.whispersystems.textsecuregcm.grpc.validators.ValidatorUtils.in
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Descriptors;
+import com.google.protobuf.GeneratedMessageV3;
 import com.google.protobuf.Message;
 import io.grpc.Status;
 import io.grpc.StatusException;
@@ -48,7 +49,7 @@ public abstract class BaseFieldValidator<T> implements FieldValidator {
   public void validate(
       final Object extensionValue,
       final Descriptors.FieldDescriptor fd,
-      final Message msg) throws StatusException {
+      final GeneratedMessageV3 msg) throws StatusException {
     try {
       final T extensionValueTyped = resolveExtensionValue(extensionValue);
 
@@ -115,7 +116,7 @@ public abstract class BaseFieldValidator<T> implements FieldValidator {
   protected void validateRepeatedField(
       final T extensionValue,
       final Descriptors.FieldDescriptor fd,
-      final Message msg) throws StatusException {
+      final GeneratedMessageV3 msg) throws StatusException {
     throw internalError("`validateRepeatedField` method needs to be implemented");
   }
 

service/src/main/java/org/whispersystems/textsecuregcm/grpc/validators/ExactlySizeFieldValidator.java

@@ -9,7 +9,7 @@ import static org.whispersystems.textsecuregcm.grpc.validators.ValidatorUtils.in
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Descriptors;
-import com.google.protobuf.Message;
+import com.google.protobuf.GeneratedMessageV3;
 import io.grpc.StatusException;
 import java.util.List;
 import java.util.Set;
@@ -53,7 +53,7 @@ public class ExactlySizeFieldValidator extends BaseFieldValidator<Set<Integer>>
   protected void validateRepeatedField(
       final Set<Integer> permittedSizes,
       final Descriptors.FieldDescriptor fd,
-      final Message msg) throws StatusException {
+      final GeneratedMessageV3 msg) throws StatusException {
     final int size = msg.getRepeatedFieldCount(fd);
     if (permittedSizes.contains(size)) {
       return;

service/src/main/java/org/whispersystems/textsecuregcm/grpc/validators/FieldValidator.java

@@ -6,11 +6,11 @@
 package org.whispersystems.textsecuregcm.grpc.validators;
 
 import com.google.protobuf.Descriptors;
-import com.google.protobuf.Message;
+import com.google.protobuf.GeneratedMessageV3;
 import io.grpc.StatusException;
 
 public interface FieldValidator {
 
-  void validate(Object extensionValue, Descriptors.FieldDescriptor fd, Message msg)
+  void validate(Object extensionValue, Descriptors.FieldDescriptor fd, GeneratedMessageV3 msg)
       throws StatusException;
 }

service/src/main/java/org/whispersystems/textsecuregcm/grpc/validators/NonEmptyFieldValidator.java

@@ -9,7 +9,7 @@ import static org.whispersystems.textsecuregcm.grpc.validators.ValidatorUtils.in
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Descriptors;
-import com.google.protobuf.Message;
+import com.google.protobuf.GeneratedMessageV3;
 import io.grpc.StatusException;
 import java.util.Set;
 import org.apache.commons.lang3.StringUtils;
@@ -52,7 +52,7 @@ public class NonEmptyFieldValidator extends BaseFieldValidator<Boolean> {
   protected void validateRepeatedField(
       final Boolean extensionValue,
       final Descriptors.FieldDescriptor fd,
-      final Message msg) throws StatusException {
+      final GeneratedMessageV3 msg) throws StatusException {
     if (msg.getRepeatedFieldCount(fd) > 0) {
       return;
     }

service/src/main/java/org/whispersystems/textsecuregcm/grpc/validators/Range.java

@@ -5,7 +5,7 @@
 
 package org.whispersystems.textsecuregcm.grpc.validators;
 
-public record Range(long min, long max) {
+public record Range(int min, int max) {
   public Range {
     if (min > max) {
       throw new IllegalArgumentException("invalid range values: expected min <= max but have [%d, %d],".formatted(min, max));

service/src/main/java/org/whispersystems/textsecuregcm/grpc/validators/RangeFieldValidator.java

@@ -39,8 +39,8 @@ public class RangeFieldValidator extends BaseFieldValidator<Range> {
   @Override
   protected Range resolveExtensionValue(final Object extensionValue) throws StatusException {
     final ValueRangeConstraint rangeConstraint = (ValueRangeConstraint) extensionValue;
-    final long min = rangeConstraint.hasMin() ? rangeConstraint.getMin() : Long.MIN_VALUE;
-    final long max = rangeConstraint.hasMax() ? rangeConstraint.getMax() : Long.MAX_VALUE;
+    final int min = rangeConstraint.hasMin() ? rangeConstraint.getMin() : Integer.MIN_VALUE;
+    final int max = rangeConstraint.hasMax() ? rangeConstraint.getMax() : Integer.MAX_VALUE;
     return new Range(min, max);
   }
 

service/src/main/java/org/whispersystems/textsecuregcm/grpc/validators/SizeFieldValidator.java

@@ -9,7 +9,7 @@ import static org.whispersystems.textsecuregcm.grpc.validators.ValidatorUtils.in
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Descriptors;
-import com.google.protobuf.Message;
+import com.google.protobuf.GeneratedMessageV3;
 import io.grpc.StatusException;
 import java.util.Set;
 import org.signal.chat.require.SizeConstraint;
@@ -48,7 +48,7 @@ public class SizeFieldValidator extends BaseFieldValidator<Range> {
   }
 
   @Override
-  protected void validateRepeatedField(final Range range, final Descriptors.FieldDescriptor fd, final Message msg) throws StatusException {
+  protected void validateRepeatedField(final Range range, final Descriptors.FieldDescriptor fd, final GeneratedMessageV3 msg) throws StatusException {
     final int size = msg.getRepeatedFieldCount(fd);
     if (size < range.min() || size > range.max()) {
       throw invalidArgument("field value is [%d] but expected to be within the [%d, %d] range".formatted(

service/src/main/java/org/whispersystems/textsecuregcm/metrics/OpenWebSocketCounter.java

@@ -67,7 +67,7 @@ public class OpenWebSocketCounter {
 
       try {
         final ClientPlatform clientPlatform =
-            UserAgentUtil.parseUserAgentString(context.getClient().getUserAgent()).platform();
+            UserAgentUtil.parseUserAgentString(context.getClient().getUserAgent()).getPlatform();
 
         calculatedOpenWebSocketCounter = openWebsocketsByClientPlatform.get(clientPlatform);
         calculatedDurationTimer = durationTimersByClientPlatform.get(clientPlatform);

service/src/main/java/org/whispersystems/textsecuregcm/metrics/UserAgentTagUtil.java

@@ -9,7 +9,6 @@ import io.micrometer.core.instrument.Tag;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
-import org.apache.commons.lang3.StringUtils;
 import org.whispersystems.textsecuregcm.WhisperServerVersion;
 import org.whispersystems.textsecuregcm.storage.ClientReleaseManager;
 import org.whispersystems.textsecuregcm.util.ua.UnrecognizedUserAgentException;
@@ -49,15 +48,15 @@ public class UserAgentTagUtil {
   }
 
   public static Tag getPlatformTag(@Nullable final UserAgent userAgent) {
-    return Tag.of(PLATFORM_TAG, userAgent != null ? userAgent.platform().name().toLowerCase() : "unrecognized");
+    return Tag.of(PLATFORM_TAG, userAgent != null ? userAgent.getPlatform().name().toLowerCase() : "unrecognized");
   }
 
   public static Optional<Tag> getClientVersionTag(final String userAgentString, final ClientReleaseManager clientReleaseManager) {
     try {
       final UserAgent userAgent = UserAgentUtil.parseUserAgentString(userAgentString);
 
-      if (clientReleaseManager.isVersionActive(userAgent.platform(), userAgent.version())) {
-        return Optional.of(Tag.of(VERSION_TAG, userAgent.version().toString()));
+      if (clientReleaseManager.isVersionActive(userAgent.getPlatform(), userAgent.getVersion())) {
+        return Optional.of(Tag.of(VERSION_TAG, userAgent.getVersion().toString()));
       }
     } catch (final UnrecognizedUserAgentException ignored) {
     }
@@ -71,8 +70,10 @@ public class UserAgentTagUtil {
 
     try {
       final UserAgent userAgent = UserAgentUtil.parseUserAgentString(userAgentString);
-      platform = userAgent.platform().name().toLowerCase();
-      libsignal = StringUtils.contains(userAgent.additionalSpecifiers(), "libsignal");
+      platform = userAgent.getPlatform().name().toLowerCase();
+      libsignal = userAgent.getAdditionalSpecifiers()
+          .map(additionalSpecifiers -> additionalSpecifiers.contains("libsignal"))
+          .orElse(false);
     } catch (final UnrecognizedUserAgentException e) {
       platform = "unrecognized";
       libsignal = false;

service/src/main/java/org/whispersystems/textsecuregcm/push/MessageSender.java

@@ -20,7 +20,6 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 import org.apache.commons.lang3.StringUtils;
 import org.signal.libsignal.protocol.SealedSenderMultiRecipientMessage;
 import org.signal.libsignal.protocol.util.Pair;
@@ -36,6 +35,7 @@ import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.Device;
 import org.whispersystems.textsecuregcm.storage.MessagesManager;
 import org.whispersystems.textsecuregcm.util.Util;
+import javax.annotation.Nullable;
 
 /**
  * A MessageSender sends Signal messages to destination devices. Messages may be "normal" user-to-user messages,
@@ -56,7 +56,6 @@ public class MessageSender {
   // Note that these names deliberately reference `MessageController` for metric continuity
   private static final String REJECT_OVERSIZE_MESSAGE_COUNTER_NAME = name(MessageController.class, "rejectOversizeMessage");
   private static final String CONTENT_SIZE_DISTRIBUTION_NAME = MetricsUtil.name(MessageController.class, "messageContentSize");
-  private static final String EMPTY_MESSAGE_LIST_COUNTER_NAME = MetricsUtil.name(MessageSender.class, "emptyMessageList");
 
   private static final String SEND_COUNTER_NAME = name(MessageSender.class, "sendMessage");
   private static final String EPHEMERAL_TAG_NAME = "ephemeral";
@@ -86,8 +85,6 @@ public class MessageSender {
    * @param destinationIdentifier the service identifier to which the messages are addressed
    * @param messagesByDeviceId a map of device IDs to message payloads
    * @param registrationIdsByDeviceId a map of device IDs to device registration IDs
-   * @param syncMessageSenderDeviceId if the message is a sync message (i.e. a message to other devices linked to the
-   *                                  caller's own account), contains the ID of the device that sent the message
    * @param userAgent the User-Agent string for the sender; may be {@code null} if not known
    *
    * @throws MismatchedDevicesException if the given bundle of messages did not include a message for all required
@@ -99,48 +96,34 @@ public class MessageSender {
       final ServiceIdentifier destinationIdentifier,
       final Map<Byte, Envelope> messagesByDeviceId,
       final Map<Byte, Integer> registrationIdsByDeviceId,
-      @SuppressWarnings("OptionalUsedAsFieldOrParameterType") final Optional<Byte> syncMessageSenderDeviceId,
       @Nullable final String userAgent) throws MismatchedDevicesException, MessageTooLargeException {
 
+    if (messagesByDeviceId.isEmpty()) {
+      return;
+    }
+
     if (!destination.isIdentifiedBy(destinationIdentifier)) {
       throw new IllegalArgumentException("Destination account not identified by destination service identifier");
     }
 
-    final Tag platformTag = UserAgentTagUtil.getPlatformTag(userAgent);
+    final Envelope firstMessage = messagesByDeviceId.values().iterator().next();
 
-    if (messagesByDeviceId.isEmpty()) {
-      Metrics.counter(EMPTY_MESSAGE_LIST_COUNTER_NAME,
-          Tags.of("sync", String.valueOf(syncMessageSenderDeviceId.isPresent())).and(platformTag)).increment();
-    }
+    final boolean isSyncMessage = StringUtils.isNotBlank(firstMessage.getSourceServiceId()) &&
+        destination.isIdentifiedBy(ServiceIdentifier.valueOf(firstMessage.getSourceServiceId()));
 
-    final byte excludedDeviceId;
-    if (syncMessageSenderDeviceId.isPresent()) {
-      if (messagesByDeviceId.values().stream().anyMatch(message -> StringUtils.isBlank(message.getSourceServiceId()) ||
-          !destination.isIdentifiedBy(ServiceIdentifier.valueOf(message.getSourceServiceId())))) {
+    final boolean isStory = firstMessage.getStory();
 
-        throw new IllegalArgumentException("Sync message sender device ID specified, but one or more messages are not addressed to sender");
-      }
-      excludedDeviceId = syncMessageSenderDeviceId.get();
-    } else {
-      if (messagesByDeviceId.values().stream().anyMatch(message -> StringUtils.isNotBlank(message.getSourceServiceId()) &&
-          destination.isIdentifiedBy(ServiceIdentifier.valueOf(message.getSourceServiceId())))) {
-
-        throw new IllegalArgumentException("Sync message sender device ID not specified, but one or more messages are addressed to sender");
-      }
-      excludedDeviceId = NO_EXCLUDED_DEVICE_ID;
-    }
+    validateIndividualMessageContentLength(messagesByDeviceId.values(), isSyncMessage, isStory, userAgent);
 
     final Optional<MismatchedDevices> maybeMismatchedDevices = getMismatchedDevices(destination,
         destinationIdentifier,
         registrationIdsByDeviceId,
-        excludedDeviceId);
+        isSyncMessage ? (byte) firstMessage.getSourceDevice() : NO_EXCLUDED_DEVICE_ID);
 
     if (maybeMismatchedDevices.isPresent()) {
       throw new MismatchedDevicesException(maybeMismatchedDevices.get());
     }
 
-    validateIndividualMessageContentLength(messagesByDeviceId.values(), syncMessageSenderDeviceId.isPresent(), userAgent);
-
     messagesManager.insert(destination.getIdentifier(IdentityType.ACI), messagesByDeviceId)
         .forEach((deviceId, destinationPresent) -> {
           final Envelope message = messagesByDeviceId.get(deviceId);
@@ -159,7 +142,7 @@ public class MessageSender {
                   STORY_TAG_NAME, String.valueOf(message.getStory()),
                   SEALED_SENDER_TAG_NAME, String.valueOf(!message.hasSourceServiceId()),
                   MULTI_RECIPIENT_TAG_NAME, "false")
-              .and(platformTag);
+              .and(UserAgentTagUtil.getPlatformTag(userAgent));
 
           Metrics.counter(SEND_COUNTER_NAME, tags).increment();
         });
@@ -325,13 +308,14 @@ public class MessageSender {
 
   private static void validateIndividualMessageContentLength(final Iterable<Envelope> messages,
       final boolean isSyncMessage,
+      final boolean isStory,
       @Nullable final String userAgent) throws MessageTooLargeException {
 
     for (final Envelope message : messages) {
       MessageSender.validateContentLength(message.getContent().size(),
           false,
           isSyncMessage,
-          message.getStory(),
+          isStory,
           userAgent);
     }
   }

service/src/main/java/org/whispersystems/textsecuregcm/push/ReceiptSender.java

@@ -8,7 +8,6 @@ package org.whispersystems.textsecuregcm.push;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;
 import org.slf4j.Logger;
@@ -71,7 +70,6 @@ public class ReceiptSender {
                     destinationIdentifier,
                     messagesByDeviceId,
                     registrationIdsByDeviceId,
-                    Optional.empty(),
                     UserAgentTagUtil.SERVER_UA);
               } catch (final Exception e) {
                 logger.warn("Could not send delivery receipt", e);

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

@@ -5,10 +5,8 @@
 package org.whispersystems.textsecuregcm.storage;
 
 import com.google.protobuf.ByteString;
-import java.time.Clock;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import org.apache.commons.lang3.ObjectUtils;
@@ -30,16 +28,12 @@ public class ChangeNumberManager {
   private static final Logger logger = LoggerFactory.getLogger(ChangeNumberManager.class);
   private final MessageSender messageSender;
   private final AccountsManager accountsManager;
-  private final Clock clock;
 
   public ChangeNumberManager(
       final MessageSender messageSender,
-      final AccountsManager accountsManager,
-      final Clock clock) {
-
+      final AccountsManager accountsManager) {
     this.messageSender = messageSender;
     this.accountsManager = accountsManager;
-    this.clock = clock;
   }
 
   public Account changeNumber(final Account account, final String number,
@@ -102,7 +96,7 @@ public class ChangeNumberManager {
       final String senderUserAgent) throws MessageTooLargeException, MismatchedDevicesException {
 
     try {
-      final long serverTimestamp = clock.millis();
+      final long serverTimestamp = System.currentTimeMillis();
       final ServiceIdentifier serviceIdentifier = new AciServiceIdentifier(account.getUuid());
 
       final Map<Byte, Envelope> messagesByDeviceId = deviceMessages.stream()
@@ -119,15 +113,10 @@ public class ChangeNumberManager {
               .setEphemeral(false)
               .build()));
 
-      final Map<Byte, Integer> registrationIdsByDeviceId = deviceMessages.stream()
-          .collect(Collectors.toMap(IncomingMessage::destinationDeviceId, IncomingMessage::destinationRegistrationId));
+      final Map<Byte, Integer> registrationIdsByDeviceId = account.getDevices().stream()
+          .collect(Collectors.toMap(Device::getId, Device::getRegistrationId));
 
-      messageSender.sendMessages(account,
-          serviceIdentifier,
-          messagesByDeviceId,
-          registrationIdsByDeviceId,
-          Optional.of(Device.PRIMARY_ID),
-          senderUserAgent);
+      messageSender.sendMessages(account, serviceIdentifier, messagesByDeviceId, registrationIdsByDeviceId, senderUserAgent);
     } catch (final RuntimeException e) {
       logger.warn("Changed number but could not send all device messages on {}", account.getUuid(), e);
       throw e;

service/src/main/java/org/whispersystems/textsecuregcm/subscriptions/StripeManager.java

@@ -7,7 +7,6 @@ package org.whispersystems.textsecuregcm.subscriptions;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
-import com.stripe.Stripe;
 import com.stripe.StripeClient;
 import com.stripe.exception.CardException;
 import com.stripe.exception.IdempotencyException;
@@ -72,7 +71,6 @@ import javax.crypto.spec.SecretKeySpec;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.textsecuregcm.WhisperServerVersion;
 import org.whispersystems.textsecuregcm.storage.PaymentTime;
 import org.whispersystems.textsecuregcm.storage.SubscriptionException;
 import org.whispersystems.textsecuregcm.util.Conversions;
@@ -99,9 +97,6 @@ public class StripeManager implements CustomerAwareSubscriptionPaymentProcessor
     if (Strings.isNullOrEmpty(apiKey)) {
       throw new IllegalArgumentException("apiKey cannot be empty");
     }
-
-    Stripe.setAppInfo("Signal-Server", WhisperServerVersion.getServerVersion());
-
     this.stripeClient = new StripeClient(apiKey);
     this.executor = Objects.requireNonNull(executor);
     this.idempotencyKeyGenerator = Objects.requireNonNull(idempotencyKeyGenerator);

service/src/main/java/org/whispersystems/textsecuregcm/util/logging/LoggingUnhandledExceptionMapper.java

@@ -46,7 +46,7 @@ public class LoggingUnhandledExceptionMapper extends LoggingExceptionMapper<Thro
 
       // streamline the user-agent if it is recognized
       final UserAgent ua = UserAgentUtil.parseUserAgentString(userAgent);
-      userAgent = String.format("%s %s", ua.platform(), ua.version());
+      userAgent = String.format("%s %s", ua.getPlatform(), ua.getVersion());
     } catch (final UnrecognizedUserAgentException ignored) {
 
     } catch (final Exception e) {

service/src/main/java/org/whispersystems/textsecuregcm/util/ua/UserAgent.java

@@ -6,8 +6,58 @@
 package org.whispersystems.textsecuregcm.util.ua;
 
 import com.vdurmont.semver4j.Semver;
-import javax.annotation.Nullable;
 import java.util.Objects;
+import java.util.Optional;
 
-public record UserAgent(ClientPlatform platform, Semver version, @Nullable String additionalSpecifiers) {
+public class UserAgent {
+
+  private final ClientPlatform platform;
+  private final Semver version;
+  private final String additionalSpecifiers;
+
+  public UserAgent(final ClientPlatform platform, final Semver version) {
+    this(platform, version, null);
+  }
+
+  public UserAgent(final ClientPlatform platform, final Semver version, final String additionalSpecifiers) {
+    this.platform = platform;
+    this.version = version;
+    this.additionalSpecifiers = additionalSpecifiers;
+  }
+
+  public ClientPlatform getPlatform() {
+    return platform;
+  }
+
+  public Semver getVersion() {
+    return version;
+  }
+
+  public Optional<String> getAdditionalSpecifiers() {
+    return Optional.ofNullable(additionalSpecifiers);
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    final UserAgent userAgent = (UserAgent)o;
+    return platform == userAgent.platform &&
+        version.equals(userAgent.version) &&
+        Objects.equals(additionalSpecifiers, userAgent.additionalSpecifiers);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(platform, version, additionalSpecifiers);
+  }
+
+  @Override
+  public String toString() {
+    return "UserAgent{" +
+        "platform=" + platform +
+        ", version=" + version +
+        ", additionalSpecifiers='" + additionalSpecifiers + '\'' +
+        '}';
+  }
 }

service/src/main/java/org/whispersystems/textsecuregcm/util/ua/UserAgentUtil.java

@@ -5,6 +5,7 @@
 
 package org.whispersystems.textsecuregcm.util.ua;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.vdurmont.semver4j.Semver;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -20,10 +21,10 @@ public class UserAgentUtil {
     }
 
     try {
-      final Matcher matcher = STANDARD_UA_PATTERN.matcher(userAgentString);
+      final UserAgent standardUserAgent = parseStandardUserAgentString(userAgentString);
 
-      if (matcher.matches()) {
-        return new UserAgent(ClientPlatform.valueOf(matcher.group(1).toUpperCase()), new Semver(matcher.group(2)), StringUtils.stripToNull(matcher.group(4)));
+      if (standardUserAgent != null) {
+        return standardUserAgent;
       }
     } catch (final Exception e) {
       throw new UnrecognizedUserAgentException(e);
@@ -31,4 +32,15 @@ public class UserAgentUtil {
 
     throw new UnrecognizedUserAgentException();
   }
+
+  @VisibleForTesting
+  static UserAgent parseStandardUserAgentString(final String userAgentString) {
+    final Matcher matcher = STANDARD_UA_PATTERN.matcher(userAgentString);
+
+    if (matcher.matches()) {
+      return new UserAgent(ClientPlatform.valueOf(matcher.group(1).toUpperCase()), new Semver(matcher.group(2)), StringUtils.stripToNull(matcher.group(4)));
+    }
+
+    return null;
+  }
 }

service/src/main/proto/org/signal/chat/messages.proto

@@ -24,12 +24,10 @@ service Messages {
    * destination account.
    *
    * This RPC may fail with a `NOT_FOUND` status if the destination account was
-   * not found. It may also fail with an `INVALID_ARGUMENT` status if the
-   * destination account is the same as the authenticated caller (callers should
-   * use `SendSyncMessage` to send messages to themselves). It may also fail
-   * with a `RESOURCE_EXHAUSTED` status if a rate limit for sending messages has
-   * been exceeded, in which case a `retry-after` header containing an ISO 8601
-   * duration string may be present in the response trailers.
+   * not found. It may also fail with a `RESOURCE_EXHAUSTED` status if a rate
+   * limit for sending messages has been exceeded, in which case a `retry-after`
+   * header containing an ISO 8601 duration string may be present in the
+   * response trailers.
    *
    * Note that message delivery may not succeed even if this RPC returns an `OK`
    * status; callers must check the response object to verify that the message
@@ -144,12 +142,9 @@ message IndividualRecipientMessageBundle {
 
   /**
    * The time, in milliseconds since the epoch, at which this message was
-   * originally sent from the perspective of the sender. Note that the maximum
-   * allowable timestamp for JavaScript clients is less than Long.MAX_VALUE; see
-   * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date#the_epoch_timestamps_and_invalid_date
-   * for additional details and discussion.
+   * originally sent from the perspective of the sender.
    */
-  uint64 timestamp = 1 [(require.range).min = 1, (require.range).max = 8640000000000000];
+  uint64 timestamp = 1;
 
   /**
    * A map of device IDs to individual messages. Generally, callers must include
@@ -332,12 +327,9 @@ message MultiRecipientMessage {
 
   /**
    * The time, in milliseconds since the epoch, at which this message was
-   * originally sent from the perspective of the sender. Note that the maximum
-   * allowable timestamp for JavaScript clients is less than Long.MAX_VALUE; see
-   * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date#the_epoch_timestamps_and_invalid_date
-   * for additional details and discussion.
+   * originally sent from the perspective of the sender.
    */
-  uint64 timestamp = 1 [(require.range).min = 1, (require.range).max = 8640000000000000];
+  uint64 timestamp = 1;
 
   /**
    * The serialized multi-recipient message payload.

service/src/main/proto/org/signal/chat/require.proto

@@ -149,8 +149,8 @@ message SizeConstraint {
 }
 
 message ValueRangeConstraint {
-  optional int64 min = 1;
-  optional int64 max = 2;
+  optional int32 min = 1;
+  optional int32 max = 2;
 }
 
 extend google.protobuf.ServiceOptions {

service/src/test/java/org/whispersystems/textsecuregcm/auth/CloudflareTurnCredentialsManagerTest.java

@@ -5,11 +5,8 @@
 
 package org.whispersystems.textsecuregcm.auth;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.created;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson;
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
-import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -18,19 +15,17 @@ import static org.mockito.Mockito.when;
 
 import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
 import io.netty.resolver.dns.DnsNameResolver;
-import io.netty.util.concurrent.GlobalEventExecutor;
-import io.netty.util.concurrent.SucceededFuture;
+import io.netty.util.concurrent.Future;
 import java.io.IOException;
 import java.net.InetAddress;
-import java.time.Duration;
-import java.util.ArrayList;
+import java.security.cert.CertificateException;
 import java.util.List;
 import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -40,41 +35,31 @@ import org.whispersystems.textsecuregcm.configuration.RetryConfiguration;
 
 public class CloudflareTurnCredentialsManagerTest {
   @RegisterExtension
-  private static final WireMockExtension wireMock = WireMockExtension.newInstance()
+  private final WireMockExtension wireMock = WireMockExtension.newInstance()
       .options(wireMockConfig().dynamicPort().dynamicHttpsPort())
       .build();
 
+  private static final String GET_CREDENTIALS_PATH = "/v1/turn/keys/LMNOP/credentials/generate";
+  private static final String TURN_HOSTNAME = "localhost";
   private ExecutorService httpExecutor;
   private ScheduledExecutorService retryExecutor;
   private DnsNameResolver dnsResolver;
+  private Future<List<InetAddress>> dnsResult;
 
-  private CloudflareTurnCredentialsManager cloudflareTurnCredentialsManager;
-
-  private static final String GET_CREDENTIALS_PATH = "/v1/turn/keys/LMNOP/credentials/generate";
-  private static final String TURN_HOSTNAME = "localhost";
-
-  private static final String API_TOKEN = RandomStringUtils.insecure().nextAlphanumeric(16);
-  private static final String USERNAME = RandomStringUtils.insecure().nextAlphanumeric(16);
-  private static final String CREDENTIAL = RandomStringUtils.insecure().nextAlphanumeric(16);
-  private static final List<String> CLOUDFLARE_TURN_URLS = List.of("turn:cf.example.com");
-  private static final Duration REQUESTED_CREDENTIAL_TTL = Duration.ofSeconds(100);
-  private static final Duration CLIENT_CREDENTIAL_TTL = REQUESTED_CREDENTIAL_TTL.dividedBy(2);
-  private static final List<String> IP_URL_PATTERNS = List.of("turn:%s", "turn:%s:80?transport=tcp", "turns:%s:443?transport=tcp");
+  private CloudflareTurnCredentialsManager cloudflareTurnCredentialsManager = null;
 
   @BeforeEach
-  void setUp() {
+  void setUp() throws CertificateException {
     httpExecutor = Executors.newSingleThreadExecutor();
     retryExecutor = Executors.newSingleThreadScheduledExecutor();
-
     dnsResolver = mock(DnsNameResolver.class);
-
+    dnsResult = mock(Future.class);
     cloudflareTurnCredentialsManager = new CloudflareTurnCredentialsManager(
-        API_TOKEN,
+        "API_TOKEN",
         "http://localhost:" + wireMock.getPort() + GET_CREDENTIALS_PATH,
-        REQUESTED_CREDENTIAL_TTL,
-        CLIENT_CREDENTIAL_TTL,
-        CLOUDFLARE_TURN_URLS,
-        IP_URL_PATTERNS,
+        100,
+        List.of("turn:cf.example.com"),
+        List.of("turn:%s", "turn:%s:80?transport=tcp", "turns:%s:443?transport=tcp"),
         TURN_HOSTNAME,
         2,
         new CircuitBreakerConfiguration(),
@@ -88,61 +73,26 @@ public class CloudflareTurnCredentialsManagerTest {
   @AfterEach
   void tearDown() throws InterruptedException {
     httpExecutor.shutdown();
-    retryExecutor.shutdown();
-
-    //noinspection ResultOfMethodCallIgnored
     httpExecutor.awaitTermination(1, TimeUnit.SECONDS);
-
-    //noinspection ResultOfMethodCallIgnored
+    retryExecutor.shutdown();
     retryExecutor.awaitTermination(1, TimeUnit.SECONDS);
   }
 
   @Test
-  public void testSuccess() throws IOException, CancellationException {
+  public void testSuccess() throws IOException, CancellationException, ExecutionException, InterruptedException {
     wireMock.stubFor(post(urlEqualTo(GET_CREDENTIALS_PATH))
-        .willReturn(created()
-            .withHeader("Content-Type", "application/json")
-            .withBody("""
-                {
-                   "iceServers": {
-                     "urls": [
-                       "turn:cloudflare.example.com:3478?transport=udp"
-                     ],
-                     "username": "%s",
-                     "credential": "%s"
-                   }
-                 }
-                """.formatted(USERNAME, CREDENTIAL))));
-
+        .willReturn(aResponse().withStatus(201).withHeader("Content-Type", new String[]{"application/json"}).withBody("{\"iceServers\":{\"urls\":[\"turn:cloudflare.example.com:3478?transport=udp\"],\"username\":\"ABC\",\"credential\":\"XYZ\"}}")));
+    when(dnsResult.get())
+        .thenReturn(List.of(InetAddress.getByName("127.0.0.1"), InetAddress.getByName("::1")));
     when(dnsResolver.resolveAll(TURN_HOSTNAME))
-        .thenReturn(new SucceededFuture<>(GlobalEventExecutor.INSTANCE,
-            List.of(InetAddress.getByName("127.0.0.1"), InetAddress.getByName("::1"))));
+        .thenReturn(dnsResult);
 
     TurnToken token = cloudflareTurnCredentialsManager.retrieveFromCloudflare();
 
-    wireMock.verify(postRequestedFor(urlEqualTo(GET_CREDENTIALS_PATH))
-        .withHeader("Content-Type", equalTo("application/json"))
-        .withHeader("Authorization", equalTo("Bearer " + API_TOKEN))
-        .withRequestBody(equalToJson("""
-            {
-              "ttl": %d
-            }
-            """.formatted(REQUESTED_CREDENTIAL_TTL.toSeconds()))));
-
-    assertThat(token.username()).isEqualTo(USERNAME);
-    assertThat(token.password()).isEqualTo(CREDENTIAL);
-    assertThat(token.hostname()).isEqualTo(TURN_HOSTNAME);
-    assertThat(token.urls()).isEqualTo(CLOUDFLARE_TURN_URLS);
-    assertThat(token.ttlSeconds()).isEqualTo(CLIENT_CREDENTIAL_TTL.toSeconds());
-
-    final List<String> expectedUrlsWithIps = new ArrayList<>();
-
-    for (final String ip : new String[] {"127.0.0.1", "[0:0:0:0:0:0:0:1]"}) {
-      for (final String pattern : IP_URL_PATTERNS) {
-        expectedUrlsWithIps.add(pattern.formatted(ip));
-      }
-    }
-
-    assertThat(token.urlsWithIps()).containsExactlyElementsOf(expectedUrlsWithIps);
+    assertThat(token.username()).isEqualTo("ABC");
+    assertThat(token.password()).isEqualTo("XYZ");
+    assertThat(token.hostname()).isEqualTo("localhost");
+    assertThat(token.urlsWithIps()).containsAll(List.of("turn:127.0.0.1", "turn:127.0.0.1:80?transport=tcp", "turns:127.0.0.1:443?transport=tcp", "turn:[0:0:0:0:0:0:0:1]", "turn:[0:0:0:0:0:0:0:1]:80?transport=tcp", "turns:[0:0:0:0:0:0:0:1]:443?transport=tcp"));;
+    assertThat(token.urls()).isEqualTo(List.of("turn:cf.example.com"));
   }
 }

service/src/test/java/org/whispersystems/textsecuregcm/auth/grpc/ProhibitAuthenticationInterceptorTest.java

@@ -3,7 +3,6 @@ package org.whispersystems.textsecuregcm.auth.grpc;
 import io.grpc.Status;
 import org.junit.jupiter.api.Test;
 import org.signal.chat.rpc.GetAuthenticatedDeviceResponse;
-import org.whispersystems.textsecuregcm.grpc.ChannelNotFoundException;
 import org.whispersystems.textsecuregcm.grpc.GrpcTestUtils;
 import org.whispersystems.textsecuregcm.grpc.net.GrpcClientConnectionManager;
 import org.whispersystems.textsecuregcm.storage.Device;
@@ -23,7 +22,7 @@ class ProhibitAuthenticationInterceptorTest extends AbstractAuthenticationInterc
   }
 
   @Test
-  void interceptCall() throws ChannelNotFoundException {
+  void interceptCall() {
     final GrpcClientConnectionManager grpcClientConnectionManager = getClientConnectionManager();
 
     when(grpcClientConnectionManager.getAuthenticatedDevice(any())).thenReturn(Optional.empty());
@@ -35,10 +34,6 @@ class ProhibitAuthenticationInterceptorTest extends AbstractAuthenticationInterc
     final AuthenticatedDevice authenticatedDevice = new AuthenticatedDevice(UUID.randomUUID(), Device.PRIMARY_ID);
     when(grpcClientConnectionManager.getAuthenticatedDevice(any())).thenReturn(Optional.of(authenticatedDevice));
 
-    GrpcTestUtils.assertStatusException(Status.INTERNAL, this::getAuthenticatedDevice);
-
-    when(grpcClientConnectionManager.getAuthenticatedDevice(any())).thenThrow(ChannelNotFoundException.class);
-
-    GrpcTestUtils.assertStatusException(Status.UNAVAILABLE, this::getAuthenticatedDevice);
+    GrpcTestUtils.assertStatusException(Status.UNAUTHENTICATED, this::getAuthenticatedDevice);
   }
 }

service/src/test/java/org/whispersystems/textsecuregcm/auth/grpc/RequireAuthenticationInterceptorTest.java

@@ -9,7 +9,6 @@ import java.util.Optional;
 import java.util.UUID;
 import org.junit.jupiter.api.Test;
 import org.signal.chat.rpc.GetAuthenticatedDeviceResponse;
-import org.whispersystems.textsecuregcm.grpc.ChannelNotFoundException;
 import org.whispersystems.textsecuregcm.grpc.GrpcTestUtils;
 import org.whispersystems.textsecuregcm.grpc.net.GrpcClientConnectionManager;
 import org.whispersystems.textsecuregcm.storage.Device;
@@ -23,12 +22,12 @@ class RequireAuthenticationInterceptorTest extends AbstractAuthenticationInterce
   }
 
   @Test
-  void interceptCall() throws ChannelNotFoundException {
+  void interceptCall() {
     final GrpcClientConnectionManager grpcClientConnectionManager = getClientConnectionManager();
 
     when(grpcClientConnectionManager.getAuthenticatedDevice(any())).thenReturn(Optional.empty());
 
-    GrpcTestUtils.assertStatusException(Status.INTERNAL, this::getAuthenticatedDevice);
+    GrpcTestUtils.assertStatusException(Status.UNAUTHENTICATED, this::getAuthenticatedDevice);
 
     final AuthenticatedDevice authenticatedDevice = new AuthenticatedDevice(UUID.randomUUID(), Device.PRIMARY_ID);
     when(grpcClientConnectionManager.getAuthenticatedDevice(any())).thenReturn(Optional.of(authenticatedDevice));
@@ -36,9 +35,5 @@ class RequireAuthenticationInterceptorTest extends AbstractAuthenticationInterce
     final GetAuthenticatedDeviceResponse response = getAuthenticatedDevice();
     assertEquals(UUIDUtil.toByteString(authenticatedDevice.accountIdentifier()), response.getAccountIdentifier());
     assertEquals(authenticatedDevice.deviceId(), response.getDeviceId());
-
-    when(grpcClientConnectionManager.getAuthenticatedDevice(any())).thenThrow(ChannelNotFoundException.class);
-
-    GrpcTestUtils.assertStatusException(Status.UNAVAILABLE, this::getAuthenticatedDevice);
   }
 }

service/src/test/java/org/whispersystems/textsecuregcm/controllers/CallRoutingControllerV2Test.java

@@ -40,15 +40,14 @@ class CallRoutingControllerV2Test {
   private static final TurnToken CLOUDFLARE_TURN_TOKEN = new TurnToken(
       "ABC",
       "XYZ",
-      43_200,
       List.of("turn:cloudflare.example.com:3478?transport=udp"),
       null,
       "cf.example.com");
 
   private static final RateLimiters rateLimiters = mock(RateLimiters.class);
   private static final RateLimiter getCallEndpointLimiter = mock(RateLimiter.class);
-  private static final CloudflareTurnCredentialsManager cloudflareTurnCredentialsManager =
-      mock(CloudflareTurnCredentialsManager.class);
+  private static final CloudflareTurnCredentialsManager cloudflareTurnCredentialsManager = mock(
+      CloudflareTurnCredentialsManager.class);
 
   private static final ResourceExtension resources = ResourceExtension.builder()
       .addProvider(AuthHelper.getAuthFilter())
@@ -67,14 +66,21 @@ class CallRoutingControllerV2Test {
 
   @AfterEach
   void tearDown() {
-    reset(rateLimiters, getCallEndpointLimiter);
+    reset( rateLimiters, getCallEndpointLimiter);
+  }
+
+  void initializeMocksWith(TurnToken cloudflareToken) {
+      try {
+        when(cloudflareTurnCredentialsManager.retrieveFromCloudflare()).thenReturn(cloudflareToken);
+      } catch (IOException ignored) {
+      }
   }
 
   @Test
-  void testGetRelaysBothRouting() throws IOException {
-    when(cloudflareTurnCredentialsManager.retrieveFromCloudflare()).thenReturn(CLOUDFLARE_TURN_TOKEN);
+  void testGetRelaysBothRouting() {
+    initializeMocksWith(CLOUDFLARE_TURN_TOKEN);
 
-    try (final Response rawResponse = resources.getJerseyTest()
+    try (Response rawResponse = resources.getJerseyTest()
         .target(GET_CALL_RELAYS_PATH)
         .request()
         .header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_UUID, AuthHelper.VALID_PASSWORD))
@@ -82,8 +88,11 @@ class CallRoutingControllerV2Test {
 
       assertThat(rawResponse.getStatus()).isEqualTo(200);
 
-      assertThat(rawResponse.readEntity(GetCallingRelaysResponse.class).relays())
-          .isEqualTo(List.of(CLOUDFLARE_TURN_TOKEN));
+      CallRoutingControllerV2.GetCallingRelaysResponse response = rawResponse.readEntity(
+          CallRoutingControllerV2.GetCallingRelaysResponse.class);
+
+      List<TurnToken> relays = response.relays();
+      assertThat(relays).isEqualTo(List.of(CLOUDFLARE_TURN_TOKEN));
     }
   }
 

service/src/test/java/org/whispersystems/textsecuregcm/controllers/MessageControllerTest.java

@@ -292,7 +292,7 @@ class MessageControllerTest {
       assertThat("Good Response", response.getStatus(), is(equalTo(200)));
 
       @SuppressWarnings("unchecked") final ArgumentCaptor<Map<Byte, Envelope>> captor = ArgumentCaptor.forClass(Map.class);
-      verify(messageSender).sendMessages(any(), any(), captor.capture(), any(), eq(Optional.empty()), any());
+      verify(messageSender).sendMessages(any(), any(), captor.capture(), any(), any());
 
       assertEquals(1, captor.getValue().size());
       final Envelope message = captor.getValue().values().stream().findFirst().orElseThrow();
@@ -319,19 +319,7 @@ class MessageControllerTest {
                     IncomingMessageList.class),
                 MediaType.APPLICATION_JSON_TYPE))) {
 
-      if (sendToPni) {
-        assertThat(response.getStatus(), is(equalTo(403)));
-        verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any(), any());
-      } else {
-        assertThat(response.getStatus(), is(equalTo(200)));
-
-        verify(messageSender).sendMessages(any(),
-            eq(serviceIdentifier),
-            any(),
-            any(),
-            eq(Optional.of(Device.PRIMARY_ID)),
-            any());
-      }
+      assertThat(response.getStatus(), is(equalTo(sendToPni ? 403 : 200)));
     }
   }
 
@@ -349,7 +337,7 @@ class MessageControllerTest {
       assertThat("Good Response", response.getStatus(), is(equalTo(200)));
 
       @SuppressWarnings("unchecked") final ArgumentCaptor<Map<Byte, Envelope>> captor = ArgumentCaptor.forClass(Map.class);
-      verify(messageSender).sendMessages(any(), any(), captor.capture(), any(), eq(Optional.empty()), any());
+      verify(messageSender).sendMessages(any(), any(), captor.capture(), any(), any());
 
       assertEquals(1, captor.getValue().size());
       final Envelope message = captor.getValue().values().stream().findFirst().orElseThrow();
@@ -374,7 +362,7 @@ class MessageControllerTest {
       assertThat("Good Response", response.getStatus(), is(equalTo(200)));
 
       @SuppressWarnings("unchecked") final ArgumentCaptor<Map<Byte, Envelope>> captor = ArgumentCaptor.forClass(Map.class);
-      verify(messageSender).sendMessages(any(), any(), captor.capture(), any(), eq(Optional.empty()), any());
+      verify(messageSender).sendMessages(any(), any(), captor.capture(), any(), any());
 
       assertEquals(1, captor.getValue().size());
       final Envelope message = captor.getValue().values().stream().findFirst().orElseThrow();
@@ -412,7 +400,7 @@ class MessageControllerTest {
       assertThat("Good Response", response.getStatus(), is(equalTo(200)));
 
       @SuppressWarnings("unchecked") final ArgumentCaptor<Map<Byte, Envelope>> captor = ArgumentCaptor.forClass(Map.class);
-      verify(messageSender).sendMessages(any(), any(), captor.capture(), any(), eq(Optional.empty()), any());
+      verify(messageSender).sendMessages(any(), any(), captor.capture(), any(), any());
 
       assertEquals(1, captor.getValue().size());
       final Envelope message = captor.getValue().values().stream().findFirst().orElseThrow();
@@ -451,7 +439,7 @@ class MessageControllerTest {
       assertThat("Good Response", response.getStatus(), is(equalTo(expectedResponse)));
       if (expectedResponse == 200) {
         @SuppressWarnings("unchecked") final ArgumentCaptor<Map<Byte, Envelope>> captor = ArgumentCaptor.forClass(Map.class);
-        verify(messageSender).sendMessages(any(), any(), captor.capture(), any(), eq(Optional.empty()), any());
+        verify(messageSender).sendMessages(any(), any(), captor.capture(), any(), any());
 
         assertEquals(1, captor.getValue().size());
         final Envelope message = captor.getValue().values().stream().findFirst().orElseThrow();
@@ -548,7 +536,7 @@ class MessageControllerTest {
   @Test
   void testMultiDeviceMissing() throws Exception {
     doThrow(new MismatchedDevicesException(new MismatchedDevices(Set.of((byte) 2, (byte) 3), Collections.emptySet(), Collections.emptySet())))
-        .when(messageSender).sendMessages(any(), any(), any(), any(), any(), any());
+        .when(messageSender).sendMessages(any(), any(), any(), any(), any());
 
     try (final Response response =
         resources.getJerseyTest()
@@ -570,7 +558,7 @@ class MessageControllerTest {
   @Test
   void testMultiDeviceExtra() throws Exception {
     doThrow(new MismatchedDevicesException(new MismatchedDevices(Set.of((byte) 2), Set.of((byte) 4), Collections.emptySet())))
-        .when(messageSender).sendMessages(any(), any(), any(), any(), any(), any());
+        .when(messageSender).sendMessages(any(), any(), any(), any(), any());
 
     try (final Response response =
         resources.getJerseyTest()
@@ -621,7 +609,7 @@ class MessageControllerTest {
       @SuppressWarnings("unchecked") final ArgumentCaptor<Map<Byte, Envelope>> envelopeCaptor =
           ArgumentCaptor.forClass(Map.class);
 
-      verify(messageSender).sendMessages(any(Account.class), any(), envelopeCaptor.capture(), any(), eq(Optional.empty()), any());
+      verify(messageSender).sendMessages(any(Account.class), any(), envelopeCaptor.capture(), any(), any());
 
       assertEquals(3, envelopeCaptor.getValue().size());
 
@@ -645,7 +633,7 @@ class MessageControllerTest {
       @SuppressWarnings("unchecked") final ArgumentCaptor<Map<Byte, Envelope>> envelopeCaptor =
           ArgumentCaptor.forClass(Map.class);
 
-      verify(messageSender).sendMessages(any(Account.class), any(), envelopeCaptor.capture(), any(), eq(Optional.empty()), any());
+      verify(messageSender).sendMessages(any(Account.class), any(), envelopeCaptor.capture(), any(), any());
 
       assertEquals(3, envelopeCaptor.getValue().size());
 
@@ -670,7 +658,6 @@ class MessageControllerTest {
           any(),
           argThat(messagesByDeviceId -> messagesByDeviceId.size() == 3),
           any(),
-          eq(Optional.empty()),
           any());
     }
   }
@@ -678,7 +665,7 @@ class MessageControllerTest {
   @Test
   void testRegistrationIdMismatch() throws Exception {
     doThrow(new MismatchedDevicesException(new MismatchedDevices(Collections.emptySet(), Collections.emptySet(), Set.of((byte) 2))))
-        .when(messageSender).sendMessages(any(), any(), any(), any(), any(), any());
+        .when(messageSender).sendMessages(any(), any(), any(), any(), any());
 
     try (final Response response =
         resources.getJerseyTest().target(String.format("/v1/messages/%s", MULTI_DEVICE_UUID))
@@ -1103,7 +1090,7 @@ class MessageControllerTest {
 
   @Test
   void testValidateContentLength() throws MismatchedDevicesException, MessageTooLargeException, IOException {
-    doThrow(new MessageTooLargeException()).when(messageSender).sendMessages(any(), any(), any(), any(), any(), any());
+    doThrow(new MessageTooLargeException()).when(messageSender).sendMessages(any(), any(), any(), any(), any());
 
     try (final Response response =
         resources.getJerseyTest()
@@ -1132,10 +1119,10 @@ class MessageControllerTest {
 
       if (expectOk) {
         assertEquals(200, response.getStatus());
-        verify(messageSender).sendMessages(any(), any(), any(), any(), any(), any());
+        verify(messageSender).sendMessages(any(), any(), any(), any(), any());
       } else {
         assertEquals(422, response.getStatus());
-        verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any(), any());
+        verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any());
       }
     }
   }

service/src/test/java/org/whispersystems/textsecuregcm/controllers/ProfileControllerTest.java

@@ -1140,58 +1140,6 @@ class ProfileControllerTest {
           new AccountBadge("TEST2", Instant.ofEpochSecond(42 + 86400), false),
           new AccountBadge("TEST3", Instant.ofEpochSecond(42 + 86400), false));
     }
-
-  }
-
-  @Test
-  void testSetProfileBadgeAfterUpdateTries() throws Exception {
-    final ProfileKeyCommitment commitment = new ProfileKey(new byte[32]).getCommitment(
-        new ServiceId.Aci(AuthHelper.VALID_UUID));
-
-    final byte[] name = TestRandomUtil.nextBytes(81);
-    final byte[] emoji = TestRandomUtil.nextBytes(60);
-    final byte[] about = TestRandomUtil.nextBytes(156);
-    final String version = versionHex("anotherversion");
-
-    clearInvocations(AuthHelper.VALID_ACCOUNT_TWO);
-    reset(accountsManager);
-    final int accountsManagerUpdateRetryCount = 2;
-    AccountsHelper.setupMockUpdateWithRetries(accountsManager, accountsManagerUpdateRetryCount);
-    // set up two invocations -- one for each AccountsManager#update try
-    when(AuthHelper.VALID_ACCOUNT_TWO.getBadges())
-        .thenReturn(List.of(
-            new AccountBadge("TEST2", Instant.ofEpochSecond(42 + 86400), true),
-            new AccountBadge("TEST3", Instant.ofEpochSecond(42 + 86400), true)
-        ))
-        .thenReturn(List.of(
-            new AccountBadge("TEST2", Instant.ofEpochSecond(42 + 86400), true),
-            new AccountBadge("TEST3", Instant.ofEpochSecond(42 + 86400), true),
-            new AccountBadge("TEST4", Instant.ofEpochSecond(43 + 86400), true)
-        ));
-
-    try (final Response response = resources.getJerseyTest()
-        .target("/v1/profile/")
-        .request()
-        .header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_UUID_TWO, AuthHelper.VALID_PASSWORD_TWO))
-        .put(Entity.entity(new CreateProfileRequest(commitment, version, name, emoji, about, null, false, false,
-            Optional.of(List.of("TEST1")), null), MediaType.APPLICATION_JSON_TYPE))) {
-
-      assertThat(response.getStatus()).isEqualTo(200);
-      assertThat(response.hasEntity()).isFalse();
-
-      //noinspection unchecked
-      final ArgumentCaptor<List<AccountBadge>> badgeCaptor = ArgumentCaptor.forClass(List.class);
-      verify(AuthHelper.VALID_ACCOUNT_TWO, times(accountsManagerUpdateRetryCount)).setBadges(refEq(clock), badgeCaptor.capture());
-      // since the stubbing of getBadges() is brittle, we need to verify the number of invocations, to protect against upstream changes
-      verify(AuthHelper.VALID_ACCOUNT_TWO, times(accountsManagerUpdateRetryCount)).getBadges();
-
-      final List<AccountBadge> badges = badgeCaptor.getValue();
-      assertThat(badges).isNotNull().hasSize(4).containsOnly(
-          new AccountBadge("TEST1", Instant.ofEpochSecond(42 + 86400), true),
-          new AccountBadge("TEST2", Instant.ofEpochSecond(42 + 86400), false),
-          new AccountBadge("TEST3", Instant.ofEpochSecond(42 + 86400), false),
-          new AccountBadge("TEST4", Instant.ofEpochSecond(43 + 86400), false));
-    }
   }
 
   @ParameterizedTest

service/src/test/java/org/whispersystems/textsecuregcm/filters/ExternalRequestFilterTest.java

@@ -7,7 +7,6 @@ package org.whispersystems.textsecuregcm.filters;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import com.google.common.net.InetAddresses;
 import com.google.protobuf.ByteString;
 import io.dropwizard.core.Application;
 import io.dropwizard.core.Configuration;
@@ -25,6 +24,7 @@ import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.core.Response;
+import java.net.InetAddress;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.Set;
@@ -39,7 +39,6 @@ import org.signal.chat.rpc.EchoServiceGrpc;
 import org.whispersystems.textsecuregcm.grpc.EchoServiceImpl;
 import org.whispersystems.textsecuregcm.grpc.GrpcTestUtils;
 import org.whispersystems.textsecuregcm.grpc.MockRequestAttributesInterceptor;
-import org.whispersystems.textsecuregcm.grpc.RequestAttributes;
 import org.whispersystems.textsecuregcm.util.InetAddressRange;
 
 @ExtendWith(DropwizardExtensionsSupport.class)
@@ -158,7 +157,7 @@ class ExternalRequestFilterTest {
       @BeforeEach
       void setUp() throws Exception {
         final MockRequestAttributesInterceptor mockRequestAttributesInterceptor = new MockRequestAttributesInterceptor();
-        mockRequestAttributesInterceptor.setRequestAttributes(new RequestAttributes(InetAddresses.forString("127.0.0.1"), null, null));
+        mockRequestAttributesInterceptor.setRemoteAddress(InetAddress.getByName("127.0.0.1"));
 
         testServer = InProcessServerBuilder.forName("ExternalRequestFilterTest")
             .directExecutor()

service/src/test/java/org/whispersystems/textsecuregcm/filters/RemoteDeprecationFilterTest.java

@@ -15,7 +15,6 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import com.google.common.net.HttpHeaders;
-import com.google.common.net.InetAddresses;
 import com.google.protobuf.ByteString;
 import com.vdurmont.semver4j.Semver;
 import io.grpc.ManagedChannel;
@@ -41,10 +40,11 @@ import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfigurati
 import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicRemoteDeprecationConfiguration;
 import org.whispersystems.textsecuregcm.grpc.EchoServiceImpl;
 import org.whispersystems.textsecuregcm.grpc.MockRequestAttributesInterceptor;
-import org.whispersystems.textsecuregcm.grpc.RequestAttributes;
 import org.whispersystems.textsecuregcm.grpc.StatusConstants;
 import org.whispersystems.textsecuregcm.storage.DynamicConfigurationManager;
 import org.whispersystems.textsecuregcm.util.ua.ClientPlatform;
+import org.whispersystems.textsecuregcm.util.ua.UnrecognizedUserAgentException;
+import org.whispersystems.textsecuregcm.util.ua.UserAgentUtil;
 
 class RemoteDeprecationFilterTest {
 
@@ -130,7 +130,11 @@ class RemoteDeprecationFilterTest {
   @MethodSource(value="testFilter")
   void testGrpcFilter(final String userAgentString, final boolean expectDeprecation) throws IOException, InterruptedException {
     final MockRequestAttributesInterceptor mockRequestAttributesInterceptor = new MockRequestAttributesInterceptor();
-    mockRequestAttributesInterceptor.setRequestAttributes(new RequestAttributes(InetAddresses.forString("127.0.0.1"), userAgentString, null));
+
+    try {
+      mockRequestAttributesInterceptor.setUserAgent(UserAgentUtil.parseUserAgentString(userAgentString));
+    } catch (UnrecognizedUserAgentException ignored) {
+    }
 
     final Server testServer = InProcessServerBuilder.forName("RemoteDeprecationFilterTest")
         .directExecutor()

service/src/test/java/org/whispersystems/textsecuregcm/grpc/AccountsAnonymousGrpcServiceTest.java

@@ -72,8 +72,7 @@ class AccountsAnonymousGrpcServiceTest extends
 
     when(rateLimiter.validateReactive(anyString())).thenReturn(Mono.empty());
 
-    getMockRequestAttributesInterceptor().setRequestAttributes(
-        new RequestAttributes(InetAddresses.forString("127.0.0.1"), null, null));
+    getMockRequestAttributesInterceptor().setRemoteAddress(InetAddresses.forString("127.0.0.1"));
 
     return new AccountsAnonymousGrpcService(accountsManager, rateLimiters);
   }

service/src/test/java/org/whispersystems/textsecuregcm/grpc/MessagesAnonymousGrpcServiceTest.java

@@ -153,8 +153,7 @@ class MessagesAnonymousGrpcServiceTest extends
     @CartesianTest
     void sendMessage(@CartesianTest.Values(booleans = {true, false}) final boolean useUak,
         @CartesianTest.Values(booleans = {true, false}) final boolean ephemeral,
-        @CartesianTest.Values(booleans = {true, false}) final boolean urgent,
-        @CartesianTest.Values(booleans = {true, false}) final boolean includeReportSpamToken)
+        @CartesianTest.Values(booleans = {true, false}) final boolean urgent)
         throws MessageTooLargeException, MismatchedDevicesException {
 
       final byte deviceId = Device.PRIMARY_ID;
@@ -178,13 +177,6 @@ class MessagesAnonymousGrpcServiceTest extends
               .setPayload(ByteString.copyFrom(payload))
               .build());
 
-      final byte[] reportSpamToken = TestRandomUtil.nextBytes(64);
-
-      if (includeReportSpamToken) {
-        when(spamChecker.checkForIndividualRecipientSpamGrpc(any(), any(), any(), any()))
-            .thenReturn(new SpamCheckResult<>(Optional.empty(), Optional.of(reportSpamToken)));
-      }
-
       final SendMessageResponse response = unauthenticatedServiceStub().sendSingleRecipientMessage(
           generateRequest(serviceIdentifier, ephemeral, urgent, messages,
               useUak ? UNIDENTIFIED_ACCESS_KEY : null,
@@ -192,7 +184,7 @@ class MessagesAnonymousGrpcServiceTest extends
 
       assertEquals(SendMessageResponse.newBuilder().build(), response);
 
-      final MessageProtos.Envelope.Builder expectedEnvelopeBuilder = MessageProtos.Envelope.newBuilder()
+      final MessageProtos.Envelope expectedEnvelope = MessageProtos.Envelope.newBuilder()
           .setType(MessageProtos.Envelope.Type.UNIDENTIFIED_SENDER)
           .setDestinationServiceId(serviceIdentifier.toServiceIdentifierString())
           .setClientTimestamp(CLOCK.millis())
@@ -200,22 +192,13 @@ class MessagesAnonymousGrpcServiceTest extends
           .setEphemeral(ephemeral)
           .setUrgent(urgent)
           .setStory(false)
-          .setContent(ByteString.copyFrom(payload));
-
-      if (includeReportSpamToken) {
-        expectedEnvelopeBuilder.setReportSpamToken(ByteString.copyFrom(reportSpamToken));
-      }
-
-      verify(spamChecker).checkForIndividualRecipientSpamGrpc(MessageType.INDIVIDUAL_SEALED_SENDER,
-          Optional.empty(),
-          Optional.of(destinationAccount),
-          serviceIdentifier);
+          .setContent(ByteString.copyFrom(payload))
+          .build();
 
       verify(messageSender).sendMessages(destinationAccount,
           serviceIdentifier,
-          Map.of(deviceId, expectedEnvelopeBuilder.build()),
+          Map.of(deviceId, expectedEnvelope),
           Map.of(deviceId, registrationId),
-          Optional.empty(),
           null);
     }
 
@@ -239,7 +222,7 @@ class MessagesAnonymousGrpcServiceTest extends
 
       doThrow(new MismatchedDevicesException(new org.whispersystems.textsecuregcm.controllers.MismatchedDevices(
           Set.of(missingDeviceId), Set.of(extraDeviceId), Set.of(staleDeviceId))))
-          .when(messageSender).sendMessages(any(), any(), any(), any(), any(), any());
+          .when(messageSender).sendMessages(any(), any(), any(), any(), any());
 
       final SendMessageResponse response = unauthenticatedServiceStub().sendSingleRecipientMessage(
           generateRequest(serviceIdentifier, false, true, messages, UNIDENTIFIED_ACCESS_KEY, null));
@@ -291,7 +274,7 @@ class MessagesAnonymousGrpcServiceTest extends
                   useUak ? incorrectUnidentifiedAccessKey : null,
                   useUak ? null : incorrectGroupSendToken)));
 
-      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any(), any());
+      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any());
     }
 
     @Test
@@ -309,7 +292,7 @@ class MessagesAnonymousGrpcServiceTest extends
           () -> unauthenticatedServiceStub().sendSingleRecipientMessage(
               generateRequest(serviceIdentifier, false, true, messages, UNIDENTIFIED_ACCESS_KEY, null)));
 
-      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any(), any());
+      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any());
     }
 
     @Test
@@ -342,7 +325,7 @@ class MessagesAnonymousGrpcServiceTest extends
           () -> unauthenticatedServiceStub().sendSingleRecipientMessage(
               generateRequest(serviceIdentifier, false, true, messages, UNIDENTIFIED_ACCESS_KEY, null)));
 
-      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any(), any());
+      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any());
       verify(messageByteLimitEstimator).add(serviceIdentifier.uuid().toString());
     }
 
@@ -365,7 +348,7 @@ class MessagesAnonymousGrpcServiceTest extends
               .build());
 
       doThrow(new MessageTooLargeException())
-          .when(messageSender).sendMessages(any(), any(), any(), any(), any(), any());
+          .when(messageSender).sendMessages(any(), any(), any(), any(), any());
 
       //noinspection ResultOfMethodCallIgnored
       GrpcTestUtils.assertStatusException(Status.INVALID_ARGUMENT,
@@ -407,7 +390,7 @@ class MessagesAnonymousGrpcServiceTest extends
           Optional.of(destinationAccount),
           serviceIdentifier);
 
-      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any(), any());
+      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any());
     }
 
     @Test
@@ -447,7 +430,7 @@ class MessagesAnonymousGrpcServiceTest extends
           Optional.of(destinationAccount),
           serviceIdentifier);
 
-      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any(), any());
+      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any());
     }
 
     private static SendSealedSenderMessageRequest generateRequest(final ServiceIdentifier serviceIdentifier,
@@ -814,11 +797,9 @@ class MessagesAnonymousGrpcServiceTest extends
   @Nested
   class SingleRecipientStory {
 
-    @CartesianTest
-    void sendStory(@CartesianTest.Values(booleans = {true, false}) final boolean urgent,
-        @CartesianTest.Values(booleans = {true, false}) final boolean includeReportSpamToken)
-        throws MessageTooLargeException, MismatchedDevicesException {
-
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void sendStory(final boolean urgent) throws MessageTooLargeException, MismatchedDevicesException {
       final byte deviceId = Device.PRIMARY_ID;
       final int registrationId = 7;
 
@@ -839,19 +820,12 @@ class MessagesAnonymousGrpcServiceTest extends
               .setPayload(ByteString.copyFrom(payload))
               .build());
 
-      final byte[] reportSpamToken = TestRandomUtil.nextBytes(64);
-
-      if (includeReportSpamToken) {
-        when(spamChecker.checkForIndividualRecipientSpamGrpc(any(), any(), any(), any()))
-            .thenReturn(new SpamCheckResult<>(Optional.empty(), Optional.of(reportSpamToken)));
-      }
-
       final SendMessageResponse response =
           unauthenticatedServiceStub().sendStory(generateRequest(serviceIdentifier, urgent, messages));
 
       assertEquals(SendMessageResponse.newBuilder().build(), response);
 
-      final MessageProtos.Envelope.Builder expectedEnvelopeBuilder = MessageProtos.Envelope.newBuilder()
+      final MessageProtos.Envelope expectedEnvelope = MessageProtos.Envelope.newBuilder()
           .setType(MessageProtos.Envelope.Type.UNIDENTIFIED_SENDER)
           .setDestinationServiceId(serviceIdentifier.toServiceIdentifierString())
           .setClientTimestamp(CLOCK.millis())
@@ -859,22 +833,13 @@ class MessagesAnonymousGrpcServiceTest extends
           .setEphemeral(false)
           .setUrgent(urgent)
           .setStory(true)
-          .setContent(ByteString.copyFrom(payload));
-
-      if (includeReportSpamToken) {
-        expectedEnvelopeBuilder.setReportSpamToken(ByteString.copyFrom(reportSpamToken));
-      }
-
-      verify(spamChecker).checkForIndividualRecipientSpamGrpc(MessageType.INDIVIDUAL_STORY,
-          Optional.empty(),
-          Optional.of(destinationAccount),
-          serviceIdentifier);
+          .setContent(ByteString.copyFrom(payload))
+          .build();
 
       verify(messageSender).sendMessages(destinationAccount,
           serviceIdentifier,
-          Map.of(deviceId, expectedEnvelopeBuilder.build()),
+          Map.of(deviceId, expectedEnvelope),
           Map.of(deviceId, registrationId),
-          Optional.empty(),
           null);
     }
 
@@ -898,7 +863,7 @@ class MessagesAnonymousGrpcServiceTest extends
 
       doThrow(new MismatchedDevicesException(new org.whispersystems.textsecuregcm.controllers.MismatchedDevices(
           Set.of(missingDeviceId), Set.of(extraDeviceId), Set.of(staleDeviceId))))
-          .when(messageSender).sendMessages(any(), any(), any(), any(), any(), any());
+          .when(messageSender).sendMessages(any(), any(), any(), any(), any());
 
       final SendMessageResponse response = unauthenticatedServiceStub().sendStory(
           generateRequest(serviceIdentifier, false, messages));
@@ -928,7 +893,7 @@ class MessagesAnonymousGrpcServiceTest extends
 
       assertEquals(SendMessageResponse.newBuilder().build(), response);
 
-      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any(), any());
+      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any());
     }
 
     @Test
@@ -959,7 +924,7 @@ class MessagesAnonymousGrpcServiceTest extends
       GrpcTestUtils.assertRateLimitExceeded(retryDuration,
           () -> unauthenticatedServiceStub().sendStory(generateRequest(serviceIdentifier, true, messages)));
 
-      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any(), any());
+      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any());
     }
 
     @Test
@@ -980,7 +945,7 @@ class MessagesAnonymousGrpcServiceTest extends
               .setPayload(ByteString.copyFrom(TestRandomUtil.nextBytes(128)))
               .build());
 
-      doThrow(new MessageTooLargeException()).when(messageSender).sendMessages(any(), any(), any(), any(), any(), any());
+      doThrow(new MessageTooLargeException()).when(messageSender).sendMessages(any(), any(), any(), any(), any());
 
       //noinspection ResultOfMethodCallIgnored
       GrpcTestUtils.assertStatusInvalidArgument(
@@ -1019,7 +984,7 @@ class MessagesAnonymousGrpcServiceTest extends
           Optional.of(destinationAccount),
           serviceIdentifier);
 
-      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any(), any());
+      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any());
     }
 
     @Test
@@ -1058,7 +1023,7 @@ class MessagesAnonymousGrpcServiceTest extends
           Optional.of(destinationAccount),
           serviceIdentifier);
 
-      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any(), any());
+      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any());
     }
 
     private static SendStoryMessageRequest generateRequest(final ServiceIdentifier serviceIdentifier,

service/src/test/java/org/whispersystems/textsecuregcm/grpc/MessagesGrpcServiceTest.java

@@ -1,618 +0,0 @@
-/*
- * Copyright 2025 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.grpc;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyByte;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.google.protobuf.ByteString;
-import io.grpc.Status;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.junitpioneer.jupiter.cartesian.CartesianTest;
-import org.mockito.Mock;
-import org.signal.chat.messages.AuthenticatedSenderMessageType;
-import org.signal.chat.messages.ChallengeRequired;
-import org.signal.chat.messages.IndividualRecipientMessageBundle;
-import org.signal.chat.messages.MessagesGrpc;
-import org.signal.chat.messages.MismatchedDevices;
-import org.signal.chat.messages.SendAuthenticatedSenderMessageRequest;
-import org.signal.chat.messages.SendMessageResponse;
-import org.signal.chat.messages.SendSyncMessageRequest;
-import org.whispersystems.textsecuregcm.auth.grpc.AuthenticatedDevice;
-import org.whispersystems.textsecuregcm.controllers.MismatchedDevicesException;
-import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException;
-import org.whispersystems.textsecuregcm.entities.MessageProtos;
-import org.whispersystems.textsecuregcm.identity.AciServiceIdentifier;
-import org.whispersystems.textsecuregcm.identity.IdentityType;
-import org.whispersystems.textsecuregcm.identity.ServiceIdentifier;
-import org.whispersystems.textsecuregcm.limits.CardinalityEstimator;
-import org.whispersystems.textsecuregcm.limits.RateLimiter;
-import org.whispersystems.textsecuregcm.limits.RateLimiters;
-import org.whispersystems.textsecuregcm.push.MessageSender;
-import org.whispersystems.textsecuregcm.push.MessageTooLargeException;
-import org.whispersystems.textsecuregcm.spam.GrpcResponse;
-import org.whispersystems.textsecuregcm.spam.MessageType;
-import org.whispersystems.textsecuregcm.spam.SpamCheckResult;
-import org.whispersystems.textsecuregcm.spam.SpamChecker;
-import org.whispersystems.textsecuregcm.storage.Account;
-import org.whispersystems.textsecuregcm.storage.AccountsManager;
-import org.whispersystems.textsecuregcm.storage.Device;
-import org.whispersystems.textsecuregcm.tests.util.DevicesHelper;
-import org.whispersystems.textsecuregcm.util.TestClock;
-import org.whispersystems.textsecuregcm.util.TestRandomUtil;
-
-class MessagesGrpcServiceTest extends SimpleBaseGrpcTest<MessagesGrpcService, MessagesGrpc.MessagesBlockingStub> {
-
-  @Mock
-  private AccountsManager accountsManager;
-
-  @Mock
-  private RateLimiters rateLimiters;
-
-  @Mock
-  private MessageSender messageSender;
-
-  @Mock
-  private CardinalityEstimator messageByteLimitEstimator;
-
-  @Mock
-  private SpamChecker spamChecker;
-
-  @Mock
-  private RateLimiter rateLimiter;
-
-  @Mock
-  private Account authenticatedAccount;
-
-  @Mock
-  private Device authenticatedDevice;
-
-  @Mock
-  private Device linkedDevice;
-
-  @Mock
-  private Device secondLinkedDevice;
-
-  private static final int AUTHENTICATED_REGISTRATION_ID = 7;
-
-  private static final byte LINKED_DEVICE_ID = AUTHENTICATED_DEVICE_ID + 1;
-  private static final int LINKED_DEVICE_REGISTRATION_ID = 13;
-
-  private static final byte SECOND_LINKED_DEVICE_ID = LINKED_DEVICE_ID + 1;
-  private static final int SECOND_LINKED_DEVICE_REGISTRATION_ID = 19;
-
-  private static final TestClock CLOCK = TestClock.pinned(Instant.now());
-
-  @Override
-  protected MessagesGrpcService createServiceBeforeEachTest() {
-    return new MessagesGrpcService(accountsManager,
-        rateLimiters,
-        messageSender,
-        messageByteLimitEstimator,
-        spamChecker,
-        CLOCK);
-  }
-
-  @BeforeEach
-  void setUp() {
-    when(accountsManager.getByServiceIdentifier(any())).thenReturn(Optional.empty());
-
-    when(rateLimiters.getInboundMessageBytes()).thenReturn(rateLimiter);
-    when(rateLimiters.getMessagesLimiter()).thenReturn(rateLimiter);
-
-    when(spamChecker.checkForIndividualRecipientSpamGrpc(any(), any(), any(), any()))
-        .thenReturn(new SpamCheckResult<>(Optional.empty(), Optional.empty()));
-
-    when(authenticatedDevice.getId()).thenReturn(AUTHENTICATED_DEVICE_ID);
-    when(authenticatedDevice.getRegistrationId()).thenReturn(AUTHENTICATED_REGISTRATION_ID);
-
-    when(linkedDevice.getId()).thenReturn(LINKED_DEVICE_ID);
-    when(linkedDevice.getRegistrationId()).thenReturn(LINKED_DEVICE_REGISTRATION_ID);
-
-    when(secondLinkedDevice.getId()).thenReturn(SECOND_LINKED_DEVICE_ID);
-    when(secondLinkedDevice.getRegistrationId()).thenReturn(SECOND_LINKED_DEVICE_REGISTRATION_ID);
-
-    when(authenticatedAccount.getUuid()).thenReturn(AUTHENTICATED_ACI);
-    when(authenticatedAccount.getIdentifier(IdentityType.ACI)).thenReturn(AUTHENTICATED_ACI);
-    when(authenticatedAccount.getDevice(anyByte())).thenReturn(Optional.empty());
-    when(authenticatedAccount.getDevice(AUTHENTICATED_DEVICE_ID)).thenReturn(Optional.of(authenticatedDevice));
-    when(authenticatedAccount.getDevice(LINKED_DEVICE_ID)).thenReturn(Optional.of(linkedDevice));
-    when(authenticatedAccount.getDevice(SECOND_LINKED_DEVICE_ID)).thenReturn(Optional.of(secondLinkedDevice));
-    when(authenticatedAccount.getDevices()).thenReturn(List.of(authenticatedDevice, linkedDevice, secondLinkedDevice));
-
-    when(accountsManager.getByServiceIdentifier(new AciServiceIdentifier(AUTHENTICATED_ACI)))
-        .thenReturn(Optional.of(authenticatedAccount));
-  }
-
-  @Nested
-  class SingleRecipient {
-
-    @CartesianTest
-    void sendMessage(@CartesianTest.Enum(mode = CartesianTest.Enum.Mode.EXCLUDE, names = {"UNSPECIFIED", "UNRECOGNIZED"}) final AuthenticatedSenderMessageType messageType,
-        @CartesianTest.Values(booleans = {true, false}) final boolean ephemeral,
-        @CartesianTest.Values(booleans = {true, false}) final boolean urgent,
-        @CartesianTest.Values(booleans = {true, false}) final boolean includeReportSpamToken)
-        throws MessageTooLargeException, MismatchedDevicesException {
-
-      final byte deviceId = Device.PRIMARY_ID;
-      final int registrationId = 7;
-
-      final Device destinationDevice = DevicesHelper.createDevice(deviceId, CLOCK.millis(), registrationId);
-
-      final Account destinationAccount = mock(Account.class);
-      when(destinationAccount.getDevices()).thenReturn(List.of(destinationDevice));
-      when(destinationAccount.getDevice(deviceId)).thenReturn(Optional.of(destinationDevice));
-
-      final AciServiceIdentifier serviceIdentifier = new AciServiceIdentifier(UUID.randomUUID());
-      when(accountsManager.getByServiceIdentifier(serviceIdentifier)).thenReturn(Optional.of(destinationAccount));
-
-      final byte[] reportSpamToken = TestRandomUtil.nextBytes(64);
-
-      if (includeReportSpamToken) {
-        when(spamChecker.checkForIndividualRecipientSpamGrpc(any(), any(), any(), any()))
-            .thenReturn(new SpamCheckResult<>(Optional.empty(), Optional.of(reportSpamToken)));
-      }
-
-      final byte[] payload = TestRandomUtil.nextBytes(128);
-
-      final Map<Byte, IndividualRecipientMessageBundle.Message> messages =
-          Map.of(deviceId, IndividualRecipientMessageBundle.Message.newBuilder()
-              .setRegistrationId(registrationId)
-              .setPayload(ByteString.copyFrom(payload))
-              .build());
-
-      final SendMessageResponse response = authenticatedServiceStub().sendMessage(
-          generateRequest(serviceIdentifier, messageType, ephemeral, urgent, messages));
-
-      assertEquals(SendMessageResponse.newBuilder().build(), response);
-
-      final MessageProtos.Envelope.Type expectedEnvelopeType = switch (messageType) {
-        case DOUBLE_RATCHET -> MessageProtos.Envelope.Type.CIPHERTEXT;
-        case PREKEY_MESSAGE -> MessageProtos.Envelope.Type.PREKEY_BUNDLE;
-        case PLAINTEXT_CONTENT -> MessageProtos.Envelope.Type.PLAINTEXT_CONTENT;
-        case UNSPECIFIED, UNRECOGNIZED -> throw new IllegalArgumentException("Unexpected message type: " + messageType);
-      };
-
-      final MessageProtos.Envelope.Builder expectedEnvelopeBuilder = MessageProtos.Envelope.newBuilder()
-          .setType(expectedEnvelopeType)
-          .setSourceServiceId(new AciServiceIdentifier(AUTHENTICATED_ACI).toServiceIdentifierString())
-          .setSourceDevice(AUTHENTICATED_DEVICE_ID)
-          .setDestinationServiceId(serviceIdentifier.toServiceIdentifierString())
-          .setClientTimestamp(CLOCK.millis())
-          .setServerTimestamp(CLOCK.millis())
-          .setEphemeral(ephemeral)
-          .setUrgent(urgent)
-          .setContent(ByteString.copyFrom(payload));
-
-      if (includeReportSpamToken) {
-        expectedEnvelopeBuilder.setReportSpamToken(ByteString.copyFrom(reportSpamToken));
-      }
-
-      verify(spamChecker).checkForIndividualRecipientSpamGrpc(MessageType.INDIVIDUAL_IDENTIFIED_SENDER,
-          Optional.of(new AuthenticatedDevice(AUTHENTICATED_ACI, AUTHENTICATED_DEVICE_ID)),
-          Optional.of(destinationAccount),
-          serviceIdentifier);
-
-      verify(messageSender).sendMessages(destinationAccount,
-          serviceIdentifier,
-          Map.of(deviceId, expectedEnvelopeBuilder.build()),
-          Map.of(deviceId, registrationId),
-          Optional.empty(),
-          null);
-    }
-
-    @Test
-    void mismatchedDevices() throws MessageTooLargeException, MismatchedDevicesException {
-      final byte missingDeviceId = Device.PRIMARY_ID;
-      final byte extraDeviceId = missingDeviceId + 1;
-      final byte staleDeviceId = extraDeviceId + 1;
-
-      final Account destinationAccount = mock(Account.class);
-
-      final AciServiceIdentifier serviceIdentifier = new AciServiceIdentifier(UUID.randomUUID());
-      when(accountsManager.getByServiceIdentifier(serviceIdentifier)).thenReturn(Optional.of(destinationAccount));
-
-      final Map<Byte, IndividualRecipientMessageBundle.Message> messages = Map.of(
-          staleDeviceId, IndividualRecipientMessageBundle.Message.newBuilder()
-              .setRegistrationId(Device.PRIMARY_ID)
-              .setPayload(ByteString.copyFrom(TestRandomUtil.nextBytes(128)))
-              .build());
-
-      doThrow(new MismatchedDevicesException(new org.whispersystems.textsecuregcm.controllers.MismatchedDevices(
-          Set.of(missingDeviceId), Set.of(extraDeviceId), Set.of(staleDeviceId))))
-          .when(messageSender).sendMessages(any(), any(), any(), any(), any(), any());
-
-      final SendMessageResponse response = authenticatedServiceStub().sendMessage(
-          generateRequest(serviceIdentifier, AuthenticatedSenderMessageType.DOUBLE_RATCHET, false, true, messages));
-
-      final SendMessageResponse expectedResponse = SendMessageResponse.newBuilder()
-          .setMismatchedDevices(MismatchedDevices.newBuilder()
-              .setServiceIdentifier(ServiceIdentifierUtil.toGrpcServiceIdentifier(serviceIdentifier))
-              .addMissingDevices(missingDeviceId)
-              .addStaleDevices(staleDeviceId)
-              .addExtraDevices(extraDeviceId)
-              .build())
-          .build();
-
-      assertEquals(expectedResponse, response);
-    }
-
-    @Test
-    void destinationNotFound() throws MessageTooLargeException, MismatchedDevicesException {
-      final AciServiceIdentifier serviceIdentifier = new AciServiceIdentifier(UUID.randomUUID());
-
-      final Map<Byte, IndividualRecipientMessageBundle.Message> messages =
-          Map.of(Device.PRIMARY_ID, IndividualRecipientMessageBundle.Message.newBuilder()
-              .setRegistrationId(1234)
-              .setPayload(ByteString.copyFrom(TestRandomUtil.nextBytes(128)))
-              .build());
-
-      //noinspection ResultOfMethodCallIgnored
-      GrpcTestUtils.assertStatusException(Status.NOT_FOUND,
-          () -> authenticatedServiceStub().sendMessage(
-              generateRequest(serviceIdentifier, AuthenticatedSenderMessageType.DOUBLE_RATCHET, false, true, messages)));
-
-      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any(), any());
-    }
-
-    @Test
-    void rateLimited() throws RateLimitExceededException, MessageTooLargeException, MismatchedDevicesException {
-      final byte deviceId = Device.PRIMARY_ID;
-      final int registrationId = 7;
-
-      final Device destinationDevice = DevicesHelper.createDevice(deviceId, CLOCK.millis(), registrationId);
-
-      final Account destinationAccount = mock(Account.class);
-      when(destinationAccount.getDevices()).thenReturn(List.of(destinationDevice));
-      when(destinationAccount.getDevice(deviceId)).thenReturn(Optional.of(destinationDevice));
-
-      final AciServiceIdentifier serviceIdentifier = new AciServiceIdentifier(UUID.randomUUID());
-      when(accountsManager.getByServiceIdentifier(serviceIdentifier)).thenReturn(Optional.of(destinationAccount));
-
-      final Duration retryDuration = Duration.ofHours(7);
-
-      doThrow(new RateLimitExceededException(retryDuration))
-          .when(rateLimiter).validate(eq(serviceIdentifier.uuid()), anyInt());
-
-      final Map<Byte, IndividualRecipientMessageBundle.Message> messages =
-          Map.of(deviceId, IndividualRecipientMessageBundle.Message.newBuilder()
-              .setRegistrationId(registrationId)
-              .setPayload(ByteString.copyFrom(TestRandomUtil.nextBytes(128)))
-              .build());
-
-      //noinspection ResultOfMethodCallIgnored
-      GrpcTestUtils.assertRateLimitExceeded(retryDuration,
-          () -> authenticatedServiceStub().sendMessage(
-              generateRequest(serviceIdentifier, AuthenticatedSenderMessageType.DOUBLE_RATCHET, false, true, messages)));
-
-      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any(), any());
-      verify(messageByteLimitEstimator).add(serviceIdentifier.uuid().toString());
-    }
-
-    @Test
-    void oversizedMessage() throws MessageTooLargeException, MismatchedDevicesException {
-      final byte missingDeviceId = Device.PRIMARY_ID;
-      final byte extraDeviceId = missingDeviceId + 1;
-      final byte staleDeviceId = extraDeviceId + 1;
-
-      final Account destinationAccount = mock(Account.class);
-
-      final AciServiceIdentifier serviceIdentifier = new AciServiceIdentifier(UUID.randomUUID());
-      when(accountsManager.getByServiceIdentifier(serviceIdentifier)).thenReturn(Optional.of(destinationAccount));
-
-      final Map<Byte, IndividualRecipientMessageBundle.Message> messages = Map.of(
-          staleDeviceId, IndividualRecipientMessageBundle.Message.newBuilder()
-              .setRegistrationId(Device.PRIMARY_ID)
-              .setPayload(ByteString.copyFrom(TestRandomUtil.nextBytes(128)))
-              .build());
-
-      doThrow(new MessageTooLargeException())
-          .when(messageSender).sendMessages(any(), any(), any(), any(), any(), any());
-
-      //noinspection ResultOfMethodCallIgnored
-      GrpcTestUtils.assertStatusException(Status.INVALID_ARGUMENT,
-          () -> authenticatedServiceStub().sendMessage(
-              generateRequest(serviceIdentifier, AuthenticatedSenderMessageType.DOUBLE_RATCHET, false, true, messages)));
-    }
-
-    @Test
-    void spamWithStatus() throws MessageTooLargeException, MismatchedDevicesException {
-      final byte deviceId = Device.PRIMARY_ID;
-      final int registrationId = 7;
-
-      final Device destinationDevice = DevicesHelper.createDevice(deviceId, CLOCK.millis(), registrationId);
-
-      final Account destinationAccount = mock(Account.class);
-      when(destinationAccount.getDevices()).thenReturn(List.of(destinationDevice));
-      when(destinationAccount.getDevice(deviceId)).thenReturn(Optional.of(destinationDevice));
-
-      final AciServiceIdentifier serviceIdentifier = new AciServiceIdentifier(UUID.randomUUID());
-      when(accountsManager.getByServiceIdentifier(serviceIdentifier)).thenReturn(Optional.of(destinationAccount));
-
-      final Map<Byte, IndividualRecipientMessageBundle.Message> messages =
-          Map.of(deviceId, IndividualRecipientMessageBundle.Message.newBuilder()
-              .setRegistrationId(registrationId)
-              .setPayload(ByteString.copyFrom(TestRandomUtil.nextBytes(128)))
-              .build());
-
-      when(spamChecker.checkForIndividualRecipientSpamGrpc(any(), any(), any(), any()))
-          .thenReturn(new SpamCheckResult<>(Optional.of(GrpcResponse.withStatus(Status.RESOURCE_EXHAUSTED)), Optional.empty()));
-
-      //noinspection ResultOfMethodCallIgnored
-      GrpcTestUtils.assertStatusException(Status.RESOURCE_EXHAUSTED,
-          () -> authenticatedServiceStub().sendMessage(
-              generateRequest(serviceIdentifier, AuthenticatedSenderMessageType.DOUBLE_RATCHET, false, true, messages)));
-
-      verify(spamChecker).checkForIndividualRecipientSpamGrpc(MessageType.INDIVIDUAL_IDENTIFIED_SENDER,
-          Optional.of(new AuthenticatedDevice(AUTHENTICATED_ACI, AUTHENTICATED_DEVICE_ID)),
-          Optional.of(destinationAccount),
-          serviceIdentifier);
-
-      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any(), any());
-    }
-
-    @Test
-    void spamWithResponse() throws MessageTooLargeException, MismatchedDevicesException {
-      final byte deviceId = Device.PRIMARY_ID;
-      final int registrationId = 7;
-
-      final Device destinationDevice = DevicesHelper.createDevice(deviceId, CLOCK.millis(), registrationId);
-
-      final Account destinationAccount = mock(Account.class);
-      when(destinationAccount.getDevices()).thenReturn(List.of(destinationDevice));
-      when(destinationAccount.getDevice(deviceId)).thenReturn(Optional.of(destinationDevice));
-
-      final AciServiceIdentifier serviceIdentifier = new AciServiceIdentifier(UUID.randomUUID());
-      when(accountsManager.getByServiceIdentifier(serviceIdentifier)).thenReturn(Optional.of(destinationAccount));
-
-      final Map<Byte, IndividualRecipientMessageBundle.Message> messages =
-          Map.of(deviceId, IndividualRecipientMessageBundle.Message.newBuilder()
-              .setRegistrationId(registrationId)
-              .setPayload(ByteString.copyFrom(TestRandomUtil.nextBytes(128)))
-              .build());
-
-      final SendMessageResponse response = SendMessageResponse.newBuilder()
-          .setChallengeRequired(ChallengeRequired.newBuilder()
-              .addChallengeOptions(ChallengeRequired.ChallengeType.CAPTCHA))
-          .build();
-
-      when(spamChecker.checkForIndividualRecipientSpamGrpc(any(), any(), any(), any()))
-          .thenReturn(new SpamCheckResult<>(Optional.of(GrpcResponse.withResponse(response)), Optional.empty()));
-
-      assertEquals(response, authenticatedServiceStub().sendMessage(
-          generateRequest(serviceIdentifier, AuthenticatedSenderMessageType.DOUBLE_RATCHET, false, true, messages)));
-
-      verify(spamChecker).checkForIndividualRecipientSpamGrpc(MessageType.INDIVIDUAL_IDENTIFIED_SENDER,
-          Optional.of(new AuthenticatedDevice(AUTHENTICATED_ACI, AUTHENTICATED_DEVICE_ID)),
-          Optional.of(destinationAccount),
-          serviceIdentifier);
-
-      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any(), any());
-    }
-
-    private static SendAuthenticatedSenderMessageRequest generateRequest(final ServiceIdentifier serviceIdentifier,
-        final AuthenticatedSenderMessageType messageType,
-        final boolean ephemeral,
-        final boolean urgent,
-        final Map<Byte, IndividualRecipientMessageBundle.Message> messages) {
-
-      final IndividualRecipientMessageBundle.Builder messageBundleBuilder = IndividualRecipientMessageBundle.newBuilder()
-          .setTimestamp(CLOCK.millis());
-
-      messages.forEach(messageBundleBuilder::putMessages);
-
-      final SendAuthenticatedSenderMessageRequest.Builder requestBuilder = SendAuthenticatedSenderMessageRequest.newBuilder()
-          .setDestination(ServiceIdentifierUtil.toGrpcServiceIdentifier(serviceIdentifier))
-          .setType(messageType)
-          .setMessages(messageBundleBuilder)
-          .setEphemeral(ephemeral)
-          .setUrgent(urgent);
-
-      return requestBuilder.build();
-    }
-  }
-
-  @Nested
-  class Sync {
-
-    @CartesianTest
-    void sendMessage(@CartesianTest.Enum(mode = CartesianTest.Enum.Mode.EXCLUDE, names = {"UNSPECIFIED", "UNRECOGNIZED"}) final AuthenticatedSenderMessageType messageType,
-        @CartesianTest.Values(booleans = {true, false}) final boolean urgent,
-        @CartesianTest.Values(booleans = {true, false}) final boolean includeReportSpamToken)
-        throws MessageTooLargeException, MismatchedDevicesException {
-
-      final AciServiceIdentifier serviceIdentifier = new AciServiceIdentifier(AUTHENTICATED_ACI);
-      final byte[] payload = TestRandomUtil.nextBytes(128);
-
-      final Map<Byte, IndividualRecipientMessageBundle.Message> messages =
-          Map.of(LINKED_DEVICE_ID, IndividualRecipientMessageBundle.Message.newBuilder()
-                  .setRegistrationId(LINKED_DEVICE_REGISTRATION_ID)
-                  .setPayload(ByteString.copyFrom(payload))
-                  .build(),
-
-              SECOND_LINKED_DEVICE_ID, IndividualRecipientMessageBundle.Message.newBuilder()
-                  .setRegistrationId(SECOND_LINKED_DEVICE_REGISTRATION_ID)
-                  .setPayload(ByteString.copyFrom(payload))
-                  .build());
-
-      final byte[] reportSpamToken = TestRandomUtil.nextBytes(64);
-
-      if (includeReportSpamToken) {
-        when(spamChecker.checkForIndividualRecipientSpamGrpc(any(), any(), any(), any()))
-            .thenReturn(new SpamCheckResult<>(Optional.empty(), Optional.of(reportSpamToken)));
-      }
-
-      final SendMessageResponse response =
-          authenticatedServiceStub().sendSyncMessage(generateRequest(messageType, urgent, messages));
-
-      assertEquals(SendMessageResponse.newBuilder().build(), response);
-
-      final MessageProtos.Envelope.Type expectedEnvelopeType = switch (messageType) {
-        case DOUBLE_RATCHET -> MessageProtos.Envelope.Type.CIPHERTEXT;
-        case PREKEY_MESSAGE -> MessageProtos.Envelope.Type.PREKEY_BUNDLE;
-        case PLAINTEXT_CONTENT -> MessageProtos.Envelope.Type.PLAINTEXT_CONTENT;
-        case UNSPECIFIED, UNRECOGNIZED -> throw new IllegalArgumentException("Unexpected message type: " + messageType);
-      };
-
-      final Map<Byte, MessageProtos.Envelope> expectedEnvelopes = new HashMap<>(Map.of(
-          LINKED_DEVICE_ID, MessageProtos.Envelope.newBuilder()
-              .setType(expectedEnvelopeType)
-              .setSourceServiceId(serviceIdentifier.toServiceIdentifierString())
-              .setSourceDevice(AUTHENTICATED_DEVICE_ID)
-              .setDestinationServiceId(serviceIdentifier.toServiceIdentifierString())
-              .setClientTimestamp(CLOCK.millis())
-              .setServerTimestamp(CLOCK.millis())
-              .setEphemeral(false)
-              .setUrgent(urgent)
-              .setContent(ByteString.copyFrom(payload))
-              .build(),
-
-          SECOND_LINKED_DEVICE_ID, MessageProtos.Envelope.newBuilder()
-              .setType(expectedEnvelopeType)
-              .setSourceServiceId(serviceIdentifier.toServiceIdentifierString())
-              .setSourceDevice(AUTHENTICATED_DEVICE_ID)
-              .setDestinationServiceId(serviceIdentifier.toServiceIdentifierString())
-              .setClientTimestamp(CLOCK.millis())
-              .setServerTimestamp(CLOCK.millis())
-              .setEphemeral(false)
-              .setUrgent(urgent)
-              .setContent(ByteString.copyFrom(payload))
-              .build()
-      ));
-
-      if (includeReportSpamToken) {
-        expectedEnvelopes.replaceAll((deviceId, envelope) ->
-            envelope.toBuilder().setReportSpamToken(ByteString.copyFrom(reportSpamToken)).build());
-      }
-
-      verify(spamChecker).checkForIndividualRecipientSpamGrpc(MessageType.SYNC,
-          Optional.of(new AuthenticatedDevice(AUTHENTICATED_ACI, AUTHENTICATED_DEVICE_ID)),
-          Optional.of(authenticatedAccount),
-          serviceIdentifier);
-
-      verify(messageSender).sendMessages(authenticatedAccount,
-          serviceIdentifier,
-          expectedEnvelopes,
-          Map.of(LINKED_DEVICE_ID, LINKED_DEVICE_REGISTRATION_ID,
-              SECOND_LINKED_DEVICE_ID, SECOND_LINKED_DEVICE_REGISTRATION_ID),
-          Optional.of(AUTHENTICATED_DEVICE_ID),
-          null);
-    }
-
-    @Test
-    void mismatchedDevices() throws MessageTooLargeException, MismatchedDevicesException {
-      final byte missingDeviceId = Device.PRIMARY_ID;
-      final byte extraDeviceId = missingDeviceId + 1;
-      final byte staleDeviceId = extraDeviceId + 1;
-
-      final Map<Byte, IndividualRecipientMessageBundle.Message> messages = Map.of(
-          staleDeviceId, IndividualRecipientMessageBundle.Message.newBuilder()
-              .setRegistrationId(Device.PRIMARY_ID)
-              .setPayload(ByteString.copyFrom(TestRandomUtil.nextBytes(128)))
-              .build());
-
-      doThrow(new MismatchedDevicesException(new org.whispersystems.textsecuregcm.controllers.MismatchedDevices(
-          Set.of(missingDeviceId), Set.of(extraDeviceId), Set.of(staleDeviceId))))
-          .when(messageSender).sendMessages(any(), any(), any(), any(), any(), any());
-
-      final SendMessageResponse response = authenticatedServiceStub().sendSyncMessage(
-          generateRequest(AuthenticatedSenderMessageType.DOUBLE_RATCHET, true, messages));
-
-      final SendMessageResponse expectedResponse = SendMessageResponse.newBuilder()
-          .setMismatchedDevices(MismatchedDevices.newBuilder()
-              .setServiceIdentifier(ServiceIdentifierUtil.toGrpcServiceIdentifier(new AciServiceIdentifier(AUTHENTICATED_ACI)))
-              .addMissingDevices(missingDeviceId)
-              .addStaleDevices(staleDeviceId)
-              .addExtraDevices(extraDeviceId)
-              .build())
-          .build();
-
-      assertEquals(expectedResponse, response);
-    }
-
-    @Test
-    void rateLimited() throws RateLimitExceededException, MessageTooLargeException, MismatchedDevicesException {
-      final Duration retryDuration = Duration.ofHours(7);
-      doThrow(new RateLimitExceededException(retryDuration))
-          .when(rateLimiter).validate(eq(AUTHENTICATED_ACI), anyInt());
-
-      final Map<Byte, IndividualRecipientMessageBundle.Message> messages =
-          Map.of(AUTHENTICATED_DEVICE_ID, IndividualRecipientMessageBundle.Message.newBuilder()
-              .setRegistrationId(AUTHENTICATED_REGISTRATION_ID)
-              .setPayload(ByteString.copyFrom(TestRandomUtil.nextBytes(128)))
-              .build());
-
-      //noinspection ResultOfMethodCallIgnored
-      GrpcTestUtils.assertRateLimitExceeded(retryDuration,
-          () -> authenticatedServiceStub().sendSyncMessage(
-              generateRequest(AuthenticatedSenderMessageType.DOUBLE_RATCHET, true, messages)));
-
-      verify(messageSender, never()).sendMessages(any(), any(), any(), any(), any(), any());
-      verify(messageByteLimitEstimator).add(AUTHENTICATED_ACI.toString());
-    }
-
-    @Test
-    void oversizedMessage() throws MessageTooLargeException, MismatchedDevicesException {
-      final byte missingDeviceId = Device.PRIMARY_ID;
-      final byte extraDeviceId = missingDeviceId + 1;
-      final byte staleDeviceId = extraDeviceId + 1;
-
-      final Account destinationAccount = mock(Account.class);
-
-      final AciServiceIdentifier serviceIdentifier = new AciServiceIdentifier(UUID.randomUUID());
-      when(accountsManager.getByServiceIdentifier(serviceIdentifier)).thenReturn(Optional.of(destinationAccount));
-
-      final Map<Byte, IndividualRecipientMessageBundle.Message> messages = Map.of(
-          staleDeviceId, IndividualRecipientMessageBundle.Message.newBuilder()
-              .setRegistrationId(Device.PRIMARY_ID)
-              .setPayload(ByteString.copyFrom(TestRandomUtil.nextBytes(128)))
-              .build());
-
-      doThrow(new MessageTooLargeException())
-          .when(messageSender).sendMessages(any(), any(), any(), any(), any(), any());
-
-      //noinspection ResultOfMethodCallIgnored
-      GrpcTestUtils.assertStatusException(Status.INVALID_ARGUMENT,
-          () -> authenticatedServiceStub().sendSyncMessage(
-              generateRequest(AuthenticatedSenderMessageType.DOUBLE_RATCHET, true, messages)));
-    }
-
-    private static SendSyncMessageRequest generateRequest(final AuthenticatedSenderMessageType messageType,
-        final boolean urgent,
-        final Map<Byte, IndividualRecipientMessageBundle.Message> messages) {
-
-      final IndividualRecipientMessageBundle.Builder messageBundleBuilder = IndividualRecipientMessageBundle.newBuilder()
-          .setTimestamp(CLOCK.millis());
-
-      messages.forEach(messageBundleBuilder::putMessages);
-
-      final SendSyncMessageRequest.Builder requestBuilder = SendSyncMessageRequest.newBuilder()
-          .setType(messageType)
-          .setMessages(messageBundleBuilder)
-          .setUrgent(urgent);
-
-      return requestBuilder.build();
-    }
-  }
-}

service/src/test/java/org/whispersystems/textsecuregcm/grpc/MockRequestAttributesInterceptor.java

@@ -5,7 +5,6 @@
 
 package org.whispersystems.textsecuregcm.grpc;
 
-import com.google.common.net.InetAddresses;
 import io.grpc.Context;
 import io.grpc.Contexts;
 import io.grpc.Metadata;
@@ -20,10 +19,25 @@ import org.whispersystems.textsecuregcm.util.ua.UserAgent;
 
 public class MockRequestAttributesInterceptor implements ServerInterceptor {
 
-  private RequestAttributes requestAttributes = new RequestAttributes(InetAddresses.forString("127.0.0.1"), null, null);
+  @Nullable
+  private InetAddress remoteAddress;
 
-  public void setRequestAttributes(final RequestAttributes requestAttributes) {
-    this.requestAttributes = requestAttributes;
+  @Nullable
+  private UserAgent userAgent;
+
+  @Nullable
+  private List<Locale.LanguageRange> acceptLanguage;
+
+  public void setRemoteAddress(@Nullable final InetAddress remoteAddress) {
+    this.remoteAddress = remoteAddress;
+  }
+
+  public void setUserAgent(@Nullable final UserAgent userAgent) {
+    this.userAgent = userAgent;
+  }
+
+  public void setAcceptLanguage(@Nullable final List<Locale.LanguageRange> acceptLanguage) {
+    this.acceptLanguage = acceptLanguage;
   }
 
   @Override
@@ -31,7 +45,20 @@ public class MockRequestAttributesInterceptor implements ServerInterceptor {
       final Metadata headers,
       final ServerCallHandler<ReqT, RespT> next) {
 
-    return Contexts.interceptCall(Context.current()
-        .withValue(RequestAttributesUtil.REQUEST_ATTRIBUTES_CONTEXT_KEY, requestAttributes), serverCall, headers, next);
+    Context context = Context.current();
+
+    if (remoteAddress != null) {
+      context = context.withValue(RequestAttributesUtil.REMOTE_ADDRESS_CONTEXT_KEY, remoteAddress);
+    }
+
+    if (userAgent != null) {
+      context = context.withValue(RequestAttributesUtil.USER_AGENT_CONTEXT_KEY, userAgent);
+    }
+
+    if (acceptLanguage != null) {
+      context = context.withValue(RequestAttributesUtil.ACCEPT_LANGUAGE_CONTEXT_KEY, acceptLanguage);
+    }
+
+    return Contexts.interceptCall(context, serverCall, headers, next);
   }
 }

service/src/test/java/org/whispersystems/textsecuregcm/grpc/ProfileAnonymousGrpcServiceTest.java

@@ -15,7 +15,6 @@ import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 import static org.whispersystems.textsecuregcm.grpc.GrpcTestUtils.assertStatusException;
 
-import com.google.common.net.InetAddresses;
 import com.google.protobuf.ByteString;
 import io.grpc.Status;
 import java.nio.charset.StandardCharsets;
@@ -76,6 +75,8 @@ import org.whispersystems.textsecuregcm.tests.util.AuthHelper;
 import org.whispersystems.textsecuregcm.tests.util.ProfileTestHelper;
 import org.whispersystems.textsecuregcm.util.TestRandomUtil;
 import org.whispersystems.textsecuregcm.util.UUIDUtil;
+import org.whispersystems.textsecuregcm.util.ua.UnrecognizedUserAgentException;
+import org.whispersystems.textsecuregcm.util.ua.UserAgentUtil;
 
 public class ProfileAnonymousGrpcServiceTest extends SimpleBaseGrpcTest<ProfileAnonymousGrpcService, ProfileAnonymousGrpc.ProfileAnonymousBlockingStub> {
 
@@ -95,9 +96,13 @@ public class ProfileAnonymousGrpcServiceTest extends SimpleBaseGrpcTest<ProfileA
 
   @Override
   protected ProfileAnonymousGrpcService createServiceBeforeEachTest() {
-    getMockRequestAttributesInterceptor().setRequestAttributes(new RequestAttributes(InetAddresses.forString("127.0.0.1"),
-        "Signal-Android/1.2.3",
-        Locale.LanguageRange.parse("en-us")));
+    getMockRequestAttributesInterceptor().setAcceptLanguage(Locale.LanguageRange.parse("en-us"));
+
+    try {
+      getMockRequestAttributesInterceptor().setUserAgent(UserAgentUtil.parseUserAgentString("Signal-Android/1.2.3"));
+    } catch (final UnrecognizedUserAgentException e) {
+      throw new IllegalArgumentException(e);
+    }
 
     return new ProfileAnonymousGrpcService(
         accountsManager,

service/src/test/java/org/whispersystems/textsecuregcm/grpc/ProfileGrpcServiceTest.java

@@ -15,16 +15,13 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.refEq;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 import static org.whispersystems.textsecuregcm.grpc.GrpcTestUtils.assertRateLimitExceeded;
 import static org.whispersystems.textsecuregcm.grpc.GrpcTestUtils.assertStatusException;
 
-import com.google.common.net.InetAddresses;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
 import com.google.i18n.phonenumbers.Phonenumber;
 import com.google.protobuf.ByteString;
@@ -33,7 +30,6 @@ import java.nio.charset.StandardCharsets;
 import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
-import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
 import java.util.Collections;
 import java.util.List;
@@ -97,18 +93,18 @@ import org.whispersystems.textsecuregcm.limits.RateLimiters;
 import org.whispersystems.textsecuregcm.s3.PolicySigner;
 import org.whispersystems.textsecuregcm.s3.PostPolicyGenerator;
 import org.whispersystems.textsecuregcm.storage.Account;
-import org.whispersystems.textsecuregcm.storage.AccountBadge;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
 import org.whispersystems.textsecuregcm.storage.DeviceCapability;
 import org.whispersystems.textsecuregcm.storage.DynamicConfigurationManager;
 import org.whispersystems.textsecuregcm.storage.ProfilesManager;
 import org.whispersystems.textsecuregcm.storage.VersionedProfile;
-import org.whispersystems.textsecuregcm.tests.util.AccountsHelper;
 import org.whispersystems.textsecuregcm.tests.util.AuthHelper;
 import org.whispersystems.textsecuregcm.tests.util.ProfileTestHelper;
 import org.whispersystems.textsecuregcm.util.MockUtils;
 import org.whispersystems.textsecuregcm.util.TestRandomUtil;
 import org.whispersystems.textsecuregcm.util.UUIDUtil;
+import org.whispersystems.textsecuregcm.util.ua.UnrecognizedUserAgentException;
+import org.whispersystems.textsecuregcm.util.ua.UserAgentUtil;
 import reactor.core.publisher.Mono;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
 import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
@@ -148,8 +144,6 @@ public class ProfileGrpcServiceTest extends SimpleBaseGrpcTest<ProfileGrpcServic
   @Mock
   private ServerZkProfileOperations serverZkProfileOperations;
 
-  private Clock clock;
-
   @Override
   protected ProfileGrpcService createServiceBeforeEachTest() {
     @SuppressWarnings("unchecked") final DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager = mock(DynamicConfigurationManager.class);
@@ -176,9 +170,13 @@ public class ProfileGrpcServiceTest extends SimpleBaseGrpcTest<ProfileGrpcServic
         PhoneNumberUtil.getInstance().getExampleNumber("US"),
         PhoneNumberUtil.PhoneNumberFormat.E164);
 
-    getMockRequestAttributesInterceptor().setRequestAttributes(new RequestAttributes(InetAddresses.forString("127.0.0.1"),
-        "Signal-Android/1.2.3",
-        Locale.LanguageRange.parse("en-us")));
+    getMockRequestAttributesInterceptor().setAcceptLanguage(Locale.LanguageRange.parse("en-us"));
+
+    try {
+      getMockRequestAttributesInterceptor().setUserAgent(UserAgentUtil.parseUserAgentString("Signal-Android/1.2.3"));
+    } catch (final UnrecognizedUserAgentException e) {
+      throw new IllegalArgumentException(e);
+    }
 
     when(rateLimiters.getProfileLimiter()).thenReturn(rateLimiter);
     when(rateLimiter.validateReactive(any(UUID.class))).thenReturn(Mono.empty());
@@ -205,10 +203,8 @@ public class ProfileGrpcServiceTest extends SimpleBaseGrpcTest<ProfileGrpcServic
 
     when(asyncS3client.deleteObject(any(DeleteObjectRequest.class))).thenReturn(CompletableFuture.completedFuture(null));
 
-    clock = Clock.fixed(Instant.ofEpochSecond(42), ZoneId.of("Etc/UTC"));
-
     return new ProfileGrpcService(
-        clock,
+        Clock.systemUTC(),
         accountsManager,
         profilesManager,
         dynamicConfigurationManager,
@@ -396,42 +392,6 @@ public class ProfileGrpcServiceTest extends SimpleBaseGrpcTest<ProfileGrpcServic
     }
   }
 
-  @Test
-  void setProfileBadges() throws InvalidInputException {
-
-    final byte[] commitment = new ProfileKey(new byte[32]).getCommitment(new ServiceId.Aci(AUTHENTICATED_ACI)).serialize();
-
-    final SetProfileRequest request = SetProfileRequest.newBuilder()
-        .setVersion(VERSION)
-        .setName(ByteString.copyFrom(VALID_NAME))
-        .setAvatarChange(AvatarChange.AVATAR_CHANGE_UNCHANGED)
-        .addAllBadgeIds(List.of("TEST3"))
-        .setCommitment(ByteString.copyFrom(commitment))
-        .build();
-
-    final int accountsManagerUpdateRetryCount = 2;
-    AccountsHelper.setupMockUpdateWithRetries(accountsManager, accountsManagerUpdateRetryCount);
-    // set up two invocations -- one for each AccountsManager#update try
-    when(account.getBadges())
-        .thenReturn(List.of(new AccountBadge("TEST3", Instant.ofEpochSecond(41), false)))
-        .thenReturn(List.of(new AccountBadge("TEST2", Instant.ofEpochSecond(41), true),
-            new AccountBadge("TEST3", Instant.ofEpochSecond(41), false)));
-
-    //noinspection ResultOfMethodCallIgnored
-    authenticatedServiceStub().setProfile(request);
-
-    //noinspection unchecked
-    final ArgumentCaptor<List<AccountBadge>> badgeCaptor = ArgumentCaptor.forClass(List.class);
-    verify(account, times(2)).setBadges(refEq(clock), badgeCaptor.capture());
-    // since the stubbing of getBadges() is brittle, we need to verify the number of invocations, to protect against upstream changes
-    verify(account, times(accountsManagerUpdateRetryCount)).getBadges();
-
-    assertEquals(List.of(
-        new AccountBadge("TEST3", Instant.ofEpochSecond(41), true),
-        new AccountBadge("TEST2", Instant.ofEpochSecond(41), false)),
-        badgeCaptor.getValue());
-  }
-
   @ParameterizedTest
   @EnumSource(value = org.signal.chat.common.IdentityType.class, names = {"IDENTITY_TYPE_ACI", "IDENTITY_TYPE_PNI"})
   void getUnversionedProfile(final IdentityType identityType) {

service/src/test/java/org/whispersystems/textsecuregcm/grpc/RequestAttributesServiceImpl.java

@@ -6,6 +6,7 @@ import org.signal.chat.rpc.GetAuthenticatedDeviceResponse;
 import org.signal.chat.rpc.GetRequestAttributesRequest;
 import org.signal.chat.rpc.GetRequestAttributesResponse;
 import org.signal.chat.rpc.RequestAttributesGrpc;
+import org.signal.chat.rpc.UserAgent;
 import org.whispersystems.textsecuregcm.auth.grpc.AuthenticatedDevice;
 import org.whispersystems.textsecuregcm.auth.grpc.AuthenticationUtil;
 import org.whispersystems.textsecuregcm.util.UUIDUtil;
@@ -18,15 +19,21 @@ public class RequestAttributesServiceImpl extends RequestAttributesGrpc.RequestA
 
     final GetRequestAttributesResponse.Builder responseBuilder = GetRequestAttributesResponse.newBuilder();
 
-    RequestAttributesUtil.getAcceptableLanguages()
-        .forEach(languageRange -> responseBuilder.addAcceptableLanguages(languageRange.toString()));
+    RequestAttributesUtil.getAcceptableLanguages().ifPresent(acceptableLanguages ->
+        acceptableLanguages.forEach(languageRange -> responseBuilder.addAcceptableLanguages(languageRange.toString())));
 
     RequestAttributesUtil.getAvailableAcceptedLocales().forEach(locale ->
         responseBuilder.addAvailableAcceptedLocales(locale.toLanguageTag()));
 
     responseBuilder.setRemoteAddress(RequestAttributesUtil.getRemoteAddress().getHostAddress());
 
-    RequestAttributesUtil.getUserAgent().ifPresent(responseBuilder::setUserAgent);
+    RequestAttributesUtil.getUserAgent().ifPresent(userAgent -> responseBuilder.setUserAgent(UserAgent.newBuilder()
+            .setPlatform(userAgent.getPlatform().toString())
+            .setVersion(userAgent.getVersion().toString())
+            .setAdditionalSpecifiers(userAgent.getAdditionalSpecifiers().orElse(""))
+        .build()));
+
+    RequestAttributesUtil.getRawUserAgent().ifPresent(responseBuilder::setRawUserAgent);
 
     responseObserver.onNext(responseBuilder.build());
     responseObserver.onCompleted();

service/src/test/java/org/whispersystems/textsecuregcm/grpc/RequestAttributesUtilTest.java

@@ -3,84 +3,172 @@ package org.whispersystems.textsecuregcm.grpc;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import com.google.common.net.InetAddresses;
-import io.grpc.Context;
-import java.net.InetAddress;
-import java.util.Collections;
+import io.grpc.ManagedChannel;
+import io.grpc.Server;
+import io.grpc.Status;
+import io.grpc.netty.NettyChannelBuilder;
+import io.grpc.netty.NettyServerBuilder;
+import io.netty.channel.DefaultEventLoopGroup;
+import io.netty.channel.local.LocalAddress;
+import io.netty.channel.local.LocalChannel;
+import io.netty.channel.local.LocalServerChannel;
+import java.io.IOException;
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
-import java.util.concurrent.Callable;
-import javax.annotation.Nullable;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.signal.chat.rpc.GetRequestAttributesRequest;
+import org.signal.chat.rpc.GetRequestAttributesResponse;
+import org.signal.chat.rpc.RequestAttributesGrpc;
+import org.whispersystems.textsecuregcm.grpc.net.GrpcClientConnectionManager;
+import org.whispersystems.textsecuregcm.util.ua.UnrecognizedUserAgentException;
+import org.whispersystems.textsecuregcm.util.ua.UserAgent;
+import org.whispersystems.textsecuregcm.util.ua.UserAgentUtil;
 
 class RequestAttributesUtilTest {
 
-  private static final InetAddress REMOTE_ADDRESS = InetAddresses.forString("127.0.0.1");
+  private static DefaultEventLoopGroup eventLoopGroup;
 
-  @Test
-  void getAcceptableLanguages() throws Exception {
-    assertEquals(Collections.emptyList(),
-        callWithRequestAttributes(buildRequestAttributes(Collections.emptyList()),
-            RequestAttributesUtil::getAcceptableLanguages));
+  private GrpcClientConnectionManager grpcClientConnectionManager;
 
-    assertEquals(Locale.LanguageRange.parse("en,ja"),
-        callWithRequestAttributes(buildRequestAttributes(Locale.LanguageRange.parse("en,ja")),
-            RequestAttributesUtil::getAcceptableLanguages));
+  private Server server;
+  private ManagedChannel managedChannel;
+
+  @BeforeAll
+  static void setUpBeforeAll() {
+    eventLoopGroup = new DefaultEventLoopGroup();
+  }
+
+  @BeforeEach
+  void setUp() throws IOException {
+    final LocalAddress serverAddress = new LocalAddress("test-request-metadata-server");
+
+    grpcClientConnectionManager = mock(GrpcClientConnectionManager.class);
+
+    when(grpcClientConnectionManager.getRemoteAddress(any()))
+        .thenReturn(Optional.of(InetAddresses.forString("127.0.0.1")));
+
+    // `RequestAttributesInterceptor` operates on `LocalAddresses`, so we need to do some slightly fancy plumbing to make
+    // sure that we're using local channels and addresses
+    server = NettyServerBuilder.forAddress(serverAddress)
+        .channelType(LocalServerChannel.class)
+        .bossEventLoopGroup(eventLoopGroup)
+        .workerEventLoopGroup(eventLoopGroup)
+        .intercept(new RequestAttributesInterceptor(grpcClientConnectionManager))
+        .addService(new RequestAttributesServiceImpl())
+        .build()
+        .start();
+
+    managedChannel = NettyChannelBuilder.forAddress(serverAddress)
+        .channelType(LocalChannel.class)
+        .eventLoopGroup(eventLoopGroup)
+        .usePlaintext()
+        .build();
+  }
+
+  @AfterEach
+  void tearDown() {
+    managedChannel.shutdown();
+    server.shutdown();
+  }
+
+  @AfterAll
+  static void tearDownAfterAll() throws InterruptedException {
+    eventLoopGroup.shutdownGracefully().await();
   }
 
   @Test
-  void getAvailableAcceptedLocales() throws Exception {
-    assertEquals(Collections.emptyList(),
-        callWithRequestAttributes(buildRequestAttributes(Collections.emptyList()),
-            RequestAttributesUtil::getAvailableAcceptedLocales));
+  void getAcceptableLanguages() {
+    when(grpcClientConnectionManager.getAcceptableLanguages(any()))
+        .thenReturn(Optional.empty());
 
-    final List<Locale> availableAcceptedLocales =
-        callWithRequestAttributes(buildRequestAttributes(Locale.LanguageRange.parse("en,ja")),
-            RequestAttributesUtil::getAvailableAcceptedLocales);
+    assertTrue(getRequestAttributes().getAcceptableLanguagesList().isEmpty());
 
-    assertFalse(availableAcceptedLocales.isEmpty());
+    when(grpcClientConnectionManager.getAcceptableLanguages(any()))
+        .thenReturn(Optional.of(Locale.LanguageRange.parse("en,ja")));
 
-    availableAcceptedLocales.forEach(locale ->
-        assertTrue("en".equals(locale.getLanguage()) || "ja".equals(locale.getLanguage())));
+    assertEquals(List.of("en", "ja"), getRequestAttributes().getAcceptableLanguagesList());
   }
 
   @Test
-  void getRemoteAddress() throws Exception {
-    assertEquals(REMOTE_ADDRESS,
-        callWithRequestAttributes(new RequestAttributes(REMOTE_ADDRESS, null, null),
-            RequestAttributesUtil::getRemoteAddress));
+  void getAvailableAcceptedLocales() {
+    when(grpcClientConnectionManager.getAcceptableLanguages(any()))
+        .thenReturn(Optional.empty());
+
+    assertTrue(getRequestAttributes().getAvailableAcceptedLocalesList().isEmpty());
+
+    when(grpcClientConnectionManager.getAcceptableLanguages(any()))
+        .thenReturn(Optional.of(Locale.LanguageRange.parse("en,ja")));
+
+    final GetRequestAttributesResponse response = getRequestAttributes();
+
+    assertFalse(response.getAvailableAcceptedLocalesList().isEmpty());
+    response.getAvailableAcceptedLocalesList().forEach(languageTag -> {
+      final Locale locale = Locale.forLanguageTag(languageTag);
+      assertTrue("en".equals(locale.getLanguage()) || "ja".equals(locale.getLanguage()));
+    });
   }
 
   @Test
-  void getUserAgent() throws Exception {
-    assertEquals(Optional.empty(),
-        callWithRequestAttributes(buildRequestAttributes((String) null),
-            RequestAttributesUtil::getUserAgent));
+  void getRemoteAddress() {
+    when(grpcClientConnectionManager.getRemoteAddress(any()))
+        .thenReturn(Optional.empty());
 
-    assertEquals(Optional.of("Signal-Desktop/1.2.3 Linux"),
-        callWithRequestAttributes(buildRequestAttributes("Signal-Desktop/1.2.3 Linux"),
-            RequestAttributesUtil::getUserAgent));
+    GrpcTestUtils.assertStatusException(Status.INTERNAL, this::getRequestAttributes);
+
+    final String remoteAddressString = "6.7.8.9";
+
+    when(grpcClientConnectionManager.getRemoteAddress(any()))
+        .thenReturn(Optional.of(InetAddresses.forString(remoteAddressString)));
+
+    assertEquals(remoteAddressString, getRequestAttributes().getRemoteAddress());
   }
 
-  private static <V> V callWithRequestAttributes(final RequestAttributes requestAttributes, final Callable<V> callable) throws Exception {
-    return Context.current()
-        .withValue(RequestAttributesUtil.REQUEST_ATTRIBUTES_CONTEXT_KEY, requestAttributes)
-        .call(callable);
+  @Test
+  void getUserAgent() throws UnrecognizedUserAgentException {
+    when(grpcClientConnectionManager.getUserAgent(any()))
+        .thenReturn(Optional.empty());
+
+    assertFalse(getRequestAttributes().hasUserAgent());
+
+    final UserAgent userAgent = UserAgentUtil.parseUserAgentString("Signal-Desktop/1.2.3 Linux");
+
+    when(grpcClientConnectionManager.getUserAgent(any()))
+        .thenReturn(Optional.of(userAgent));
+
+    final GetRequestAttributesResponse response = getRequestAttributes();
+    assertTrue(response.hasUserAgent());
+    assertEquals("DESKTOP", response.getUserAgent().getPlatform());
+    assertEquals("1.2.3", response.getUserAgent().getVersion());
+    assertEquals("Linux", response.getUserAgent().getAdditionalSpecifiers());
   }
 
-  private static RequestAttributes buildRequestAttributes(final String userAgent) {
-    return buildRequestAttributes(userAgent, Collections.emptyList());
+  @Test
+  void getRawUserAgent() {
+    when(grpcClientConnectionManager.getRawUserAgent(any()))
+        .thenReturn(Optional.empty());
+
+    assertTrue(getRequestAttributes().getRawUserAgent().isBlank());
+
+    final String userAgentString = "Signal-Desktop/1.2.3 Linux";
+
+    when(grpcClientConnectionManager.getRawUserAgent(any()))
+        .thenReturn(Optional.of(userAgentString));
+
+    assertEquals(userAgentString, getRequestAttributes().getRawUserAgent());
   }
 
-  private static RequestAttributes buildRequestAttributes(final List<Locale.LanguageRange> acceptLanguage) {
-    return buildRequestAttributes(null, acceptLanguage);
-  }
-
-  private static RequestAttributes buildRequestAttributes(@Nullable final String userAgent,
-      final List<Locale.LanguageRange> acceptLanguage) {
-
-    return new RequestAttributes(REMOTE_ADDRESS, userAgent, acceptLanguage);
+  private GetRequestAttributesResponse getRequestAttributes() {
+    return RequestAttributesGrpc.newBlockingStub(managedChannel)
+        .getRequestAttributes(GetRequestAttributesRequest.newBuilder().build());
   }
 }

service/src/test/java/org/whispersystems/textsecuregcm/grpc/net/GrpcClientConnectionManagerTest.java

@@ -1,11 +1,7 @@
 package org.whispersystems.textsecuregcm.grpc.net;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import com.google.common.net.InetAddresses;
+import com.vdurmont.semver4j.Semver;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;
@@ -16,12 +12,6 @@ import io.netty.channel.embedded.EmbeddedChannel;
 import io.netty.channel.local.LocalAddress;
 import io.netty.channel.local.LocalChannel;
 import io.netty.channel.local.LocalServerChannel;
-import java.net.InetAddress;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.Optional;
-import java.util.UUID;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
@@ -31,9 +21,20 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.whispersystems.textsecuregcm.auth.grpc.AuthenticatedDevice;
-import org.whispersystems.textsecuregcm.grpc.ChannelNotFoundException;
-import org.whispersystems.textsecuregcm.grpc.RequestAttributes;
 import org.whispersystems.textsecuregcm.storage.Device;
+import org.whispersystems.textsecuregcm.util.ua.ClientPlatform;
+import org.whispersystems.textsecuregcm.util.ua.UnrecognizedUserAgentException;
+import org.whispersystems.textsecuregcm.util.ua.UserAgent;
+import org.whispersystems.textsecuregcm.util.ua.UserAgentUtil;
+
+import javax.annotation.Nullable;
+import java.net.InetAddress;
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 class GrpcClientConnectionManagerTest {
 
@@ -102,7 +103,7 @@ class GrpcClientConnectionManagerTest {
     grpcClientConnectionManager.handleConnectionEstablished(localChannel, remoteChannel, maybeAuthenticatedDevice);
 
     assertEquals(maybeAuthenticatedDevice,
-        grpcClientConnectionManager.getAuthenticatedDevice(remoteChannel));
+        grpcClientConnectionManager.getAuthenticatedDevice(localChannel.localAddress()));
   }
 
   private static List<Optional<AuthenticatedDevice>> getAuthenticatedDevice() {
@@ -113,115 +114,170 @@ class GrpcClientConnectionManagerTest {
   }
 
   @Test
-  void getRequestAttributes() {
+  void getAcceptableLanguages() {
     grpcClientConnectionManager.handleConnectionEstablished(localChannel, remoteChannel, Optional.empty());
 
-    assertThrows(IllegalStateException.class, () -> grpcClientConnectionManager.getRequestAttributes(remoteChannel));
+    assertEquals(Optional.empty(),
+        grpcClientConnectionManager.getAcceptableLanguages(localChannel.localAddress()));
 
-    final RequestAttributes requestAttributes = new RequestAttributes(InetAddresses.forString("6.7.8.9"), null, null);
-    remoteChannel.attr(GrpcClientConnectionManager.REQUEST_ATTRIBUTES_KEY).set(requestAttributes);
+    final List<Locale.LanguageRange> acceptLanguageRanges = Locale.LanguageRange.parse("en,ja");
+    remoteChannel.attr(GrpcClientConnectionManager.ACCEPT_LANGUAGE_ATTRIBUTE_KEY).set(acceptLanguageRanges);
 
-    assertEquals(requestAttributes, grpcClientConnectionManager.getRequestAttributes(remoteChannel));
+    assertEquals(Optional.of(acceptLanguageRanges),
+        grpcClientConnectionManager.getAcceptableLanguages(localChannel.localAddress()));
   }
 
   @Test
-  void closeConnection() throws InterruptedException, ChannelNotFoundException {
+  void getRemoteAddress() {
+    grpcClientConnectionManager.handleConnectionEstablished(localChannel, remoteChannel, Optional.empty());
+
+    assertEquals(Optional.empty(),
+        grpcClientConnectionManager.getRemoteAddress(localChannel.localAddress()));
+
+    final InetAddress remoteAddress = InetAddresses.forString("6.7.8.9");
+    remoteChannel.attr(GrpcClientConnectionManager.REMOTE_ADDRESS_ATTRIBUTE_KEY).set(remoteAddress);
+
+    assertEquals(Optional.of(remoteAddress),
+        grpcClientConnectionManager.getRemoteAddress(localChannel.localAddress()));
+  }
+
+  @Test
+  void getUserAgent() throws UnrecognizedUserAgentException {
+    grpcClientConnectionManager.handleConnectionEstablished(localChannel, remoteChannel, Optional.empty());
+
+    assertEquals(Optional.empty(),
+        grpcClientConnectionManager.getUserAgent(localChannel.localAddress()));
+
+    final UserAgent userAgent = UserAgentUtil.parseUserAgentString("Signal-Desktop/1.2.3 Linux");
+    remoteChannel.attr(GrpcClientConnectionManager.PARSED_USER_AGENT_ATTRIBUTE_KEY).set(userAgent);
+
+    assertEquals(Optional.of(userAgent),
+        grpcClientConnectionManager.getUserAgent(localChannel.localAddress()));
+  }
+
+  @Test
+  void closeConnection() throws InterruptedException {
     final AuthenticatedDevice authenticatedDevice = new AuthenticatedDevice(UUID.randomUUID(), Device.PRIMARY_ID);
 
     grpcClientConnectionManager.handleConnectionEstablished(localChannel, remoteChannel, Optional.of(authenticatedDevice));
 
     assertTrue(remoteChannel.isOpen());
 
-    assertEquals(remoteChannel, grpcClientConnectionManager.getRemoteChannel(localChannel.localAddress()));
+    assertEquals(remoteChannel, grpcClientConnectionManager.getRemoteChannelByLocalAddress(localChannel.localAddress()));
     assertEquals(List.of(remoteChannel),
         grpcClientConnectionManager.getRemoteChannelsByAuthenticatedDevice(authenticatedDevice));
 
     remoteChannel.close().await();
 
-    assertThrows(ChannelNotFoundException.class,
-        () -> grpcClientConnectionManager.getRemoteChannel(localChannel.localAddress()));
-
+    assertNull(grpcClientConnectionManager.getRemoteChannelByLocalAddress(localChannel.localAddress()));
     assertNull(grpcClientConnectionManager.getRemoteChannelsByAuthenticatedDevice(authenticatedDevice));
   }
 
+  @Test
+  void handleWebSocketHandshakeCompleteRemoteAddress() {
+    final EmbeddedChannel embeddedChannel = new EmbeddedChannel();
+
+    final InetAddress preferredRemoteAddress = InetAddresses.forString("192.168.1.1");
+
+    GrpcClientConnectionManager.handleWebSocketHandshakeComplete(embeddedChannel,
+        preferredRemoteAddress,
+        null,
+        null);
+
+    assertEquals(preferredRemoteAddress,
+        embeddedChannel.attr(GrpcClientConnectionManager.REMOTE_ADDRESS_ATTRIBUTE_KEY).get());
+  }
+
   @ParameterizedTest
   @MethodSource
-  void handleHandshakeCompleteRequestAttributes(final InetAddress preferredRemoteAddress,
-      final String userAgentHeader,
-      final String acceptLanguageHeader,
-      final RequestAttributes expectedRequestAttributes) {
+  void handleWebSocketHandshakeCompleteUserAgent(@Nullable final String userAgentHeader,
+      @Nullable final UserAgent expectedParsedUserAgent) {
 
     final EmbeddedChannel embeddedChannel = new EmbeddedChannel();
 
-    GrpcClientConnectionManager.handleHandshakeComplete(embeddedChannel,
-        preferredRemoteAddress,
+    GrpcClientConnectionManager.handleWebSocketHandshakeComplete(embeddedChannel,
+        InetAddresses.forString("127.0.0.1"),
         userAgentHeader,
-        acceptLanguageHeader);
+        null);
 
-    assertEquals(expectedRequestAttributes,
-        embeddedChannel.attr(GrpcClientConnectionManager.REQUEST_ATTRIBUTES_KEY).get());
+    assertEquals(userAgentHeader,
+        embeddedChannel.attr(GrpcClientConnectionManager.RAW_USER_AGENT_ATTRIBUTE_KEY).get());
+
+    assertEquals(expectedParsedUserAgent,
+        embeddedChannel.attr(GrpcClientConnectionManager.PARSED_USER_AGENT_ATTRIBUTE_KEY).get());
   }
 
-  private static List<Arguments> handleHandshakeCompleteRequestAttributes() {
-    final InetAddress preferredRemoteAddress = InetAddresses.forString("192.168.1.1");
-
+  private static List<Arguments> handleWebSocketHandshakeCompleteUserAgent() {
     return List.of(
-        Arguments.argumentSet("Null User-Agent and Accept-Language headers",
-            preferredRemoteAddress, null, null,
-            new RequestAttributes(preferredRemoteAddress, null, Collections.emptyList())),
+        // Recognized user-agent
+        Arguments.of("Signal-Desktop/1.2.3 Linux", new UserAgent(ClientPlatform.DESKTOP, new Semver("1.2.3"), "Linux")),
 
-        Arguments.argumentSet("Recognized User-Agent and null Accept-Language header",
-            preferredRemoteAddress, "Signal-Desktop/1.2.3 Linux", null,
-            new RequestAttributes(preferredRemoteAddress, "Signal-Desktop/1.2.3 Linux", Collections.emptyList())),
+        // Unrecognized user-agent
+        Arguments.of("Not a valid user-agent string", null),
 
-        Arguments.argumentSet("Unparsable User-Agent and null Accept-Language header",
-            preferredRemoteAddress, "Not a valid user-agent string", null,
-            new RequestAttributes(preferredRemoteAddress, "Not a valid user-agent string", Collections.emptyList())),
+        // Missing user-agent
+        Arguments.of(null, null)
+    );
+  }
 
-        Arguments.argumentSet("Null User-Agent and parsable Accept-Language header",
-            preferredRemoteAddress, null, "ja,en;q=0.4",
-            new RequestAttributes(preferredRemoteAddress, null, Locale.LanguageRange.parse("ja,en;q=0.4"))),
 
-        Arguments.argumentSet("Null User-Agent and unparsable Accept-Language header",
-            preferredRemoteAddress, null, "This is not a valid language preference list",
-            new RequestAttributes(preferredRemoteAddress, null, Collections.emptyList()))
+  @ParameterizedTest
+  @MethodSource
+  void handleWebSocketHandshakeCompleteAcceptLanguage(@Nullable final String acceptLanguageHeader,
+      @Nullable final List<Locale.LanguageRange> expectedLanguageRanges) {
+
+    final EmbeddedChannel embeddedChannel = new EmbeddedChannel();
+
+    GrpcClientConnectionManager.handleWebSocketHandshakeComplete(embeddedChannel,
+        InetAddresses.forString("127.0.0.1"),
+        null,
+        acceptLanguageHeader);
+
+    assertEquals(expectedLanguageRanges,
+        embeddedChannel.attr(GrpcClientConnectionManager.ACCEPT_LANGUAGE_ATTRIBUTE_KEY).get());
+  }
+
+  private static List<Arguments> handleWebSocketHandshakeCompleteAcceptLanguage() {
+    return List.of(
+        // Parseable list
+        Arguments.of("ja,en;q=0.4", Locale.LanguageRange.parse("ja,en;q=0.4")),
+
+        // Unparsable list
+        Arguments.of("This is not a valid language preference list", null),
+
+        // Missing list
+        Arguments.of(null, null)
     );
   }
 
   @Test
-  void handleConnectionEstablishedAuthenticated() throws InterruptedException, ChannelNotFoundException {
+  void handleConnectionEstablishedAuthenticated() throws InterruptedException {
     final AuthenticatedDevice authenticatedDevice = new AuthenticatedDevice(UUID.randomUUID(), Device.PRIMARY_ID);
 
-    assertThrows(ChannelNotFoundException.class,
-        () -> grpcClientConnectionManager.getRemoteChannel(localChannel.localAddress()));
-
+    assertNull(grpcClientConnectionManager.getRemoteChannelByLocalAddress(localChannel.localAddress()));
     assertNull(grpcClientConnectionManager.getRemoteChannelsByAuthenticatedDevice(authenticatedDevice));
 
     grpcClientConnectionManager.handleConnectionEstablished(localChannel, remoteChannel, Optional.of(authenticatedDevice));
 
-    assertEquals(remoteChannel, grpcClientConnectionManager.getRemoteChannel(localChannel.localAddress()));
+    assertEquals(remoteChannel, grpcClientConnectionManager.getRemoteChannelByLocalAddress(localChannel.localAddress()));
     assertEquals(List.of(remoteChannel), grpcClientConnectionManager.getRemoteChannelsByAuthenticatedDevice(authenticatedDevice));
 
     remoteChannel.close().await();
 
-    assertThrows(ChannelNotFoundException.class,
-        () -> grpcClientConnectionManager.getRemoteChannel(localChannel.localAddress()));
-
+    assertNull(grpcClientConnectionManager.getRemoteChannelByLocalAddress(localChannel.localAddress()));
     assertNull(grpcClientConnectionManager.getRemoteChannelsByAuthenticatedDevice(authenticatedDevice));
   }
 
   @Test
-  void handleConnectionEstablishedAnonymous() throws InterruptedException, ChannelNotFoundException {
-    assertThrows(ChannelNotFoundException.class,
-        () -> grpcClientConnectionManager.getRemoteChannel(localChannel.localAddress()));
+  void handleConnectionEstablishedAnonymous() throws InterruptedException {
+    assertNull(grpcClientConnectionManager.getRemoteChannelByLocalAddress(localChannel.localAddress()));
 
     grpcClientConnectionManager.handleConnectionEstablished(localChannel, remoteChannel, Optional.empty());
 
-    assertEquals(remoteChannel, grpcClientConnectionManager.getRemoteChannel(localChannel.localAddress()));
+    assertEquals(remoteChannel, grpcClientConnectionManager.getRemoteChannelByLocalAddress(localChannel.localAddress()));
 
     remoteChannel.close().await();
 
-    assertThrows(ChannelNotFoundException.class,
-        () -> grpcClientConnectionManager.getRemoteChannel(localChannel.localAddress()));
+    assertNull(grpcClientConnectionManager.getRemoteChannelByLocalAddress(localChannel.localAddress()));
   }
 }

service/src/test/java/org/whispersystems/textsecuregcm/grpc/net/NoiseWebSocketTunnelServerIntegrationTest.java

@@ -523,7 +523,10 @@ class NoiseWebSocketTunnelServerIntegrationTest extends AbstractLeakDetectionTes
 
         assertEquals(remoteAddress, response.getRemoteAddress());
         assertEquals(List.of(acceptLanguage), response.getAcceptableLanguagesList());
-        assertEquals(userAgent, response.getUserAgent());
+
+        assertEquals("DESKTOP", response.getUserAgent().getPlatform());
+        assertEquals("1.2.3", response.getUserAgent().getVersion());
+        assertEquals("Linux", response.getUserAgent().getAdditionalSpecifiers());
       } finally {
         channel.shutdown();
       }

service/src/test/java/org/whispersystems/textsecuregcm/grpc/net/WebsocketHandshakeCompleteHandlerTest.java

@@ -4,7 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.params.provider.Arguments.argumentSet;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 import static org.mockito.Mockito.mock;
 
@@ -17,7 +16,6 @@ import io.netty.channel.local.LocalAddress;
 import io.netty.handler.codec.http.DefaultHttpHeaders;
 import io.netty.handler.codec.http.HttpHeaders;
 import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
-import io.netty.util.Attribute;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -33,7 +31,6 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.signal.libsignal.protocol.ecc.Curve;
-import org.whispersystems.textsecuregcm.grpc.RequestAttributes;
 import org.whispersystems.textsecuregcm.storage.ClientPublicKeysManager;
 
 class WebsocketHandshakeCompleteHandlerTest extends AbstractLeakDetectionTest {
@@ -137,13 +134,8 @@ class WebsocketHandshakeCompleteHandlerTest extends AbstractLeakDetectionTest {
     embeddedChannel.setRemoteAddress(remoteAddress);
     embeddedChannel.pipeline().fireUserEventTriggered(handshakeCompleteEvent);
 
-
-
     assertEquals(expectedRemoteAddress,
-        Optional.ofNullable(embeddedChannel.attr(GrpcClientConnectionManager.REQUEST_ATTRIBUTES_KEY))
-            .map(Attribute::get)
-            .map(RequestAttributes::remoteAddress)
-            .orElse(null));
+        embeddedChannel.attr(GrpcClientConnectionManager.REMOTE_ADDRESS_ATTRIBUTE_KEY).get());
   }
 
   private static List<Arguments> getRemoteAddress() {
@@ -152,53 +144,53 @@ class WebsocketHandshakeCompleteHandlerTest extends AbstractLeakDetectionTest {
     final InetAddress proxyAddress = InetAddresses.forString("4.3.2.1");
 
     return List.of(
-        argumentSet("Recognized proxy, single forwarded-for address",
-            new DefaultHttpHeaders()
-                .add(WebsocketHandshakeCompleteHandler.RECOGNIZED_PROXY_SECRET_HEADER, RECOGNIZED_PROXY_SECRET)
-                .add(WebsocketHandshakeCompleteHandler.FORWARDED_FOR_HEADER, clientAddress.getHostAddress()),
+        // Recognized proxy, single forwarded-for address
+        Arguments.of(new DefaultHttpHeaders()
+            .add(WebsocketHandshakeCompleteHandler.RECOGNIZED_PROXY_SECRET_HEADER, RECOGNIZED_PROXY_SECRET)
+            .add(WebsocketHandshakeCompleteHandler.FORWARDED_FOR_HEADER, clientAddress.getHostAddress()),
             remoteAddress,
             clientAddress),
 
-        argumentSet("Recognized proxy, multiple forwarded-for addresses",
-            new DefaultHttpHeaders()
+        // Recognized proxy, multiple forwarded-for addresses
+        Arguments.of(new DefaultHttpHeaders()
                 .add(WebsocketHandshakeCompleteHandler.RECOGNIZED_PROXY_SECRET_HEADER, RECOGNIZED_PROXY_SECRET)
                 .add(WebsocketHandshakeCompleteHandler.FORWARDED_FOR_HEADER, clientAddress.getHostAddress() + "," + proxyAddress.getHostAddress()),
             remoteAddress,
             proxyAddress),
 
-        argumentSet("No recognized proxy header, single forwarded-for address",
-            new DefaultHttpHeaders()
+        // No recognized proxy header, single forwarded-for address
+        Arguments.of(new DefaultHttpHeaders()
                 .add(WebsocketHandshakeCompleteHandler.FORWARDED_FOR_HEADER, clientAddress.getHostAddress()),
             remoteAddress,
             remoteAddress.getAddress()),
 
-        argumentSet("No recognized proxy header, no forwarded-for address",
-            new DefaultHttpHeaders(),
+        // No recognized proxy header, no forwarded-for address
+        Arguments.of(new DefaultHttpHeaders(),
             remoteAddress,
             remoteAddress.getAddress()),
 
-        argumentSet("Incorrect proxy header, single forwarded-for address",
-            new DefaultHttpHeaders()
+        // Incorrect proxy header, single forwarded-for address
+        Arguments.of(new DefaultHttpHeaders()
                 .add(WebsocketHandshakeCompleteHandler.RECOGNIZED_PROXY_SECRET_HEADER, RECOGNIZED_PROXY_SECRET + "-incorrect")
                 .add(WebsocketHandshakeCompleteHandler.FORWARDED_FOR_HEADER, clientAddress.getHostAddress()),
             remoteAddress,
             remoteAddress.getAddress()),
 
-        argumentSet("Recognized proxy, no forwarded-for address",
-            new DefaultHttpHeaders()
+        // Recognized proxy, no forwarded-for address
+        Arguments.of(new DefaultHttpHeaders()
                 .add(WebsocketHandshakeCompleteHandler.RECOGNIZED_PROXY_SECRET_HEADER, RECOGNIZED_PROXY_SECRET),
             remoteAddress,
             remoteAddress.getAddress()),
 
-        argumentSet("Recognized proxy, bogus forwarded-for address",
-            new DefaultHttpHeaders()
+        // Recognized proxy, bogus forwarded-for address
+        Arguments.of(new DefaultHttpHeaders()
                 .add(WebsocketHandshakeCompleteHandler.RECOGNIZED_PROXY_SECRET_HEADER, RECOGNIZED_PROXY_SECRET)
                 .add(WebsocketHandshakeCompleteHandler.FORWARDED_FOR_HEADER, "not a valid address"),
             remoteAddress,
             null),
 
-        argumentSet("No forwarded-for address, non-InetSocketAddress remote address",
-            new DefaultHttpHeaders()
+        // No forwarded-for address, non-InetSocketAddress remote address
+        Arguments.of(new DefaultHttpHeaders()
                 .add(WebsocketHandshakeCompleteHandler.RECOGNIZED_PROXY_SECRET_HEADER, RECOGNIZED_PROXY_SECRET),
             new LocalAddress("local-address"),
             null)

service/src/test/java/org/whispersystems/textsecuregcm/push/MessageSenderTest.java

@@ -104,7 +104,6 @@ class MessageSenderTest {
         serviceIdentifier,
         Map.of(device.getId(), message),
         Map.of(device.getId(), registrationId),
-        Optional.empty(),
         null));
 
     final MessageProtos.Envelope expectedMessage = ephemeral
@@ -145,7 +144,6 @@ class MessageSenderTest {
             serviceIdentifier,
             Map.of(device.getId(), message),
             Map.of(device.getId(), registrationId + 1),
-            Optional.empty(),
             null));
 
     assertEquals(new MismatchedDevices(Collections.emptySet(), Collections.emptySet(), Set.of(deviceId)),
@@ -346,64 +344,4 @@ class MessageSenderTest {
             Optional.of(new MismatchedDevices(Set.of(primaryDeviceId), Set.of(extraDeviceId), Set.of(linkedDeviceId))))
     );
   }
-
-  @Test
-  void sendMessageEmptyMessageList() {
-    final ServiceIdentifier serviceIdentifier = new AciServiceIdentifier(UUID.randomUUID());
-
-    final Device device = mock(Device.class);
-    when(device.getId()).thenReturn(Device.PRIMARY_ID);
-
-    final Account account = mock(Account.class);
-    when(account.getDevices()).thenReturn(List.of(device));
-    when(account.isIdentifiedBy(serviceIdentifier)).thenReturn(true);
-
-    assertThrows(MismatchedDevicesException.class, () -> messageSender.sendMessages(account,
-        serviceIdentifier,
-        Collections.emptyMap(),
-        Collections.emptyMap(),
-        Optional.empty(),
-        null));
-
-    assertDoesNotThrow(() -> messageSender.sendMessages(account,
-        serviceIdentifier,
-        Collections.emptyMap(),
-        Collections.emptyMap(),
-        Optional.of(Device.PRIMARY_ID),
-        null));
-  }
-
-  @Test
-  void sendSyncMessageMismatchedAddressing() {
-    final UUID accountIdentifier = UUID.randomUUID();
-    final ServiceIdentifier serviceIdentifier = new AciServiceIdentifier(accountIdentifier);
-    final byte deviceId = Device.PRIMARY_ID;
-
-    final Account account = mock(Account.class);
-    when(account.getUuid()).thenReturn(accountIdentifier);
-    when(account.getIdentifier(IdentityType.ACI)).thenReturn(accountIdentifier);
-    when(account.isIdentifiedBy(serviceIdentifier)).thenReturn(true);
-
-    final Account nonSyncDestination = mock(Account.class);
-    when(nonSyncDestination.isIdentifiedBy(any())).thenReturn(true);
-
-    assertThrows(IllegalArgumentException.class, () -> messageSender.sendMessages(nonSyncDestination,
-            new AciServiceIdentifier(UUID.randomUUID()),
-            Map.of(deviceId, MessageProtos.Envelope.newBuilder().build()),
-            Map.of(deviceId, 17),
-            Optional.of(deviceId),
-            null),
-        "Should throw an IllegalArgumentException for inter-account messages with a sync message device ID");
-
-    assertThrows(IllegalArgumentException.class, () -> messageSender.sendMessages(account,
-        serviceIdentifier,
-        Map.of(deviceId, MessageProtos.Envelope.newBuilder()
-            .setSourceServiceId(serviceIdentifier.toServiceIdentifierString())
-            .setSourceDevice(deviceId)
-            .build()),
-        Map.of(deviceId, 17),
-        Optional.empty(),
-        null),
-        "Should throw an IllegalArgumentException for self-addressed messages without a sync message device ID");
-  }
 }

service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountTest.java

@@ -19,6 +19,7 @@ import static org.whispersystems.textsecuregcm.tests.util.DevicesHelper.createDe
 import com.fasterxml.jackson.annotation.JsonFilter;
 import java.lang.annotation.Annotation;
 import java.nio.charset.StandardCharsets;
+import java.time.Clock;
 import java.time.Instant;
 import java.util.Arrays;
 import java.util.Collections;
@@ -186,7 +187,7 @@ class AccountTest {
   @Test
   void addAndRemoveBadges() {
     final Account account = AccountsHelper.generateTestAccount("+14151234567", UUID.randomUUID(), UUID.randomUUID(), List.of(createDevice(Device.PRIMARY_ID)), new byte[0]);
-    final TestClock clock = TestClock.pinned(Instant.ofEpochSecond(40));
+    final Clock clock = TestClock.pinned(Instant.ofEpochSecond(40));
 
     account.addBadge(clock, new AccountBadge("foo", Instant.ofEpochSecond(42), false));
     account.addBadge(clock, new AccountBadge("bar", Instant.ofEpochSecond(44), true));
@@ -213,17 +214,6 @@ class AccountTest {
       assertThat(badge.expiration().getEpochSecond()).isEqualTo(51);
       assertThat(badge.visible()).isTrue();
     });
-
-    clock.pin(Instant.ofEpochSecond(52));
-
-    // for a merged badge, visible = true is preferred
-    account.addBadge(clock, new AccountBadge("foo", Instant.ofEpochSecond(53), false));
-
-    assertThat(account.getBadges()).hasSize(1).element(0).satisfies(badge -> {
-      assertThat(badge.id()).isEqualTo("foo");
-      assertThat(badge.expiration().getEpochSecond()).isEqualTo(53);
-      assertThat(badge.visible()).isTrue();
-    });
   }
 
   @Test

service/src/test/java/org/whispersystems/textsecuregcm/storage/ChangeNumberManagerTest.java

@@ -9,16 +9,13 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyByte;
-import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.google.protobuf.ByteString;
 import java.nio.charset.StandardCharsets;
-import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -38,10 +35,8 @@ import org.whispersystems.textsecuregcm.entities.ECSignedPreKey;
 import org.whispersystems.textsecuregcm.entities.IncomingMessage;
 import org.whispersystems.textsecuregcm.entities.KEMSignedPreKey;
 import org.whispersystems.textsecuregcm.entities.MessageProtos;
-import org.whispersystems.textsecuregcm.identity.AciServiceIdentifier;
 import org.whispersystems.textsecuregcm.push.MessageSender;
 import org.whispersystems.textsecuregcm.tests.util.KeysHelper;
-import org.whispersystems.textsecuregcm.util.TestClock;
 
 public class ChangeNumberManagerTest {
   private AccountsManager accountsManager;
@@ -50,13 +45,11 @@ public class ChangeNumberManagerTest {
 
   private Map<Account, UUID> updatedPhoneNumberIdentifiersByAccount;
 
-  private static final TestClock CLOCK = TestClock.pinned(Instant.now());
-
   @BeforeEach
   void setUp() throws Exception {
     accountsManager = mock(AccountsManager.class);
     messageSender = mock(MessageSender.class);
-    changeNumberManager = new ChangeNumberManager(messageSender, accountsManager, CLOCK);
+    changeNumberManager = new ChangeNumberManager(messageSender, accountsManager);
 
     updatedPhoneNumberIdentifiersByAccount = new HashMap<>();
 
@@ -110,7 +103,7 @@ public class ChangeNumberManagerTest {
     changeNumberManager.changeNumber(account, "+18025551234", null, null, null, null, null, null);
     verify(accountsManager).changeNumber(account, "+18025551234", null, null, null, null);
     verify(accountsManager, never()).updateDevice(any(), anyByte(), any());
-    verify(messageSender, never()).sendMessages(eq(account), any(), any(), any(), any(), any());
+    verify(messageSender, never()).sendMessages(eq(account), any(), any(), any(), any());
   }
 
   @Test
@@ -124,7 +117,7 @@ public class ChangeNumberManagerTest {
 
     changeNumberManager.changeNumber(account, "+18025551234", pniIdentityKey, prekeys, null, Collections.emptyList(), Collections.emptyMap(), null);
     verify(accountsManager).changeNumber(account, "+18025551234", pniIdentityKey, prekeys, null, Collections.emptyMap());
-    verify(messageSender, never()).sendMessages(eq(account), any(), any(), any(), any(), any());
+    verify(messageSender, never()).sendMessages(eq(account), any(), any(), any(), any());
   }
 
   @Test
@@ -139,59 +132,45 @@ public class ChangeNumberManagerTest {
     when(account.getUuid()).thenReturn(aci);
     when(account.getPhoneNumberIdentifier()).thenReturn(pni);
 
-    final Device primaryDevice = mock(Device.class);
-    when(primaryDevice.getId()).thenReturn(Device.PRIMARY_ID);
-    when(primaryDevice.getRegistrationId()).thenReturn(7);
+    final Device d2 = mock(Device.class);
+    final byte deviceId2 = 2;
+    when(d2.getId()).thenReturn(deviceId2);
 
-    final Device linkedDevice = mock(Device.class);
-    final byte linkedDeviceId = Device.PRIMARY_ID + 1;
-    final int linkedDeviceRegistrationId = 17;
-    when(linkedDevice.getId()).thenReturn(linkedDeviceId);
-    when(linkedDevice.getRegistrationId()).thenReturn(linkedDeviceRegistrationId);
-
-    when(account.getDevice(anyByte())).thenReturn(Optional.empty());
-    when(account.getDevice(Device.PRIMARY_ID)).thenReturn(Optional.of(primaryDevice));
-    when(account.getDevice(linkedDeviceId)).thenReturn(Optional.of(linkedDevice));
-    when(account.getDevices()).thenReturn(List.of(primaryDevice, linkedDevice));
+    when(account.getDevice(deviceId2)).thenReturn(Optional.of(d2));
+    when(account.getDevices()).thenReturn(List.of(d2));
 
     final ECKeyPair pniIdentityKeyPair = Curve.generateKeyPair();
     final IdentityKey pniIdentityKey = new IdentityKey(pniIdentityKeyPair.getPublicKey());
     final Map<Byte, ECSignedPreKey> prekeys = Map.of(Device.PRIMARY_ID,
         KeysHelper.signedECPreKey(1, pniIdentityKeyPair),
-        linkedDeviceId, KeysHelper.signedECPreKey(2, pniIdentityKeyPair));
-    final Map<Byte, Integer> registrationIds = Map.of(Device.PRIMARY_ID, 17, linkedDeviceId, 19);
+        deviceId2, KeysHelper.signedECPreKey(2, pniIdentityKeyPair));
+    final Map<Byte, Integer> registrationIds = Map.of(Device.PRIMARY_ID, 17, deviceId2, 19);
 
     final IncomingMessage msg = mock(IncomingMessage.class);
-    when(msg.type()).thenReturn(1);
-    when(msg.destinationDeviceId()).thenReturn(linkedDeviceId);
-    when(msg.destinationRegistrationId()).thenReturn(linkedDeviceRegistrationId);
+    when(msg.destinationDeviceId()).thenReturn(deviceId2);
     when(msg.content()).thenReturn(new byte[]{1});
 
     changeNumberManager.changeNumber(account, changedE164, pniIdentityKey, prekeys, null, List.of(msg), registrationIds, null);
 
     verify(accountsManager).changeNumber(account, changedE164, pniIdentityKey, prekeys, null, registrationIds);
 
-    final MessageProtos.Envelope expectedEnvelope = MessageProtos.Envelope.newBuilder()
-        .setType(MessageProtos.Envelope.Type.forNumber(msg.type()))
-        .setClientTimestamp(CLOCK.millis())
-        .setServerTimestamp(CLOCK.millis())
-        .setDestinationServiceId(new AciServiceIdentifier(aci).toServiceIdentifierString())
-        .setContent(ByteString.copyFrom(msg.content()))
-        .setSourceServiceId(new AciServiceIdentifier(aci).toServiceIdentifierString())
-        .setSourceDevice(Device.PRIMARY_ID)
-        .setUpdatedPni(updatedPhoneNumberIdentifiersByAccount.get(account).toString())
-        .setUrgent(true)
-        .setEphemeral(false)
-        .build();
+    @SuppressWarnings("unchecked") final ArgumentCaptor<Map<Byte, MessageProtos.Envelope>> envelopeCaptor =
+        ArgumentCaptor.forClass(Map.class);
 
-    verify(messageSender).sendMessages(argThat(a -> a.getUuid().equals(aci)),
-        eq(new AciServiceIdentifier(aci)),
-        eq(Map.of(linkedDeviceId, expectedEnvelope)),
-        eq(Map.of(linkedDeviceId, linkedDeviceRegistrationId)),
-        eq(Optional.of(Device.PRIMARY_ID)),
-        any());
+    verify(messageSender).sendMessages(any(), any(), envelopeCaptor.capture(), any(), any());
+
+    assertEquals(1, envelopeCaptor.getValue().size());
+    assertEquals(Set.of(deviceId2), envelopeCaptor.getValue().keySet());
+
+    final MessageProtos.Envelope envelope = envelopeCaptor.getValue().get(deviceId2);
+
+    assertEquals(aci, UUID.fromString(envelope.getDestinationServiceId()));
+    assertEquals(aci, UUID.fromString(envelope.getSourceServiceId()));
+    assertEquals(Device.PRIMARY_ID, envelope.getSourceDevice());
+    assertEquals(updatedPhoneNumberIdentifiersByAccount.get(account), UUID.fromString(envelope.getUpdatedPni()));
   }
 
+
   @Test
   void changeNumberSetPrimaryDevicePrekeyPqAndSendMessages() throws Exception {
     final String originalE164 = "+18005551234";
@@ -231,7 +210,7 @@ public class ChangeNumberManagerTest {
     @SuppressWarnings("unchecked") final ArgumentCaptor<Map<Byte, MessageProtos.Envelope>> envelopeCaptor =
         ArgumentCaptor.forClass(Map.class);
 
-    verify(messageSender).sendMessages(any(), any(), envelopeCaptor.capture(), any(), any(), any());
+    verify(messageSender).sendMessages(any(), any(), envelopeCaptor.capture(), any(), any());
 
     assertEquals(1, envelopeCaptor.getValue().size());
     assertEquals(Set.of(deviceId2), envelopeCaptor.getValue().keySet());
@@ -282,7 +261,7 @@ public class ChangeNumberManagerTest {
     @SuppressWarnings("unchecked") final ArgumentCaptor<Map<Byte, MessageProtos.Envelope>> envelopeCaptor =
         ArgumentCaptor.forClass(Map.class);
 
-    verify(messageSender).sendMessages(any(), any(), envelopeCaptor.capture(), any(), any(), any());
+    verify(messageSender).sendMessages(any(), any(), envelopeCaptor.capture(), any(), any());
 
     assertEquals(1, envelopeCaptor.getValue().size());
     assertEquals(Set.of(deviceId2), envelopeCaptor.getValue().keySet());
@@ -329,7 +308,7 @@ public class ChangeNumberManagerTest {
     @SuppressWarnings("unchecked") final ArgumentCaptor<Map<Byte, MessageProtos.Envelope>> envelopeCaptor =
         ArgumentCaptor.forClass(Map.class);
 
-    verify(messageSender).sendMessages(any(), any(), envelopeCaptor.capture(), any(), any(), any());
+    verify(messageSender).sendMessages(any(), any(), envelopeCaptor.capture(), any(), any());
 
     assertEquals(1, envelopeCaptor.getValue().size());
     assertEquals(Set.of(deviceId2), envelopeCaptor.getValue().keySet());
@@ -378,7 +357,7 @@ public class ChangeNumberManagerTest {
     @SuppressWarnings("unchecked") final ArgumentCaptor<Map<Byte, MessageProtos.Envelope>> envelopeCaptor =
         ArgumentCaptor.forClass(Map.class);
 
-    verify(messageSender).sendMessages(any(), any(), envelopeCaptor.capture(), any(), any(), any());
+    verify(messageSender).sendMessages(any(), any(), envelopeCaptor.capture(), any(), any());
 
     assertEquals(1, envelopeCaptor.getValue().size());
     assertEquals(Set.of(deviceId2), envelopeCaptor.getValue().keySet());

service/src/test/java/org/whispersystems/textsecuregcm/tests/util/AccountsHelper.java

@@ -31,8 +31,8 @@ import org.whispersystems.textsecuregcm.auth.SaltedTokenHash;
 import org.whispersystems.textsecuregcm.entities.AccountAttributes;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
-import org.whispersystems.textsecuregcm.storage.Device;
 import org.whispersystems.textsecuregcm.storage.DeviceSpec;
+import org.whispersystems.textsecuregcm.storage.Device;
 import org.whispersystems.textsecuregcm.util.SystemMapper;
 
 public class AccountsHelper {
@@ -62,71 +62,6 @@ public class AccountsHelper {
     setupMockUpdate(mockAccountsManager, false);
   }
 
-  /**
-   * Sets up stubbing for:
-   * <ul>
-   *    <li>{@link AccountsManager#update(Account, Consumer)}</li>
-   *    <li>{@link AccountsManager#updateAsync(Account, Consumer)}</li>
-   *    <li>{@link AccountsManager#updateDevice(Account, byte, Consumer)}</li>
-   *    <li>{@link AccountsManager#updateDeviceAsync(Account, byte, Consumer)}</li>
-   * </ul>
-   *
-   * with multiple calls to the {@link Consumer<Account>}. This simulates retries from {@link org.whispersystems.textsecuregcm.storage.ContestedOptimisticLockException}.
-   * Callers will typically set up stubbing for relevant {@link Account} methods with multiple {@link org.mockito.stubbing.OngoingStubbing#thenReturn(Object)}
-   * calls:
-   * <pre>
-   *   // example stubbing
-   *   when(account.getNextDeviceId())
-   *     .thenReturn(2)
-   *     .thenReturn(3);
-   * </pre>
-   */
-  @SuppressWarnings("unchecked")
-  public static void setupMockUpdateWithRetries(final AccountsManager mockAccountsManager, final int retryCount) {
-    when(mockAccountsManager.update(any(), any())).thenAnswer(answer -> {
-      final Account account = answer.getArgument(0, Account.class);
-
-      for (int i = 0; i < retryCount; i++) {
-        answer.getArgument(1, Consumer.class).accept(account);
-      }
-
-      return copyAndMarkStale(account);
-    });
-
-    when(mockAccountsManager.updateAsync(any(), any())).thenAnswer(answer -> {
-      final Account account = answer.getArgument(0, Account.class);
-
-      for (int i = 0; i < retryCount; i++) {
-        answer.getArgument(1, Consumer.class).accept(account);
-      }
-
-      return CompletableFuture.completedFuture(copyAndMarkStale(account));
-    });
-
-    when(mockAccountsManager.updateDevice(any(), anyByte(), any())).thenAnswer(answer -> {
-      final Account account = answer.getArgument(0, Account.class);
-      final byte deviceId = answer.getArgument(1, Byte.class);
-
-      for (int i = 0; i < retryCount; i++) {
-        account.getDevice(deviceId).ifPresent(answer.getArgument(2, Consumer.class));
-      }
-
-      return copyAndMarkStale(account);
-    });
-
-    when(mockAccountsManager.updateDeviceAsync(any(), anyByte(), any())).thenAnswer(answer -> {
-      final Account account = answer.getArgument(0, Account.class);
-      final byte deviceId = answer.getArgument(1, Byte.class);
-
-      for (int i = 0; i < retryCount; i++) {
-        account.getDevice(deviceId).ifPresent(answer.getArgument(2, Consumer.class));
-      }
-
-      return CompletableFuture.completedFuture(copyAndMarkStale(account));
-    });
-  }
-
-  @SuppressWarnings("unchecked")
   private static void setupMockUpdate(final AccountsManager mockAccountsManager, final boolean markStale) {
     when(mockAccountsManager.update(any(), any())).thenAnswer(answer -> {
       final Account account = answer.getArgument(0, Account.class);

service/src/test/java/org/whispersystems/textsecuregcm/util/ua/UserAgentUtilTest.java

@@ -13,20 +13,28 @@ import java.util.stream.Stream;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import javax.annotation.Nullable;
 
 class UserAgentUtilTest {
 
   @ParameterizedTest
-  @MethodSource("argumentsForTestParseStandardUserAgentString")
-  void testParseStandardUserAgentString(final String userAgentString, @Nullable final UserAgent expectedUserAgent)
-      throws UnrecognizedUserAgentException {
+  @MethodSource
+  void testParseBogusUserAgentString(final String userAgentString) {
+    assertThrows(UnrecognizedUserAgentException.class, () -> UserAgentUtil.parseUserAgentString(userAgentString));
+  }
 
-    if (expectedUserAgent != null) {
-      assertEquals(expectedUserAgent, UserAgentUtil.parseUserAgentString(userAgentString));
-    } else {
-      assertThrows(UnrecognizedUserAgentException.class, () -> UserAgentUtil.parseUserAgentString(userAgentString));
-    }
+  @SuppressWarnings("unused")
+  private static Stream<String> testParseBogusUserAgentString() {
+    return Stream.of(
+        null,
+        "This is obviously not a reasonable User-Agent string.",
+        "Signal-Android/4.6-8.3.unreasonableversionstring-17"
+    );
+  }
+
+  @ParameterizedTest
+  @MethodSource("argumentsForTestParseStandardUserAgentString")
+  void testParseStandardUserAgentString(final String userAgentString, final UserAgent expectedUserAgent) {
+    assertEquals(expectedUserAgent, UserAgentUtil.parseStandardUserAgentString(userAgentString));
   }
 
   private static Stream<Arguments> argumentsForTestParseStandardUserAgentString() {
@@ -34,18 +42,18 @@ class UserAgentUtilTest {
         Arguments.of("This is obviously not a reasonable User-Agent string.", null),
         Arguments.of("Signal-Android/4.68.3 Android/25",
             new UserAgent(ClientPlatform.ANDROID, new Semver("4.68.3"), "Android/25")),
-        Arguments.of("Signal-Android/4.68.3", new UserAgent(ClientPlatform.ANDROID, new Semver("4.68.3"), null)),
+        Arguments.of("Signal-Android/4.68.3", new UserAgent(ClientPlatform.ANDROID, new Semver("4.68.3"))),
         Arguments.of("Signal-Desktop/1.2.3 Linux", new UserAgent(ClientPlatform.DESKTOP, new Semver("1.2.3"), "Linux")),
         Arguments.of("Signal-Desktop/1.2.3 macOS", new UserAgent(ClientPlatform.DESKTOP, new Semver("1.2.3"), "macOS")),
         Arguments.of("Signal-Desktop/1.2.3 Windows",
             new UserAgent(ClientPlatform.DESKTOP, new Semver("1.2.3"), "Windows")),
-        Arguments.of("Signal-Desktop/1.2.3", new UserAgent(ClientPlatform.DESKTOP, new Semver("1.2.3"), null)),
+        Arguments.of("Signal-Desktop/1.2.3", new UserAgent(ClientPlatform.DESKTOP, new Semver("1.2.3"))),
         Arguments.of("Signal-Desktop/1.32.0-beta.3",
-            new UserAgent(ClientPlatform.DESKTOP, new Semver("1.32.0-beta.3"), null)),
+            new UserAgent(ClientPlatform.DESKTOP, new Semver("1.32.0-beta.3"))),
         Arguments.of("Signal-iOS/3.9.0 (iPhone; iOS 12.2; Scale/3.00)",
             new UserAgent(ClientPlatform.IOS, new Semver("3.9.0"), "(iPhone; iOS 12.2; Scale/3.00)")),
         Arguments.of("Signal-iOS/3.9.0 iOS/14.2", new UserAgent(ClientPlatform.IOS, new Semver("3.9.0"), "iOS/14.2")),
-        Arguments.of("Signal-iOS/3.9.0", new UserAgent(ClientPlatform.IOS, new Semver("3.9.0"), null)),
+        Arguments.of("Signal-iOS/3.9.0", new UserAgent(ClientPlatform.IOS, new Semver("3.9.0"))),
         Arguments.of("Signal-Android/7.11.23-nightly-1982-06-28-07-07-07 tonic/0.31",
             new UserAgent(ClientPlatform.ANDROID, new Semver("7.11.23-nightly-1982-06-28-07-07-07"), "tonic/0.31")),
         Arguments.of("Signal-Android/7.11.23-nightly-1982-06-28-07-07-07 Android/42 tonic/0.31",

service/src/test/proto/request_attributes_service.proto

@@ -23,7 +23,14 @@ message GetRequestAttributesResponse {
   repeated string acceptable_languages = 1;
   repeated string available_accepted_locales = 2;
   string remote_address = 3;
-  string user_agent = 4;
+  string raw_user_agent = 4;
+  UserAgent user_agent = 5;
+}
+
+message UserAgent {
+  string platform = 1;
+  string version = 2;
+  string additional_specifiers = 3;
 }
 
 message GetAuthenticatedDeviceRequest {

service/src/test/resources/config/test.yml

@@ -470,8 +470,7 @@ turn:
   cloudflare:
     apiToken: secret://turn.cloudflare.apiToken
     endpoint: https://rtc.live.cloudflare.com/v1/turn/keys/LMNOP/credentials/generate
-    requestedCredentialTtl: PT24H
-    clientCredentialTtl: PT12H
+    ttl: 86400
     urls:
       - turn:turn.example.com:80
     urlsWithIps:

spam-filter

@@ -1 +1 @@
-Subproject commit d9852e294a853b88c7feaa748e17fee38acbf849
+Subproject commit 8f566196d763c8eb1f3c8fcefd5be3c35ff8d148