Update to the latest version of the spam filter

It's been supplanted by /v2/config for all clients beyond the 90-day window.
We still have [some traffic](https://signal.grafana.net/goto/bf5tjk346v1moa?orgId=1)
but it's all from expired/third-party clients (note the lack of a recognized
version number in the client-version tag).

.github/workflows/documentation.yml

@@ -11,11 +11,11 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version-file: .java-version
           cache: 'maven'
       - name: Compile and Build OpenAPI file
         run: ./mvnw compile

.github/workflows/integration-tests.yml

@@ -5,30 +5,33 @@ on:
     - cron: '30 19 * * MON-FRI'
   workflow_dispatch:
 
+env:
+  # This may seem a little redundant, but copying the configuration to an environment variable makes it easier and safer
+  # to then write its contents to a file
+  INTEGRATION_TEST_CONFIG: ${{ vars.INTEGRATION_TEST_CONFIG }}
+
 jobs:
   build:
-    if: ${{ vars.INTEGRATION_TESTS_BUCKET != '' }}
+    if: ${{ vars.INTEGRATION_TEST_CONFIG != '' }}
     runs-on: ubuntu-latest
     permissions:
       id-token: write
       contents: read
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version-file: .java-version
           cache: 'maven'
-      - uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 #v4.0.2
+      - uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v5.0.0
         name: Configure AWS credentials from Test account
         with:
           role-to-assume: ${{ vars.AWS_ROLE }}
           aws-region: ${{ vars.AWS_REGION }}
-      - name: Fetch integration utils library
+      - name: Write integration test configuration
         run: |
-          mkdir -p integration-tests/.libs
           mkdir -p integration-tests/src/main/resources
-          wget -O integration-tests/.libs/software.amazon.awssdk-sso.jar https://repo1.maven.org/maven2/software/amazon/awssdk/sso/2.19.8/sso-2.19.8.jar
-          aws s3 cp "s3://${{ vars.INTEGRATION_TESTS_BUCKET }}/config-latest.yml" integration-tests/src/main/resources/config.yml
+          echo "${INTEGRATION_TEST_CONFIG}" > integration-tests/src/main/resources/config.yml
       - name: Run and verify integration tests
-        run: ./mvnw clean compile test-compile failsafe:integration-test failsafe:verify
+        run: ./mvnw clean compile test-compile failsafe:integration-test failsafe:verify -P aws-sso

.github/workflows/test.yml

@@ -1,6 +1,7 @@
 name: Service CI
 
 on:
+  pull_request:
   push:
     branches-ignore:
       - gh-pages
@@ -8,19 +9,59 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: ubuntu:22.04
+    container: ubuntu:24.04
+    timeout-minutes: 20
+
+    services:
+      foundationdb0:
+        # Note: this should generally match the version of the FoundationDB SERVER deployed in production; it's okay if
+        # it's a little behind the CLIENT version.
+        image: foundationdb/foundationdb:7.3.62
+        options: --name foundationdb0
+      foundationdb1:
+        # Note: this should generally match the version of the FoundationDB SERVER deployed in production; it's okay if
+        # it's a little behind the CLIENT version.
+        image: foundationdb/foundationdb:7.3.62
+        options: --name foundationdb1
 
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - name: Set up JDK 21
-        uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - name: Set up JDK
+        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version-file: .java-version
           cache: 'maven'
         env:
           # work around an issue with actions/runner setting an incorrect HOME in containers, which breaks maven caching
           # https://github.com/actions/setup-java/issues/356
           HOME: /root
+      - name: Install APT packages
+        # ca-certificates: required for AWS CRT client
+        run: |
+          # Add Docker's official GPG key:
+          apt update
+          apt install -y ca-certificates curl
+          install -m 0755 -d /etc/apt/keyrings
+          curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+          chmod a+r /etc/apt/keyrings/docker.asc
+
+          # Add Docker repository to apt sources:
+          echo \
+            "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
+            $(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | \
+            tee /etc/apt/sources.list.d/docker.list > /dev/null
+
+          # ca-certificates: required for AWS CRT client
+          apt update && apt install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin ca-certificates
+      - name: Configure FoundationDB0 database
+        run: docker exec foundationdb0 /usr/bin/fdbcli --exec 'configure new single memory'
+      - name: Configure FoundationDB1 database
+        run: docker exec foundationdb1 /usr/bin/fdbcli --exec 'configure new single memory'
+      - name: Download and install FoundationDB client
+        run: |
+          ./mvnw -e -B -Pexclude-spam-filter clean prepare-package -DskipTests=true
+          cp service/target/jib-extra/usr/lib/libfdb_c.x86_64.so /usr/lib/libfdb_c.x86_64.so
+          ldconfig
       - name: Build with Maven
-        run: ./mvnw -e -B verify
+        run: ./mvnw -e -B clean verify -DfoundationDb.serviceContainerNamePrefix=foundationdb

.gitignore

@@ -16,7 +16,6 @@ config/deploy.properties
 /service/config/testing.yml
 /service/config/deploy.properties
 /service/dependency-reduced-pom.xml
-.java-version
 .opsmanage
 put.sh
 deployer-staging.properties
@@ -29,4 +28,4 @@ deployer.log
 .project
 .classpath
 .settings
-.DS_Store
+.DS_Store

.java-version

@@ -0,0 +1 @@
+temurin-24

.mvn/wrapper/maven-wrapper.properties

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
-distributionSha256Sum=e896b60329a71b719d77bb4388b251a50aebcd73c62f69d510c858ce360afe0f
-wrapperSha256Sum=e63a53cfb9c4d291ebe3c2b0edacb7622bbc480326beaa5a0456e412f52f066a
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar
+distributionSha256Sum=0d7125e8c91097b36edb990ea5934e6c68b4440eef4ea96510a0f6815e7eeadb
+wrapperSha256Sum=4e2fbf6554bc8a4702cdfdd3bef464f423393d784ddbb037216320ce55d5e4e1

README.md

@@ -8,9 +8,28 @@ Looking for protocol documentation? Check out the website!
 
 https://signal.org/docs/
 
-Cryptography Notice
+How to Build
 ------------
 
+This project uses [FoundationDB](https://www.foundationdb.org/) and requires the FoundationDB client library to be installed on the host system. With that in place, the server can be built and tested with:
+
+```shell script
+$ ./mvnw clean test
+```
+
+Security
+--------
+
+Security issues should be sent to <a href=mailto:security@signal.org>security@signal.org</a>.
+
+Help
+----
+
+We cannot provide direct technical support. Get help running this software in your own environment in our [unofficial community forum][community forum].
+
+Cryptography Notice
+-------------------
+
 This distribution includes cryptographic software. The country in which you currently reside may have restrictions on the import, possession, use, and/or re-export to another country, of encryption software.
 BEFORE using any encryption software, please check your country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
 See <https://www.wassenaar.org/> for more information.
@@ -19,8 +38,10 @@ The U.S. Government Department of Commerce, Bureau of Industry and Security (BIS
 The form and manner of this distribution makes it eligible for export under the License Exception ENC Technology Software Unrestricted (TSU) exception (see the BIS Export Administration Regulations, Section 740.13) for both object code and source code.
 
 License
----------------------
+-------
 
-Copyright 2013-2024 Signal Messenger, LLC
+Copyright 2013 Signal Messenger, LLC
 
 Licensed under the GNU AGPLv3: https://www.gnu.org/licenses/agpl-3.0.html
+
+[community forum]: https://community.signalusers.org

TESTING.md

@@ -0,0 +1,30 @@
+# Testing
+
+## Automated tests
+
+The full suite of automated tests can be run using Maven from the project root:
+
+```sh
+./mvnw verify
+```
+
+## Test server
+
+The service can be run in a feature-limited test mode by running the Maven `integration-test`
+goal with the `test-server` profile activated:
+
+```sh
+./mvnw integration-test -Ptest-server [-DskipTests=true]
+```
+
+This runs [`LocalWhisperServerService`][lwss] with [test configuration][test.yml] and [secrets][test secrets]. External
+registration clients are stubbed so that:
+
+- a captcha requirement can be satisfied with `noop.noop.registration.noop`
+- any string will be accepted for a phone verification code
+
+[lwss]: service/src/test/java/org/whispersystems/textsecuregcm/LocalWhisperServerService.java
+
+[test.yml]: service/src/test/resources/config/test.yml
+
+[test secrets]: service/src/test/resources/config/test-secrets-bundle.yml

api-doc/pom.xml

@@ -22,7 +22,7 @@
     <plugins>
       <plugin>
         <groupId>io.swagger.core.v3</groupId>
-        <artifactId>swagger-maven-plugin</artifactId>
+        <artifactId>swagger-maven-plugin-jakarta</artifactId>
         <version>${swagger.version}</version>
         <configuration>
           <outputFileName>signal-server-openapi</outputFileName>

api-doc/src/main/java/org/signal/openapi/OpenApiExtension.java

@@ -13,6 +13,7 @@ import io.swagger.v3.jaxrs2.ResolvedParameter;
 import io.swagger.v3.jaxrs2.ext.AbstractOpenAPIExtension;
 import io.swagger.v3.jaxrs2.ext.OpenAPIExtension;
 import io.swagger.v3.oas.models.Components;
+import jakarta.ws.rs.Consumes;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Iterator;
@@ -20,8 +21,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.ServiceLoader;
 import java.util.Set;
-import javax.ws.rs.Consumes;
-import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount;
+import org.whispersystems.textsecuregcm.auth.AuthenticatedDevice;
 
 /**
  * One of the extension mechanisms of Swagger Core library (OpenAPI processor) is via custom implementations
@@ -62,11 +62,11 @@ public class OpenApiExtension extends AbstractOpenAPIExtension {
     if (annotations.stream().anyMatch(a -> a.annotationType().equals(Auth.class))) {
       // this is the case of authenticated endpoint,
       if (type instanceof SimpleType simpleType
-          && simpleType.getRawClass().equals(AuthenticatedAccount.class)) {
+          && simpleType.getRawClass().equals(AuthenticatedDevice.class)) {
         return AUTHENTICATED_ACCOUNT;
       }
       if (type instanceof SimpleType simpleType
-          && isOptionalOfType(simpleType, AuthenticatedAccount.class)) {
+          && isOptionalOfType(simpleType, AuthenticatedDevice.class)) {
         return OPTIONAL_AUTHENTICATED_ACCOUNT;
       }
     }

api-doc/src/main/java/org/signal/openapi/OpenApiReader.java

@@ -15,11 +15,11 @@ import io.swagger.v3.jaxrs2.Reader;
 import io.swagger.v3.jaxrs2.ResolvedParameter;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
+import jakarta.ws.rs.Consumes;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Collections;
 import java.util.List;
-import javax.ws.rs.Consumes;
 
 /**
  * One of the extension mechanisms of Swagger Core library (OpenAPI processor) is via custom implementations

integration-tests/pom.xml

@@ -28,7 +28,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.1.2</version>
         <configuration>
           <excludes>
             <exclude>**</exclude>
@@ -39,7 +38,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>3.1.2</version>
         <configuration>
           <additionalClasspathElements>
             <additionalClasspathElement>${project.basedir}/.libs/software.amazon.awssdk-sso.jar</additionalClasspathElement>
@@ -59,4 +57,17 @@
       </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <profile>
+      <id>aws-sso</id>
+
+      <dependencies>
+        <dependency>
+          <groupId>software.amazon.awssdk</groupId>
+          <artifactId>sso</artifactId>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>

integration-tests/src/main/java/org/signal/integration/Codecs.java

@@ -14,7 +14,6 @@ import com.fasterxml.jackson.databind.SerializerProvider;
 import java.io.IOException;
 import java.util.Base64;
 import org.signal.libsignal.protocol.IdentityKey;
-import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 
 public final class Codecs {
@@ -84,7 +83,7 @@ public final class Codecs {
 
   public static class ECPublicKeyDeserializer extends Base64BasedDeserializer<ECPublicKey> {
     public ECPublicKeyDeserializer() {
-      super(bytes -> Curve.decodePoint(bytes, 0));
+      super(ECPublicKey::new);
     }
   }
 

integration-tests/src/main/java/org/signal/integration/IntegrationTools.java

@@ -8,18 +8,19 @@ package org.signal.integration;
 import java.time.Clock;
 import java.time.Duration;
 import java.util.Optional;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import org.signal.integration.config.Config;
+import org.whispersystems.textsecuregcm.metrics.NoopAwsSdkMetricPublisher;
 import org.whispersystems.textsecuregcm.registration.VerificationSession;
+import org.whispersystems.textsecuregcm.storage.PhoneNumberIdentifiers;
 import org.whispersystems.textsecuregcm.storage.RegistrationRecoveryPasswords;
 import org.whispersystems.textsecuregcm.storage.RegistrationRecoveryPasswordsManager;
 import org.whispersystems.textsecuregcm.storage.VerificationSessionManager;
 import org.whispersystems.textsecuregcm.storage.VerificationSessions;
-import org.whispersystems.textsecuregcm.util.DynamoDbFromConfig;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
 import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
 
 public class IntegrationTools {
 
@@ -27,39 +28,41 @@ public class IntegrationTools {
 
   private final VerificationSessionManager verificationSessionManager;
 
+  private final PhoneNumberIdentifiers phoneNumberIdentifiers;
+
 
   public static IntegrationTools create(final Config config) {
     final AwsCredentialsProvider credentialsProvider = DefaultCredentialsProvider.builder().build();
 
-    final DynamoDbAsyncClient dynamoDbAsyncClient = DynamoDbFromConfig.asyncClient(
-        config.dynamoDbClientConfiguration(),
-        credentialsProvider);
-
-    final DynamoDbClient dynamoDbClient = DynamoDbFromConfig.client(
-        config.dynamoDbClientConfiguration(),
-        credentialsProvider);
+    final DynamoDbAsyncClient dynamoDbAsyncClient =
+        config.dynamoDbClient().buildAsyncClient(credentialsProvider, new NoopAwsSdkMetricPublisher());
 
     final RegistrationRecoveryPasswords registrationRecoveryPasswords = new RegistrationRecoveryPasswords(
-        config.dynamoDbTables().registrationRecovery(), Duration.ofDays(1), dynamoDbClient, dynamoDbAsyncClient);
+        config.dynamoDbTables().registrationRecovery(), Duration.ofDays(1), dynamoDbAsyncClient, Clock.systemUTC());
 
     final VerificationSessions verificationSessions = new VerificationSessions(
         dynamoDbAsyncClient, config.dynamoDbTables().verificationSessions(), Clock.systemUTC());
 
     return new IntegrationTools(
         new RegistrationRecoveryPasswordsManager(registrationRecoveryPasswords),
-        new VerificationSessionManager(verificationSessions)
+        new VerificationSessionManager(verificationSessions),
+        new PhoneNumberIdentifiers(dynamoDbAsyncClient, config.dynamoDbTables().phoneNumberIdentifiers())
     );
   }
 
   private IntegrationTools(
       final RegistrationRecoveryPasswordsManager registrationRecoveryPasswordsManager,
-      final VerificationSessionManager verificationSessionManager) {
+      final VerificationSessionManager verificationSessionManager,
+      final PhoneNumberIdentifiers phoneNumberIdentifiers) {
     this.registrationRecoveryPasswordsManager = registrationRecoveryPasswordsManager;
     this.verificationSessionManager = verificationSessionManager;
+    this.phoneNumberIdentifiers = phoneNumberIdentifiers;
   }
 
-  public CompletableFuture<Void> populateRecoveryPassword(final String e164, final byte[] password) {
-    return registrationRecoveryPasswordsManager.storeForCurrentNumber(e164, password);
+  public CompletableFuture<Void> populateRecoveryPassword(final String phoneNumber, final byte[] password) {
+    return phoneNumberIdentifiers
+        .getPhoneNumberIdentifier(phoneNumber)
+        .thenCompose(pni -> registrationRecoveryPasswordsManager.store(pni, password));
   }
 
   public CompletableFuture<Optional<String>> peekVerificationSessionPushChallenge(final String sessionId) {

integration-tests/src/main/java/org/signal/integration/Operations.java

@@ -10,6 +10,9 @@ import static java.util.Objects.requireNonNull;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.io.Resources;
 import com.google.common.net.HttpHeaders;
+import io.dropwizard.configuration.ConfigurationValidationException;
+import io.dropwizard.jersey.validation.Validators;
+import jakarta.validation.ConstraintViolation;
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.net.URI;
@@ -24,13 +27,13 @@ import java.util.Base64;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.Executors;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.tuple.Pair;
 import org.signal.integration.config.Config;
 import org.signal.libsignal.protocol.IdentityKey;
-import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECKeyPair;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.signal.libsignal.protocol.kem.KEMKeyPair;
@@ -38,15 +41,16 @@ import org.signal.libsignal.protocol.kem.KEMKeyType;
 import org.signal.libsignal.protocol.kem.KEMPublicKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.textsecuregcm.configuration.CircuitBreakerConfiguration;
 import org.whispersystems.textsecuregcm.entities.AccountAttributes;
 import org.whispersystems.textsecuregcm.entities.AccountIdentityResponse;
+import org.whispersystems.textsecuregcm.entities.DeviceActivationRequest;
 import org.whispersystems.textsecuregcm.entities.ECSignedPreKey;
 import org.whispersystems.textsecuregcm.entities.KEMSignedPreKey;
 import org.whispersystems.textsecuregcm.entities.RegistrationRequest;
 import org.whispersystems.textsecuregcm.http.FaultTolerantHttpClient;
 import org.whispersystems.textsecuregcm.storage.Device;
 import org.whispersystems.textsecuregcm.util.HeaderUtils;
+import org.whispersystems.textsecuregcm.util.HttpUtils;
 import org.whispersystems.textsecuregcm.util.SystemMapper;
 
 public final class Operations {
@@ -67,16 +71,14 @@ public final class Operations {
   }
 
   public static TestUser newRegisteredUser(final String number) {
-    final byte[] registrationPassword = randomBytes(32);
+    final byte[] registrationPassword = populateRandomRecoveryPassword(number);
     final String accountPassword = Base64.getEncoder().encodeToString(randomBytes(32));
 
     final TestUser user = TestUser.create(number, accountPassword, registrationPassword);
     final AccountAttributes accountAttributes = user.accountAttributes();
 
-    INTEGRATION_TOOLS.populateRecoveryPassword(number, registrationPassword).join();
-
-    final ECKeyPair aciIdentityKeyPair = Curve.generateKeyPair();
-    final ECKeyPair pniIdentityKeyPair = Curve.generateKeyPair();
+    final ECKeyPair aciIdentityKeyPair = ECKeyPair.generate();
+    final ECKeyPair pniIdentityKeyPair = ECKeyPair.generate();
 
     // register account
     final RegistrationRequest registrationRequest = new RegistrationRequest(null,
@@ -85,12 +87,12 @@ public final class Operations {
         true,
         new IdentityKey(aciIdentityKeyPair.getPublicKey()),
         new IdentityKey(pniIdentityKeyPair.getPublicKey()),
-        generateSignedECPreKey(1, aciIdentityKeyPair),
-        generateSignedECPreKey(2, pniIdentityKeyPair),
-        generateSignedKEMPreKey(3, aciIdentityKeyPair),
-        generateSignedKEMPreKey(4, pniIdentityKeyPair),
-        Optional.empty(),
-        Optional.empty());
+        new DeviceActivationRequest(generateSignedECPreKey(1, aciIdentityKeyPair),
+            generateSignedECPreKey(2, pniIdentityKeyPair),
+            generateSignedKEMPreKey(3, aciIdentityKeyPair),
+            generateSignedKEMPreKey(4, pniIdentityKeyPair),
+            Optional.empty(),
+            Optional.empty()));
 
     final AccountIdentityResponse registrationResponse = apiPost("/v1/registration", registrationRequest)
         .authorized(number, accountPassword)
@@ -103,6 +105,7 @@ public final class Operations {
   }
 
   public record PrescribedVerificationNumber(String number, String verificationCode) {}
+
   public static PrescribedVerificationNumber prescribedVerificationNumber() {
       return new PrescribedVerificationNumber(
           CONFIG.prescribedRegistrationNumber(),
@@ -118,6 +121,13 @@ public final class Operations {
         .orElseThrow(() -> new RuntimeException("push challenge not found for the verification session"));
   }
 
+  public static byte[] populateRandomRecoveryPassword(final String number) {
+    final byte[] recoveryPassword = randomBytes(32);
+    INTEGRATION_TOOLS.populateRecoveryPassword(number, recoveryPassword).join();
+
+    return recoveryPassword;
+  }
+
   public static <T> T sendEmptyRequestAuthenticated(
       final String endpoint,
       final String method,
@@ -245,7 +255,7 @@ public final class Operations {
     public Pair<Integer, Void> executeExpectSuccess() {
       final Pair<Integer, Void> execute = execute();
       Validate.isTrue(
-          execute.getLeft() >= 200 && execute.getLeft() < 300,
+          HttpUtils.isSuccessfulResponse(execute.getLeft()),
           "Unexpected response code: %d",
           execute.getLeft());
       return execute;
@@ -253,6 +263,10 @@ public final class Operations {
 
     public <T> T executeExpectSuccess(final Class<T> expectedType) {
       final Pair<Integer, T> execute = execute(expectedType);
+      Validate.isTrue(
+          HttpUtils.isSuccessfulResponse(execute.getLeft()),
+          "Unexpected response code: %d : %s",
+          execute.getLeft(), execute.getRight());
       return requireNonNull(execute.getRight());
     }
 
@@ -291,11 +305,7 @@ public final class Operations {
 
   private static FaultTolerantHttpClient buildClient() {
     try {
-      return FaultTolerantHttpClient.newBuilder()
-          .withName("integration-test")
-          .withExecutor(Executors.newFixedThreadPool(16))
-          .withRetryExecutor(Executors.newSingleThreadScheduledExecutor())
-          .withCircuitBreaker(new CircuitBreakerConfiguration())
+      return FaultTolerantHttpClient.newBuilder("integration-test", Executors.newFixedThreadPool(16))
           .withTrustedServerCertificates(CONFIG.rootCert())
           .build();
     } catch (final CertificateException e) {
@@ -306,21 +316,29 @@ public final class Operations {
   private static Config loadConfigFromClasspath(final String filename) {
     try {
       final URL configFileUrl = Resources.getResource(filename);
-      return SystemMapper.yamlMapper().readValue(Resources.toByteArray(configFileUrl), Config.class);
-    } catch (final IOException e) {
+      final Config config = SystemMapper.yamlMapper().readValue(Resources.toByteArray(configFileUrl), Config.class);
+
+      final Set<ConstraintViolation<Config>> constraintViolations = Validators.newValidator().validate(config);
+
+      if (!constraintViolations.isEmpty()) {
+        throw new ConfigurationValidationException(filename, constraintViolations);
+      }
+
+      return config;
+    } catch (final Exception e) {
       throw new RuntimeException(e);
     }
   }
 
-  private static ECSignedPreKey generateSignedECPreKey(long id, final ECKeyPair identityKeyPair) {
-    final ECPublicKey pubKey = Curve.generateKeyPair().getPublicKey();
-    final byte[] sig = identityKeyPair.getPrivateKey().calculateSignature(pubKey.serialize());
-    return new ECSignedPreKey(id, pubKey, sig);
+  public static ECSignedPreKey generateSignedECPreKey(final long id, final ECKeyPair identityKeyPair) {
+    final ECPublicKey pubKey = ECKeyPair.generate().getPublicKey();
+    final byte[] signature = identityKeyPair.getPrivateKey().calculateSignature(pubKey.serialize());
+    return new ECSignedPreKey(id, pubKey, signature);
   }
 
-  private static KEMSignedPreKey generateSignedKEMPreKey(long id, final ECKeyPair identityKeyPair) {
+  public static KEMSignedPreKey generateSignedKEMPreKey(final long id, final ECKeyPair identityKeyPair) {
     final KEMPublicKey pubKey = KEMKeyPair.generate(KEMKeyType.KYBER_1024).getPublicKey();
-    final byte[] sig = identityKeyPair.getPrivateKey().calculateSignature(pubKey.serialize());
-    return new KEMSignedPreKey(id, pubKey, sig);
+    final byte[] signature = identityKeyPair.getPrivateKey().calculateSignature(pubKey.serialize());
+    return new KEMSignedPreKey(id, pubKey, signature);
   }
 }

integration-tests/src/main/java/org/signal/integration/TestDevice.java

@@ -9,8 +9,6 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import org.apache.commons.lang3.tuple.Pair;
 import org.signal.libsignal.protocol.IdentityKeyPair;
-import org.signal.libsignal.protocol.InvalidKeyException;
-import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECKeyPair;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 
@@ -50,15 +48,11 @@ public class TestDevice {
   }
 
   public SignedPreKeyRecord addSignedPreKey(final IdentityKeyPair identity) {
-    try {
-      final int nextId = signedPreKeys.keySet().stream().mapToInt(k -> k + 1).max().orElse(0);
-      final ECKeyPair keyPair = Curve.generateKeyPair();
-      final byte[] signature = Curve.calculateSignature(identity.getPrivateKey(), keyPair.getPublicKey().serialize());
-      final SignedPreKeyRecord signedPreKeyRecord = new SignedPreKeyRecord(nextId, System.currentTimeMillis(), keyPair, signature);
-      signedPreKeys.put(nextId, Pair.of(identity, signedPreKeyRecord));
-      return signedPreKeyRecord;
-    } catch (InvalidKeyException e) {
-      throw new RuntimeException(e);
-    }
+    final int nextId = signedPreKeys.keySet().stream().mapToInt(k -> k + 1).max().orElse(0);
+    final ECKeyPair keyPair = ECKeyPair.generate();
+    final byte[] signature = keyPair.getPrivateKey().calculateSignature(keyPair.getPublicKey().serialize());
+    final SignedPreKeyRecord signedPreKeyRecord = new SignedPreKeyRecord(nextId, System.currentTimeMillis(), keyPair, signature);
+    signedPreKeys.put(nextId, Pair.of(identity, signedPreKeyRecord));
+    return signedPreKeyRecord;
   }
 }

integration-tests/src/main/java/org/signal/integration/TestUser.java

@@ -14,10 +14,12 @@ import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.IdentityKeyPair;
+import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.signal.libsignal.protocol.util.KeyHelper;
@@ -126,7 +128,7 @@ public class TestUser {
   }
 
   public AccountAttributes accountAttributes() {
-    return new AccountAttributes(true, registrationId, pniRegistrationId, "".getBytes(StandardCharsets.UTF_8), "", true, new Device.DeviceCapabilities(false, false, false))
+    return new AccountAttributes(true, registrationId, pniRegistrationId, "".getBytes(StandardCharsets.UTF_8), "", true, Set.of())
         .withUnidentifiedAccessKey(unidentifiedAccessKey)
         .withRecoveryPassword(registrationPassword);
   }
@@ -161,15 +163,19 @@ public class TestUser {
         : aciIdentityKey;
     final TestDevice device = requireNonNull(devices.get(deviceId));
     final SignedPreKeyRecord signedPreKeyRecord = device.latestSignedPreKey(identity);
-    return new PreKeySetPublicView(
-        Collections.emptyList(),
-        identity.getPublicKey(),
-        new SignedPreKeyPublicView(
-            signedPreKeyRecord.getId(),
-            signedPreKeyRecord.getKeyPair().getPublicKey(),
-            signedPreKeyRecord.getSignature()
-        )
-    );
+    try {
+      return new PreKeySetPublicView(
+          Collections.emptyList(),
+          identity.getPublicKey(),
+          new SignedPreKeyPublicView(
+              signedPreKeyRecord.getId(),
+              signedPreKeyRecord.getKeyPair().getPublicKey(),
+              signedPreKeyRecord.getSignature()
+          )
+      );
+    } catch (InvalidKeyException e) {
+      throw new RuntimeException(e);
+    }
   }
 
   public record SignedPreKeyPublicView(

integration-tests/src/main/java/org/signal/integration/config/Config.java

@@ -5,12 +5,15 @@
 
 package org.signal.integration.config;
 
-import org.whispersystems.textsecuregcm.configuration.DynamoDbClientConfiguration;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import org.whispersystems.textsecuregcm.configuration.DynamoDbClientFactory;
 
-public record Config(String domain,
-                     String rootCert,
-                     DynamoDbClientConfiguration dynamoDbClientConfiguration,
-                     DynamoDbTables dynamoDbTables,
-                     String prescribedRegistrationNumber,
-                     String prescribedRegistrationCode) {
+public record Config(@NotBlank String domain,
+                     @NotBlank String rootCert,
+                     @NotNull @Valid DynamoDbClientFactory dynamoDbClient,
+                     @NotNull @Valid DynamoDbTables dynamoDbTables,
+                     @NotBlank String prescribedRegistrationNumber,
+                     @NotBlank String prescribedRegistrationCode) {
 }

integration-tests/src/main/java/org/signal/integration/config/DynamoDbTables.java

@@ -5,6 +5,9 @@
 
 package org.signal.integration.config;
 
-public record DynamoDbTables(String registrationRecovery,
-                             String verificationSessions) {
+import jakarta.validation.constraints.NotBlank;
+
+public record DynamoDbTables(@NotBlank String registrationRecovery,
+                             @NotBlank String verificationSessions,
+                             @NotBlank String phoneNumberIdentifiers) {
 }

integration-tests/src/test/java/org/signal/integration/AccountTest.java

@@ -6,27 +6,34 @@
 package org.signal.integration;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import java.util.Arrays;
 import java.util.Base64;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.http.HttpStatus;
 import org.junit.jupiter.api.Test;
+import org.signal.libsignal.protocol.IdentityKey;
+import org.signal.libsignal.protocol.ecc.ECKeyPair;
 import org.signal.libsignal.usernames.BaseUsernameException;
 import org.signal.libsignal.usernames.Username;
 import org.whispersystems.textsecuregcm.entities.AccountIdentifierResponse;
 import org.whispersystems.textsecuregcm.entities.AccountIdentityResponse;
+import org.whispersystems.textsecuregcm.entities.ChangeNumberRequest;
 import org.whispersystems.textsecuregcm.entities.ConfirmUsernameHashRequest;
 import org.whispersystems.textsecuregcm.entities.ReserveUsernameHashRequest;
 import org.whispersystems.textsecuregcm.entities.ReserveUsernameHashResponse;
 import org.whispersystems.textsecuregcm.entities.UsernameHashResponse;
 import org.whispersystems.textsecuregcm.identity.AciServiceIdentifier;
+import org.whispersystems.textsecuregcm.storage.Device;
 
 public class AccountTest {
 
   @Test
-  public void testCreateAccount() throws Exception {
+  public void testCreateAccount() {
     final TestUser user = Operations.newRegisteredUser("+19995550101");
     try {
       final Pair<Integer, AccountIdentityResponse> execute = Operations.apiGet("/v1/accounts/whoami")
@@ -39,7 +46,7 @@ public class AccountTest {
   }
 
   @Test
-  public void testCreateAccountAtomic() throws Exception {
+  public void testCreateAccountAtomic() {
     final TestUser user = Operations.newRegisteredUser("+19995550201");
     try {
       final Pair<Integer, AccountIdentityResponse> execute = Operations.apiGet("/v1/accounts/whoami")
@@ -51,6 +58,33 @@ public class AccountTest {
     }
   }
 
+  @Test
+  public void changePhoneNumber() {
+    final TestUser user = Operations.newRegisteredUser("+19995550301");
+    final String targetNumber = "+19995550302";
+
+    final ECKeyPair pniIdentityKeyPair = ECKeyPair.generate();
+
+    final ChangeNumberRequest changeNumberRequest = new ChangeNumberRequest(null,
+        Operations.populateRandomRecoveryPassword(targetNumber),
+        targetNumber,
+        null,
+        new IdentityKey(pniIdentityKeyPair.getPublicKey()),
+        Collections.emptyList(),
+        Map.of(Device.PRIMARY_ID, Operations.generateSignedECPreKey(1, pniIdentityKeyPair)),
+        Map.of(Device.PRIMARY_ID, Operations.generateSignedKEMPreKey(2, pniIdentityKeyPair)),
+        Map.of(Device.PRIMARY_ID, 17));
+
+    final AccountIdentityResponse accountIdentityResponse =
+        Operations.apiPut("/v2/accounts/number", changeNumberRequest)
+            .authorized(user)
+            .executeExpectSuccess(AccountIdentityResponse.class);
+
+    assertEquals(user.aciUuid(), accountIdentityResponse.uuid());
+    assertNotEquals(user.pniUuid(), accountIdentityResponse.pni());
+    assertEquals(targetNumber, accountIdentityResponse.number());
+  }
+
   @Test
   public void testUsernameOperations() throws Exception {
     final TestUser user = Operations.newRegisteredUser("+19995550102");

integration-tests/src/test/java/org/signal/integration/MessagingTest.java

@@ -8,7 +8,6 @@ package org.signal.integration;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 import java.nio.charset.StandardCharsets;
-import java.util.Base64;
 import java.util.List;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.jupiter.api.Test;
@@ -27,11 +26,10 @@ public class MessagingTest {
 
     try {
       final byte[] expectedContent = "Hello, World!".getBytes(StandardCharsets.UTF_8);
-      final String contentBase64 = Base64.getEncoder().encodeToString(expectedContent);
-      final IncomingMessage message = new IncomingMessage(1, Device.PRIMARY_ID, userB.registrationId(), contentBase64);
+      final IncomingMessage message = new IncomingMessage(1, Device.PRIMARY_ID, userB.registrationId(), expectedContent);
       final IncomingMessageList messages = new IncomingMessageList(List.of(message), false, true, System.currentTimeMillis());
 
-      final Pair<Integer, SendMessageResponse> sendMessage = Operations
+      Operations
           .apiPut("/v1/messages/%s".formatted(userB.aciUuid().toString()), messages)
           .authorized(userA)
           .execute(SendMessageResponse.class);
@@ -40,7 +38,7 @@ public class MessagingTest {
           .authorized(userB)
           .execute(OutgoingMessageEntityList.class);
 
-      final byte[] actualContent = receiveMessages.getRight().messages().get(0).content();
+      final byte[] actualContent = receiveMessages.getRight().messages().getFirst().content();
       assertArrayEquals(expectedContent, actualContent);
     } finally {
       Operations.deleteUser(userA);

integration-tests/src/test/java/org/signal/integration/RegistrationTest.java

@@ -5,6 +5,7 @@
 
 package org.signal.integration;
 
+import io.micrometer.common.util.StringUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.whispersystems.textsecuregcm.entities.CreateVerificationSessionRequest;
@@ -29,6 +30,8 @@ public class RegistrationTest {
         .executeExpectSuccess(VerificationSessionResponse.class);
 
     final String sessionId = verificationSessionResponse.id();
+    Assertions.assertTrue(StringUtils.isNotBlank(sessionId));
+
     final String pushChallenge = Operations.peekVerificationSessionPushChallenge(sessionId);
 
     // supply push challenge

mvnw

@@ -260,7 +260,7 @@ done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
 if [ -n "$wrapperSha256Sum" ]; then
   wrapperSha256Result=false
   if command -v sha256sum > /dev/null; then
-    if echo "$wrapperSha256Sum  $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then
+    if echo "$wrapperSha256Sum  $wrapperJarPath" | sha256sum -c - > /dev/null 2>&1; then
       wrapperSha256Result=true
     fi
   elif command -v shasum > /dev/null; then

pom.xml

@@ -37,45 +37,60 @@
   </modules>
 
   <properties>
-    <aws.sdk2.version>2.23.8</aws.sdk2.version>
-    <braintree.version>3.27.0</braintree.version>
-    <commons-csv.version>1.10.0</commons-csv.version>
-    <commons-io.version>2.14.0</commons-io.version>
-    <dropwizard.version>3.0.6</dropwizard.version>
-    <dropwizard-metrics-datadog.version>1.1.13</dropwizard-metrics-datadog.version>
-    <google-cloud-libraries.version>26.33.0</google-cloud-libraries.version>
-    <grpc.version>1.61.1</grpc.version> <!-- should be kept in sync with the value from Google libraries-bom -->
-    <gson.version>2.10.1</gson.version>
+    <aws.sdk2.version>2.33.8</aws.sdk2.version>
+    <braintree.version>3.44.0</braintree.version>
+    <commons-csv.version>1.14.1</commons-csv.version>
+    <commons-io.version>2.20.0</commons-io.version>
+    <dropwizard.version>4.0.16</dropwizard.version>
+    <!-- Note: when updating FoundationDB, also include a copy of `libfdb_c.so` from the FoundationDB release at
+    src/main/jib/usr/lib/libfdb_c.so. We use x86_64 builds without AVX instructions enabled (i.e. FoundationDB versions
+    with even-numbered patch versions). Also when updating FoundationDB, make sure to update the version of FoundationDB
+    used by GitHub Actions. -->
+    <foundationdb.version>7.3.62</foundationdb.version>
+    <foundationdb.api-version>730</foundationdb.api-version>
+    <foundationdb.client-library-sha256>bfed237b787fae3cde1222676e6bfbb0d218fc27bf9e903397a7a7aa96fb2d33</foundationdb.client-library-sha256>
+    <google-cloud-libraries.version>26.67.0</google-cloud-libraries.version>
+    <grpc.version>1.73.0</grpc.version> <!-- should be kept in sync with the value from Google libraries-bom -->
+    <gson.version>2.13.2</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>
     <httpclient.version>4.5.14</httpclient.version>
-    <jackson.version>2.16.0</jackson.version>
-    <jaxb.version>2.3.1</jaxb.version>
-    <junit-pioneer.version>2.1.0</junit-pioneer.version>
+    <jackson.version>2.20.0</jackson.version>
+    <junit-pioneer.version>2.3.0</junit-pioneer.version>
     <jsr305.version>3.0.2</jsr305.version>
-    <kotlin.version>1.9.10</kotlin.version>
-    <kotlinx-serialization.version>1.5.1</kotlinx-serialization.version>
-    <lettuce.version>6.2.6.RELEASE</lettuce.version>
-    <libphonenumber.version>8.13.23</libphonenumber.version>
-    <logstash.logback.version>7.3</logstash.logback.version>
-    <log4j-bom.version>2.21.0</log4j-bom.version>
-    <luajava.version>3.4.0</luajava.version>
-    <micrometer.version>1.10.10</micrometer.version>
-    <netty.version>4.1.96.Final</netty.version>
-    <opentest4j.version>1.3.0</opentest4j.version>
-    <protobuf.version>3.25.2</protobuf.version> <!-- should be kept in sync with the value from Google libraries-bom -->
-    <pushy.version>0.15.2</pushy.version>
+    <kotlin.version>2.2.20</kotlin.version>
+    <!-- Logback 1.5.14+ has a null pointer bug: https://github.com/qos-ch/logback/issues/929. -->
+    <logback.version>1.5.13</logback.version>
+    <logback-access-common.version>2.0.6</logback-access-common.version>
+    <lettuce.version>6.8.1.RELEASE</lettuce.version>
+    <libphonenumber.version>9.0.13</libphonenumber.version>
+    <logstash.logback.version>8.1</logstash.logback.version>
+    <log4j-bom.version>2.25.1</log4j-bom.version>
+    <luajava.version>3.5.0</luajava.version>
+    <micrometer.version>1.15.4</micrometer.version>
+    <netty.version>4.1.127.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>
+    <pushy.version>0.15.4</pushy.version>
     <reactive.grpc.version>1.2.4</reactive.grpc.version>
-    <reactor-bom.version>2022.0.12</reactor-bom.version> <!-- 3.5.x, see https://github.com/reactor/reactor#bom-versioning-scheme -->
-    <resilience4j.version>1.7.0</resilience4j.version>
+    <reactor-bom.version>2024.0.10</reactor-bom.version> <!-- 3.7.11, see https://github.com/reactor/reactor#bom-versioning-scheme -->
+    <resilience4j.version>2.3.0</resilience4j.version>
     <semver4j.version>3.1.0</semver4j.version>
-    <slf4j.version>2.0.9</slf4j.version>
-    <stripe.version>23.10.0</stripe.version>
-    <swagger.version>2.2.17</swagger.version>
-    <vavr.version>0.10.4</vavr.version>
+    <simple-grpc.version>0.1.0</simple-grpc.version>
+    <slf4j.version>2.0.17</slf4j.version>
+    <stripe.version>30.2.0</stripe.version>
+    <swagger.version>2.2.36</swagger.version>
+    <testcontainers.version>1.21.3</testcontainers.version>
 
-    <!-- 21.0.1_12-jre-jammy -->
-    <docker.image.sha256>2d00f6910282a7a20ae7747b8f5e2371f7d55f06daed6bf60a323fcc7eaa3da8</docker.image.sha256>
+    <!-- images to use in tests via testcontainers  -->
+    <dynamodb.image>amazon/dynamodb-local:3.0.0@sha256:2fed5e3a965a4ba5aa6ac82baec57058b5a3848e959d705518f3fd579a77e76b</dynamodb.image>
+    <localstack.image>localstack/localstack:4@sha256:5a97e0f9917a3f0d9630bb13b9d8ccf10cbe52f33252807d3b4e21418cc21348</localstack.image>
+    <redis.image>redis:7.4-alpine@sha256:af1d0fc3f63b02b13ff7906c9baf7c5b390b8881ca08119cd570677fe2f60b55</redis.image>
+    <redis-cluster.image>docker.io/bitnamilegacy/redis-cluster:7.4.3@sha256:a53d023fdfaf8a8d7ddc58da040d3494e4cb45772644618ffa44c42dcd32b9af</redis-cluster.image>
+
+    <!-- eclipse-temurin:24.0.2_12-jre-noble (note: always use the multi-arch manifest *LIST* here) -->
+    <docker.image.sha256>85ecfc9bbb42af046d2bacbf1219d2005be4840cbfa16c2e6fd910d9ccfec95b</docker.image.sha256>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
@@ -147,6 +162,20 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>io.opentelemetry</groupId>
+        <artifactId>opentelemetry-bom</artifactId>
+        <version>1.54.0</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.opentelemetry.instrumentation</groupId>
+        <artifactId>opentelemetry-instrumentation-bom</artifactId>
+        <version>2.20.0</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>io.projectreactor</groupId>
         <artifactId>reactor-bom</artifactId>
@@ -171,11 +200,6 @@
         <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>
@@ -196,16 +220,6 @@
         <artifactId>lettuce-core</artifactId>
         <version>${lettuce.version}</version>
       </dependency>
-      <dependency>
-        <groupId>io.vavr</groupId>
-        <artifactId>vavr</artifactId>
-        <version>${vavr.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
-        <version>${jaxb.version}</version>
-      </dependency>
       <dependency>
         <groupId>net.logstash.logback</groupId>
         <artifactId>logstash-logback-encoder</artifactId>
@@ -217,21 +231,9 @@
         <version>${commons-csv.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.coursera</groupId>
-        <artifactId>dropwizard-metrics-datadog</artifactId>
-        <version>${dropwizard-metrics-datadog.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.glassfish.jaxb</groupId>
-        <artifactId>jaxb-runtime</artifactId>
-        <version>${jaxb.version}</version>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opentest4j</groupId>
-        <artifactId>opentest4j</artifactId>
-        <version>${opentest4j.version}</version>
-        <scope>test</scope>
+        <groupId>org.foundationdb</groupId>
+        <artifactId>fdb-java</artifactId>
+        <version>${foundationdb.version}</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -247,12 +249,12 @@
       <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
-        <version>1.2</version>
+        <version>1.3.5</version>
       </dependency>
       <dependency>
         <groupId>org.ow2.asm</groupId>
         <artifactId>asm</artifactId>
-        <version>9.5</version>
+        <version>9.8</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -276,20 +278,20 @@
         <version>${gson.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.signal</groupId>
-        <artifactId>embedded-redis</artifactId>
-        <version>0.8.3</version>
+        <groupId>com.redis</groupId>
+        <artifactId>testcontainers-redis</artifactId>
+        <version>2.2.4</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.signal</groupId>
         <artifactId>libsignal-server</artifactId>
-        <version>0.39.0</version>
+        <version>0.80.3</version>
       </dependency>
       <dependency>
-        <groupId>org.signal.forks</groupId>
-        <artifactId>noise-java</artifactId>
-        <version>0.1.1</version>
+        <groupId>org.signal</groupId>
+        <artifactId>simple-grpc-runtime</artifactId>
+        <version>${simple-grpc.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
@@ -308,6 +310,34 @@
         <artifactId>httpclient</artifactId>
         <version>${httpclient.version}</version>
       </dependency>
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-core</artifactId>
+        <version>${logback.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-classic</artifactId>
+        <version>${logback.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>ch.qos.logback.access</groupId>
+        <artifactId>logback-access-common</artifactId>
+        <version>${logback-access-common.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>testcontainers-bom</artifactId>
+        <version>${testcontainers.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>earth.adi</groupId>
+        <artifactId>testcontainers-foundationdb</artifactId>
+        <version>1.1.0</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -324,9 +354,8 @@
     </dependency>
     <dependency>
       <groupId>org.wiremock</groupId>
-      <!-- use standalone until Dropwizard 4 + jakarta.* -->
-      <artifactId>wiremock-standalone</artifactId>
-      <version>3.3.1</version>
+      <artifactId>wiremock</artifactId>
+      <version>3.13.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -389,7 +418,42 @@
         <plugin>
           <groupId>com.google.cloud.tools</groupId>
           <artifactId>jib-maven-plugin</artifactId>
-          <version>3.4.0</version>
+          <version>3.4.4</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>3.5.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <version>3.5.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.4.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-shade-plugin</artifactId>
+          <version>3.6.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>3.7.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>properties-maven-plugin</artifactId>
+          <version>1.2.1</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -401,7 +465,7 @@
         <version>0.6.1</version>
         <configuration>
           <checkStaleness>false</checkStaleness>
-          <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
+          <protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
           <pluginId>grpc-java</pluginId>
           <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
 
@@ -413,6 +477,14 @@
               <version>${reactive.grpc.version}</version>
               <mainClass>com.salesforce.reactorgrpc.ReactorGrpcGenerator</mainClass>
             </protocPlugin>
+
+            <protocPlugin>
+              <id>simple</id>
+              <groupId>org.signal</groupId>
+              <artifactId>simple-grpc-generator</artifactId>
+              <version>${simple-grpc.version}</version>
+              <mainClass>org.signal.grpc.simple.SimpleGrpcGenerator</mainClass>
+            </protocPlugin>
           </protocPlugins>
         </configuration>
         <executions>
@@ -430,16 +502,16 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.11.0</version>
+        <version>3.13.0</version>
         <configuration>
-          <release>21</release>
+          <release>24</release>
         </configuration>
       </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.2</version>
         <configuration>
           <archive>
             <manifest>
@@ -452,41 +524,27 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.8.1</version>
         <executions>
           <execution>
-            <id>copy</id>
-            <phase>test-compile</phase>
+            <!--
+              Set dependencies as properties for use in argLine property for mockito jar.
+              The property isn't needed until the test phase, and deferring it from the default
+              `initialize` addresses issues running lifecycle phases that precede `test` in isolation.
+            -->
+            <phase>process-test-classes</phase>
             <goals>
-              <goal>copy-dependencies</goal>
+              <goal>properties</goal>
             </goals>
-            <configuration>
-              <includeScope>test</includeScope>
-              <includeTypes>so,dll,dylib</includeTypes>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
-            </configuration>
           </execution>
         </executions>
-      </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.1.2</version>
-        <configuration>
-          <systemProperties>
-            <property>
-              <name>sqlite4java.library.path</name>
-              <value>${project.build.directory}/lib</value>
-            </property>
-          </systemProperties>
-        </configuration>
       </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.5.0</version>
         <executions>
           <execution>
             <goals>
@@ -496,7 +554,7 @@
               <rules>
                 <dependencyConvergence/>
                 <requireMavenVersion>
-                  <version>3.8.6</version>
+                  <version>3.9.11</version>
                 </requireMavenVersion>
               </rules>
             </configuration>
@@ -507,7 +565,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-install-plugin</artifactId>
-        <version>3.1.1</version>
+        <version>3.1.3</version>
         <configuration>
           <skip>true</skip>
         </configuration>
@@ -516,7 +574,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
-        <version>3.1.1</version>
+        <version>3.1.3</version>
         <configuration>
           <skip>true</skip>
         </configuration>

service/config/sample-secrets-bundle.yml

@@ -1,24 +1,25 @@
-datadog.apiKey: unset
-
 stripe.apiKey: unset
 stripe.idempotencyKeyGenerator: abcdefg12345678= # base64 for creating request idempotency hash
 
+braintree.publicKey: unset
 braintree.privateKey: unset
 
+googlePlayBilling.credentialsJson: |
+  { "json": true }
+
+appleAppStore.encodedKey: unset
+
 directoryV2.client.userAuthenticationTokenSharedSecret: abcdefghijklmnopqrstuvwxyz0123456789ABCDEFG= # base64-encoded secret shared with CDS to generate auth tokens for Signal users
 directoryV2.client.userIdTokenSharedSecret: bbcdefghijklmnopqrstuvwxyz0123456789ABCDEFG= # base64-encoded secret shared with CDS to generate auth identity tokens for Signal users
 
 svr2.userAuthenticationTokenSharedSecret: abcdefghijklmnopqrstuvwxyz0123456789ABCDEFG= # base64-encoded secret shared with SVR2 to generate auth tokens for Signal users
 svr2.userIdTokenSharedSecret: bbcdefghijklmnopqrstuvwxyz0123456789ABCDEFG= # base64-encoded secret shared with SVR2 to generate auth identity tokens for Signal users
 
-svr3.userAuthenticationTokenSharedSecret: cbcdefghijklmnopqrstuvwxyz0123456789ABCDEFG= # base64-encoded secret shared with SVR3 to generate auth tokens for Signal users
-svr3.userIdTokenSharedSecret: dbcdefghijklmnopqrstuvwxyz0123456789ABCDEFG= # base64-encoded secret shared with SVR3 to generate auth identity tokens for Signal users
+svrb.userAuthenticationTokenSharedSecret: abcdefghijklmnopqrstuvwxyz0123456789ABCDEFG= # base64-encoded secret shared with SVRB to generate auth tokens for Signal users
+svrb.userIdTokenSharedSecret: bbcdefghijklmnopqrstuvwxyz0123456789ABCDEFG= # base64-encoded secret shared with SVRB to generate auth identity tokens for Signal users
 
 tus.userAuthenticationTokenSharedSecret: abcdefghijklmnopqrstuvwxyz0123456789ABCDEFG=
 
-awsAttachments.accessKey: test
-awsAttachments.accessSecret: test
-
 gcpAttachments.rsaSigningKey: |
   -----BEGIN PRIVATE KEY-----
   ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
@@ -67,14 +68,19 @@ cdn.accessSecret: test # AWS Access Secret
 
 cdn3StorageManager.clientSecret: test
 
-unidentifiedDelivery.certificate: ABCD1234
 unidentifiedDelivery.privateKey: ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789AAAAAAA
 
-hCaptcha.apiKey: unset
+keyTransparencyService.clientPrivateKey: |
+  -----BEGIN PRIVATE KEY-----
+  ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+  ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+  ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+  AAAAAAAA
+  -----END PRIVATE KEY-----
 
 storageService.userAuthenticationTokenSharedSecret: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
 
-zkConfig-libsignal-0.37.serverSecret: ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzAA==
+zkConfig-libsignal-0.42.serverSecret: ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdef
 
 genericZkConfig.serverSecret: ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzAA==
 callingZkConfig.serverSecret: ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzAA==
@@ -82,15 +88,14 @@ backupsZkConfig.serverSecret: ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijkl
 
 paymentsService.userAuthenticationTokenSharedSecret: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= # base64-encoded 32-byte secret shared with MobileCoin services used to generate auth tokens for Signal users
 paymentsService.fixerApiKey: unset
-paymentsService.coinMarketCapApiKey: unset
-
-artService.userAuthenticationTokenSharedSecret: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= # base64-encoded 32-byte secret not shared with any external service, but used in ArtController
-artService.userAuthenticationTokenUserIdSecret: AAAAAAAAAAA= # base64-encoded secret to obscure user phone numbers from Sticker Creator
+paymentsService.coinGeckoApiKey: unset
 
 currentReportingKey.secret: AAAAAAAAAAA=
 currentReportingKey.salt: AAAAAAAAAAA=
 
-turn.secret: AAAAAAAAAAA=
+registrationService.collationKeySalt: AAAAAAAAAAA=
+
+turn.cloudflare.apiToken: ABCDEFGHIJKLM
 
 linkDevice.secret: AAAAAAAAAAA=
 

service/config/sample.yml

@@ -10,35 +10,7 @@ logging:
       threshold: ALL
       timeZone: UTC
       target: stdout
-    - type: logstashtcpsocket
-      destination: example.com:10516
-      apiKey: secret://datadog.apiKey
-      environment: staging
-
-metrics:
-  reporters:
-    - type: signal-datadog
-      frequency: 10 seconds
-      tags:
-        - "env:staging"
-        - "service:chat"
-      udpTransport:
-        statsdHost: localhost
-        port: 8125
-      excludesAttributes:
-        - m1_rate
-        - m5_rate
-        - m15_rate
-        - mean_rate
-        - stddev
-      useRegexFilters: true
-      excludes:
-        - ^.+\.total$
-        - ^.+\.request\.filtering$
-        - ^.+\.response\.filtering$
-        - ^executor\..+$
-        - ^lettuce\..+$
-  reportOnStop: true
+    - type: otlp
 
 tlsKeyStore:
   password: secret://tlsKeyStore.password
@@ -57,7 +29,7 @@ stripe:
 
 braintree:
   merchantId: unset
-  publicKey: unset
+  publicKey: secret://braintree.publicKey
   privateKey: secret://braintree.privateKey
   environment: unset
   graphqlUrl: unset
@@ -67,8 +39,41 @@ braintree:
   supportedCurrenciesByPaymentMethod:
     PAYPAL:
       - usd
+  pubSubPublisher:
+    project: example-project
+    topic: example-topic
+    credentialConfiguration: |
+      {
+        "credential": "configuration"
+      }
 
-dynamoDbClientConfiguration:
+googlePlayBilling:
+  credentialsJson: secret://googlePlayBilling.credentialsJson
+  packageName: package.name
+  applicationName: test
+  productIdToLevel: {}
+
+appleAppStore:
+  env: SANDBOX
+  bundleId: bundle.name
+  appAppleId: 12345
+  issuerId: abcdefg
+  keyId: abcdefg
+  encodedKey: secret://appleAppStore.encodedKey
+  subscriptionGroupId: example_subscriptionGroupId
+  productIdToLevel: {}
+  appleRootCerts: []
+
+appleDeviceCheck:
+  production: false
+  teamId: 0123456789
+  bundleId: bundle.name
+
+deviceCheck:
+  backupRedemptionDuration: P30D
+  backupRedemptionLevel: 201
+
+dynamoDbClient:
   region: us-west-2 # AWS Region
 
 dynamoDbTables:
@@ -77,6 +82,11 @@ dynamoDbTables:
     phoneNumberTableName: Example_Accounts_PhoneNumbers
     phoneNumberIdentifierTableName: Example_Accounts_PhoneNumberIdentifiers
     usernamesTableName: Example_Accounts_Usernames
+    usedLinkDeviceTokensTableName: Example_Accounts_UsedLinkDeviceTokens
+  appleDeviceChecks:
+    tableName: Example_AppleDeviceChecks
+  appleDeviceCheckPublicKeys:
+    tableName: Example_AppleDeviceCheckPublicKeys
   backups:
     tableName: Example_Backups
   clientReleases:
@@ -89,12 +99,19 @@ dynamoDbTables:
     tableName: Example_IssuedReceipts
     expiration: P30D # Duration of time until rows expire
     generator: abcdefg12345678= # random base64-encoded binary sequence
+    maxIssuedReceiptsPerPaymentId:
+      STRIPE: 1
+      BRAINTREE: 1
+      GOOGLE_PLAY_BILLING: 1
+      APPLE_APP_STORE: 1
   ecKeys:
     tableName: Example_Keys
   ecSignedPreKeys:
     tableName: Example_EC_Signed_Pre_Keys
   pqKeys:
     tableName: Example_PQ_Keys
+  pagedPqKeys:
+    tableName: Example_PQ_Paged_Keys
   pqLastResortKeys:
     tableName: Example_PQ_Last_Resort_Keys
   messages:
@@ -109,6 +126,8 @@ dynamoDbTables:
     tableName: Example_Profiles
   pushChallenge:
     tableName: Example_PushChallenge
+  pushNotificationExperimentSamples:
+    tableName: Example_PushNotificationExperimentSamples
   redeemedReceipts:
     tableName: Example_RedeemedReceipts
     expiration: P30D # Duration of time until rows expire
@@ -119,6 +138,9 @@ dynamoDbTables:
     tableName: Example_RemoteConfig
   reportMessage:
     tableName: Example_ReportMessage
+  scheduledJobs:
+    tableName: Example_ScheduledJobs
+    expiration: P7D
   subscriptions:
     tableName: Example_Subscriptions
   clientPublicKeys:
@@ -126,10 +148,11 @@ dynamoDbTables:
   verificationSessions:
     tableName: Example_VerificationSessions
 
-cacheCluster: # Redis server configuration for cache cluster
-  configurationUri: redis://redis.example.com:6379/
+pagedSingleUseKEMPreKeyStore:
+  bucket: preKeyBucket # S3 Bucket name
+  region: us-west-2    # AWS region
 
-clientPresenceCluster: # Redis server configuration for client presence cluster
+cacheCluster: # Redis server configuration for cache cluster
   configurationUri: redis://redis.example.com:6379/
 
 pubsub: # Redis server configuration for pubsub cluster
@@ -174,10 +197,10 @@ svr2:
       AAAAAAAAAAAAAAAAAAAA
       -----END CERTIFICATE-----
 
-svr3:
-  uri: svr3.example.com
-  userAuthenticationTokenSharedSecret: secret://svr3.userAuthenticationTokenSharedSecret
-  userIdTokenSharedSecret: secret://svr3.userIdTokenSharedSecret
+svrb:
+  uri: svrb.example.com
+  userAuthenticationTokenSharedSecret: secret://svrb.userAuthenticationTokenSharedSecret
+  userIdTokenSharedSecret: secret://svrb.userIdTokenSharedSecret
   svrCaCertificates:
     - |
       -----BEGIN CERTIFICATE-----
@@ -202,21 +225,11 @@ svr3:
       AAAAAAAAAAAAAAAAAAAA
       -----END CERTIFICATE-----
 
-
 messageCache: # Redis server configuration for message store cache
   persistDelayMinutes: 1
   cluster:
     configurationUri: redis://redis.example.com:6379/
 
-metricsCluster:
-  configurationUri: redis://redis.example.com:6379/
-
-awsAttachments: # AWS S3 configuration
-  accessKey: secret://awsAttachments.accessKey
-  accessSecret: secret://awsAttachments.accessSecret
-  bucket: aws-attachments
-  region: us-west-2
-
 gcpAttachments: # GCP Storage configuration
   domain: example.com
   email: user@example.cocm
@@ -239,59 +252,30 @@ fcm: # FCM configuration
   credentials: secret://fcm.credentials
 
 cdn:
-  accessKey: secret://cdn.accessKey
-  accessSecret: secret://cdn.accessSecret
   bucket: cdn        # S3 Bucket name
+  credentials:
+    accessKeyId: secret://cdn.accessKey
+    secretAccessKey: secret://cdn.accessSecret
   region: us-west-2  # AWS region
 
-clientCdn:
-  attachmentUrls:
-    2: https://cdn2.example.com/attachments/
-  caCertificates:
-    - |
-      -----BEGIN CERTIFICATE-----
-      ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
-      ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
-      ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
-      ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
-      ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
-      ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
-      ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
-      ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
-      ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
-      ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
-      ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
-      ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
-      ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
-      ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
-      ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
-      ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
-      ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
-      ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
-      AAAAAAAAAAAAAAAAAAAA
-      -----END CERTIFICATE-----
-
 cdn3StorageManager:
   baseUri: https://storage-manager.example.com
   clientId: example
   clientSecret: secret://cdn3StorageManager.clientSecret
+  sourceSchemes:
+    2: gcs
+    3: r2
 
-dogstatsd:
+openTelemetry:
+  enabled: true
   environment: dev
-  host: 127.0.0.1
+  url: http://127.0.0.1:4318/
 
 unidentifiedDelivery:
-  certificate: secret://unidentifiedDelivery.certificate
+  certificate: CgIIAQ==
   privateKey: secret://unidentifiedDelivery.privateKey
   expiresDays: 7
 
-recaptcha:
-  projectPath: projects/example
-  credentialConfigurationJson: "{ }" # service account configuration for backend authentication
-
-hCaptcha:
-  apiKey: secret://hCaptcha.apiKey
-
 shortCode:
   baseUrl: https://example.com/shortcodes/
 
@@ -323,8 +307,8 @@ storageService:
       -----END CERTIFICATE-----
 
 zkConfig:
-  serverPublic: ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
-  serverSecret: secret://zkConfig-libsignal-0.37.serverSecret
+  serverPublic: ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyzAB==
+  serverSecret: secret://zkConfig-libsignal-0.42.serverSecret
 
 callingZkConfig:
   serverSecret: secret://callingZkConfig.serverSecret
@@ -332,10 +316,12 @@ callingZkConfig:
 backupsZkConfig:
   serverSecret: secret://backupsZkConfig.serverSecret
 
-appConfig:
-  application: example
-  environment: example
-  configuration: example
+dynamicConfig:
+  s3Region: a-region
+  s3Bucket: a-bucket
+  objectKey: dynamic-config.yaml
+  maxSize: 100000
+  refreshInterval: PT10S
 
 remoteConfig:
   globalConfig: # keys and values that are given to clients on GET /v1/config
@@ -343,17 +329,14 @@ remoteConfig:
 
 paymentsService:
   userAuthenticationTokenSharedSecret: secret://paymentsService.userAuthenticationTokenSharedSecret
-  fixerApiKey: secret://paymentsService.fixerApiKey
-  coinMarketCapApiKey: secret://paymentsService.coinMarketCapApiKey
-  coinMarketCapCurrencyIds:
-    MOB: 7878
   paymentCurrencies:
     # list of symbols for supported currencies
     - MOB
-
-artService:
-  userAuthenticationTokenSharedSecret: secret://artService.userAuthenticationTokenSharedSecret
-  userAuthenticationTokenUserIdSecret: secret://artService.userAuthenticationTokenUserIdSecret
+  externalClients:
+    fixerApiKey: secret://paymentsService.fixerApiKey
+    coinGeckoApiKey: secret://paymentsService.coinGeckoApiKey
+    coinGeckoCurrencyIds:
+      MOB: mobilecoin
 
 badges:
   badges:
@@ -378,6 +361,9 @@ badges:
 subscription: # configuration for Stripe subscriptions
   badgeExpiration: P30D
   badgeGracePeriod: P15D
+  backupExpiration: P30D
+  backupGracePeriod: P15D
+  backupFreeTierMediaDuration: P30D
   levels:
     500:
       badge: EXAMPLE
@@ -420,6 +406,7 @@ registrationService:
       "example": "example"
     }
   identityTokenAudience: https://registration.example.com
+  collationKeySalt: secret://registrationService.collationKeySalt
   registrationCaCertificate: | # Registration service TLS certificate trust root
     -----BEGIN CERTIFICATE-----
     ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
@@ -443,32 +430,99 @@ registrationService:
     AAAAAAAAAAAAAAAAAAAA
     -----END CERTIFICATE-----
 
+keyTransparencyService:
+  host: kt.example.com
+  port: 443
+  tlsCertificate: |
+    -----BEGIN CERTIFICATE-----
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    AAAAAAAAAAAAAAAAAAAA
+    -----END CERTIFICATE-----
+  clientCertificate: |
+    -----BEGIN CERTIFICATE-----
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz
+    AAAAAAAAAAAAAAAAAAAA
+    -----END CERTIFICATE-----
+  clientPrivateKey: secret://keyTransparencyService.clientPrivateKey
+
 turn:
-  secret: secret://turn.secret
+  cloudflare:
+    apiToken: secret://turn.cloudflare.apiToken
+    endpoint: https://rtc.live.cloudflare.com/v1/turn/keys/LMNOP/credentials/generate
+    urls:
+      - turn:turn.example.com:80
+    urlsWithIps:
+      - turn:%s
+      - turn:%s:80?transport=tcp
+      - turns:%s:443?transport=tcp
+    requestedCredentialTtl: PT24H
+    clientCredentialTtl: PT12H
+    hostname: turn.cloudflare.example.com
+    numHttpClients: 1
 
 linkDevice:
   secret: secret://linkDevice.secret
 
-maxmindCityDatabase:
-  s3Region: a-region
-  s3Bucket: a-bucket
-  objectKey: an-object.tar.gz
-  maxSize: 32777216
+externalRequestFilter:
+  grpcMethods:
+    - com.example.grpc.ExampleService/exampleMethod
+  paths:
+    - /example
+  permittedInternalRanges:
+    - 127.0.0.0/8
 
-callingTurnDnsRecords:
-  s3Region: a-region
-  s3Bucket: a-bucket
-  objectKey: an-object.tar.gz
-  maxSize: 32777216
+idlePrimaryDeviceReminder:
+  minIdleDuration: P30D
 
-callingTurnPerformanceTable:
-  s3Region: a-region
-  s3Bucket: a-bucket
-  objectKey: an-object.tar.gz
-  maxSize: 32777216
+grpc:
+  port: 50051
 
-callingTurnManualTable:
+asnTable:
   s3Region: a-region
   s3Bucket: a-bucket
-  objectKey: an-object.tar.gz
-  maxSize: 32777216
+  objectKey: asn.tsv
+  maxSize: 100000
+  refreshInterval: PT10S
+
+callQualitySurvey:
+  pubSubPublisher:
+    project: example-project
+    topic: example-topic
+    credentialConfiguration: |
+      {
+        "credential": "configuration"
+      }

service/pom.xml

@@ -11,16 +11,53 @@
   <artifactId>service</artifactId>
 
   <properties>
-    <firebase-admin.version>9.2.0</firebase-admin.version>
-    <java-uuid-generator.version>4.3.0</java-uuid-generator.version>
-    <sqlite4java.version>1.0.392</sqlite4java.version>
+    <firebase-admin.version>9.6.0</firebase-admin.version>
+    <java-uuid-generator.version>5.1.0</java-uuid-generator.version>
+    <google-androidpublisher.version>v3-rev20250904-2.0.0</google-androidpublisher.version>
+    <storekit.version>3.6.0</storekit.version>
+    <webauthn4j.version>0.29.6.RELEASE</webauthn4j.version>
+    <java-jwt.version>4.5.0</java-jwt.version>
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>com.auth0</groupId>
+      <artifactId>java-jwt</artifactId>
+      <version>${java-jwt.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.apis</groupId>
+      <artifactId>google-api-services-androidpublisher</artifactId>
+      <version>${google-androidpublisher.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.apple.itunes.storekit</groupId>
+      <artifactId>app-store-server-library</artifactId>
+      <version>${storekit.version}</version>
+      <exclusions>
+        <!-- conflicts with other users; resolved manually with explicit import -->
+        <exclusion>
+          <groupId>com.squareup.okio</groupId>
+          <artifactId>okio-jvm</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.webauthn4j</groupId>
+      <artifactId>webauthn4j-appattest</artifactId>
+      <version>${webauthn4j.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
-      <artifactId>swagger-jaxrs2</artifactId>
+      <artifactId>swagger-jaxrs2-jakarta</artifactId>
       <version>${swagger.version}</version>
+      <exclusions>
+        <!-- conflicts with jackson-dataformat-yaml -->
+        <exclusion>
+          <groupId>org.yaml</groupId>
+          <artifactId>snakeyaml</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>jakarta.servlet</groupId>
@@ -46,8 +83,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.signal.forks</groupId>
-      <artifactId>noise-java</artifactId>
+      <groupId>org.signal</groupId>
+      <artifactId>simple-grpc-runtime</artifactId>
     </dependency>
 
     <dependency>
@@ -113,8 +150,8 @@
       <artifactId>logback-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-access</artifactId>
+      <groupId>ch.qos.logback.access</groupId>
+      <artifactId>logback-access-common</artifactId>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
@@ -149,10 +186,6 @@
       <groupId>org.glassfish.jersey.core</groupId>
       <artifactId>jersey-client</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.glassfish.jaxb</groupId>
-      <artifactId>jaxb-runtime</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>io.dropwizard</groupId>
@@ -160,6 +193,28 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-exporter-otlp</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.opentelemetry.instrumentation</groupId>
+      <artifactId>opentelemetry-logback-appender-1.0</artifactId>
+      <!-- *all* opentelemetry-logback-appender versions are "alpha" despite the advanced version number -->
+      <version>2.19.0-alpha</version>
+      <exclusions>
+        <!-- incubator packages aren't included in the opentelemetry BOM, and we don't use them -->
+        <exclusion>
+          <groupId>io.opentelemetry.instrumentation</groupId>
+          <artifactId>opentelemetry-instrumentation-api-incubator</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
     <dependency>
       <groupId>party.iroiro.luajava</groupId>
       <artifactId>luajava</artifactId>
@@ -205,13 +260,19 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
-      <version>1.26.0</version>
+      <version>1.28.0</version>
     </dependency>
 
     <dependency>
-      <groupId>com.maxmind.geoip2</groupId>
-      <artifactId>geoip2</artifactId>
-      <version>4.2.0</version>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>google-cloud-pubsub</artifactId>
+      <exclusions>
+        <!-- our direct import of guava brings in a more recent version of failureaccess, so excluding it here -->
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>failureaccess</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -219,8 +280,25 @@
       <artifactId>firebase-admin</artifactId>
       <version>${firebase-admin.version}</version>
       <exclusions>
+        <!-- our direct import of guava brings in a more recent version of failureaccess, so excluding it here -->
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>failureaccess</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>google-cloud-firestore</artifactId>
+      <exclusions>
+        <!-- incubator packages aren't included in the opentelemetry BOM, and we don't use them -->
+        <exclusion>
+          <groupId>io.opentelemetry.instrumentation</groupId>
+          <artifactId>opentelemetry-instrumentation-api-incubator</artifactId>
+        </exclusion>
+        <!-- our direct import of guava brings in a more recent version of failureaccess, so excluding it here -->
         <exclusion>
-          <!-- fix dependency convergence from older 1.0.1 -->
           <groupId>com.google.guava</groupId>
           <artifactId>failureaccess</artifactId>
         </exclusion>
@@ -248,13 +326,6 @@
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-netty</artifactId>
-      <exclusions>
-        <!-- fix dependency convergence from older 0.26.0 -->
-        <exclusion>
-          <groupId>io.perfmark</groupId>
-          <artifactId>perfmark-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
@@ -277,11 +348,7 @@
     </dependency>
     <dependency>
       <groupId>io.micrometer</groupId>
-      <artifactId>micrometer-registry-statsd</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.coursera</groupId>
-      <artifactId>dropwizard-metrics-datadog</artifactId>
+      <artifactId>micrometer-registry-otlp</artifactId>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -313,6 +380,11 @@
       <artifactId>reactor-grpc-stub</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.foundationdb</groupId>
+      <artifactId>fdb-java</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>apache-client</artifactId>
@@ -333,18 +405,10 @@
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>dynamodb</artifactId>
     </dependency>
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>appconfig</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>appconfigdata</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>dynamodb-lock-client</artifactId>
-      <version>1.2.0</version>
+      <version>1.4.0</version>
     </dependency>
 
     <dependency>
@@ -381,11 +445,30 @@
       <artifactId>libphonenumber</artifactId>
     </dependency>
 
+    <!-- Provides tools for mapping phone numbers to time zones, which is helpful for scheduling push notifications
+    during waking hours -->
+    <dependency>
+      <groupId>com.googlecode.libphonenumber</groupId>
+      <artifactId>geocoder</artifactId>
+      <version>3.14</version>
+    </dependency>
+
     <dependency>
       <groupId>net.sourceforge.argparse4j</groupId>
       <artifactId>argparse4j</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec-haproxy</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport-native-epoll</artifactId>
+      <classifier>linux-x86_64</classifier>
+    </dependency>
+
     <dependency>
       <groupId>org.glassfish.jersey.test-framework</groupId>
       <artifactId>jersey-test-framework-core</artifactId>
@@ -403,13 +486,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>com.almworks.sqlite4java</groupId>
-      <artifactId>sqlite4java</artifactId>
-      <version>${sqlite4java.version}</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-core</artifactId>
@@ -418,10 +494,6 @@
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-core-micrometer</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.vavr</groupId>
-      <artifactId>vavr</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>org.junit.jupiter</groupId>
@@ -435,8 +507,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.signal</groupId>
-      <artifactId>embedded-redis</artifactId>
+      <groupId>com.redis</groupId>
+      <artifactId>testcontainers-redis</artifactId>
       <scope>test</scope>
     </dependency>
 
@@ -448,16 +520,20 @@
     </dependency>
 
     <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>DynamoDBLocal</artifactId>
-      <version>1.23.0</version>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>localstack</artifactId>
       <scope>test</scope>
     </dependency>
+
     <dependency>
-      <groupId>io.github.ganadist.sqlite4java</groupId>
-      <artifactId>libsqlite4java-osx-aarch64</artifactId>
-      <version>${sqlite4java.version}</version>
-      <type>dylib</type>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>earth.adi</groupId>
+      <artifactId>testcontainers-foundationdb</artifactId>
       <scope>test</scope>
     </dependency>
 
@@ -466,18 +542,6 @@
       <artifactId>google-auth-library-oauth2-http</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.cloud</groupId>
-      <artifactId>google-cloud-recaptchaenterprise</artifactId>
-      <exclusions>
-        <!-- fix dependency convergence from older 1.0.1 -->
-        <exclusion>
-          <groupId>com.google.guava</groupId>
-          <artifactId>failureaccess</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
     <dependency>
       <groupId>com.stripe</groupId>
       <artifactId>stripe-java</artifactId>
@@ -491,16 +555,28 @@
     <dependency>
       <groupId>com.apollographql.apollo3</groupId>
       <artifactId>apollo-api-jvm</artifactId>
-      <version>3.8.2</version>
+      <version>3.8.5</version>
 
       <exclusions>
         <exclusion>
           <groupId>org.jetbrains</groupId>
           <artifactId>annotations</artifactId>
         </exclusion>
+        <!-- conflicts with other users; resolved manually with explicit import -->
+        <exclusion>
+          <groupId>com.squareup.okio</groupId>
+          <artifactId>okio-jvm</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
+    <!-- to resolve conflicting imports from other dependencies -->
+    <dependency>
+      <groupId>com.squareup.okio</groupId>
+      <artifactId>okio-jvm</artifactId>
+      <version>3.15.0</version>
+    </dependency>
+
   </dependencies>
 
   <profiles>
@@ -508,10 +584,31 @@
       <id>exclude-spam-filter</id>
       <build>
         <plugins>
+          <plugin>
+            <groupId>io.github.download-maven-plugin</groupId>
+            <artifactId>download-maven-plugin</artifactId>
+            <version>2.0.0</version>
+
+            <executions>
+              <execution>
+                <id>install-foundationdb-client-library</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>wget</goal>
+                </goals>
+              </execution>
+            </executions>
+
+            <configuration>
+              <url>https://github.com/apple/foundationdb/releases/download/${foundationdb.version}/libfdb_c.x86_64.so</url>
+              <outputDirectory>${project.build.directory}/jib-extra/usr/lib</outputDirectory>
+              <sha256>${foundationdb.client-library-sha256}</sha256>
+            </configuration>
+          </plugin>
+
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-shade-plugin</artifactId>
-            <version>3.5.1</version>
             <configuration>
               <createDependencyReducedPom>true</createDependencyReducedPom>
               <filters>
@@ -546,7 +643,6 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-assembly-plugin</artifactId>
-            <version>3.6.0</version>
             <configuration>
               <descriptors>
                 <descriptor>assembly.xml</descriptor>
@@ -566,7 +662,6 @@
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>properties-maven-plugin</artifactId>
-            <version>1.2.0</version>
             <executions>
               <execution>
                 <id>read-deploy-configuration</id>
@@ -595,6 +690,16 @@
             <configuration>
               <from>
                 <image>eclipse-temurin@sha256:${docker.image.sha256}</image>
+                <platforms>
+                  <platform>
+                    <architecture>amd64</architecture>
+                    <os>linux</os>
+                  </platform>
+                  <platform>
+                    <architecture>arm64</architecture>
+                    <os>linux</os>
+                  </platform>
+                </platforms>
               </from>
               <to>
                 <image>${docker.repo}:${project.version}</image>
@@ -606,6 +711,7 @@
                   <jvmFlag>-Djava.awt.headless=true</jvmFlag>
                   <jvmFlag>-Djdk.nio.maxCachedBufferSize=262144</jvmFlag>
                   <jvmFlag>-Dlog4j2.formatMsgNoLookups=true</jvmFlag>
+                  <jvmFlag>-Djdk.tls.server.newSessionTicketCount=0</jvmFlag>
                   <jvmFlag>-XX:MaxRAMPercentage=75</jvmFlag>
                   <jvmFlag>-XX:+HeapDumpOnOutOfMemoryError</jvmFlag>
                   <jvmFlag>-XX:HeapDumpPath=/tmp/heapdump.bin</jvmFlag>
@@ -622,6 +728,9 @@
                     <includes>*.yml</includes>
                     <into>/usr/share/signal/</into>
                   </path>
+                  <path>
+                    <from>${project.build.directory}/jib-extra</from>
+                  </path>
                 </paths>
               </extraDirectories>
             </configuration>
@@ -644,6 +753,30 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>test-server</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>start-test-server</id>
+                <phase>integration-test</phase>
+                <goals>
+                  <goal>java</goal>
+                </goals>
+                <configuration>
+                  <mainClass>org.whispersystems.textsecuregcm.LocalWhisperServerService</mainClass>
+                  <classpathScope>test</classpathScope>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 
   <build>
@@ -652,7 +785,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>templating-maven-plugin</artifactId>
-        <version>1.0.0</version>
+        <version>3.0.0</version>
         <executions>
           <execution>
             <id>filter-src</id>
@@ -660,16 +793,21 @@
               <goal>filter-sources</goal>
             </goals>
           </execution>
+          <execution>
+            <id>filter-test-src</id>
+            <goals>
+              <goal>filter-test-sources</goal>
+            </goals>
+          </execution>
         </executions>
       </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.1.2</version>
         <configuration>
-          <!-- work around PATCH not being a supported method on HttpUrlConnection -->
-          <argLine>--add-opens=java.base/java.net=ALL-UNNAMED</argLine>
+          <!-- add-opens: work around PATCH not being a supported method on HttpUrlConnection -->
+          <argLine>-javaagent:${org.mockito:mockito-core:jar} --add-opens=java.base/java.net=ALL-UNNAMED</argLine>
         </configuration>
       </plugin>
 
@@ -688,7 +826,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>3.1.0</version>
         <executions>
           <execution>
             <id>check-all-service-config</id>
@@ -696,15 +833,15 @@
             <goals>
               <goal>java</goal>
             </goals>
+            <configuration>
+              <mainClass>org.whispersystems.textsecuregcm.CheckServiceConfigurations</mainClass>
+              <classpathScope>test</classpathScope>
+              <arguments>
+                <argument>${project.basedir}/config</argument>
+              </arguments>
+            </configuration>
           </execution>
         </executions>
-        <configuration>
-          <mainClass>org.whispersystems.textsecuregcm.CheckServiceConfigurations</mainClass>
-          <classpathScope>test</classpathScope>
-          <arguments>
-            <argument>${project.basedir}/config</argument>
-          </arguments>
-        </configuration>
       </plugin>
 
       <plugin>

service/src/main/java-templates/org/whispersystems/textsecuregcm/storage/FoundationDbVersion.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2025 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.textsecuregcm.storage;
+
+public class FoundationDbVersion {
+
+  private static final String VERSION = "${foundationdb.version}";
+  private static final int API_VERSION = ${foundationdb.api-version};
+
+  public static String getFoundationDbVersion() {
+    return VERSION;
+  }
+
+  public static int getFoundationDbApiVersion() {
+    return API_VERSION;
+  }
+}

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

@@ -6,60 +6,65 @@ package org.whispersystems.textsecuregcm;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.dropwizard.core.Configuration;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import java.time.Duration;
+import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import org.whispersystems.textsecuregcm.attachments.TusConfiguration;
 import org.whispersystems.textsecuregcm.configuration.ApnConfiguration;
-import org.whispersystems.textsecuregcm.configuration.AppConfigConfiguration;
-import org.whispersystems.textsecuregcm.configuration.ArtServiceConfiguration;
-import org.whispersystems.textsecuregcm.configuration.AwsAttachmentsConfiguration;
+import org.whispersystems.textsecuregcm.configuration.AppleAppStoreConfiguration;
+import org.whispersystems.textsecuregcm.configuration.AppleDeviceCheckConfiguration;
+import org.whispersystems.textsecuregcm.configuration.AwsCredentialsProviderFactory;
 import org.whispersystems.textsecuregcm.configuration.BadgesConfiguration;
 import org.whispersystems.textsecuregcm.configuration.BraintreeConfiguration;
+import org.whispersystems.textsecuregcm.configuration.CallQualitySurveyConfiguration;
 import org.whispersystems.textsecuregcm.configuration.Cdn3StorageManagerConfiguration;
 import org.whispersystems.textsecuregcm.configuration.CdnConfiguration;
-import org.whispersystems.textsecuregcm.configuration.ClientCdnConfiguration;
+import org.whispersystems.textsecuregcm.configuration.CircuitBreakerConfiguration;
 import org.whispersystems.textsecuregcm.configuration.ClientReleaseConfiguration;
+import org.whispersystems.textsecuregcm.configuration.DefaultAwsCredentialsFactory;
+import org.whispersystems.textsecuregcm.configuration.DeviceCheckConfiguration;
 import org.whispersystems.textsecuregcm.configuration.DirectoryV2Configuration;
-import org.whispersystems.textsecuregcm.configuration.DogstatsdConfiguration;
-import org.whispersystems.textsecuregcm.configuration.DynamoDbClientConfiguration;
+import org.whispersystems.textsecuregcm.configuration.DynamoDbClientFactory;
 import org.whispersystems.textsecuregcm.configuration.DynamoDbTables;
+import org.whispersystems.textsecuregcm.configuration.ExternalRequestFilterConfiguration;
+import org.whispersystems.textsecuregcm.configuration.FaultTolerantRedisClientFactory;
+import org.whispersystems.textsecuregcm.configuration.FaultTolerantRedisClusterFactory;
 import org.whispersystems.textsecuregcm.configuration.FcmConfiguration;
 import org.whispersystems.textsecuregcm.configuration.GcpAttachmentsConfiguration;
 import org.whispersystems.textsecuregcm.configuration.GenericZkConfig;
-import org.whispersystems.textsecuregcm.configuration.HCaptchaConfiguration;
+import org.whispersystems.textsecuregcm.configuration.GooglePlayBillingConfiguration;
+import org.whispersystems.textsecuregcm.configuration.GrpcConfiguration;
+import org.whispersystems.textsecuregcm.configuration.IdlePrimaryDeviceReminderConfiguration;
+import org.whispersystems.textsecuregcm.configuration.KeyTransparencyServiceConfiguration;
 import org.whispersystems.textsecuregcm.configuration.LinkDeviceSecretConfiguration;
 import org.whispersystems.textsecuregcm.configuration.MaxDeviceConfiguration;
 import org.whispersystems.textsecuregcm.configuration.MessageByteLimitCardinalityEstimatorConfiguration;
 import org.whispersystems.textsecuregcm.configuration.MessageCacheConfiguration;
-import org.whispersystems.textsecuregcm.configuration.MonitoredS3ObjectConfiguration;
 import org.whispersystems.textsecuregcm.configuration.OneTimeDonationConfiguration;
+import org.whispersystems.textsecuregcm.configuration.OpenTelemetryConfiguration;
+import org.whispersystems.textsecuregcm.configuration.PagedSingleUseKEMPreKeyStoreConfiguration;
 import org.whispersystems.textsecuregcm.configuration.PaymentsServiceConfiguration;
-import org.whispersystems.textsecuregcm.configuration.RecaptchaConfiguration;
-import org.whispersystems.textsecuregcm.configuration.RedisClusterConfiguration;
-import org.whispersystems.textsecuregcm.configuration.RedisConfiguration;
-import org.whispersystems.textsecuregcm.configuration.RegistrationServiceConfiguration;
+import org.whispersystems.textsecuregcm.configuration.RegistrationServiceClientFactory;
 import org.whispersystems.textsecuregcm.configuration.RemoteConfigConfiguration;
 import org.whispersystems.textsecuregcm.configuration.ReportMessageConfiguration;
+import org.whispersystems.textsecuregcm.configuration.RetryConfiguration;
+import org.whispersystems.textsecuregcm.configuration.S3ObjectMonitorFactory;
 import org.whispersystems.textsecuregcm.configuration.SecureStorageServiceConfiguration;
-import org.whispersystems.textsecuregcm.configuration.SecureValueRecovery2Configuration;
-import org.whispersystems.textsecuregcm.configuration.SecureValueRecovery3Configuration;
+import org.whispersystems.textsecuregcm.configuration.SecureValueRecoveryConfiguration;
 import org.whispersystems.textsecuregcm.configuration.ShortCodeExpanderConfiguration;
 import org.whispersystems.textsecuregcm.configuration.SpamFilterConfiguration;
 import org.whispersystems.textsecuregcm.configuration.StripeConfiguration;
 import org.whispersystems.textsecuregcm.configuration.SubscriptionConfiguration;
 import org.whispersystems.textsecuregcm.configuration.TlsKeyStoreConfiguration;
-import org.whispersystems.textsecuregcm.configuration.TurnSecretConfiguration;
+import org.whispersystems.textsecuregcm.configuration.TurnConfiguration;
 import org.whispersystems.textsecuregcm.configuration.UnidentifiedDeliveryConfiguration;
 import org.whispersystems.textsecuregcm.configuration.VirtualThreadConfiguration;
 import org.whispersystems.textsecuregcm.configuration.ZkConfig;
-import org.whispersystems.textsecuregcm.limits.RateLimiterConfig;
 import org.whispersystems.websocket.configuration.WebSocketConfiguration;
 
 /** @noinspection MismatchedQueryAndUpdateOfCollection, WeakerAccess */
@@ -70,6 +75,11 @@ public class WhisperServerConfiguration extends Configuration {
   @JsonProperty
   private TlsKeyStoreConfiguration tlsKeyStore;
 
+  @NotNull
+  @Valid
+  @JsonProperty
+  AwsCredentialsProviderFactory awsCredentialsProvider = new DefaultAwsCredentialsFactory();
+
   @NotNull
   @Valid
   @JsonProperty
@@ -83,18 +93,33 @@ public class WhisperServerConfiguration extends Configuration {
   @NotNull
   @Valid
   @JsonProperty
-  private DynamoDbClientConfiguration dynamoDbClientConfiguration;
+  private GooglePlayBillingConfiguration googlePlayBilling;
+
+  @NotNull
+  @Valid
+  @JsonProperty
+  private AppleAppStoreConfiguration appleAppStore;
+
+  @NotNull
+  @Valid
+  @JsonProperty
+  private AppleDeviceCheckConfiguration appleDeviceCheck;
+
+  @NotNull
+  @Valid
+  @JsonProperty
+  private DeviceCheckConfiguration deviceCheck;
+
+  @NotNull
+  @Valid
+  @JsonProperty
+  private DynamoDbClientFactory dynamoDbClient;
 
   @NotNull
   @Valid
   @JsonProperty
   private DynamoDbTables dynamoDbTables;
 
-  @NotNull
-  @Valid
-  @JsonProperty
-  private AwsAttachmentsConfiguration awsAttachments;
-
   @NotNull
   @Valid
   @JsonProperty
@@ -105,11 +130,6 @@ public class WhisperServerConfiguration extends Configuration {
   @JsonProperty
   private CdnConfiguration cdn;
 
-  @NotNull
-  @Valid
-  @JsonProperty
-  private ClientCdnConfiguration clientCdn;
-
   @NotNull
   @Valid
   @JsonProperty
@@ -118,22 +138,17 @@ public class WhisperServerConfiguration extends Configuration {
   @NotNull
   @Valid
   @JsonProperty
-  private DogstatsdConfiguration dogstatsd = new DogstatsdConfiguration();
+  private OpenTelemetryConfiguration openTelemetry;
 
   @NotNull
   @Valid
   @JsonProperty
-  private RedisClusterConfiguration cacheCluster;
+  private FaultTolerantRedisClusterFactory cacheCluster;
 
   @NotNull
   @Valid
   @JsonProperty
-  private RedisConfiguration pubsub;
-
-  @NotNull
-  @Valid
-  @JsonProperty
-  private RedisClusterConfiguration metricsCluster;
+  private FaultTolerantRedisClientFactory pubsub;
 
   @NotNull
   @Valid
@@ -143,47 +158,33 @@ public class WhisperServerConfiguration extends Configuration {
   @NotNull
   @Valid
   @JsonProperty
-  private SecureValueRecovery2Configuration svr2;
-  @NotNull
-  @Valid
-  @JsonProperty
-  private SecureValueRecovery3Configuration svr3;
+  private SecureValueRecoveryConfiguration svr2;
 
   @NotNull
   @Valid
   @JsonProperty
-  private RedisClusterConfiguration pushSchedulerCluster;
+  private SecureValueRecoveryConfiguration svrb;
 
   @NotNull
   @Valid
   @JsonProperty
-  private RedisClusterConfiguration rateLimitersCluster;
+  private FaultTolerantRedisClusterFactory pushSchedulerCluster;
+
+  @NotNull
+  @Valid
+  @JsonProperty
+  private FaultTolerantRedisClusterFactory rateLimitersCluster;
 
   @NotNull
   @Valid
   @JsonProperty
   private MessageCacheConfiguration messageCache;
 
-  @NotNull
-  @Valid
-  @JsonProperty
-  private RedisClusterConfiguration clientPresenceCluster;
-
-  @Valid
-  @NotNull
-  @JsonProperty
-  private Set<String> testDevices = new HashSet<>();
-
   @Valid
   @NotNull
   @JsonProperty
   private List<MaxDeviceConfiguration> maxDevices = new LinkedList<>();
 
-  @Valid
-  @NotNull
-  @JsonProperty
-  private Map<String, RateLimiterConfig> limits = new HashMap<>();
-
   @Valid
   @NotNull
   @JsonProperty
@@ -204,16 +205,6 @@ public class WhisperServerConfiguration extends Configuration {
   @JsonProperty
   private UnidentifiedDeliveryConfiguration unidentifiedDelivery;
 
-  @Valid
-  @NotNull
-  @JsonProperty
-  private RecaptchaConfiguration recaptcha;
-
-  @Valid
-  @NotNull
-  @JsonProperty
-  private HCaptchaConfiguration hCaptcha;
-
   @Valid
   @NotNull
   @JsonProperty
@@ -229,11 +220,6 @@ public class WhisperServerConfiguration extends Configuration {
   @JsonProperty
   private PaymentsServiceConfiguration paymentsService;
 
-  @Valid
-  @NotNull
-  @JsonProperty
-  private ArtServiceConfiguration artService;
-
   @Valid
   @NotNull
   @JsonProperty
@@ -257,7 +243,7 @@ public class WhisperServerConfiguration extends Configuration {
   @Valid
   @NotNull
   @JsonProperty
-  private AppConfigConfiguration appConfig;
+  private S3ObjectMonitorFactory dynamicConfig;
 
   @Valid
   @NotNull
@@ -274,6 +260,11 @@ public class WhisperServerConfiguration extends Configuration {
   @NotNull
   private OneTimeDonationConfiguration oneTimeDonations;
 
+  @Valid
+  @JsonProperty
+  @NotNull
+  private PagedSingleUseKEMPreKeyStoreConfiguration pagedSingleUseKEMPreKeyStore;
+
   @Valid
   @NotNull
   @JsonProperty
@@ -281,17 +272,17 @@ public class WhisperServerConfiguration extends Configuration {
 
   @Valid
   @JsonProperty
-  private SpamFilterConfiguration spamFilterConfiguration;
+  private SpamFilterConfiguration spamFilter;
 
   @Valid
   @NotNull
   @JsonProperty
-  private RegistrationServiceConfiguration registrationService;
+  private RegistrationServiceClientFactory registrationService;
 
   @Valid
   @NotNull
   @JsonProperty
-  private TurnSecretConfiguration turn;
+  private TurnConfiguration turn;
 
   @Valid
   @NotNull
@@ -316,33 +307,59 @@ public class WhisperServerConfiguration extends Configuration {
   @Valid
   @NotNull
   @JsonProperty
-  private VirtualThreadConfiguration virtualThreadConfiguration = new VirtualThreadConfiguration(Duration.ofMillis(1));
-
+  private VirtualThreadConfiguration virtualThread = new VirtualThreadConfiguration();
 
   @Valid
   @NotNull
   @JsonProperty
-  private MonitoredS3ObjectConfiguration maxmindCityDatabase;
+  private ExternalRequestFilterConfiguration externalRequestFilter;
 
   @Valid
   @NotNull
   @JsonProperty
-  private MonitoredS3ObjectConfiguration callingTurnDnsRecords;
+  private KeyTransparencyServiceConfiguration keyTransparencyService;
+
+  @JsonProperty
+  private boolean logMessageDeliveryLoops;
+
+  @JsonProperty
+  private IdlePrimaryDeviceReminderConfiguration idlePrimaryDeviceReminder =
+      new IdlePrimaryDeviceReminderConfiguration(Duration.ofDays(30));
+
+  @JsonProperty
+  private Map<String, @Valid CircuitBreakerConfiguration> circuitBreakers = Collections.emptyMap();
+
+  @JsonProperty
+  private Map<String, @Valid RetryConfiguration> retries = Collections.emptyMap();
+
+  @JsonProperty
+  @Valid
+  @NotNull
+  private RetryConfiguration generalRedisRetry = new RetryConfiguration();
+
+  @NotNull
+  @Valid
+  @JsonProperty
+  private GrpcConfiguration grpc;
 
   @Valid
   @NotNull
   @JsonProperty
-  private MonitoredS3ObjectConfiguration callingTurnPerformanceTable;
+  private S3ObjectMonitorFactory asnTable;
 
   @Valid
   @NotNull
   @JsonProperty
-  private MonitoredS3ObjectConfiguration callingTurnManualTable;
+  private CallQualitySurveyConfiguration callQualitySurvey;
 
   public TlsKeyStoreConfiguration getTlsKeyStoreConfiguration() {
     return tlsKeyStore;
   }
 
+  public AwsCredentialsProviderFactory getAwsCredentialsConfiguration() {
+    return awsCredentialsProvider;
+  }
+
   public StripeConfiguration getStripe() {
     return stripe;
   }
@@ -351,22 +368,30 @@ public class WhisperServerConfiguration extends Configuration {
     return braintree;
   }
 
-  public DynamoDbClientConfiguration getDynamoDbClientConfiguration() {
-    return dynamoDbClientConfiguration;
+  public GooglePlayBillingConfiguration getGooglePlayBilling() {
+    return googlePlayBilling;
+  }
+
+  public AppleAppStoreConfiguration getAppleAppStore() {
+    return appleAppStore;
+  }
+
+  public AppleDeviceCheckConfiguration getAppleDeviceCheck() {
+    return appleDeviceCheck;
+  }
+
+  public DeviceCheckConfiguration getDeviceCheck() {
+    return deviceCheck;
+  }
+
+  public DynamoDbClientFactory getDynamoDbClientConfiguration() {
+    return dynamoDbClient;
   }
 
   public DynamoDbTables getDynamoDbTables() {
     return dynamoDbTables;
   }
 
-  public RecaptchaConfiguration getRecaptchaConfiguration() {
-    return recaptcha;
-  }
-
-  public HCaptchaConfiguration getHCaptchaConfiguration() {
-    return hCaptcha;
-  }
-
   public ShortCodeExpanderConfiguration getShortCodeRetrieverConfiguration() {
     return shortCode;
   }
@@ -375,32 +400,24 @@ public class WhisperServerConfiguration extends Configuration {
     return webSocket;
   }
 
-  public AwsAttachmentsConfiguration getAwsAttachmentsConfiguration() {
-    return awsAttachments;
-  }
-
   public GcpAttachmentsConfiguration getGcpAttachmentsConfiguration() {
     return gcpAttachments;
   }
 
-  public RedisClusterConfiguration getCacheClusterConfiguration() {
+  public FaultTolerantRedisClusterFactory getCacheClusterConfiguration() {
     return cacheCluster;
   }
 
-  public RedisConfiguration getPubsubCacheConfiguration() {
+  public FaultTolerantRedisClientFactory getRedisPubSubConfiguration() {
     return pubsub;
   }
 
-  public RedisClusterConfiguration getMetricsClusterConfiguration() {
-    return metricsCluster;
-  }
-
-
-  public SecureValueRecovery2Configuration getSvr2Configuration() {
+  public SecureValueRecoveryConfiguration getSvr2Configuration() {
     return svr2;
   }
-  public SecureValueRecovery3Configuration getSvr3Configuration() {
-    return svr3;
+
+  public SecureValueRecoveryConfiguration getSvrbConfiguration() {
+    return svrb;
   }
 
   public DirectoryV2Configuration getDirectoryV2Configuration() {
@@ -415,22 +432,14 @@ public class WhisperServerConfiguration extends Configuration {
     return messageCache;
   }
 
-  public RedisClusterConfiguration getClientPresenceClusterConfiguration() {
-    return clientPresenceCluster;
-  }
-
-  public RedisClusterConfiguration getPushSchedulerCluster() {
+  public FaultTolerantRedisClusterFactory getPushSchedulerCluster() {
     return pushSchedulerCluster;
   }
 
-  public RedisClusterConfiguration getRateLimitersCluster() {
+  public FaultTolerantRedisClusterFactory getRateLimitersCluster() {
     return rateLimitersCluster;
   }
 
-  public Map<String, RateLimiterConfig> getLimitsConfiguration() {
-    return limits;
-  }
-
   public FcmConfiguration getFcmConfiguration() {
     return fcm;
   }
@@ -443,26 +452,18 @@ public class WhisperServerConfiguration extends Configuration {
     return cdn;
   }
 
-  public ClientCdnConfiguration getClientCdnConfiguration() {
-    return clientCdn;
-  }
-
   public Cdn3StorageManagerConfiguration getCdn3StorageManagerConfiguration() {
     return cdn3StorageManager;
   }
 
-  public DogstatsdConfiguration getDatadogConfiguration() {
-    return dogstatsd;
+  public OpenTelemetryConfiguration getOpenTelemetryConfiguration() {
+    return openTelemetry;
   }
 
   public UnidentifiedDeliveryConfiguration getDeliveryCertificate() {
     return unidentifiedDelivery;
   }
 
-  public Set<String> getTestDevices() {
-    return testDevices;
-  }
-
   public Map<String, Integer> getMaxDevices() {
     Map<String, Integer> results = new HashMap<>();
 
@@ -478,10 +479,6 @@ public class WhisperServerConfiguration extends Configuration {
     return paymentsService;
   }
 
-  public ArtServiceConfiguration getArtServiceConfiguration() {
-    return artService;
-  }
-
   public ZkConfig getZkConfig() {
     return zkConfig;
   }
@@ -498,8 +495,8 @@ public class WhisperServerConfiguration extends Configuration {
     return remoteConfig;
   }
 
-  public AppConfigConfiguration getAppConfig() {
-    return appConfig;
+  public S3ObjectMonitorFactory getDynamicConfig() {
+    return dynamicConfig;
   }
 
   public BadgesConfiguration getBadges() {
@@ -514,19 +511,23 @@ public class WhisperServerConfiguration extends Configuration {
     return oneTimeDonations;
   }
 
+  public PagedSingleUseKEMPreKeyStoreConfiguration getPagedSingleUseKEMPreKeyStore() {
+    return pagedSingleUseKEMPreKeyStore;
+  }
+
   public ReportMessageConfiguration getReportMessageConfiguration() {
     return reportMessage;
   }
 
   public SpamFilterConfiguration getSpamFilterConfiguration() {
-    return spamFilterConfiguration;
+    return spamFilter;
   }
 
-  public RegistrationServiceConfiguration getRegistrationServiceConfiguration() {
+  public RegistrationServiceClientFactory getRegistrationServiceConfiguration() {
     return registrationService;
   }
 
-  public TurnSecretConfiguration getTurnSecretConfiguration() {
+  public TurnConfiguration getTurnConfiguration() {
     return turn;
   }
 
@@ -547,22 +548,46 @@ public class WhisperServerConfiguration extends Configuration {
   }
 
   public VirtualThreadConfiguration getVirtualThreadConfiguration() {
-    return virtualThreadConfiguration;
+    return virtualThread;
   }
 
-  public MonitoredS3ObjectConfiguration getMaxmindCityDatabase() {
-    return maxmindCityDatabase;
+  public ExternalRequestFilterConfiguration getExternalRequestFilterConfiguration() {
+    return externalRequestFilter;
   }
 
-  public MonitoredS3ObjectConfiguration getCallingTurnDnsRecords() {
-    return callingTurnDnsRecords;
+  public KeyTransparencyServiceConfiguration getKeyTransparencyServiceConfiguration() {
+    return keyTransparencyService;
   }
 
-  public MonitoredS3ObjectConfiguration getCallingTurnPerformanceTable() {
-    return callingTurnPerformanceTable;
+  public boolean logMessageDeliveryLoops() {
+    return logMessageDeliveryLoops;
   }
 
-  public MonitoredS3ObjectConfiguration getCallingTurnManualTable() {
-    return callingTurnManualTable;
+  public IdlePrimaryDeviceReminderConfiguration idlePrimaryDeviceReminderConfiguration() {
+    return idlePrimaryDeviceReminder;
+  }
+
+  public Map<String, CircuitBreakerConfiguration> getCircuitBreakerConfigurations() {
+    return circuitBreakers;
+  }
+
+  public Map<String, RetryConfiguration> getRetryConfigurations() {
+    return retries;
+  }
+
+  public RetryConfiguration getGeneralRedisRetryConfiguration() {
+    return generalRedisRetry;
+  }
+
+  public GrpcConfiguration getGrpc() {
+    return grpc;
+  }
+
+  public S3ObjectMonitorFactory getAsnTableConfiguration() {
+    return asnTable;
+  }
+
+  public CallQualitySurveyConfiguration getCallQualitySurveyConfiguration() {
+    return callQualitySurvey;
   }
 }

service/src/main/java/org/whispersystems/textsecuregcm/asn/AsnInfo.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright 2013-2021 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.textsecuregcm.asn;
+
+import static java.util.Objects.requireNonNull;
+
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import javax.annotation.Nonnull;
+
+public record AsnInfo(long asn, @Nonnull String regionCode) {
+
+  public AsnInfo {
+    requireNonNull(regionCode, "regionCode must not be null");
+  }
+}

service/src/main/java/org/whispersystems/textsecuregcm/asn/AsnInfoProvider.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2013-2021 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.textsecuregcm.asn;
+
+import java.util.Optional;
+import javax.annotation.Nonnull;
+
+public interface AsnInfoProvider {
+
+  /// Gets ASN information for an IP address.
+  ///
+  /// @param ipString a string representation of an IP address
+  ///
+  /// @return ASN information for the given IP address or empty if no ASN information was found for the given IP address
+  Optional<AsnInfo> lookup(@Nonnull String ipString);
+
+  AsnInfoProvider EMPTY = _ -> Optional.empty();
+}

service/src/main/java/org/whispersystems/textsecuregcm/asn/AsnInfoProviderImpl.java

@@ -0,0 +1,165 @@
+/*
+ * Copyright 2013-2021 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.textsecuregcm.asn;
+
+import static java.util.Objects.requireNonNull;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.invoke.MethodHandles;
+import java.math.BigInteger;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.Optional;
+import java.util.TreeMap;
+import java.util.zip.GZIPInputStream;
+import javax.annotation.Nonnull;
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
+import org.apache.commons.lang3.Validate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * {@code AsnInfoProvider} implementation that supports both IPv4 and IPv6.
+ */
+public class AsnInfoProviderImpl implements AsnInfoProvider {
+
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+  @Nonnull
+  private final NavigableMap<Long, AsnRange<Long>> asnBlocksByFirstIpv4;
+
+  @Nonnull
+  private final NavigableMap<BigInteger, AsnRange<BigInteger>> asnBlocksByFirstIpv6;
+
+
+  /**
+   * Creates an instance of {@code AsnInfoProviderImpl} using data from <a href="https://iptoasn.com/">iptoasn.com</a>.
+   * @param tsvGzInputStream gzip input stream representing the data.
+   */
+  @Nonnull
+  public static AsnInfoProviderImpl fromTsvGz(@Nonnull final InputStream tsvGzInputStream) {
+    try (final GZIPInputStream inputStream = new GZIPInputStream(tsvGzInputStream)) {
+      return fromTsv(inputStream);
+    } catch (final IOException e) {
+      log.error("failed to ungzip the input stream", e);
+      throw new RuntimeException(e);
+    }
+  }
+
+  /**
+   * Creates an instance of {@code AsnInfoProviderImpl} using data from <a href="https://iptoasn.com/">iptoasn.com</a>.
+   * @param tsvInputStream input stream representing the data.
+   */
+  @Nonnull
+  public static AsnInfoProviderImpl fromTsv(@Nonnull final InputStream tsvInputStream) {
+    try (final InputStreamReader tsvReader = new InputStreamReader(tsvInputStream)) {
+      final NavigableMap<Long, AsnRange<Long>> ip4asns = new TreeMap<>();
+      final NavigableMap<BigInteger, AsnRange<BigInteger>> ip6asns = new TreeMap<>();
+      final Map<Long, AsnInfo> asnInfoCache = new HashMap<>();
+
+      try (final CSVParser csvParser = CSVFormat.TDF.parse(tsvReader)) {
+        for (final CSVRecord record : csvParser) {
+          // format:
+          // range_start_ip_string range_end_ip_string AS_number country_code AS_description
+          final InetAddress startIp = InetAddress.getByName(record.get(0));
+          final InetAddress endIp = InetAddress.getByName(record.get(1));
+          final long asn = Long.parseLong(record.get(2));
+          final String regionCode = record.get(3);
+          // country code should be the same for any ASN, so we're caching AsnInfo objects
+          // not to have multiple instances with the same values
+          final AsnInfo asnInfo = asnInfoCache.computeIfAbsent(asn, k -> new AsnInfo(asn, regionCode));
+          if (!regionCode.equals(asnInfo.regionCode())) {
+            log.warn("ASN {} mapped to country codes {} and {}", asn, regionCode, asnInfo.regionCode());
+          }
+
+          // IPv4
+          if (startIp instanceof Inet4Address) {
+            final AsnRange<Long> asnRange = new AsnRange<>(
+                ip4BytesToLong((Inet4Address) startIp),
+                ip4BytesToLong((Inet4Address) endIp),
+                asnInfo
+            );
+            ip4asns.put(asnRange.from(), asnRange);
+          }
+
+          // IPv6
+          if (startIp instanceof Inet6Address) {
+            final AsnRange<BigInteger> asnRange = new AsnRange<>(
+                ip6BytesToBigInteger((Inet6Address) startIp),
+                ip6BytesToBigInteger((Inet6Address) endIp),
+                asnInfo
+            );
+            ip6asns.put(asnRange.from(), asnRange);
+          }
+        }
+      }
+      return new AsnInfoProviderImpl(ip4asns, ip6asns);
+    } catch (final Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public AsnInfoProviderImpl(
+      @Nonnull final NavigableMap<Long, AsnRange<Long>> asnBlocksByFirstIpv4,
+      @Nonnull final NavigableMap<BigInteger, AsnRange<BigInteger>> asnBlocksByFirstIpv6) {
+    this.asnBlocksByFirstIpv4 = requireNonNull(asnBlocksByFirstIpv4);
+    this.asnBlocksByFirstIpv6 = requireNonNull(asnBlocksByFirstIpv6);
+  }
+
+  @Nonnull
+  @Override
+  public Optional<AsnInfo> lookup(@Nonnull final String ipString) {
+    try {
+      final InetAddress address = InetAddress.getByName(ipString);
+      if (address instanceof Inet4Address ip4) {
+        final Long key = ip4BytesToLong(ip4);
+        return lookupInMap(asnBlocksByFirstIpv4, key);
+      }
+      if (address instanceof Inet6Address ip6) {
+        final BigInteger key = ip6BytesToBigInteger(ip6);
+        return lookupInMap(asnBlocksByFirstIpv6, key);
+      }
+      // safety net, should never happen
+      log.warn("Unknown InetAddress implementation: {}", address.getClass().getName());
+    } catch (final Exception e) {
+      log.error("Could not resolve ASN for IP string {}", ipString);
+    }
+    return Optional.empty();
+  }
+
+  @VisibleForTesting
+  protected static long ip4BytesToLong(@Nonnull final Inet4Address address) {
+    final byte[] arr = address.getAddress();
+    Validate.isTrue(arr.length == 4);
+    return Integer.toUnsignedLong(ByteBuffer.wrap(arr).getInt());
+  }
+
+  @VisibleForTesting
+  protected static BigInteger ip6BytesToBigInteger(@Nonnull final Inet6Address address) {
+    final byte[] arr = address.getAddress();
+    Validate.isTrue(arr.length == 16);
+    return new BigInteger(1, arr);
+  }
+
+  @Nonnull
+  private static <T extends Comparable<T>> Optional<AsnInfo> lookupInMap(
+      @Nonnull final NavigableMap<T, AsnRange<T>> map,
+      @Nonnull final T key) {
+    return Optional.ofNullable(map.floorEntry(key))
+        .filter(e -> e.getValue().contains(key) && e.getValue().asnInfo().asn() != 0)
+        .map(e -> e.getValue().asnInfo());
+  }
+}

service/src/main/java/org/whispersystems/textsecuregcm/asn/AsnRange.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2013-2021 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.textsecuregcm.asn;
+
+import static java.util.Objects.requireNonNull;
+
+import javax.annotation.Nonnull;
+import org.apache.commons.lang3.Validate;
+
+public record AsnRange<T extends Comparable<T>>(@Nonnull T from,
+                                                @Nonnull T to,
+                                                @Nonnull AsnInfo asnInfo) {
+  public AsnRange {
+    requireNonNull(from);
+    requireNonNull(to);
+    requireNonNull(asnInfo);
+    Validate.isTrue(from.compareTo(to) <= 0);
+  }
+
+  boolean contains(@Nonnull final T element) {
+    requireNonNull(element);
+    return from.compareTo(element) <= 0
+        && element.compareTo(to) <= 0;
+  }
+}

service/src/main/java/org/whispersystems/textsecuregcm/attachments/TusConfiguration.java

@@ -5,9 +5,9 @@
 
 package org.whispersystems.textsecuregcm.attachments;
 
+import jakarta.validation.constraints.NotEmpty;
 import org.whispersystems.textsecuregcm.configuration.secrets.SecretBytes;
 import org.whispersystems.textsecuregcm.util.ExactlySize;
-import javax.validation.constraints.NotEmpty;
 
 public record TusConfiguration(
   @ExactlySize(32) SecretBytes userAuthenticationTokenSharedSecret,

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

@@ -1,16 +0,0 @@
-/*
- * Copyright 2021 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.auth;
-
-import org.whispersystems.textsecuregcm.storage.Account;
-import org.whispersystems.textsecuregcm.storage.Device;
-
-public interface AccountAndAuthenticatedDeviceHolder {
-
-  Account getAccount();
-
-  Device getAuthenticatedDevice();
-}

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

@@ -5,36 +5,40 @@
 
 package org.whispersystems.textsecuregcm.auth;
 
-import static com.codahale.metrics.MetricRegistry.name;
+import static org.whispersystems.textsecuregcm.metrics.MetricsUtil.name;
 
 import com.google.common.annotations.VisibleForTesting;
 import io.dropwizard.auth.Authenticator;
 import io.dropwizard.auth.basic.BasicCredentials;
+import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.Tags;
 import java.time.Clock;
 import java.time.Duration;
+import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.Optional;
 import java.util.UUID;
 import org.apache.commons.lang3.StringUtils;
+import org.whispersystems.textsecuregcm.identity.IdentityType;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
 import org.whispersystems.textsecuregcm.storage.Device;
 import org.whispersystems.textsecuregcm.util.Pair;
 import org.whispersystems.textsecuregcm.util.Util;
 
-public class AccountAuthenticator implements Authenticator<BasicCredentials, AuthenticatedAccount> {
+public class AccountAuthenticator implements Authenticator<BasicCredentials, AuthenticatedDevice> {
 
-  private static final String LEGACY_NAME_PREFIX = "org.whispersystems.textsecuregcm.auth.BaseAccountAuthenticator";
-
-  private static final String AUTHENTICATION_COUNTER_NAME = name(LEGACY_NAME_PREFIX, "authentication");
+  private static final String AUTHENTICATION_COUNTER_NAME = name(AccountAuthenticator.class, "authentication");
   private static final String AUTHENTICATION_SUCCEEDED_TAG_NAME = "succeeded";
   private static final String AUTHENTICATION_FAILURE_REASON_TAG_NAME = "reason";
 
-  private static final String DAYS_SINCE_LAST_SEEN_DISTRIBUTION_NAME = name(LEGACY_NAME_PREFIX, "daysSinceLastSeen");
+  private static final String DAYS_SINCE_LAST_SEEN_DISTRIBUTION_NAME = name(AccountAuthenticator.class, "daysSinceLastSeen");
   private static final String IS_PRIMARY_DEVICE_TAG = "isPrimary";
 
+  private static final Counter OLD_TOKEN_VERSION_COUNTER =
+      Metrics.counter(name(AccountAuthenticator.class, "oldTokenVersionCounter"));
+
   @VisibleForTesting
   static final char DEVICE_ID_SEPARATOR = '.';
 
@@ -69,7 +73,7 @@ public class AccountAuthenticator implements Authenticator<BasicCredentials, Aut
   }
 
   @Override
-  public Optional<AuthenticatedAccount> authenticate(BasicCredentials basicCredentials) {
+  public Optional<AuthenticatedDevice> authenticate(BasicCredentials basicCredentials) {
     boolean succeeded = false;
     String failureReason = null;
 
@@ -102,15 +106,19 @@ public class AccountAuthenticator implements Authenticator<BasicCredentials, Aut
         succeeded = true;
         Account authenticatedAccount = updateLastSeen(account.get(), device.get());
         if (deviceSaltedTokenHash.getVersion() != SaltedTokenHash.CURRENT_VERSION) {
+          OLD_TOKEN_VERSION_COUNTER.increment();
           authenticatedAccount = accountsManager.updateDeviceAuthentication(
               authenticatedAccount,
               device.get(),
               SaltedTokenHash.generateFor(basicCredentials.getPassword()));  // new credentials have current version
         }
-        return Optional.of(new AuthenticatedAccount(authenticatedAccount, device.get()));
+        return Optional.of(new AuthenticatedDevice(authenticatedAccount.getIdentifier(IdentityType.ACI),
+            device.get().getId(),
+            Instant.ofEpochMilli(authenticatedAccount.getPrimaryDevice().getLastSeen())));
+      } else {
+        failureReason = "incorrectPassword";
+        return Optional.empty();
       }
-
-      return Optional.empty();
     } catch (IllegalArgumentException | InvalidAuthorizationHeaderException iae) {
       failureReason = "invalidHeader";
       return Optional.empty();

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

@@ -5,9 +5,9 @@
 
 package org.whispersystems.textsecuregcm.auth;
 
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
 import java.util.Base64;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
 
 public class Anonymous {
 

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

@@ -1,100 +0,0 @@
-/*
- * Copyright 2021 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.auth;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
-import org.glassfish.jersey.server.ContainerRequest;
-import org.glassfish.jersey.server.monitoring.RequestEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.whispersystems.textsecuregcm.storage.Account;
-import org.whispersystems.textsecuregcm.storage.AccountsManager;
-import org.whispersystems.textsecuregcm.storage.Device;
-import org.whispersystems.textsecuregcm.util.Pair;
-
-/**
- * This {@link WebsocketRefreshRequirementProvider} observes intra-request changes in {@link Account#isEnabled()} and
- * {@link Device#isEnabled()}.
- * <p>
- * If a change in {@link Account#isEnabled()} or any associated {@link Device#isEnabled()} is observed, then any active
- * WebSocket connections for the account must be closed in order for clients to get a refreshed
- * {@link io.dropwizard.auth.Auth} object with a current device list.
- *
- * @see AuthenticatedAccount
- */
-public class AuthEnablementRefreshRequirementProvider implements WebsocketRefreshRequirementProvider {
-
-  private final AccountsManager accountsManager;
-
-  private static final Logger logger = LoggerFactory.getLogger(AuthEnablementRefreshRequirementProvider.class);
-
-  private static final String ACCOUNT_UUID = AuthEnablementRefreshRequirementProvider.class.getName() + ".accountUuid";
-  private static final String DEVICES_ENABLED = AuthEnablementRefreshRequirementProvider.class.getName() + ".devicesEnabled";
-
-  public AuthEnablementRefreshRequirementProvider(final AccountsManager accountsManager) {
-    this.accountsManager = accountsManager;
-  }
-
-
-  @Override
-  public void handleRequestFiltered(final RequestEvent requestEvent) {
-    if (requestEvent.getUriInfo().getMatchedResourceMethod().getInvocable().getHandlingMethod().getAnnotation(ChangesDeviceEnabledState.class) != null) {
-      // The authenticated principal, if any, will be available after filters have run.
-      // Now that the account is known, capture a snapshot of `isEnabled` for the account's devices before carrying out
-      // the request’s business logic.
-      ContainerRequestUtil.getAuthenticatedAccount(requestEvent.getContainerRequest()).ifPresent(account ->
-          setAccount(requestEvent.getContainerRequest(), account));
-    }
-  }
-  public static void setAccount(final ContainerRequest containerRequest, final Account account) {
-    setAccount(containerRequest, ContainerRequestUtil.AccountInfo.fromAccount(account));
-  }
-
-  private static void setAccount(final ContainerRequest containerRequest, final ContainerRequestUtil.AccountInfo info) {
-    containerRequest.setProperty(ACCOUNT_UUID, info.accountId());
-    containerRequest.setProperty(DEVICES_ENABLED, info.devicesEnabled());
-  }
-
-  @Override
-  public List<Pair<UUID, Byte>> handleRequestFinished(final RequestEvent requestEvent) {
-    // Now that the request is finished, check whether `isEnabled` changed for any of the devices. If the value did
-    // change or if a devices was added or removed, all devices must disconnect and reauthenticate.
-    if (requestEvent.getContainerRequest().getProperty(DEVICES_ENABLED) != null) {
-
-      @SuppressWarnings("unchecked") final Map<Byte, Boolean> initialDevicesEnabled =
-          (Map<Byte, Boolean>) requestEvent.getContainerRequest().getProperty(DEVICES_ENABLED);
-
-      return accountsManager.getByAccountIdentifier((UUID) requestEvent.getContainerRequest().getProperty(ACCOUNT_UUID))
-          .map(ContainerRequestUtil.AccountInfo::fromAccount)
-          .map(account -> {
-            final Set<Byte> deviceIdsToDisplace;
-            final Map<Byte, Boolean> currentDevicesEnabled = account.devicesEnabled();
-
-            if (!initialDevicesEnabled.equals(currentDevicesEnabled)) {
-              deviceIdsToDisplace = new HashSet<>(initialDevicesEnabled.keySet());
-              deviceIdsToDisplace.addAll(currentDevicesEnabled.keySet());
-            } else {
-              deviceIdsToDisplace = Collections.emptySet();
-            }
-
-            return deviceIdsToDisplace.stream()
-                .map(deviceId -> new Pair<>(account.accountId(), deviceId))
-                .collect(Collectors.toList());
-          }).orElseGet(() -> {
-            logger.error("Request had account, but it is no longer present");
-            return Collections.emptyList();
-          });
-    } else {
-      return Collections.emptyList();
-    }
-  }
-}

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

@@ -1,44 +0,0 @@
-/*
- * Copyright 2021 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.auth;
-
-import java.security.Principal;
-import java.util.function.Supplier;
-import javax.security.auth.Subject;
-import org.whispersystems.textsecuregcm.storage.Account;
-import org.whispersystems.textsecuregcm.storage.Device;
-
-public class AuthenticatedAccount implements Principal, AccountAndAuthenticatedDeviceHolder {
-  private final Account account;
-  private final Device device;
-
- public AuthenticatedAccount(final Account account, final Device device) {
-    this.account = account;
-    this.device = device;
-  }
-
-  @Override
-  public Account getAccount() {
-    return account;
-  }
-
-  @Override
-  public Device getAuthenticatedDevice() {
-    return device;
-  }
-
-  // Principal implementation
-
-  @Override
-  public String getName() {
-    return null;
-  }
-
-  @Override
-  public boolean implies(final Subject subject) {
-    return false;
-  }
-}

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

@@ -5,6 +5,16 @@
 
 package org.whispersystems.textsecuregcm.auth;
 
-import org.whispersystems.textsecuregcm.backup.BackupTier;
+import org.signal.libsignal.zkgroup.backups.BackupCredentialType;
+import org.signal.libsignal.zkgroup.backups.BackupLevel;
+import org.whispersystems.textsecuregcm.util.ua.UserAgent;
+import javax.annotation.Nullable;
 
-public record AuthenticatedBackupUser(byte[] backupId, BackupTier backupTier) {}
+public record AuthenticatedBackupUser(
+    byte[] backupId,
+    BackupCredentialType credentialType,
+    BackupLevel backupLevel,
+    String backupDir,
+    String mediaDir,
+    @Nullable UserAgent userAgent) {
+}

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

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2021 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.textsecuregcm.auth;
+
+import java.security.Principal;
+import java.time.Instant;
+import java.util.UUID;
+import javax.security.auth.Subject;
+
+public record AuthenticatedDevice(UUID accountIdentifier, byte deviceId, Instant primaryDeviceLastSeen)
+    implements Principal {
+
+  @Override
+  public String getName() {
+    return null;
+  }
+
+  @Override
+  public boolean implies(final Subject subject) {
+    return false;
+  }
+}

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

@@ -9,7 +9,6 @@ import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.security.InvalidKeyException;
 import java.util.concurrent.TimeUnit;
-import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECPrivateKey;
 import org.whispersystems.textsecuregcm.entities.MessageProtos.SenderCertificate;
 import org.whispersystems.textsecuregcm.entities.MessageProtos.ServerCertificate;
@@ -31,9 +30,9 @@ public class CertificateGenerator {
     this.serverCertificate = ServerCertificate.parseFrom(serverCertificate);
   }
 
-  public byte[] createFor(Account account, Device device, boolean includeE164) throws InvalidKeyException {
+  public byte[] createFor(final Account account, final byte deviceId, boolean includeE164) throws InvalidKeyException {
     SenderCertificate.Certificate.Builder builder = SenderCertificate.Certificate.newBuilder()
-        .setSenderDevice(Math.toIntExact(device.getId()))
+        .setSenderDevice(Math.toIntExact(deviceId))
         .setExpires(System.currentTimeMillis() + TimeUnit.DAYS.toMillis(expiresDays))
         .setIdentityKey(ByteString.copyFrom(account.getIdentityKey(IdentityType.ACI).serialize()))
         .setSigner(serverCertificate)
@@ -45,11 +44,7 @@ public class CertificateGenerator {
 
     byte[] certificate = builder.build().toByteArray();
     byte[] signature;
-    try {
-      signature = Curve.calculateSignature(privateKey, certificate);
-    } catch (org.signal.libsignal.protocol.InvalidKeyException e) {
-      throw new InvalidKeyException(e);
-    }
+    signature = privateKey.calculateSignature(certificate);
 
     return SenderCertificate.newBuilder()
                             .setCertificate(ByteString.copyFrom(certificate))

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

@@ -16,5 +16,5 @@ import java.lang.annotation.Target;
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface ChangesDeviceEnabledState {
+public @interface ChangesLinkedDevices {
 }

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

@@ -0,0 +1,137 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.textsecuregcm.auth;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import io.netty.resolver.dns.DnsNameResolver;
+import jakarta.ws.rs.core.Response;
+import java.io.IOException;
+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;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
+import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.textsecuregcm.http.FaultTolerantHttpClient;
+import org.whispersystems.textsecuregcm.util.ExceptionUtils;
+import org.whispersystems.textsecuregcm.util.SystemMapper;
+
+public class CloudflareTurnCredentialsManager {
+
+  private static final Logger logger = LoggerFactory.getLogger(CloudflareTurnCredentialsManager.class);
+
+  private final List<String> cloudflareTurnUrls;
+  private final List<String> cloudflareTurnUrlsWithIps;
+  private final String cloudflareTurnHostname;
+  private final HttpRequest getCredentialsRequest;
+
+  private final FaultTolerantHttpClient cloudflareTurnClient;
+  private final DnsNameResolver dnsNameResolver;
+
+  private final Duration clientCredentialTtl;
+
+  private record CredentialRequest(long ttl) {}
+
+  private record CloudflareTurnResponse(IceServer iceServers) {
+
+    private record IceServer(
+        String username,
+        String credential,
+        List<String> urls) {
+    }
+  }
+
+  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,
+      @Nullable final String circuitBreakerConfigurationName,
+      final ExecutorService executor,
+      @Nullable final String retryConfigurationName,
+      final ScheduledExecutorService retryExecutor,
+      final DnsNameResolver dnsNameResolver) {
+
+    this.cloudflareTurnClient = FaultTolerantHttpClient.newBuilder("cloudflare-turn", executor)
+        .withCircuitBreaker(circuitBreakerConfigurationName)
+        .withRetry(retryConfigurationName, retryExecutor)
+        .withNumClients(cloudflareTurnNumHttpClients)
+        .build();
+    this.cloudflareTurnUrls = cloudflareTurnUrls;
+    this.cloudflareTurnUrlsWithIps = cloudflareTurnUrlsWithIps;
+    this.cloudflareTurnHostname = cloudflareTurnHostname;
+    this.dnsNameResolver = dnsNameResolver;
+
+    final String credentialsRequestBody;
+
+    try {
+      credentialsRequestBody =
+          SystemMapper.jsonMapper().writeValueAsString(new CredentialRequest(requestedCredentialTtl.toSeconds()));
+    } catch (final 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 {
+    final List<String> cloudflareTurnComposedUrls;
+    try {
+      cloudflareTurnComposedUrls = dnsNameResolver.resolveAll(cloudflareTurnHostname).get().stream()
+          .map(i -> switch (i) {
+            case Inet6Address i6 -> "[" + i6.getHostAddress() + "]";
+            default -> i.getHostAddress();
+          })
+          .flatMap(i -> cloudflareTurnUrlsWithIps.stream().map(u -> u.formatted(i)))
+          .toList();
+    } catch (Exception e) {
+      throw new IOException(e);
+    }
+
+    final HttpResponse<String> response;
+    try {
+      response = cloudflareTurnClient.sendAsync(getCredentialsRequest, HttpResponse.BodyHandlers.ofString()).join();
+    } catch (CompletionException e) {
+      logger.warn("failed to make http request to Cloudflare Turn: {}", e.getMessage());
+      throw new IOException(ExceptionUtils.unwrap(e));
+    }
+
+    if (response.statusCode() != Response.Status.CREATED.getStatusCode()) {
+      logger.warn("failure request credentials from Cloudflare Turn (code={}): {}", response.statusCode(), response);
+      throw new IOException("Cloudflare Turn http failure : " + response.statusCode());
+    }
+
+    final CloudflareTurnResponse cloudflareTurnResponse = SystemMapper.jsonMapper()
+        .readValue(response.body(), CloudflareTurnResponse.class);
+
+    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/CombinedUnidentifiedSenderAccessKeys.java

@@ -5,10 +5,10 @@
 
 package org.whispersystems.textsecuregcm.auth;
 
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
 import java.util.Base64;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
 
 public class CombinedUnidentifiedSenderAccessKeys {
   private final byte[] combinedUnidentifiedSenderAccessKeys;

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

@@ -1,48 +0,0 @@
-/*
- * Copyright 2013-2021 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.auth;
-
-import org.glassfish.jersey.server.ContainerRequest;
-import org.whispersystems.textsecuregcm.storage.Account;
-import org.whispersystems.textsecuregcm.storage.Device;
-import javax.ws.rs.core.SecurityContext;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-class ContainerRequestUtil {
-
-  private static Map<Byte, Boolean> buildDevicesEnabledMap(final Account account) {
-    return account.getDevices().stream().collect(Collectors.toMap(Device::getId, Device::isEnabled));
-  }
-
-  /**
-   * A read-only subset of the authenticated Account object, to enforce that filter-based consumers do not perform
-   * account modifying operations.
-   */
-  record AccountInfo(UUID accountId, String e164, Map<Byte, Boolean> devicesEnabled) {
-
-    static AccountInfo fromAccount(final Account account) {
-      return new AccountInfo(
-          account.getUuid(),
-          account.getNumber(),
-          buildDevicesEnabledMap(account));
-    }
-  }
-
-  static Optional<AccountInfo> getAuthenticatedAccount(final ContainerRequest request) {
-    return Optional.ofNullable(request.getSecurityContext())
-        .map(SecurityContext::getUserPrincipal)
-        .map(principal -> {
-          if (principal instanceof AccountAndAuthenticatedDeviceHolder aaadh) {
-            return aaadh.getAccount();
-          }
-          return null;
-        })
-        .map(AccountInfo::fromAccount);
-  }
-}

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

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.textsecuregcm.auth;
+
+/**
+ * A disconnection request listener receives and handles a request to close an authenticated network connection for a
+ * specific client.
+ */
+public interface DisconnectionRequestListener {
+
+  /**
+   * Handles a request to close an authenticated network connection for a specific authenticated device. Requests are
+   * dispatched on dedicated threads, and implementations may safely block.
+   */
+  void handleDisconnectionRequest();
+}

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

@@ -0,0 +1,231 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.textsecuregcm.auth;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.protobuf.InvalidProtocolBufferException;
+import io.dropwizard.lifecycle.Managed;
+import io.lettuce.core.RedisCommandTimeoutException;
+import io.lettuce.core.pubsub.RedisPubSubAdapter;
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.Metrics;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
+import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.textsecuregcm.identity.IdentityType;
+import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
+import org.whispersystems.textsecuregcm.redis.FaultTolerantPubSubConnection;
+import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisClient;
+import org.whispersystems.textsecuregcm.storage.Account;
+import org.whispersystems.textsecuregcm.storage.Device;
+import org.whispersystems.textsecuregcm.util.ResilienceUtil;
+import org.whispersystems.textsecuregcm.util.UUIDUtil;
+
+/**
+ * A disconnection request manager broadcasts and dispatches requests for servers to close authenticated connections
+ * from specific clients.
+ *
+ * @see DisconnectionRequestListener
+ */
+public class DisconnectionRequestManager extends RedisPubSubAdapter<byte[], byte[]> implements Managed {
+
+  private final FaultTolerantRedisClient pubSubClient;
+  private final Executor listenerEventExecutor;
+  private final ScheduledExecutorService retryExecutor;
+
+  private static final String RETRY_NAME = ResilienceUtil.name(DisconnectionRequestManager.class);
+
+  private static final Duration SUBSCRIBE_RETRY_DELAY = Duration.ofSeconds(5);
+
+  private final Map<AccountIdentifierAndDeviceId, List<DisconnectionRequestListener>> listeners =
+      new ConcurrentHashMap<>();
+
+  @Nullable
+  private FaultTolerantPubSubConnection<byte[], byte[]> pubSubConnection;
+
+  private static final byte[] DISCONNECTION_REQUEST_CHANNEL = "disconnection_requests".getBytes(StandardCharsets.UTF_8);
+
+  private static final Counter DISCONNECTION_REQUESTS_SENT_COUNTER =
+      Metrics.counter(MetricsUtil.name(DisconnectionRequestManager.class, "requestsSent"));
+
+  private static final Counter DISCONNECTION_REQUESTS_RECEIVED_COUNTER =
+      Metrics.counter(MetricsUtil.name(DisconnectionRequestManager.class, "requestsReceived"));
+
+  private static final Logger logger = LoggerFactory.getLogger(DisconnectionRequestManager.class);
+
+  private record AccountIdentifierAndDeviceId(UUID accountIdentifier, byte deviceId) {}
+
+  public DisconnectionRequestManager(final FaultTolerantRedisClient pubSubClient,
+      final Executor listenerEventExecutor,
+      final ScheduledExecutorService retryExecutor) {
+
+    this.pubSubClient = pubSubClient;
+    this.listenerEventExecutor = listenerEventExecutor;
+    this.retryExecutor = retryExecutor;
+  }
+
+  @Override
+  public synchronized void start() {
+    this.pubSubConnection = pubSubClient.createBinaryPubSubConnection();
+    this.pubSubConnection.usePubSubConnection(connection -> {
+      connection.addListener(this);
+
+      boolean subscribed = false;
+
+      // Loop indefinitely until we establish a subscription. We don't want to fail immediately if there's a temporary
+      // Redis connectivity issue, since that would derail the whole startup process and likely lead to unnecessary pod
+      // churn, which might make things worse. If we never establish a connection, readiness probes will eventually fail
+      // and terminate the pods.
+      do {
+        try {
+          connection.sync().subscribe(DISCONNECTION_REQUEST_CHANNEL);
+          subscribed = true;
+        } catch (final RedisCommandTimeoutException e) {
+          try {
+            Thread.sleep(SUBSCRIBE_RETRY_DELAY);
+          } catch (final InterruptedException ex) {
+            throw new RuntimeException(ex);
+          }
+        }
+      } while (!subscribed);
+    });
+  }
+
+  @Override
+  public synchronized void stop() {
+    if (pubSubConnection != null) {
+      pubSubConnection.usePubSubConnection(connection -> {
+        connection.removeListener(this);
+        connection.close();
+      });
+    }
+
+    pubSubConnection = null;
+  }
+
+  /**
+   * Adds a listener for disconnection requests for a specific authenticated device.
+   *
+   * @param accountIdentifier TODO
+   * @param deviceId TODO
+   * @param listener the listener to register
+   */
+  public void addListener(final UUID accountIdentifier, final byte deviceId, final DisconnectionRequestListener listener) {
+    listeners.compute(new AccountIdentifierAndDeviceId(accountIdentifier, deviceId), (_, existingListeners) -> {
+      final List<DisconnectionRequestListener> listeners =
+          existingListeners == null ? new ArrayList<>() : existingListeners;
+
+      listeners.add(listener);
+
+      return listeners;
+    });
+  }
+
+  /**
+   * Removes a listener for disconnection requests for a specific authenticated device.
+   *
+   * @param accountIdentifier TODO
+   * @param deviceId TODO
+   * @param listener the listener to remove
+   */
+  public void removeListener(final UUID accountIdentifier, final byte deviceId, final DisconnectionRequestListener listener) {
+    listeners.computeIfPresent(new AccountIdentifierAndDeviceId(accountIdentifier, deviceId), (_, existingListeners) -> {
+      existingListeners.remove(listener);
+
+      return existingListeners.isEmpty() ? null : existingListeners;
+    });
+  }
+
+  @VisibleForTesting
+  List<DisconnectionRequestListener> getListeners(final UUID accountIdentifier, final byte deviceId) {
+    return listeners.getOrDefault(new AccountIdentifierAndDeviceId(accountIdentifier, deviceId), Collections.emptyList());
+  }
+
+  /**
+   * Broadcasts a request to close all connections associated with the given account identifier to all servers.
+   *
+   * @param account the account for which to close connections
+   *
+   * @return a future that completes when the request has been broadcast
+   */
+  public CompletionStage<Void> requestDisconnection(final Account account) {
+    return requestDisconnection(account.getIdentifier(IdentityType.ACI),
+        account.getDevices().stream().map(Device::getId).toList());
+  }
+
+  /**
+   * Broadcasts a request to close connections associated with the given account identifier and device IDs to all
+   * servers.
+   *
+   * @param accountIdentifier the account for which to close connections
+   * @param deviceIds the device IDs for which to close connections
+   *
+   * @return a future that completes when the request has been broadcast
+   */
+  public CompletionStage<Void> requestDisconnection(final UUID accountIdentifier, final Collection<Byte> deviceIds) {
+    final DisconnectionRequest disconnectionRequest = DisconnectionRequest.newBuilder()
+        .setAccountIdentifier(UUIDUtil.toByteString(accountIdentifier))
+        .addAllDeviceIds(deviceIds.stream().mapToInt(Byte::intValue).boxed().toList())
+        .build();
+
+    return ResilienceUtil.getGeneralRedisRetry(RETRY_NAME)
+        .executeCompletionStage(retryExecutor, () -> pubSubClient.withBinaryConnection(connection ->
+                connection.async().publish(DISCONNECTION_REQUEST_CHANNEL, disconnectionRequest.toByteArray()))
+            .toCompletableFuture())
+        .thenRun(DISCONNECTION_REQUESTS_SENT_COUNTER::increment);
+  }
+
+  @Override
+  public void message(final byte[] channel, final byte[] message) {
+    final UUID accountIdentifier;
+    final List<Byte> deviceIds;
+
+    try {
+      final DisconnectionRequest disconnectionRequest = DisconnectionRequest.parseFrom(message);
+      DISCONNECTION_REQUESTS_RECEIVED_COUNTER.increment();
+
+      accountIdentifier = UUIDUtil.fromByteString(disconnectionRequest.getAccountIdentifier());
+      deviceIds = disconnectionRequest.getDeviceIdsList().stream()
+          .map(deviceIdInt -> {
+            if (deviceIdInt == null || deviceIdInt < Device.PRIMARY_ID || deviceIdInt > Byte.MAX_VALUE) {
+              throw new IllegalArgumentException("Invalid device ID: " + deviceIdInt);
+            }
+
+            return deviceIdInt.byteValue();
+          })
+          .toList();
+    } catch (final InvalidProtocolBufferException e) {
+      logger.error("Could not parse disconnection request protobuf", e);
+      return;
+    } catch (final IllegalArgumentException e) {
+      logger.error("Could not parse part of disconnection request", e);
+      return;
+    }
+
+    deviceIds.forEach(deviceId -> {
+      listeners.getOrDefault(new AccountIdentifierAndDeviceId(accountIdentifier, deviceId), Collections.emptyList())
+          .forEach(listener -> listenerEventExecutor.execute(() -> {
+            try {
+              listener.handleDisconnectionRequest();
+            } catch (final Exception e) {
+              logger.warn("Listener failed to handle disconnection request", e);
+            }
+          }));
+    });
+  }
+}

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

@@ -1,26 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.auth;
-
-import java.util.Base64;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response.Status;
-
-import org.signal.libsignal.zkgroup.InvalidInputException;
-import org.signal.libsignal.zkgroup.groupsend.GroupSendCredentialPresentation;
-
-public record GroupSendCredentialHeader(GroupSendCredentialPresentation presentation) {
-
-  public static GroupSendCredentialHeader valueOf(String header) {
-    try {
-      return new GroupSendCredentialHeader(new GroupSendCredentialPresentation(Base64.getDecoder().decode(header)));
-    } catch (InvalidInputException | IllegalArgumentException e) {
-      // Base64 throws IllegalArgumentException; GroupSendCredentialPresentation ctor throws InvalidInputException
-      throw new WebApplicationException(e, Status.UNAUTHORIZED);
-    }
-  }
-
-}

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

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.textsecuregcm.auth;
+
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response.Status;
+import java.util.Base64;
+import org.signal.libsignal.zkgroup.InvalidInputException;
+import org.signal.libsignal.zkgroup.groupsend.GroupSendFullToken;
+
+public record GroupSendTokenHeader(GroupSendFullToken token) {
+
+  public static GroupSendTokenHeader valueOf(String header) {
+    try {
+      return new GroupSendTokenHeader(new GroupSendFullToken(Base64.getDecoder().decode(header)));
+    } catch (InvalidInputException | IllegalArgumentException e) {
+      // Base64 throws IllegalArgumentException; GroupSendFullToken ctor throws InvalidInputException
+      throw new WebApplicationException(e, Status.UNAUTHORIZED);
+    }
+  }
+
+}

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

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2025 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.textsecuregcm.auth;
+
+import com.google.common.annotations.VisibleForTesting;
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.Metrics;
+import java.time.Clock;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Optional;
+import org.eclipse.jetty.websocket.server.JettyServerUpgradeRequest;
+import org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse;
+import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
+import org.whispersystems.textsecuregcm.storage.Device;
+import org.whispersystems.websocket.auth.AuthenticatedWebSocketUpgradeFilter;
+
+public class IdlePrimaryDeviceAuthenticatedWebSocketUpgradeFilter implements
+    AuthenticatedWebSocketUpgradeFilter<AuthenticatedDevice> {
+
+  private final Duration minIdleDuration;
+  private final Clock clock;
+
+  @VisibleForTesting
+  static final String ALERT_HEADER = "X-Signal-Alert";
+
+  @VisibleForTesting
+  static final String IDLE_PRIMARY_DEVICE_ALERT = "idle-primary-device";
+
+  private static final Counter IDLE_PRIMARY_WARNING_COUNTER = Metrics.counter(
+      MetricsUtil.name(IdlePrimaryDeviceAuthenticatedWebSocketUpgradeFilter.class, "idlePrimaryDeviceWarning"),
+      "critical", "false");
+
+  public IdlePrimaryDeviceAuthenticatedWebSocketUpgradeFilter(final Duration minIdleDuration, final Clock clock) {
+    this.minIdleDuration = minIdleDuration;
+    this.clock = clock;
+  }
+
+  @Override
+  public void handleAuthentication(final Optional<AuthenticatedDevice> authenticated,
+      final JettyServerUpgradeRequest request,
+      final JettyServerUpgradeResponse response) {
+
+    // No action needed if the connection is unauthenticated (in which case we don't know when we've last seen the
+    // primary device) or if the authenticated device IS the primary device
+    authenticated
+        .filter(authenticatedDevice -> authenticatedDevice.deviceId() != Device.PRIMARY_ID)
+        .ifPresent(authenticatedDevice -> {
+          if (authenticatedDevice.primaryDeviceLastSeen().isBefore(clock.instant().minus(minIdleDuration))) {
+            response.addHeader(ALERT_HEADER, IDLE_PRIMARY_DEVICE_ALERT);
+            IDLE_PRIMARY_WARNING_COUNTER.increment();
+          }
+        });
+  }
+}

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

@@ -5,8 +5,8 @@
 package org.whispersystems.textsecuregcm.auth;
 
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response.Status;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response.Status;
 
 public class InvalidAuthorizationHeaderException extends WebApplicationException {
   public InvalidAuthorizationHeaderException(String s) {

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

@@ -5,33 +5,37 @@
 
 package org.whispersystems.textsecuregcm.auth;
 
-import org.whispersystems.textsecuregcm.storage.Account;
-import org.whispersystems.textsecuregcm.storage.Device;
-
-import javax.ws.rs.NotAuthorizedException;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.NotAuthorizedException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
 import java.security.MessageDigest;
 import java.util.Optional;
+import org.whispersystems.textsecuregcm.identity.IdentityType;
+import org.whispersystems.textsecuregcm.identity.ServiceIdentifier;
+import org.whispersystems.textsecuregcm.storage.Account;
+import org.whispersystems.textsecuregcm.storage.Device;
 
 @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
 public class OptionalAccess {
 
-  public static void verify(Optional<Account>   requestAccount,
-                            Optional<Anonymous> accessKey,
-                            Optional<Account>   targetAccount,
-                            String              deviceSelector)
-  {
-    try {
-      verify(requestAccount, accessKey, targetAccount);
+  public static String ALL_DEVICES_SELECTOR = "*";
 
-      if (!deviceSelector.equals("*")) {
+  public static void verify(Optional<Account> requestAccount,
+      Optional<Anonymous> accessKey,
+      Optional<Account> targetAccount,
+      ServiceIdentifier targetIdentifier,
+      String deviceSelector) {
+
+    try {
+      verify(requestAccount, accessKey, targetAccount, targetIdentifier);
+
+      if (!ALL_DEVICES_SELECTOR.equals(deviceSelector)) {
         byte deviceId = Byte.parseByte(deviceSelector);
 
         Optional<Device> targetDevice = targetAccount.get().getDevice(deviceId);
 
-        if (targetDevice.isPresent() && targetDevice.get().isEnabled()) {
+        if (targetDevice.isPresent()) {
           return;
         }
 
@@ -46,29 +50,50 @@ public class OptionalAccess {
     }
   }
 
-  public static void verify(Optional<Account>   requestAccount,
-                            Optional<Anonymous> accessKey,
-                            Optional<Account>   targetAccount)
-  {
-    if (requestAccount.isPresent() && targetAccount.isPresent() && targetAccount.get().isEnabled()) {
+  public static void verify(Optional<Account> requestAccount,
+      Optional<Anonymous> accessKey,
+      Optional<Account> targetAccount,
+      ServiceIdentifier targetIdentifier) {
+
+    if (requestAccount.isPresent()) {
+      // Authenticated requests are never unauthorized; if the target exists, return OK, otherwise throw not-found.
+      if (targetAccount.isPresent()) {
+        return;
+      } else {
+        throw new NotFoundException();
+      }
+    }
+
+    // Anything past this point can only be authenticated by an access key. Even when the target
+    // has unrestricted unidentified access, callers need to supply a fake access key. Likewise, if
+    // the target account does not exist, we *also* report unauthorized here (*not* not-found,
+    // since that would provide a free exists check).
+    if (accessKey.isEmpty() || targetAccount.isEmpty()) {
+      throw new NotAuthorizedException(Response.Status.UNAUTHORIZED);
+    }
+
+    // Unidentified access is only for ACI identities
+    if (IdentityType.PNI.equals(targetIdentifier.identityType())) {
+      throw new NotAuthorizedException(Response.Status.UNAUTHORIZED);
+    }
+
+    // Unrestricted unidentified access does what it says on the tin: we don't check if the key the
+    // caller provided is right or not.
+    if (targetAccount.get().isUnrestrictedUnidentifiedAccess()) {
       return;
     }
 
-    //noinspection ConstantConditions
-    if (requestAccount.isPresent() && (targetAccount.isEmpty() || (targetAccount.isPresent() && !targetAccount.get().isEnabled()))) {
-      throw new NotFoundException();
+    if (!targetAccount.get().isIdentifiedBy(targetIdentifier)) {
+      throw new IllegalArgumentException("Target account is not identified by the given identifier");
     }
 
-    if (accessKey.isPresent() && targetAccount.isPresent() && targetAccount.get().isEnabled() && targetAccount.get().isUnrestrictedUnidentifiedAccess()) {
-      return;
+    // At this point, any successful authentication requires a real access key on the target account
+    if (targetAccount.get().getUnidentifiedAccessKey().isEmpty()) {
+      throw new NotAuthorizedException(Response.Status.UNAUTHORIZED);
     }
 
-    if (accessKey.isPresent()                                      &&
-        targetAccount.isPresent()                                  &&
-        targetAccount.get().getUnidentifiedAccessKey().isPresent() &&
-        targetAccount.get().isEnabled()                            &&
-        MessageDigest.isEqual(accessKey.get().getAccessKey(), targetAccount.get().getUnidentifiedAccessKey().get()))
-    {
+    // Otherwise, access is gated by the caller having the unidentified-access key matching the target account.
+    if (MessageDigest.isEqual(accessKey.get().getAccessKey(), targetAccount.get().getUnidentifiedAccessKey().get())) {
       return;
     }
 

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

@@ -1,56 +0,0 @@
-/*
- * Copyright 2013-2021 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.auth;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
-import java.util.stream.Collectors;
-import org.glassfish.jersey.server.monitoring.RequestEvent;
-import org.whispersystems.textsecuregcm.storage.AccountsManager;
-import org.whispersystems.textsecuregcm.util.Pair;
-
-public class PhoneNumberChangeRefreshRequirementProvider implements WebsocketRefreshRequirementProvider {
-
-  private static final String ACCOUNT_UUID =
-      PhoneNumberChangeRefreshRequirementProvider.class.getName() + ".accountUuid";
-
-  private static final String INITIAL_NUMBER_KEY =
-      PhoneNumberChangeRefreshRequirementProvider.class.getName() + ".initialNumber";
-  private final AccountsManager accountsManager;
-
-  public PhoneNumberChangeRefreshRequirementProvider(final AccountsManager accountsManager) {
-    this.accountsManager = accountsManager;
-  }
-
-  @Override
-  public void handleRequestFiltered(final RequestEvent requestEvent) {
-    if (requestEvent.getUriInfo().getMatchedResourceMethod().getInvocable().getHandlingMethod()
-        .getAnnotation(ChangesPhoneNumber.class) == null) {
-      return;
-    }
-    ContainerRequestUtil.getAuthenticatedAccount(requestEvent.getContainerRequest())
-        .ifPresent(account -> {
-          requestEvent.getContainerRequest().setProperty(INITIAL_NUMBER_KEY, account.e164());
-          requestEvent.getContainerRequest().setProperty(ACCOUNT_UUID, account.accountId());
-        });
-  }
-
-  @Override
-  public List<Pair<UUID, Byte>> handleRequestFinished(final RequestEvent requestEvent) {
-    final String initialNumber = (String) requestEvent.getContainerRequest().getProperty(INITIAL_NUMBER_KEY);
-
-    if (initialNumber == null) {
-      return Collections.emptyList();
-    }
-    return accountsManager.getByAccountIdentifier((UUID) requestEvent.getContainerRequest().getProperty(ACCOUNT_UUID))
-        .filter(account -> !initialNumber.equals(account.getNumber()))
-        .map(account -> account.getDevices().stream()
-            .map(device -> new Pair<>(account.getUuid(), device.getId()))
-            .collect(Collectors.toList()))
-        .orElse(Collections.emptyList());
-  }
-}

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

@@ -7,22 +7,25 @@ package org.whispersystems.textsecuregcm.auth;
 
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.NotAuthorizedException;
+import jakarta.ws.rs.ServerErrorException;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Response;
 import java.security.MessageDigest;
 import java.time.Duration;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.NotAuthorizedException;
-import javax.ws.rs.ServerErrorException;
-import javax.ws.rs.core.Response;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.textsecuregcm.entities.PhoneVerificationRequest;
 import org.whispersystems.textsecuregcm.entities.RegistrationServiceSession;
 import org.whispersystems.textsecuregcm.registration.RegistrationServiceClient;
+import org.whispersystems.textsecuregcm.spam.RegistrationRecoveryChecker;
+import org.whispersystems.textsecuregcm.storage.PhoneNumberIdentifiers;
 import org.whispersystems.textsecuregcm.storage.RegistrationRecoveryPasswordsManager;
 
 public class PhoneVerificationTokenManager {
@@ -31,19 +34,27 @@ public class PhoneVerificationTokenManager {
   private static final Duration REGISTRATION_RPC_TIMEOUT = Duration.ofSeconds(15);
   private static final long VERIFICATION_TIMEOUT_SECONDS = REGISTRATION_RPC_TIMEOUT.plusSeconds(1).getSeconds();
 
+  private final PhoneNumberIdentifiers phoneNumberIdentifiers;
+
   private final RegistrationServiceClient registrationServiceClient;
   private final RegistrationRecoveryPasswordsManager registrationRecoveryPasswordsManager;
+  private final RegistrationRecoveryChecker registrationRecoveryChecker;
 
-  public PhoneVerificationTokenManager(final RegistrationServiceClient registrationServiceClient,
-      final RegistrationRecoveryPasswordsManager registrationRecoveryPasswordsManager) {
+  public PhoneVerificationTokenManager(final PhoneNumberIdentifiers phoneNumberIdentifiers,
+      final RegistrationServiceClient registrationServiceClient,
+      final RegistrationRecoveryPasswordsManager registrationRecoveryPasswordsManager,
+      final RegistrationRecoveryChecker registrationRecoveryChecker) {
+    this.phoneNumberIdentifiers = phoneNumberIdentifiers;
     this.registrationServiceClient = registrationServiceClient;
     this.registrationRecoveryPasswordsManager = registrationRecoveryPasswordsManager;
+    this.registrationRecoveryChecker = registrationRecoveryChecker;
   }
 
   /**
    * Checks if a {@link PhoneVerificationRequest} has a token that verifies the caller has confirmed access to the e164
    * number
    *
+   * @param requestContext the container request context
    * @param number  the e164 presented for verification
    * @param request the request with exactly one verification token (RegistrationService sessionId or registration
    *                recovery password)
@@ -54,13 +65,13 @@ public class PhoneVerificationTokenManager {
    * @throws ForbiddenException     if the recovery password is not valid
    * @throws InterruptedException   if verification did not complete before a timeout
    */
-  public PhoneVerificationRequest.VerificationType verify(final String number, final PhoneVerificationRequest request)
+  public PhoneVerificationRequest.VerificationType verify(final ContainerRequestContext requestContext, final String number, final PhoneVerificationRequest request)
       throws InterruptedException {
 
     final PhoneVerificationRequest.VerificationType verificationType = request.verificationType();
     switch (verificationType) {
       case SESSION -> verifyBySessionId(number, request.decodeSessionId());
-      case RECOVERY_PASSWORD -> verifyByRecoveryPassword(number, request.recoveryPassword());
+      case RECOVERY_PASSWORD -> verifyByRecoveryPassword(requestContext, number, request.recoveryPassword());
     }
 
     return verificationType;
@@ -97,10 +108,13 @@ public class PhoneVerificationTokenManager {
     }
   }
 
-  private void verifyByRecoveryPassword(final String number, final byte[] recoveryPassword)
+  private void verifyByRecoveryPassword(final ContainerRequestContext requestContext, final String number, final byte[] recoveryPassword)
       throws InterruptedException {
+    if (!registrationRecoveryChecker.checkRegistrationRecoveryAttempt(requestContext, number)) {
+      throw new ForbiddenException("recoveryPassword couldn't be verified");
+    }
     try {
-      final boolean verified = registrationRecoveryPasswordsManager.verify(number, recoveryPassword)
+      final boolean verified = registrationRecoveryPasswordsManager.verify(phoneNumberIdentifiers.getPhoneNumberIdentifier(number).join(), recoveryPassword)
           .get(VERIFICATION_TIMEOUT_SECONDS, TimeUnit.SECONDS);
       if (!verified) {
         throw new ForbiddenException("recoveryPassword couldn't be verified");

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

@@ -0,0 +1,103 @@
+/*
+ * Copyright 2025 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+package org.whispersystems.textsecuregcm.auth;
+
+import java.time.Clock;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneOffset;
+import java.time.temporal.ChronoUnit;
+import java.util.Iterator;
+import java.util.Objects;
+import java.util.stream.Stream;
+import org.jetbrains.annotations.NotNull;
+
+/// A validated range of days for which a credential may be issued.
+public class RedemptionRange implements Iterable<Instant> {
+
+  public static final Duration MAX_REDEMPTION_DURATION = Duration.ofDays(7);
+
+  /// The first day for which a credential should be issued
+  private final LocalDate from;
+
+  /// The last day for which a credential should be issued
+  private final LocalDate end;
+
+  private RedemptionRange(final LocalDate from, final LocalDate end) {
+    this.from = from;
+    this.end = end;
+  }
+
+  ///  Construct a {@link RedemptionRange} if the provided day bounds are valid.
+  ///
+  /// The redemption bounds must satisfy:
+  ///   - `redemptionEnd` >= `redemptionStart`
+  ///   - `redemptionStart` and `redemptionEnd` are day-aligned
+  ///   - `redemptionStart` is yesterday or later
+  ///   - `redemptionEnd` is tomorrow + `MAX_REDEMPTION_DURATION` or earlier
+  ///   - The number of days requested is less than `MAX_REDEMPTION_DURATION`
+  ///
+  /// @param clock           Clock to use to get current day
+  /// @param redemptionStart The first day included in the range
+  /// @param redemptionEnd   The last day included in the range
+  /// @return A {@link RedemptionRange} that can be used to iterate each day between `redemptionStart` and
+  ///  `redemptionEnd`
+  /// @throws IllegalArgumentException if the redemption bounds were not valid
+  public static RedemptionRange inclusive(Clock clock, Instant redemptionStart, Instant redemptionEnd)
+      throws IllegalArgumentException {
+    final Instant today = clock.instant().truncatedTo(ChronoUnit.DAYS);
+    final Instant yesterday = today.minus(Duration.ofDays(1));
+
+    if (redemptionStart.isAfter(redemptionEnd)) {
+      throw new IllegalArgumentException("end of range must be after start of range");
+    }
+
+    if (!redemptionStart.truncatedTo(ChronoUnit.DAYS).equals(redemptionStart)
+        || !redemptionEnd.truncatedTo(ChronoUnit.DAYS).equals(redemptionEnd)) {
+      throw new IllegalArgumentException("timestamps must be day aligned");
+    }
+
+    if (redemptionStart.isBefore(yesterday)) {
+      throw new IllegalArgumentException("start of range too far in the past");
+    }
+
+    if (redemptionEnd.isAfter(today.plus(MAX_REDEMPTION_DURATION).plus(Duration.ofDays(1)))) {
+      throw new IllegalArgumentException("end of range too far in the future");
+    }
+
+    if (redemptionEnd.isAfter(redemptionStart.plus(MAX_REDEMPTION_DURATION))) {
+      throw new IllegalArgumentException("redemption window too large");
+    }
+
+    return new RedemptionRange(
+        LocalDate.ofInstant(redemptionStart, ZoneOffset.UTC),
+        LocalDate.ofInstant(redemptionEnd, ZoneOffset.UTC));
+  }
+
+  @Override
+  public @NotNull Iterator<Instant> iterator() {
+    final Instant fromInstant = from.atStartOfDay(ZoneOffset.UTC).toInstant();
+    final Instant endInstant = end.atStartOfDay(ZoneOffset.UTC).toInstant();
+    return Stream
+        .iterate(fromInstant, redemptionTime -> redemptionTime.plus(Duration.ofDays(1)))
+        .takeWhile(redemptionTime -> !redemptionTime.isAfter(endInstant))
+        .iterator();
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    RedemptionRange that = (RedemptionRange) o;
+    return Objects.equals(from, that.from) && Objects.equals(end, that.end);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(from, end);
+  }
+}

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

@@ -12,19 +12,19 @@ import io.micrometer.core.instrument.DistributionSummary;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.Tags;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
 import javax.annotation.Nullable;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
 import org.apache.commons.lang3.StringUtils;
 import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException;
 import org.whispersystems.textsecuregcm.entities.PhoneVerificationRequest;
 import org.whispersystems.textsecuregcm.entities.RegistrationLockFailure;
+import org.whispersystems.textsecuregcm.identity.IdentityType;
 import org.whispersystems.textsecuregcm.limits.RateLimiters;
 import org.whispersystems.textsecuregcm.metrics.UserAgentTagUtil;
-import org.whispersystems.textsecuregcm.push.ClientPresenceManager;
 import org.whispersystems.textsecuregcm.push.NotPushRegisteredException;
 import org.whispersystems.textsecuregcm.push.PushNotificationManager;
 import org.whispersystems.textsecuregcm.storage.Account;
@@ -53,20 +53,21 @@ public class RegistrationLockVerificationManager {
   private static final String PHONE_VERIFICATION_TYPE_TAG_NAME = "phoneVerificationType";
 
   private final AccountsManager accounts;
-  private final ClientPresenceManager clientPresenceManager;
+  private final DisconnectionRequestManager disconnectionRequestManager;
   private final ExternalServiceCredentialsGenerator svr2CredentialGenerator;
   private final RateLimiters rateLimiters;
   private final RegistrationRecoveryPasswordsManager registrationRecoveryPasswordsManager;
   private final PushNotificationManager pushNotificationManager;
 
   public RegistrationLockVerificationManager(
-      final AccountsManager accounts, final ClientPresenceManager clientPresenceManager,
+      final AccountsManager accounts,
+      final DisconnectionRequestManager disconnectionRequestManager,
       final ExternalServiceCredentialsGenerator svr2CredentialGenerator,
       final RegistrationRecoveryPasswordsManager registrationRecoveryPasswordsManager,
       final PushNotificationManager pushNotificationManager,
       final RateLimiters rateLimiters) {
     this.accounts = accounts;
-    this.clientPresenceManager = clientPresenceManager;
+    this.disconnectionRequestManager = disconnectionRequestManager;
     this.svr2CredentialGenerator = svr2CredentialGenerator;
     this.registrationRecoveryPasswordsManager = registrationRecoveryPasswordsManager;
     this.pushNotificationManager = pushNotificationManager;
@@ -138,8 +139,6 @@ public class RegistrationLockVerificationManager {
       // Freezing the existing account credentials will definitively start the reglock timeout.
       // Until the timeout, the current reglock can still be supplied,
       // along with phone number verification, to restore access.
-      final ExternalServiceCredentials existingSvr2Credentials = svr2CredentialGenerator.generateForUuid(account.getUuid());
-
       final Account updatedAccount;
       if (!alreadyLocked) {
         updatedAccount = accounts.update(account, Account::lockAuthTokenHash);
@@ -154,11 +153,11 @@ public class RegistrationLockVerificationManager {
       // This allows users to re-register via registration recovery password
       // instead of always being forced to fall back to SMS verification.
       if (!phoneVerificationType.equals(PhoneVerificationRequest.VerificationType.RECOVERY_PASSWORD) || clientRegistrationLock != null) {
-        registrationRecoveryPasswordsManager.removeForNumber(updatedAccount.getNumber());
+        registrationRecoveryPasswordsManager.remove(updatedAccount.getIdentifier(IdentityType.PNI));
       }
 
       final List<Byte> deviceIds = updatedAccount.getDevices().stream().map(Device::getId).toList();
-      clientPresenceManager.disconnectAllPresences(updatedAccount.getUuid(), deviceIds);
+      disconnectionRequestManager.requestDisconnection(updatedAccount.getUuid(), deviceIds);
 
       try {
         // Send a push notification that prompts the client to attempt login and fail due to locked credentials
@@ -168,11 +167,20 @@ public class RegistrationLockVerificationManager {
       }
 
       throw new WebApplicationException(Response.status(FAILURE_HTTP_STATUS)
-          .entity(new RegistrationLockFailure(existingRegistrationLock.getTimeRemaining().toMillis(),
-              existingRegistrationLock.needsFailureCredentials() ? existingSvr2Credentials : null))
+          .entity(new RegistrationLockFailure(
+              existingRegistrationLock.getTimeRemaining().toMillis(),
+              svr2FailureCredentials(existingRegistrationLock, updatedAccount)))
           .build());
     }
 
     rateLimiters.getPinLimiter().clear(phoneNumber);
   }
+
+  private @Nullable ExternalServiceCredentials svr2FailureCredentials(final StoredRegistrationLock existingRegistrationLock, final Account account) {
+    if (!existingRegistrationLock.needsFailureCredentials()) {
+      return null;
+    }
+    return svr2CredentialGenerator.generateForUuid(account.getUuid());
+  }
+
 }

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

@@ -80,9 +80,4 @@ public class StoredRegistrationLock {
       return false;
     }
   }
-
-  @VisibleForTesting
-  public StoredRegistrationLock forTime(long timestamp) {
-    return new StoredRegistrationLock(registrationLock, registrationLockSalt, Instant.ofEpochMilli(timestamp));
-  }
 }

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

@@ -5,10 +5,16 @@
 
 package org.whispersystems.textsecuregcm.auth;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
-public record TurnToken(String username, String password, List<String> urls, List<String> urlsWithIps, String hostname) {
-  public TurnToken(String username, String password, List<String> urls) {
-    this(username, password, urls, null, null);
-  }
+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/TurnTokenGenerator.java

@@ -1,86 +0,0 @@
-/*
- * Copyright 2013-2020 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.auth;
-
-import org.whispersystems.textsecuregcm.calls.routing.TurnServerOptions;
-import org.whispersystems.textsecuregcm.configuration.TurnUriConfiguration;
-import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;
-import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicTurnConfiguration;
-import org.whispersystems.textsecuregcm.storage.DynamicConfigurationManager;
-import org.whispersystems.textsecuregcm.util.Pair;
-import org.whispersystems.textsecuregcm.util.Util;
-import org.whispersystems.textsecuregcm.util.WeightedRandomSelect;
-
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.Base64;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-
-public class TurnTokenGenerator {
-
-  private final DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager;
-
-  private final byte[] turnSecret;
-
-  private static final String ALGORITHM = "HmacSHA1";
-
-  public TurnTokenGenerator(final DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager,
-      final byte[] turnSecret) {
-
-    this.dynamicConfigurationManager = dynamicConfigurationManager;
-    this.turnSecret = turnSecret;
-  }
-
-  public TurnToken generate(final UUID aci) {
-    return generateToken(null, null, urls(aci));
-  }
-
-  public TurnToken generateWithTurnServerOptions(TurnServerOptions options) {
-    return generateToken(options.hostname(), options.urlsWithIps(), options.urlsWithHostname());
-  }
-
-  private TurnToken generateToken(String hostname, List<String> urlsWithIps, List<String> urlsWithHostname) {
-    try {
-      final Mac mac = Mac.getInstance(ALGORITHM);
-      final long validUntilSeconds = Instant.now().plus(Duration.ofDays(1)).getEpochSecond();
-      final long user = Util.ensureNonNegativeInt(new SecureRandom().nextInt());
-      final String userTime = validUntilSeconds + ":" + user;
-
-      mac.init(new SecretKeySpec(turnSecret, ALGORITHM));
-      final String password = Base64.getEncoder().encodeToString(mac.doFinal(userTime.getBytes()));
-
-      return new TurnToken(userTime, password, urlsWithHostname, urlsWithIps, hostname);
-    } catch (final NoSuchAlgorithmException | InvalidKeyException e) {
-      throw new AssertionError(e);
-    }
-  }
-
-  private List<String> urls(final UUID aci) {
-    final DynamicTurnConfiguration turnConfig = dynamicConfigurationManager.getConfiguration().getTurnConfiguration();
-
-    // Check if number is enrolled to test out specific turn servers
-    final Optional<TurnUriConfiguration> enrolled = turnConfig.getUriConfigs().stream()
-        .filter(config -> config.getEnrolledAcis().contains(aci))
-        .findFirst();
-
-    if (enrolled.isPresent()) {
-      return enrolled.get().getUris();
-    }
-
-    // Otherwise, select from turn server sets by weighted choice
-    return WeightedRandomSelect.select(turnConfig
-        .getUriConfigs()
-        .stream()
-        .map(c -> new Pair<>(c.getUris(), c.getWeight())).toList());
-  }
-}

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

@@ -7,6 +7,9 @@ package org.whispersystems.textsecuregcm.auth;
 
 import org.whispersystems.textsecuregcm.storage.Account;
 import java.security.MessageDigest;
+import java.util.Collection;
+import java.util.function.Predicate;
+import java.util.stream.IntStream;
 
 public class UnidentifiedAccessUtil {
 
@@ -31,4 +34,42 @@ public class UnidentifiedAccessUtil {
         .map(targetUnidentifiedAccessKey -> MessageDigest.isEqual(targetUnidentifiedAccessKey, unidentifiedAccessKey))
         .orElse(false);
   }
+
+  /**
+   * Checks whether an action (e.g. sending a message or retrieving pre-keys) may be taken on the collection of target
+   * accounts by an actor presenting the given combined unidentified access key.
+   *
+   * @param targetAccounts the accounts on which an actor wishes to take an action
+   * @param combinedUnidentifiedAccessKey the unidentified access key presented by the actor
+   *
+   * @return {@code true} if an actor presenting the given unidentified access key has permission to take an action on
+   * the target accounts or {@code false} otherwise
+   */
+  public static boolean checkUnidentifiedAccess(final Collection<Account> targetAccounts, final byte[] combinedUnidentifiedAccessKey) {
+    return MessageDigest.isEqual(getCombinedUnidentifiedAccessKey(targetAccounts), combinedUnidentifiedAccessKey);
+  }
+
+  /**
+   * Calculates a combined unidentified access key for the given collection of accounts.
+   *
+   * @param accounts the accounts from which to derive a combined unidentified access key
+   * @return a combined unidentified access key
+   *
+   * @throws IllegalArgumentException if one or more of the given accounts had an unidentified access key with an
+   * unexpected length
+   */
+  public static byte[] getCombinedUnidentifiedAccessKey(final Collection<Account> accounts) {
+    return accounts.stream()
+        .filter(Predicate.not(Account::isUnrestrictedUnidentifiedAccess))
+        .map(account ->
+            account.getUnidentifiedAccessKey()
+                .filter(b -> b.length == UnidentifiedAccessUtil.UNIDENTIFIED_ACCESS_KEY_LENGTH)
+                .orElseThrow(IllegalArgumentException::new))
+        .reduce(new byte[UnidentifiedAccessUtil.UNIDENTIFIED_ACCESS_KEY_LENGTH],
+            (a, b) -> {
+              final byte[] xor = new byte[UnidentifiedAccessUtil.UNIDENTIFIED_ACCESS_KEY_LENGTH];
+              IntStream.range(0, UnidentifiedAccessUtil.UNIDENTIFIED_ACCESS_KEY_LENGTH).forEach(i -> xor[i] = (byte) (a[i] ^ b[i]));
+              return xor;
+            });
+  }
 }

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

@@ -1,38 +0,0 @@
-/*
- * Copyright 2021 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.auth;
-
-import org.glassfish.jersey.server.monitoring.ApplicationEvent;
-import org.glassfish.jersey.server.monitoring.ApplicationEventListener;
-import org.glassfish.jersey.server.monitoring.RequestEvent;
-import org.glassfish.jersey.server.monitoring.RequestEventListener;
-import org.whispersystems.textsecuregcm.push.ClientPresenceManager;
-import org.whispersystems.textsecuregcm.storage.AccountsManager;
-
-/**
- * Delegates request events to a listener that watches for intra-request changes that require websocket refreshes
- */
-public class WebsocketRefreshApplicationEventListener implements ApplicationEventListener {
-
-  private final WebsocketRefreshRequestEventListener websocketRefreshRequestEventListener;
-
-  public WebsocketRefreshApplicationEventListener(final AccountsManager accountsManager,
-      final ClientPresenceManager clientPresenceManager) {
-
-    this.websocketRefreshRequestEventListener = new WebsocketRefreshRequestEventListener(clientPresenceManager,
-        new AuthEnablementRefreshRequirementProvider(accountsManager),
-        new PhoneNumberChangeRefreshRequirementProvider(accountsManager));
-  }
-
-  @Override
-  public void onEvent(final ApplicationEvent event) {
-  }
-
-  @Override
-  public RequestEventListener onRequest(final RequestEvent requestEvent) {
-    return websocketRefreshRequestEventListener;
-  }
-}

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

@@ -1,74 +0,0 @@
-/*
- * Copyright 2013-2021 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.auth;
-
-import static org.whispersystems.textsecuregcm.metrics.MetricsUtil.name;
-
-import io.micrometer.core.instrument.Counter;
-import io.micrometer.core.instrument.Metrics;
-import java.util.Arrays;
-import java.util.concurrent.atomic.AtomicInteger;
-import javax.ws.rs.container.ResourceInfo;
-import javax.ws.rs.core.Context;
-import org.glassfish.jersey.server.monitoring.RequestEvent;
-import org.glassfish.jersey.server.monitoring.RequestEvent.Type;
-import org.glassfish.jersey.server.monitoring.RequestEventListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.whispersystems.textsecuregcm.push.ClientPresenceManager;
-
-public class WebsocketRefreshRequestEventListener implements RequestEventListener {
-
-  private final ClientPresenceManager clientPresenceManager;
-  private final WebsocketRefreshRequirementProvider[] providers;
-
-  private static final Counter DISPLACED_ACCOUNTS = Metrics.counter(
-      name(WebsocketRefreshRequestEventListener.class, "displacedAccounts"));
-
-  private static final Counter DISPLACED_DEVICES = Metrics.counter(
-      name(WebsocketRefreshRequestEventListener.class, "displacedDevices"));
-
-  private static final Logger logger = LoggerFactory.getLogger(WebsocketRefreshRequestEventListener.class);
-
-  public WebsocketRefreshRequestEventListener(
-      final ClientPresenceManager clientPresenceManager,
-      final WebsocketRefreshRequirementProvider... providers) {
-
-    this.clientPresenceManager = clientPresenceManager;
-    this.providers = providers;
-  }
-
-  @Context
-  private ResourceInfo resourceInfo;
-
-  @Override
-  public void onEvent(final RequestEvent event) {
-    if (event.getType() == Type.REQUEST_FILTERED) {
-      for (final WebsocketRefreshRequirementProvider provider : providers) {
-        provider.handleRequestFiltered(event);
-      }
-    } else if (event.getType() == Type.FINISHED) {
-      final AtomicInteger displacedDevices = new AtomicInteger(0);
-
-      Arrays.stream(providers)
-          .flatMap(provider -> provider.handleRequestFinished(event).stream())
-          .distinct()
-          .forEach(pair -> {
-            try {
-              displacedDevices.incrementAndGet();
-              clientPresenceManager.disconnectPresence(pair.first(), pair.second());
-            } catch (final Exception e) {
-              logger.error("Could not displace device presence", e);
-            }
-          });
-
-      if (displacedDevices.get() > 0) {
-        DISPLACED_ACCOUNTS.increment();
-        DISPLACED_DEVICES.increment(displacedDevices.get());
-      }
-    }
-  }
-}

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

@@ -1,34 +0,0 @@
-/*
- * Copyright 2013-2021 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.auth;
-
-import java.util.List;
-import java.util.UUID;
-import org.glassfish.jersey.server.monitoring.RequestEvent;
-import org.whispersystems.textsecuregcm.util.Pair;
-
-/**
- * A websocket refresh requirement provider watches for intra-request changes (e.g. to authentication status) that
- * require a websocket refresh.
- */
-public interface WebsocketRefreshRequirementProvider {
-
-  /**
-   * Processes a request after filters have run and the request has been mapped to a destination controller.
-   *
-   * @param requestEvent the request event to observe
-   */
-  void handleRequestFiltered(RequestEvent requestEvent);
-
-  /**
-   * Processes a request after all normal request handling has been completed.
-   *
-   * @param requestEvent the request event to observe
-   * @return a list of pairs of account UUID/device ID pairs identifying websockets that need to be refreshed as a
-   * result of the observed request
-   */
-  List<Pair<UUID, Byte>> handleRequestFinished(RequestEvent requestEvent);
-}

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

@@ -7,7 +7,6 @@ package org.whispersystems.textsecuregcm.auth.grpc;
 
 import io.grpc.Context;
 import io.grpc.Status;
-import java.util.UUID;
 import javax.annotation.Nullable;
 import org.whispersystems.textsecuregcm.storage.Device;
 
@@ -16,8 +15,7 @@ import org.whispersystems.textsecuregcm.storage.Device;
  */
 public class AuthenticationUtil {
 
-  static final Context.Key<UUID> CONTEXT_AUTHENTICATED_ACCOUNT_IDENTIFIER_KEY = Context.key("authenticated-aci");
-  static final Context.Key<Byte> CONTEXT_AUTHENTICATED_DEVICE_IDENTIFIER_KEY = Context.key("authenticated-device-id");
+  static final Context.Key<AuthenticatedDevice> CONTEXT_AUTHENTICATED_DEVICE = Context.key("authenticated-device");
 
   /**
    * Returns the account/device authenticated in the current gRPC context or throws an "unauthenticated" exception if
@@ -29,11 +27,10 @@ public class AuthenticationUtil {
    * could be retrieved from the current gRPC context
    */
   public static AuthenticatedDevice requireAuthenticatedDevice() {
-    @Nullable final UUID accountIdentifier = CONTEXT_AUTHENTICATED_ACCOUNT_IDENTIFIER_KEY.get();
-    @Nullable final Byte deviceId = CONTEXT_AUTHENTICATED_DEVICE_IDENTIFIER_KEY.get();
+    @Nullable final AuthenticatedDevice authenticatedDevice = CONTEXT_AUTHENTICATED_DEVICE.get();
 
-    if (accountIdentifier != null && deviceId != null) {
-      return new AuthenticatedDevice(accountIdentifier, deviceId);
+    if (authenticatedDevice != null) {
+      return authenticatedDevice;
     }
 
     throw Status.UNAUTHENTICATED.asRuntimeException();

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

@@ -1,85 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.auth.grpc;
-
-import com.google.common.annotations.VisibleForTesting;
-import io.dropwizard.auth.basic.BasicCredentials;
-import io.grpc.Context;
-import io.grpc.Contexts;
-import io.grpc.Metadata;
-import io.grpc.ServerCall;
-import io.grpc.ServerCallHandler;
-import io.grpc.ServerInterceptor;
-import io.grpc.Status;
-import java.util.Optional;
-import org.apache.commons.lang3.StringUtils;
-import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount;
-import org.whispersystems.textsecuregcm.auth.AccountAuthenticator;
-import org.whispersystems.textsecuregcm.util.HeaderUtils;
-
-/**
- * A basic credential authentication interceptor enforces the presence of a valid username and password on every call.
- * Callers supply credentials by providing a username (UUID and optional device ID) and password pair in the
- * {@code x-signal-basic-auth-credentials} call header.
- * <p/>
- * Downstream services can retrieve the identity of the authenticated caller using methods in
- * {@link AuthenticationUtil}.
- * <p/>
- * Note that this authentication, while fully functional, is intended only for development and testing purposes and is
- * intended to be replaced with a more robust and efficient strategy before widespread client adoption.
- *
- * @see AuthenticationUtil
- * @see AccountAuthenticator
- */
-public class BasicCredentialAuthenticationInterceptor implements ServerInterceptor {
-
-  private final AccountAuthenticator accountAuthenticator;
-
-  @VisibleForTesting
-  static final Metadata.Key<String> BASIC_CREDENTIALS =
-      Metadata.Key.of("x-signal-auth", Metadata.ASCII_STRING_MARSHALLER);
-
-  private static final Metadata EMPTY_TRAILERS = new Metadata();
-
-  public BasicCredentialAuthenticationInterceptor(final AccountAuthenticator accountAuthenticator) {
-    this.accountAuthenticator = accountAuthenticator;
-  }
-
-  @Override
-  public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
-      final ServerCall<ReqT, RespT> call,
-      final Metadata headers,
-      final ServerCallHandler<ReqT, RespT> next) {
-
-    final String authHeader = headers.get(BASIC_CREDENTIALS);
-
-    if (StringUtils.isNotBlank(authHeader)) {
-      final Optional<BasicCredentials> maybeCredentials = HeaderUtils.basicCredentialsFromAuthHeader(authHeader);
-      if (maybeCredentials.isEmpty()) {
-        call.close(Status.UNAUTHENTICATED.withDescription("Could not parse credentials"), EMPTY_TRAILERS);
-      } else {
-        final Optional<AuthenticatedAccount> maybeAuthenticatedAccount =
-            accountAuthenticator.authenticate(maybeCredentials.get());
-
-        if (maybeAuthenticatedAccount.isPresent()) {
-          final AuthenticatedAccount authenticatedAccount = maybeAuthenticatedAccount.get();
-
-          final Context context = Context.current()
-              .withValue(AuthenticationUtil.CONTEXT_AUTHENTICATED_ACCOUNT_IDENTIFIER_KEY, authenticatedAccount.getAccount().getUuid())
-              .withValue(AuthenticationUtil.CONTEXT_AUTHENTICATED_DEVICE_IDENTIFIER_KEY, authenticatedAccount.getAuthenticatedDevice().getId());
-
-          return Contexts.interceptCall(context, call, headers, next);
-        } else {
-          call.close(Status.UNAUTHENTICATED.withDescription("Credentials not accepted"), EMPTY_TRAILERS);
-        }
-      }
-    } else {
-      call.close(Status.UNAUTHENTICATED.withDescription("No credentials provided"), EMPTY_TRAILERS);
-    }
-
-    return new ServerCall.Listener<>() {};
-  }
-}

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

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2025 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+package org.whispersystems.textsecuregcm.auth.grpc;
+
+import io.grpc.Metadata;
+import io.grpc.ServerCall;
+import io.grpc.ServerCallHandler;
+import io.grpc.ServerInterceptor;
+import io.grpc.Status;
+
+/**
+ * A "prohibit authentication" interceptor ensures that requests to endpoints that should be invoked anonymously do not
+ * contain an authorization header in the request metdata. Calls with an associated authenticated device are closed with
+ * an {@code UNAUTHENTICATED} status.
+ */
+public class ProhibitAuthenticationInterceptor implements ServerInterceptor {
+
+  @Override
+  public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(final ServerCall<ReqT, RespT> call,
+      final Metadata headers, final ServerCallHandler<ReqT, RespT> next) {
+    final String authHeaderString = headers.get(Metadata.Key.of(RequireAuthenticationInterceptor.AUTHORIZATION_HEADER, Metadata.ASCII_STRING_MARSHALLER));
+    if (authHeaderString != null) {
+      call.close(Status.UNAUTHENTICATED.withDescription("authorization header forbidden"), new Metadata());
+      return new ServerCall.Listener<>() {};
+    }
+    return next.startCall(call, headers);
+  }
+}

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

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2025 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+package org.whispersystems.textsecuregcm.auth.grpc;
+
+import io.dropwizard.auth.basic.BasicCredentials;
+import io.grpc.Context;
+import io.grpc.Contexts;
+import io.grpc.Metadata;
+import io.grpc.ServerCall;
+import io.grpc.ServerCallHandler;
+import io.grpc.ServerInterceptor;
+import io.grpc.Status;
+import java.util.Optional;
+import org.whispersystems.textsecuregcm.auth.AccountAuthenticator;
+import org.whispersystems.textsecuregcm.grpc.ServerInterceptorUtil;
+import org.whispersystems.textsecuregcm.util.HeaderUtils;
+
+/**
+ * A "require authentication" interceptor authenticates requests and attaches the {@link AuthenticatedDevice} to the
+ * current gRPC context. Calls without authentication or with invalid credentials are closed with an
+ * {@code UNAUTHENTICATED} status. If a call's authentication status cannot be determined (i.e. because the accounts
+ * database is unavailable), the interceptor will reject the call with a status of {@code UNAVAILABLE}.
+ */
+public class RequireAuthenticationInterceptor implements ServerInterceptor {
+
+  static final String AUTHORIZATION_HEADER = "authorization";
+
+  private final AccountAuthenticator authenticator;
+
+  public RequireAuthenticationInterceptor(final AccountAuthenticator authenticator) {
+    this.authenticator = authenticator;
+  }
+
+  @Override
+  public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(final ServerCall<ReqT, RespT> call,
+      final Metadata headers, final ServerCallHandler<ReqT, RespT> next) {
+    final String authHeaderString = headers.get(
+        Metadata.Key.of(AUTHORIZATION_HEADER, Metadata.ASCII_STRING_MARSHALLER));
+
+    if (authHeaderString == null) {
+      return ServerInterceptorUtil.closeWithStatus(call,
+          Status.UNAUTHENTICATED.withDescription("missing authorization header"));
+    }
+
+    final Optional<BasicCredentials> basicCredentials = HeaderUtils.basicCredentialsFromAuthHeader(authHeaderString);
+    if (basicCredentials.isEmpty()) {
+      return ServerInterceptorUtil.closeWithStatus(call,
+          Status.UNAUTHENTICATED.withDescription("malformed authorization header"));
+    }
+
+    final Optional<org.whispersystems.textsecuregcm.auth.AuthenticatedDevice> authenticated =
+        authenticator.authenticate(basicCredentials.get());
+    if (authenticated.isEmpty()) {
+      return ServerInterceptorUtil.closeWithStatus(call,
+          Status.UNAUTHENTICATED.withDescription("invalid credentials"));
+    }
+
+    final AuthenticatedDevice authenticatedDevice = new AuthenticatedDevice(
+        authenticated.get().accountIdentifier(),
+        authenticated.get().deviceId());
+
+    return Contexts.interceptCall(Context.current()
+            .withValue(AuthenticationUtil.CONTEXT_AUTHENTICATED_DEVICE, authenticatedDevice),
+        call, headers, next);
+  }
+}

service/src/main/java/org/whispersystems/textsecuregcm/backup/BackupAuthManager.java

@@ -11,20 +11,35 @@ import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-import java.util.stream.Stream;
+import java.util.concurrent.CompletionStage;
+import java.util.stream.StreamSupport;
+import javax.annotation.Nullable;
 import org.signal.libsignal.zkgroup.GenericServerSecretParams;
 import org.signal.libsignal.zkgroup.InvalidInputException;
+import org.signal.libsignal.zkgroup.VerificationFailedException;
 import org.signal.libsignal.zkgroup.backups.BackupAuthCredentialRequest;
 import org.signal.libsignal.zkgroup.backups.BackupAuthCredentialResponse;
-import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;
+import org.signal.libsignal.zkgroup.backups.BackupCredentialType;
+import org.signal.libsignal.zkgroup.backups.BackupLevel;
+import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation;
+import org.signal.libsignal.zkgroup.receipts.ReceiptSerial;
+import org.signal.libsignal.zkgroup.receipts.ServerZkReceiptOperations;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.textsecuregcm.auth.RedemptionRange;
 import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException;
+import org.whispersystems.textsecuregcm.experiment.ExperimentEnrollmentManager;
+import org.whispersystems.textsecuregcm.limits.RateLimiter;
 import org.whispersystems.textsecuregcm.limits.RateLimiters;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
-import org.whispersystems.textsecuregcm.storage.DynamicConfigurationManager;
+import org.whispersystems.textsecuregcm.storage.Device;
+import org.whispersystems.textsecuregcm.storage.RedeemedReceiptsManager;
 import org.whispersystems.textsecuregcm.util.Util;
 
 /**
@@ -39,56 +54,133 @@ import org.whispersystems.textsecuregcm.util.Util;
  */
 public class BackupAuthManager {
 
-  private static final Duration MAX_REDEMPTION_DURATION = Duration.ofDays(7);
-  final static String BACKUP_EXPERIMENT_NAME = "backup";
+  private static final Logger logger = LoggerFactory.getLogger(BackupAuthManager.class);
+
+
+  final static Duration MAX_REDEMPTION_DURATION = Duration.ofDays(7);
   final static String BACKUP_MEDIA_EXPERIMENT_NAME = "backupMedia";
 
-  private final DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager;
+  private final ExperimentEnrollmentManager experimentEnrollmentManager;
   private final GenericServerSecretParams serverSecretParams;
+  private final ServerZkReceiptOperations serverZkReceiptOperations;
+  private final RedeemedReceiptsManager redeemedReceiptsManager;
   private final Clock clock;
   private final RateLimiters rateLimiters;
   private final AccountsManager accountsManager;
 
   public BackupAuthManager(
-      final DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager,
+      final ExperimentEnrollmentManager experimentEnrollmentManager,
       final RateLimiters rateLimiters,
       final AccountsManager accountsManager,
+      final ServerZkReceiptOperations serverZkReceiptOperations,
+      final RedeemedReceiptsManager redeemedReceiptsManager,
       final GenericServerSecretParams serverSecretParams,
       final Clock clock) {
-    this.dynamicConfigurationManager = dynamicConfigurationManager;
+    this.experimentEnrollmentManager = experimentEnrollmentManager;
     this.rateLimiters = rateLimiters;
     this.accountsManager = accountsManager;
+    this.serverZkReceiptOperations = serverZkReceiptOperations;
+    this.redeemedReceiptsManager = redeemedReceiptsManager;
     this.serverSecretParams = serverSecretParams;
     this.clock = clock;
   }
 
   /**
-   * Store a credential request containing a blinded backup-id for future use.
+   * Store credential requests containing blinded backup-ids for future use.
    *
-   * @param account                  The account using the backup-id
-   * @param backupAuthCredentialRequest A request containing the blinded backup-id
+   * @param account                         The account using the backup-id
+   * @param device                          The device setting the account backup-id
+   * @param messagesBackupCredentialRequest A request containing the blinded backup-id the client will use to upload
+   *                                        message backups
+   * @param mediaBackupCredentialRequest    A request containing the blinded backup-id the client will use to upload
+   *                                        media backups
    * @return A future that completes when the credentialRequest has been stored
    * @throws RateLimitExceededException If too many backup-ids have been committed
    */
-  public CompletableFuture<Void> commitBackupId(final Account account,
-      final BackupAuthCredentialRequest backupAuthCredentialRequest) throws RateLimitExceededException {
-    if (receiptLevel(account).isEmpty()) {
-      throw Status.PERMISSION_DENIED.withDescription("Backups not allowed on account").asRuntimeException();
+  public CompletableFuture<Void> commitBackupId(
+      final Account account,
+      final Device device,
+      final Optional<BackupAuthCredentialRequest> messagesBackupCredentialRequest,
+      final Optional<BackupAuthCredentialRequest> mediaBackupCredentialRequest) {
+    if (!device.isPrimary()) {
+      throw Status.PERMISSION_DENIED.withDescription("Only primary device can set backup-id").asRuntimeException();
     }
 
-    byte[] serializedRequest = backupAuthCredentialRequest.serialize();
-    byte[] existingRequest = account.getBackupCredentialRequest();
-    if (existingRequest != null && MessageDigest.isEqual(serializedRequest, existingRequest)) {
+    if (messagesBackupCredentialRequest.isEmpty() && mediaBackupCredentialRequest.isEmpty()) {
+      throw Status.INVALID_ARGUMENT
+          .withDescription("Must set at least one of message/media credential requests")
+          .asRuntimeException();
+    }
+
+    final byte[] storedMessageCredentialRequest = account.getBackupCredentialRequest(BackupCredentialType.MESSAGES)
+        .orElse(null);
+    final byte[] storedMediaCredentialRequest = account.getBackupCredentialRequest(BackupCredentialType.MEDIA)
+        .orElse(null);
+
+    // If the provided credential request is null, we want to set to the existing request
+    final byte[] targetMessageCredentialRequest = messagesBackupCredentialRequest
+        .map(BackupAuthCredentialRequest::serialize)
+        .orElse(storedMessageCredentialRequest);
+    final byte[] targetMediaCredentialRequest = mediaBackupCredentialRequest
+        .map(BackupAuthCredentialRequest::serialize)
+        .orElse(storedMediaCredentialRequest);
+
+    final boolean requiresMessageRotation =
+        !MessageDigest.isEqual(targetMessageCredentialRequest, storedMessageCredentialRequest);
+    final boolean requiresMediaRotation =
+        !MessageDigest.isEqual(targetMediaCredentialRequest, storedMediaCredentialRequest);
+
+    if (!requiresMessageRotation && !requiresMediaRotation) {
       // No need to update or enforce rate limits, this is the credential that the user has already
       // committed to.
       return CompletableFuture.completedFuture(null);
     }
 
-    rateLimiters.forDescriptor(RateLimiters.For.SET_BACKUP_ID).validate(account.getUuid());
+    CompletableFuture<Void> rateLimitFuture = CompletableFuture.completedFuture(null);
 
-    return this.accountsManager
-        .updateAsync(account, acc -> acc.setBackupCredentialRequest(serializedRequest))
-        .thenRun(Util.NOOP);
+    if (requiresMessageRotation) {
+      rateLimitFuture = rateLimitFuture.thenCombine(
+          rateLimiters.forDescriptor(RateLimiters.For.SET_BACKUP_ID).validateAsync(account.getUuid()),
+          (_, _) -> null);
+    }
+
+    if (requiresMediaRotation && hasActiveVoucher(account)) {
+      rateLimitFuture = rateLimitFuture.thenCombine(
+          rateLimiters.forDescriptor(RateLimiters.For.SET_PAID_MEDIA_BACKUP_ID).validateAsync(account.getUuid()),
+          (_, _) -> null);
+    }
+
+    return rateLimitFuture.thenCompose(ignored -> this.accountsManager
+            .updateAsync(account, a ->
+                a.setBackupCredentialRequests(targetMessageCredentialRequest, targetMediaCredentialRequest))
+            .thenRun(Util.NOOP))
+        .toCompletableFuture();
+  }
+
+  public record BackupIdRotationLimit(boolean hasPermitsRemaining, Duration nextPermitAvailable) {}
+
+  public CompletionStage<BackupIdRotationLimit> checkBackupIdRotationLimit(final Account account) {
+    final RateLimiter messagesLimiter = rateLimiters.forDescriptor(RateLimiters.For.SET_BACKUP_ID);
+    final RateLimiter mediaLimiter = rateLimiters.forDescriptor(RateLimiters.For.SET_PAID_MEDIA_BACKUP_ID);
+
+    final boolean isPaid = hasActiveVoucher(account);
+
+    final CompletionStage<Boolean> hasSetMessagesPermits =
+        messagesLimiter.hasAvailablePermitsAsync(account.getUuid(), 1);
+    final CompletionStage<Boolean> hasSetMediaPermits = isPaid
+        ? mediaLimiter.hasAvailablePermitsAsync(account.getUuid(), 1)
+        : CompletableFuture.completedFuture(true);
+
+    return hasSetMessagesPermits.thenCombine(hasSetMediaPermits, (hasMessage, hasMedia) -> {
+      if (hasMedia && hasMessage) {
+        return new BackupIdRotationLimit(true, Duration.ZERO);
+      } else {
+        final Duration timeToNextPermit = Collections.max(Arrays.asList(
+            messagesLimiter.config().permitRegenerationDuration(),
+            isPaid ? mediaLimiter.config().permitRegenerationDuration() : Duration.ZERO));
+        return new BackupIdRotationLimit(false, timeToNextPermit);
+      }
+    });
   }
 
   public record Credential(BackupAuthCredentialResponse credential, Instant redemptionTime) {}
@@ -98,45 +190,49 @@ public class BackupAuthManager {
    * <p>
    * This uses a {@link BackupAuthCredentialRequest} previous stored via {@link this#commitBackupId} to generate the
    * credentials.
+   * <p>
+   * If the account has a BackupVoucher allowing access to paid backups, credentials with a redemptionTime before the
+   * voucher's expiration will include paid backup access. If the BackupVoucher exists but is already expired, this
+   * method will also remove the expired voucher from the account.
    *
    * @param account         The account to create the credentials for
-   * @param redemptionStart The day (must be truncated to a day boundary) the first credential should be valid
-   * @param redemptionEnd   The day (must be truncated to a day boundary) the last credential should be valid
+   * @param credentialType  The type of backup credentials to create
+   * @param redemptionRange The time range to return credentials for
    * @return Credentials and the day on which they may be redeemed
    */
   public CompletableFuture<List<Credential>> getBackupAuthCredentials(
       final Account account,
-      final Instant redemptionStart,
-      final Instant redemptionEnd) {
+      final BackupCredentialType credentialType,
+      final RedemptionRange redemptionRange) {
 
-    final long receiptLevel = receiptLevel(account).orElseThrow(
-        () -> Status.PERMISSION_DENIED.withDescription("Backups not allowed on account").asRuntimeException());
-
-    final Instant startOfDay = clock.instant().truncatedTo(ChronoUnit.DAYS);
-    if (redemptionStart.isAfter(redemptionEnd) ||
-        redemptionStart.isBefore(startOfDay) ||
-        redemptionEnd.isAfter(startOfDay.plus(MAX_REDEMPTION_DURATION)) ||
-        !redemptionStart.equals(redemptionStart.truncatedTo(ChronoUnit.DAYS)) ||
-        !redemptionEnd.equals(redemptionEnd.truncatedTo(ChronoUnit.DAYS))) {
-
-      throw Status.INVALID_ARGUMENT.withDescription("invalid redemption window").asRuntimeException();
+    // If the account has an expired payment, clear it before continuing
+    if (hasExpiredVoucher(account)) {
+      return accountsManager.updateAsync(account, a -> {
+        // Re-check in case we raced with an update
+        if (hasExpiredVoucher(a)) {
+          a.setBackupVoucher(null);
+        }
+      }).thenCompose(updated -> getBackupAuthCredentials(updated, credentialType, redemptionRange));
     }
 
     // fetch the blinded backup-id the account should have previously committed to
-    final byte[] committedBytes = account.getBackupCredentialRequest();
-    if (committedBytes == null) {
-      throw Status.NOT_FOUND.withDescription("No blinded backup-id has been added to the account").asRuntimeException();
-    }
+    final byte[] committedBytes = account.getBackupCredentialRequest(credentialType)
+        .orElseThrow(() -> Status.NOT_FOUND.withDescription("No blinded backup-id has been added to the account").asRuntimeException());
 
     try {
+      final BackupLevel defaultBackupLevel = configuredBackupLevel(account);
+
       // create a credential for every day in the requested period
       final BackupAuthCredentialRequest credentialReq = new BackupAuthCredentialRequest(committedBytes);
-      return CompletableFuture.completedFuture(Stream
-          .iterate(redemptionStart, curr -> curr.plus(Duration.ofDays(1)))
-          .takeWhile(redemptionTime -> !redemptionTime.isAfter(redemptionEnd))
-          .map(redemption -> new Credential(
-              credentialReq.issueCredential(redemption, receiptLevel, serverSecretParams),
-              redemption))
+      return CompletableFuture.completedFuture(StreamSupport.stream(redemptionRange.spliterator(), false)
+          .map(redemptionTime -> {
+            // Check if the account has a voucher that's good for a certain receiptLevel at redemption time, otherwise
+            // use the default receipt level
+            final BackupLevel backupLevel = storedBackupLevel(account, redemptionTime).orElse(defaultBackupLevel);
+            return new Credential(
+                credentialReq.issueCredential(redemptionTime, backupLevel, credentialType, serverSecretParams),
+                redemptionTime);
+          })
           .toList());
     } catch (InvalidInputException e) {
       throw Status.INTERNAL
@@ -146,20 +242,128 @@ public class BackupAuthManager {
     }
   }
 
-  private Optional<Long> receiptLevel(final Account account) {
-    if (inExperiment(BACKUP_MEDIA_EXPERIMENT_NAME, account)) {
-      return Optional.of(BackupTier.MEDIA.getReceiptLevel());
+  /**
+   * Redeem a receipt to enable paid backups on the account.
+   *
+   * @param account                       The account to enable backups on
+   * @param receiptCredentialPresentation A ZK receipt presentation proving payment
+   * @return A future that completes successfully when the account has been updated
+   */
+  public CompletableFuture<Void> redeemReceipt(
+      final Account account,
+      final ReceiptCredentialPresentation receiptCredentialPresentation) {
+    try {
+      serverZkReceiptOperations.verifyReceiptCredentialPresentation(receiptCredentialPresentation);
+    } catch (VerificationFailedException e) {
+      throw Status.INVALID_ARGUMENT
+          .withDescription("receipt credential presentation verification failed")
+          .asRuntimeException();
     }
-    if (inExperiment(BACKUP_EXPERIMENT_NAME, account)) {
-      return Optional.of(BackupTier.MESSAGES.getReceiptLevel());
+    final ReceiptSerial receiptSerial = receiptCredentialPresentation.getReceiptSerial();
+    final Instant receiptExpiration = Instant.ofEpochSecond(receiptCredentialPresentation.getReceiptExpirationTime());
+    if (clock.instant().isAfter(receiptExpiration)) {
+      throw Status.INVALID_ARGUMENT.withDescription("receipt is already expired").asRuntimeException();
     }
-    return Optional.empty();
+
+    final long receiptLevel = receiptCredentialPresentation.getReceiptLevel();
+
+    if (BackupLevelUtil.fromReceiptLevel(receiptLevel) != BackupLevel.PAID) {
+      throw Status.INVALID_ARGUMENT
+          .withDescription("server does not recognize the requested receipt level")
+          .asRuntimeException();
+    }
+
+    if (account.getBackupCredentialRequest(BackupCredentialType.MEDIA).isEmpty()) {
+      throw Status.ABORTED
+          .withDescription("account must have a backup-id commitment")
+          .asRuntimeException();
+    }
+
+    return redeemedReceiptsManager
+        .put(receiptSerial, receiptExpiration.getEpochSecond(), receiptLevel, account.getUuid())
+        .thenCompose(receiptAllowed -> {
+          if (!receiptAllowed) {
+            throw Status.INVALID_ARGUMENT
+                .withDescription("receipt serial is already redeemed")
+                .asRuntimeException();
+          }
+          return extendBackupVoucher(account, new Account.BackupVoucher(receiptLevel, receiptExpiration));
+        });
   }
 
-  private boolean inExperiment(final String experimentName, final Account account) {
-    return dynamicConfigurationManager.getConfiguration()
-        .getExperimentEnrollmentConfiguration(experimentName)
-        .map(config -> config.getEnrolledUuids().contains(account.getUuid()))
-        .orElse(false);
+  /**
+   * Extend the duration of the backup voucher on an account.
+   *
+   * @param account The account to update
+   * @param backupVoucher The backup voucher to apply to this account
+   * @return A future that completes once the account has been updated to have at least the level and expiration
+   * in the provided voucher.
+   */
+  public CompletableFuture<Void> extendBackupVoucher(final Account account, final Account.BackupVoucher backupVoucher) {
+    return accountsManager.updateAsync(account, a -> {
+      // Receipt credential expirations must be day aligned. Make sure any manually set backupVoucher is also day
+      // aligned
+      final Account.BackupVoucher newPayment =  new Account.BackupVoucher(
+          backupVoucher.receiptLevel(),
+          backupVoucher.expiration().truncatedTo(ChronoUnit.DAYS));
+      final Account.BackupVoucher existingPayment = a.getBackupVoucher();
+      a.setBackupVoucher(merge(existingPayment, newPayment));
+    }).thenRun(Util.NOOP);
+  }
+
+  private static Account.BackupVoucher merge(@Nullable final Account.BackupVoucher prev,
+      final Account.BackupVoucher next) {
+    if (prev == null) {
+      return next;
+    }
+
+    if (next.receiptLevel() != prev.receiptLevel()) {
+      return next;
+    }
+
+    // If the new payment has the same receipt level as the old, select the further out of the two expiration times
+    if (prev.expiration().isAfter(next.expiration())) {
+      // This should be fairly rare, either a client reused an old receipt or we reduced the validity period
+      logger.warn(
+          "Redeemed receipt with an expiration at {} when we've previously had a redemption with a later expiration {}",
+          next.expiration(), prev.expiration());
+      return prev;
+    }
+    return next;
+  }
+
+  private boolean hasActiveVoucher(final Account account) {
+    return account.getBackupVoucher() != null && clock.instant().isBefore(account.getBackupVoucher().expiration());
+  }
+
+  private boolean hasExpiredVoucher(final Account account) {
+    return account.getBackupVoucher() != null && !hasActiveVoucher(account);
+  }
+
+  /**
+   * Get the receipt level stored in the {@link Account.BackupVoucher} on the account if it's present and not expired.
+   *
+   * @param account        The account to check
+   * @param redemptionTime The time to check against the expiration time
+   * @return The receipt level on the backup voucher, or empty if the account does not have one or it is expired
+   */
+  private Optional<BackupLevel> storedBackupLevel(final Account account, final Instant redemptionTime) {
+    return Optional.ofNullable(account.getBackupVoucher())
+        .filter(backupVoucher -> !redemptionTime.isAfter(backupVoucher.expiration()))
+        .map(Account.BackupVoucher::receiptLevel)
+        .map(BackupLevelUtil::fromReceiptLevel);
+  }
+
+  /**
+   * Get the backup receipt level that should be used by default for this account determined via configuration.
+   *
+   * @param account the account to check
+   * @return The default receipt level that should be used for the account if the account does not have a
+   * BackupVoucher.
+   */
+  private BackupLevel configuredBackupLevel(final Account account) {
+    return this.experimentEnrollmentManager.isEnrolled(account.getUuid(), BACKUP_MEDIA_EXPERIMENT_NAME)
+        ? BackupLevel.PAID
+        : BackupLevel.FREE;
   }
 }

service/src/main/java/org/whispersystems/textsecuregcm/backup/BackupLevelUtil.java

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+package org.whispersystems.textsecuregcm.backup;
+
+import org.signal.libsignal.zkgroup.backups.BackupLevel;
+
+public class BackupLevelUtil {
+  public static BackupLevel fromReceiptLevel(long receiptLevel) {
+    try {
+      return BackupLevel.fromValue(Math.toIntExact(receiptLevel));
+    } catch (ArithmeticException e) {
+      throw new IllegalArgumentException("Invalid receipt level: " + receiptLevel);
+    }
+  }
+}

service/src/main/java/org/whispersystems/textsecuregcm/backup/BackupMediaEncrypter.java

@@ -1,102 +0,0 @@
-package org.whispersystems.textsecuregcm.backup;
-
-import java.nio.ByteBuffer;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.util.List;
-import java.util.concurrent.Flow;
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.Mac;
-import javax.crypto.NoSuchPaddingException;
-import org.reactivestreams.FlowAdapters;
-import org.whispersystems.textsecuregcm.util.ExceptionUtils;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-public class BackupMediaEncrypter {
-
-  private final Cipher cipher;
-  private final Mac mac;
-
-  public BackupMediaEncrypter(final MediaEncryptionParameters encryptionParameters) {
-    cipher = initializeCipher(encryptionParameters);
-    mac = initializeMac(encryptionParameters);
-  }
-
-  public int outputSize(final int inputSize) {
-    return cipher.getIV().length + cipher.getOutputSize(inputSize) + mac.getMacLength();
-  }
-
-  /**
-   * Perform streaming encryption
-   *
-   * @param sourceBody A source of ByteBuffers, typically from an asynchronous HttpResponse
-   * @return A publisher that returns IV + AES/CBC/PKCS5Padding encrypted source + HMAC(IV + encrypted source) suitable
-   * to write with an asynchronous HttpRequest
-   */
-  public Flow.Publisher<ByteBuffer> encryptBody(Flow.Publisher<List<ByteBuffer>> sourceBody) {
-
-    // Write IV, encrypted payload, mac
-    final Flux<ByteBuffer> encryptedBody = Flux.concat(
-        Mono.fromSupplier(() -> {
-          mac.update(cipher.getIV());
-          return ByteBuffer.wrap(cipher.getIV());
-        }),
-        Flux.from(FlowAdapters.toPublisher(sourceBody))
-            .flatMap(buffers -> Flux.fromIterable(buffers))
-            .concatMap(byteBuffer -> {
-              final byte[] copy = new byte[byteBuffer.remaining()];
-              byteBuffer.get(copy);
-              final byte[] res = cipher.update(copy);
-              if (res == null) {
-                return Mono.empty();
-              } else {
-                mac.update(res);
-                return Mono.just(ByteBuffer.wrap(res));
-              }
-            }),
-        Mono.fromSupplier(() -> {
-          try {
-            final byte[] finalBytes = cipher.doFinal();
-            mac.update(finalBytes);
-            return ByteBuffer.wrap(finalBytes);
-          } catch (IllegalBlockSizeException | BadPaddingException e) {
-            throw ExceptionUtils.wrap(e);
-          }
-        }),
-        Mono.fromSupplier(() -> ByteBuffer.wrap(mac.doFinal())));
-    return FlowAdapters.toFlowPublisher(encryptedBody);
-  }
-
-  private static Mac initializeMac(final MediaEncryptionParameters encryptionParameters) {
-    try {
-      final Mac mac = Mac.getInstance("HmacSHA256");
-      mac.init(encryptionParameters.hmacSHA256Key());
-      return mac;
-    } catch (NoSuchAlgorithmException e) {
-      throw new AssertionError(e);
-    } catch (InvalidKeyException e) {
-      throw new IllegalArgumentException(e);
-    }
-  }
-
-  private static Cipher initializeCipher(final MediaEncryptionParameters encryptionParameters) {
-    try {
-      final Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
-      cipher.init(
-          Cipher.ENCRYPT_MODE,
-          encryptionParameters.aesEncryptionKey(),
-          encryptionParameters.iv());
-      return cipher;
-
-    } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
-      throw new AssertionError(e);
-    } catch (InvalidAlgorithmParameterException | InvalidKeyException e) {
-      throw new IllegalArgumentException(e);
-    }
-  }
-
-}

service/src/main/java/org/whispersystems/textsecuregcm/backup/BackupTier.java

@@ -1,34 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.backup;
-
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-public enum BackupTier {
-  NONE(0),
-  MESSAGES(10),
-  MEDIA(20);
-
-  private static Map<Long, BackupTier> LOOKUP = Arrays.stream(BackupTier.values())
-      .collect(Collectors.toMap(BackupTier::getReceiptLevel, Function.identity()));
-  private long receiptLevel;
-
-  private BackupTier(long receiptLevel) {
-    this.receiptLevel = receiptLevel;
-  }
-
-  long getReceiptLevel() {
-    return receiptLevel;
-  }
-
-  static Optional<BackupTier> fromReceiptLevel(long receiptLevel) {
-    return Optional.ofNullable(LOOKUP.get(receiptLevel));
-  }
-}

service/src/main/java/org/whispersystems/textsecuregcm/backup/BackupUploadDescriptor.java

@@ -7,7 +7,7 @@ package org.whispersystems.textsecuregcm.backup;
 
 import java.util.Map;
 
-public record MessageBackupUploadDescriptor(
+public record BackupUploadDescriptor(
     int cdn,
     String key,
     Map<String, String> headers,

service/src/main/java/org/whispersystems/textsecuregcm/backup/BackupsDb.java

@@ -1,29 +1,52 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
 package org.whispersystems.textsecuregcm.backup;
 
 import io.grpc.Status;
+import java.io.IOException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 import java.time.Clock;
 import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.HashMap;
+import java.util.HexFormat;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Predicate;
+import io.micrometer.core.instrument.DistributionSummary;
+import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.Tag;
+import io.micrometer.core.instrument.Tags;
+import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
+import org.signal.libsignal.zkgroup.backups.BackupLevel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.textsecuregcm.auth.AuthenticatedBackupUser;
+import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
+import org.whispersystems.textsecuregcm.metrics.UserAgentTagUtil;
 import org.whispersystems.textsecuregcm.util.AttributeValues;
 import org.whispersystems.textsecuregcm.util.ExceptionUtils;
 import org.whispersystems.textsecuregcm.util.Util;
+import reactor.core.publisher.Flux;
+import reactor.core.scheduler.Scheduler;
 import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
 import software.amazon.awssdk.services.dynamodb.model.ConditionalCheckFailedException;
+import software.amazon.awssdk.services.dynamodb.model.DeleteItemRequest;
 import software.amazon.awssdk.services.dynamodb.model.GetItemRequest;
+import software.amazon.awssdk.services.dynamodb.model.ReturnValue;
+import software.amazon.awssdk.services.dynamodb.model.ScanRequest;
 import software.amazon.awssdk.services.dynamodb.model.Update;
 import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest;
 
@@ -31,10 +54,30 @@ import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest;
  * Tracks backup metadata in a persistent store.
  * <p>
  * It's assumed that the caller has already validated that the backupUser being operated on has valid credentials and
- * possesses the appropriate {@link BackupTier} to perform the current operation.
+ * possesses the appropriate {@link BackupLevel} to perform the current operation.
+ * <p>
+ * Backup records track two timestamps indicating the last time that a user interacted with their backup. One for the
+ * last refresh that contained a credential including media level, and the other for any access. After a period of
+ * inactivity stale backups can be purged (either just the media, or the entire backup). Callers can discover what
+ * backups are stale and whether only the media or the entire backup is stale via {@link #getExpiredBackups}.
+ * <p>
+ * Because backup objects reside on a transactionally unrelated store, expiring anything from the backup requires a 2
+ * phase process. First the caller calls {@link #startExpiration} which will atomically update the user's backup
+ * directories and record the cdn directory that should be expired. Then the caller must delete the expired directory,
+ * calling {@link #finishExpiration} to clear the recorded expired prefix when complete. Since the user's backup
+ * directories have been swapped, the deleter does not have to account for a user coming back and starting to upload
+ * concurrently with the deletion.
+ * <p>
+ * If the directory deletion fails, a subsequent call to {@link #getExpiredBackups} will return the backup again
+ * indicating that the old expired prefix needs to be cleaned up before any other expiration action is taken. For
+ * example, if a media expiration fails and then in the next expiration pass the backup has become eligible for total
+ * deletion, the caller still must process the stale media expiration first before processing the full deletion.
  */
 public class BackupsDb {
 
+  private static final int DIR_NAME_LENGTH = generateDirName(new SecureRandom()).length();
+  public static final int BACKUP_DIRECTORY_PATH_LENGTH = DIR_NAME_LENGTH;
+  public static final int MEDIA_DIRECTORY_PATH_LENGTH = BACKUP_DIRECTORY_PATH_LENGTH + "/".length() + DIR_NAME_LENGTH;
   private static final Logger logger = LoggerFactory.getLogger(BackupsDb.class);
   static final int BACKUP_CDN = 3;
 
@@ -42,6 +85,8 @@ public class BackupsDb {
   private final String backupTableName;
   private final Clock clock;
 
+  private final SecureRandom secureRandom;
+
   // The backups table
 
   // B: 16 bytes that identifies the backup
@@ -50,7 +95,7 @@ public class BackupsDb {
   // garbage collection of archive objects.
   public static final String ATTR_LAST_REFRESH = "R";
   // N: Time in seconds since epoch of the last backup media refresh. This timestamp can only be updated if the client
-  // has BackupTier.MEDIA, and must be periodically updated to avoid garbage collection of media objects.
+  // has BackupLevel.PAID, and must be periodically updated to avoid garbage collection of media objects.
   public static final String ATTR_LAST_MEDIA_REFRESH = "MR";
   // B: A 32 byte public key that should be used to sign the presentation used to authenticate requests against the
   // backup-id
@@ -64,6 +109,12 @@ public class BackupsDb {
   // N: Time in seconds since epoch of last backup media usage recalculation. This timestamp is updated whenever we
   // recalculate the up-to-date bytes used by querying the cdn(s) directly.
   public static final String ATTR_MEDIA_USAGE_LAST_RECALCULATION = "MBTS";
+  // S: The name of the user's backup directory on the CDN
+  public static final String ATTR_BACKUP_DIR = "BD";
+  // S: The name of the user's media directory within the backup directory on the CDN
+  public static final String ATTR_MEDIA_DIR = "MD";
+  // S: A prefix pending deletion
+  public static final String ATTR_EXPIRED_PREFIX = "EP";
 
   public BackupsDb(
       final DynamoDbAsyncClient dynamoClient,
@@ -72,71 +123,112 @@ public class BackupsDb {
     this.dynamoClient = dynamoClient;
     this.backupTableName = backupTableName;
     this.clock = clock;
+    this.secureRandom = new SecureRandom();
   }
 
   /**
    * Set the public key associated with a backupId.
    *
-   * @param authenticatedBackupId   The backup-id bytes that should be associated with the provided public key
-   * @param authenticatedBackupTier The backup tier
-   * @param publicKey               The public key to associate with the backup id
+   * @param authenticatedBackupId    The backup-id bytes that should be associated with the provided public key
+   * @param authenticatedBackupLevel The backup level
+   * @param publicKey                The public key to associate with the backup id
    * @return A stage that completes when the public key has been set. If the backup-id already has a set public key that
    * does not match, the stage will be completed exceptionally with a {@link PublicKeyConflictException}
    */
   CompletableFuture<Void> setPublicKey(
       final byte[] authenticatedBackupId,
-      final BackupTier authenticatedBackupTier,
+      final BackupLevel authenticatedBackupLevel,
       final ECPublicKey publicKey) {
     final byte[] hashedBackupId = hashedBackupId(authenticatedBackupId);
-    return dynamoClient.updateItem(new UpdateBuilder(backupTableName, authenticatedBackupTier, hashedBackupId)
+    return dynamoClient.updateItem(new UpdateBuilder(backupTableName, authenticatedBackupLevel, hashedBackupId)
             .addSetExpression("#publicKey = :publicKey",
                 Map.entry("#publicKey", ATTR_PUBLIC_KEY),
                 Map.entry(":publicKey", AttributeValues.b(publicKey.serialize())))
+            // When the user sets a public key, we ensure that they have a backupDir/mediaDir assigned
+            .setDirectoryNamesIfMissing(secureRandom)
             .setRefreshTimes(clock)
             .withConditionExpression("attribute_not_exists(#publicKey) OR #publicKey = :publicKey")
             .updateItemBuilder()
             .build())
-        .exceptionally(throwable -> {
-          // There was already a row for this backup-id and it contained a different publicKey
-          if (ExceptionUtils.unwrap(throwable) instanceof ConditionalCheckFailedException) {
-            throw ExceptionUtils.wrap(new PublicKeyConflictException());
-          }
-          throw ExceptionUtils.wrap(throwable);
-        })
+        .exceptionally(ExceptionUtils.marshal(ConditionalCheckFailedException.class, e ->
+            // There was already a row for this backup-id and it contained a different publicKey
+            new PublicKeyConflictException()))
         .thenRun(Util.NOOP);
   }
 
-  CompletableFuture<Optional<byte[]>> retrievePublicKey(byte[] backupId) {
+  /**
+   * Data stored to authenticate a backup user
+   *
+   * @param publicKey The public key for the backup entry. All credentials for this backup user must be signed * by this
+   *                  public key for the credential to be valid
+   * @param backupDir The current backupDir for the backup user. If authentication is successful, the user may be given
+   *                  credentials for this backupDir on the CDN
+   * @param mediaDir  The current mediaDir for the backup user. If authentication is successful, the user may be given *
+   *                  credentials for the path backupDir/mediaDir on the CDN
+   */
+  record AuthenticationData(ECPublicKey publicKey, String backupDir, String mediaDir) {}
+
+  CompletableFuture<Optional<AuthenticationData>> retrieveAuthenticationData(byte[] backupId) {
     final byte[] hashedBackupId = hashedBackupId(backupId);
     return dynamoClient.getItem(GetItemRequest.builder()
             .tableName(backupTableName)
             .key(Map.of(KEY_BACKUP_ID_HASH, AttributeValues.b(hashedBackupId)))
             .consistentRead(true)
-            .projectionExpression("#publicKey")
-            .expressionAttributeNames(Map.of("#publicKey", ATTR_PUBLIC_KEY))
+            .projectionExpression("#publicKey,#backupDir,#mediaDir")
+            .expressionAttributeNames(Map.of(
+                "#publicKey", ATTR_PUBLIC_KEY,
+                "#backupDir", ATTR_BACKUP_DIR,
+                "#mediaDir", ATTR_MEDIA_DIR))
             .build())
-        .thenApply(response ->
-            AttributeValues.get(response.item(), ATTR_PUBLIC_KEY)
-                .map(AttributeValue::b)
-                .map(SdkBytes::asByteArray));
+        .thenApply(response -> extractStoredPublicKey(response.item())
+            .map(pubKey -> new AuthenticationData(
+                pubKey,
+                getDirName(response.item(), ATTR_BACKUP_DIR),
+                getDirName(response.item(), ATTR_MEDIA_DIR))));
   }
 
+  private static String getDirName(final Map<String, AttributeValue> item, final String attr) {
+    return AttributeValues.get(item, attr).map(AttributeValue::s).orElseThrow(() -> {
+      logger.error("Backups with public keys should have directory names");
+      return Status.INTERNAL
+          .withDescription("Backups with public keys must have directory names")
+          .asRuntimeException();
+    });
+  }
+
+  private static Optional<ECPublicKey> extractStoredPublicKey(final Map<String, AttributeValue> item) {
+    return AttributeValues.get(item, ATTR_PUBLIC_KEY)
+        .map(AttributeValue::b)
+        .map(SdkBytes::asByteArray)
+        .map(BackupsDb::deserializeStoredPublicKey);
+  }
+
+  private static ECPublicKey deserializeStoredPublicKey(final byte[] publicKeyBytes) {
+    try {
+      return new ECPublicKey(publicKeyBytes);
+    } catch (InvalidKeyException e) {
+      logger.error("Invalid publicKey {}", HexFormat.of().formatHex(publicKeyBytes), e);
+      throw Status.INTERNAL
+          .withCause(e)
+          .withDescription("Could not deserialize stored public key")
+          .asRuntimeException();
+    }
+  }
 
   /**
    * Update the quota in the backup table
    *
-   * @param backupUser  The backup user
+   * @param backupUser      The backup user
    * @param mediaBytesDelta The length of the media after encryption. A negative length implies media being removed
    * @param mediaCountDelta The number of media objects being added, or if negative, removed
    * @return A stage that completes successfully once the table are updated.
    */
-  CompletableFuture<Void> trackMedia(final AuthenticatedBackupUser backupUser, final long mediaCountDelta, final long mediaBytesDelta) {
-    final Instant now = clock.instant();
+  CompletableFuture<Void> trackMedia(final AuthenticatedBackupUser backupUser, final long mediaCountDelta,
+      final long mediaBytesDelta) {
     return dynamoClient
         .updateItem(
             // Update the media quota and TTL
             UpdateBuilder.forUser(backupTableName, backupUser)
-                .setRefreshTimes(now)
                 .incrementMediaBytes(mediaBytesDelta)
                 .incrementMediaCount(mediaCountDelta)
                 .updateItemBuilder()
@@ -150,31 +242,85 @@ public class BackupsDb {
    *
    * @param backupUser an already authorized backup user
    */
-  CompletableFuture<Void> ttlRefresh(final AuthenticatedBackupUser backupUser) {
+  CompletableFuture<StoredBackupAttributes> ttlRefresh(final AuthenticatedBackupUser backupUser) {
+    final Instant today = clock.instant().truncatedTo(ChronoUnit.DAYS);
     // update message backup TTL
     return dynamoClient.updateItem(UpdateBuilder.forUser(backupTableName, backupUser)
-            .setRefreshTimes(clock)
+            .setRefreshTimes(today)
             .updateItemBuilder()
+            .returnValues(ReturnValue.ALL_OLD)
             .build())
-        .thenRun(Util.NOOP);
+        .thenApply(updateItemResponse -> fromItem(updateItemResponse.attributes()));
   }
 
+
   /**
    * Track that a backup will be stored for the user
    *
    * @param backupUser an already authorized backup user
+   * @return A future that completes with the attributes of the backup before the update
    */
-  CompletableFuture<Void> addMessageBackup(final AuthenticatedBackupUser backupUser) {
+  CompletableFuture<StoredBackupAttributes> addMessageBackup(final AuthenticatedBackupUser backupUser) {
+    final Instant today = clock.instant().truncatedTo(ChronoUnit.DAYS);
     // this could race with concurrent updates, but the only effect would be last-writer-wins on the timestamp
     return dynamoClient.updateItem(
             UpdateBuilder.forUser(backupTableName, backupUser)
-                .setRefreshTimes(clock)
+                .setRefreshTimes(today)
                 .setCdn(BACKUP_CDN)
                 .updateItemBuilder()
+                .returnValues(ReturnValue.ALL_OLD)
                 .build())
-        .thenRun(Util.NOOP);
+        .thenApply(updateItemResponse -> fromItem(updateItemResponse.attributes()));
   }
 
+  /**
+   * Indicates that we couldn't schedule a deletion because one was already scheduled. The caller may want to delete the
+   * objects directly.
+   */
+  static class PendingDeletionException extends IOException {}
+
+  /**
+   * Attempt to mark a backup as expired and swap in a new empty backupDir for the user.
+   * <p>
+   * After successful completion, the backupDir for the backup-id will be swapped to a new empty directory on the cdn,
+   * and the row will be immediately marked eligible for expiration via {@link #getExpiredBackups}.
+   * <p>
+   * If there is already a pending deletion, this will not swap the backupDir. The expiration timestamps will be
+   * updated, but the existing backupDir will remain. The caller should handle this case and start the deletion
+   * immediately by catching {@link PendingDeletionException}.
+   *
+   * @param backupUser The backupUser whose data should be eventually deleted
+   * @return A future that completes successfully if the user's data is now inaccessible, or with a
+   * {@link PendingDeletionException} if the backupDir could not be changed.
+   */
+  CompletableFuture<Void> scheduleBackupDeletion(final AuthenticatedBackupUser backupUser) {
+    final byte[] hashedBackupId = hashedBackupId(backupUser);
+
+    // Clear usage metadata, swap names of things we intend to delete, and record our intent to delete in attr_expired_prefix
+    return dynamoClient.updateItem(new UpdateBuilder(backupTableName, BackupLevel.PAID, hashedBackupId)
+            .clearMediaUsage(clock)
+            .expireDirectoryNames(secureRandom, ExpiredBackup.ExpirationType.ALL)
+            .setRefreshTimes(Instant.ofEpochSecond(0))
+            .addSetExpression("#expiredPrefix = :expiredPrefix",
+                Map.entry("#expiredPrefix", ATTR_EXPIRED_PREFIX),
+                Map.entry(":expiredPrefix", AttributeValues.s(backupUser.backupDir())))
+            .withConditionExpression("attribute_not_exists(#expiredPrefix) OR #expiredPrefix = :expiredPrefix")
+            .updateItemBuilder()
+            .build())
+        .exceptionallyCompose(ExceptionUtils.exceptionallyHandler(ConditionalCheckFailedException.class, e ->
+            // We already have a pending deletion for this backup-id. This is most likely to occur when the caller
+            // is toggling backups on and off. In this case, it should be pretty cheap to directly delete the backup.
+            // Instead of changing the backupDir, just make sure the row has expired/ timestamps and tell the caller we
+            // couldn't schedule the deletion.
+            dynamoClient.updateItem(new UpdateBuilder(backupTableName, BackupLevel.PAID, hashedBackupId)
+                    .setRefreshTimes(Instant.ofEpochSecond(0))
+                    .updateItemBuilder()
+                    .build())
+                .thenApply(ignore -> {
+                  throw ExceptionUtils.wrap(new PendingDeletionException());
+                })))
+        .thenRun(Util.NOOP);
+  }
 
   record BackupDescription(int cdn, Optional<Long> mediaUsedSpace) {}
 
@@ -195,13 +341,10 @@ public class BackupsDb {
             .build())
         .thenApply(response -> {
           if (!response.hasItem()) {
-            throw Status.NOT_FOUND.withDescription("Backup not found").asRuntimeException();
+            throw Status.NOT_FOUND.withDescription("Backup ID not found").asRuntimeException();
           }
-          final int cdn = AttributeValues.get(response.item(), ATTR_CDN)
-              .map(AttributeValue::n)
-              .map(Integer::parseInt)
-              .orElseThrow(() -> Status.NOT_FOUND.withDescription("Stored backup not found").asRuntimeException());
-
+          // If the client hasn't already uploaded a backup, return the cdn we would return if they did create one
+          final int cdn = AttributeValues.getInt(response.item(), ATTR_CDN, BACKUP_CDN);
           final Optional<Long> mediaUsed = AttributeValues.get(response.item(), ATTR_MEDIA_BYTES_USED)
               .map(AttributeValue::n)
               .map(Long::parseLong);
@@ -234,8 +377,16 @@ public class BackupsDb {
   }
 
   CompletableFuture<Void> setMediaUsage(final AuthenticatedBackupUser backupUser, UsageInfo usageInfo) {
+    return setMediaUsage(UpdateBuilder.forUser(backupTableName, backupUser), usageInfo);
+  }
+
+  CompletableFuture<Void> setMediaUsage(final StoredBackupAttributes backupAttributes, UsageInfo usageInfo) {
+    return setMediaUsage(new UpdateBuilder(backupTableName, BackupLevel.PAID, backupAttributes.hashedBackupId()), usageInfo);
+  }
+
+  private CompletableFuture<Void> setMediaUsage(final UpdateBuilder updateBuilder, UsageInfo usageInfo) {
     return dynamoClient.updateItem(
-            UpdateBuilder.forUser(backupTableName, backupUser)
+            updateBuilder
                 .addSetExpression("#mediaBytesUsed = :mediaBytesUsed",
                     Map.entry("#mediaBytesUsed", ATTR_MEDIA_BYTES_USED),
                     Map.entry(":mediaBytesUsed", AttributeValues.n(usageInfo.bytesUsed())))
@@ -251,27 +402,213 @@ public class BackupsDb {
   }
 
 
+  /**
+   * Marks the backup as undergoing expiration.
+   * <p>
+   * This must be called before beginning to delete items in the CDN with the prefix specified by
+   * {@link ExpiredBackup#prefixToDelete()}. If the prefix has been successfully deleted, {@link #finishExpiration} must
+   * be called.
+   *
+   * @param expiredBackup The backup to expire
+   * @return A stage that completes when the backup has been marked for expiration
+   */
+  CompletableFuture<Void> startExpiration(final ExpiredBackup expiredBackup) {
+    if (expiredBackup.expirationType() == ExpiredBackup.ExpirationType.GARBAGE_COLLECTION) {
+      // We've already updated the row on a prior (failed) attempt, just need to remove the data from the cdn now
+      return CompletableFuture.completedFuture(null);
+    }
+
+    // Clear usage metadata, swap names of things we intend to delete, and record our intent to delete in attr_expired_prefix
+    return dynamoClient.updateItem(new UpdateBuilder(backupTableName, BackupLevel.PAID, expiredBackup.hashedBackupId())
+            .clearMediaUsage(clock)
+            .expireDirectoryNames(secureRandom, expiredBackup.expirationType())
+            .addRemoveExpression(Map.entry("#mediaRefresh", ATTR_LAST_MEDIA_REFRESH))
+            .addSetExpression("#expiredPrefix = :expiredPrefix",
+                Map.entry("#expiredPrefix", ATTR_EXPIRED_PREFIX),
+                Map.entry(":expiredPrefix", AttributeValues.s(expiredBackup.prefixToDelete())))
+            .withConditionExpression("attribute_not_exists(#expiredPrefix) OR #expiredPrefix = :expiredPrefix")
+            .updateItemBuilder()
+            .build())
+        .thenRun(Util.NOOP);
+  }
+
+  /**
+   * Complete expiration of a backup started with {@link #startExpiration}
+   * <p>
+   * If the expiration was for the entire backup, this will delete the entire item for the backup.
+   *
+   * @param expiredBackup The backup to expire
+   * @return A stage that completes when the expiration is marked as finished
+   */
+  CompletableFuture<Void> finishExpiration(final ExpiredBackup expiredBackup) {
+    final byte[] hashedBackupId = expiredBackup.hashedBackupId();
+    if (expiredBackup.expirationType() == ExpiredBackup.ExpirationType.ALL) {
+      final long expectedLastRefresh = expiredBackup.lastRefresh().getEpochSecond();
+      return dynamoClient.deleteItem(DeleteItemRequest.builder()
+              .tableName(backupTableName)
+              .key(Map.of(KEY_BACKUP_ID_HASH, AttributeValues.b(hashedBackupId)))
+              .conditionExpression("#lastRefresh <= :expectedLastRefresh")
+              .expressionAttributeNames(Map.of("#lastRefresh", ATTR_LAST_REFRESH))
+              .expressionAttributeValues(Map.of(":expectedLastRefresh", AttributeValues.n(expectedLastRefresh)))
+              .build())
+          .thenRun(Util.NOOP);
+    } else {
+      return dynamoClient.updateItem(new UpdateBuilder(backupTableName, BackupLevel.PAID, hashedBackupId)
+              .addRemoveExpression(Map.entry("#expiredPrefixes", ATTR_EXPIRED_PREFIX))
+              .updateItemBuilder()
+              .build())
+          .thenRun(Util.NOOP);
+    }
+  }
+
+  Flux<StoredBackupAttributes> listBackupAttributes(final int segments) {
+    if (segments < 1) {
+      throw new IllegalArgumentException("Total number of segments must be positive");
+    }
+
+    return Flux.range(0, segments)
+        .flatMap(segment -> dynamoClient.scanPaginator(ScanRequest.builder()
+                .tableName(backupTableName)
+                .consistentRead(true)
+                .segment(segment)
+                .totalSegments(segments)
+                .expressionAttributeNames(Map.of(
+                    "#backupIdHash", KEY_BACKUP_ID_HASH,
+                    "#refresh", ATTR_LAST_REFRESH,
+                    "#mediaRefresh", ATTR_LAST_MEDIA_REFRESH,
+                    "#bytesUsed", ATTR_MEDIA_BYTES_USED,
+                    "#numObjects", ATTR_MEDIA_COUNT,
+                    "#backupDir", ATTR_BACKUP_DIR,
+                    "#mediaDir", ATTR_MEDIA_DIR))
+                .projectionExpression("#backupIdHash, #refresh, #mediaRefresh, #bytesUsed, #numObjects, #backupDir, #mediaDir")
+                .build()))
+        // Don't use the SDK's item publisher, works around https://github.com/aws/aws-sdk-java-v2/issues/6411
+        .concatMap(page -> Flux.fromIterable(page.items()))
+        .filter(item -> item.containsKey(KEY_BACKUP_ID_HASH))
+        .map(BackupsDb::fromItem);
+  }
+
+  private static StoredBackupAttributes fromItem(Map<String, AttributeValue> item) {
+    return new StoredBackupAttributes(
+        AttributeValues.getByteArray(item, KEY_BACKUP_ID_HASH, null),
+        AttributeValues.getString(item, ATTR_BACKUP_DIR, null),
+        AttributeValues.getString(item, ATTR_MEDIA_DIR, null),
+        Instant.ofEpochSecond(AttributeValues.getLong(item, ATTR_LAST_REFRESH, 0L)),
+        Instant.ofEpochSecond(AttributeValues.getLong(item, ATTR_LAST_MEDIA_REFRESH, 0L)),
+        AttributeValues.getLong(item, ATTR_MEDIA_BYTES_USED, 0L),
+        AttributeValues.getLong(item, ATTR_MEDIA_COUNT, 0L));
+  }
+
+  Flux<ExpiredBackup> getExpiredBackups(final int segments, final Scheduler scheduler, final Instant purgeTime) {
+    if (segments < 1) {
+      throw new IllegalArgumentException("Total number of segments must be positive");
+    }
+
+    return Flux.range(0, segments)
+        .parallel()
+        .runOn(scheduler)
+        .flatMap(segment -> dynamoClient.scanPaginator(ScanRequest.builder()
+                .tableName(backupTableName)
+                .consistentRead(true)
+                .segment(segment)
+                .totalSegments(segments)
+                .expressionAttributeNames(Map.of(
+                    "#backupIdHash", KEY_BACKUP_ID_HASH,
+                    "#refresh", ATTR_LAST_REFRESH,
+                    "#mediaRefresh", ATTR_LAST_MEDIA_REFRESH,
+                    "#backupDir", ATTR_BACKUP_DIR,
+                    "#mediaDir", ATTR_MEDIA_DIR,
+                    "#expiredPrefix", ATTR_EXPIRED_PREFIX))
+                .expressionAttributeValues(Map.of(":purgeTime", AttributeValues.n(purgeTime.getEpochSecond())))
+                .projectionExpression("#backupIdHash, #refresh, #mediaRefresh, #backupDir, #mediaDir, #expiredPrefix")
+                .filterExpression(
+                    "(#refresh < :purgeTime) OR (#mediaRefresh < :purgeTime) OR attribute_exists(#expiredPrefix)")
+                .build())
+            .items())
+        .sequential()
+        .filter(Predicate.not(Map::isEmpty))
+        .mapNotNull(item -> {
+          final byte[] hashedBackupId = AttributeValues.getByteArray(item, KEY_BACKUP_ID_HASH, null);
+          if (hashedBackupId == null) {
+            return null;
+          }
+          final String backupDir = AttributeValues.getString(item, ATTR_BACKUP_DIR, null);
+          final String mediaDir = AttributeValues.getString(item, ATTR_MEDIA_DIR, null);
+          if (backupDir == null || mediaDir == null) {
+            // Could be the case for backups that have not yet set a public key
+            return null;
+          }
+          final long lastRefresh = AttributeValues.getLong(item, ATTR_LAST_REFRESH, Long.MAX_VALUE);
+          final long lastMediaRefresh = AttributeValues.getLong(item, ATTR_LAST_MEDIA_REFRESH, Long.MAX_VALUE);
+          final String existingExpiration = AttributeValues.getString(item, ATTR_EXPIRED_PREFIX, null);
+
+          final ExpiredBackup expiredBackup;
+          if (existingExpiration != null) {
+            // If we have work from a failed previous expiration, handle that before worrying about any new expirations.
+            // This guarantees we won't accumulate expirations
+            expiredBackup = new ExpiredBackup(hashedBackupId, ExpiredBackup.ExpirationType.GARBAGE_COLLECTION,
+                Instant.ofEpochSecond(lastRefresh), existingExpiration);
+          } else if (lastRefresh < purgeTime.getEpochSecond()) {
+            // The whole backup was expired
+            expiredBackup = new ExpiredBackup(hashedBackupId, ExpiredBackup.ExpirationType.ALL,
+                Instant.ofEpochSecond(lastRefresh), backupDir);
+          } else if (lastMediaRefresh < purgeTime.getEpochSecond()) {
+            // The media was expired
+            expiredBackup = new ExpiredBackup(hashedBackupId, ExpiredBackup.ExpirationType.MEDIA,
+                Instant.ofEpochSecond(lastRefresh), backupDir + "/" + mediaDir);
+          } else {
+            return null;
+          }
+
+          if (!isValid(expiredBackup)) {
+            logger.error("Not expiring backup {} for backupId {} with invalid cdn path prefixes",
+                HexFormat.of().formatHex(expiredBackup.hashedBackupId()),
+                expiredBackup);
+            return null;
+          }
+          return expiredBackup;
+        });
+  }
+
+  /**
+   * Backup expiration will expire any prefix we tell it to, so confirm that the directory names that came out of the
+   * database have the correct shape before handing them off.
+   *
+   * @param expiredBackup The ExpiredBackup object to check
+   * @return Whether this is a valid expiration object
+   */
+  private static boolean isValid(final ExpiredBackup expiredBackup) {
+    // expired prefixes should be of the form "backupDir" or "backupDir/mediaDir"
+    return switch (expiredBackup.expirationType()) {
+      case MEDIA -> expiredBackup.prefixToDelete().length() == MEDIA_DIRECTORY_PATH_LENGTH;
+      case ALL -> expiredBackup.prefixToDelete().length() == BACKUP_DIRECTORY_PATH_LENGTH;
+      case GARBAGE_COLLECTION -> expiredBackup.prefixToDelete().length() == MEDIA_DIRECTORY_PATH_LENGTH ||
+          expiredBackup.prefixToDelete().length() == BACKUP_DIRECTORY_PATH_LENGTH;
+    };
+  }
+
   /**
    * Build ddb update statements for the backups table
    */
   private static class UpdateBuilder {
 
     private final List<String> setStatements = new ArrayList<>();
+    private final List<String> removeStatements = new ArrayList<>();
     private final Map<String, AttributeValue> attrValues = new HashMap<>();
     private final Map<String, String> attrNames = new HashMap<>();
 
     private final String tableName;
-    private final BackupTier backupTier;
+    private final BackupLevel backupLevel;
     private final byte[] hashedBackupId;
     private String conditionExpression = null;
 
     static UpdateBuilder forUser(String tableName, AuthenticatedBackupUser backupUser) {
-      return new UpdateBuilder(tableName, backupUser.backupTier(), hashedBackupId(backupUser));
+      return new UpdateBuilder(tableName, backupUser.backupLevel(), hashedBackupId(backupUser));
     }
 
-    UpdateBuilder(String tableName, BackupTier backupTier, byte[] hashedBackupId) {
+    UpdateBuilder(String tableName, BackupLevel backupLevel, byte[] hashedBackupId) {
       this.tableName = tableName;
-      this.backupTier = backupTier;
+      this.backupLevel = backupLevel;
       this.hashedBackupId = hashedBackupId;
     }
 
@@ -308,6 +645,12 @@ public class BackupsDb {
       return this;
     }
 
+    UpdateBuilder addRemoveExpression(final Map.Entry<String, String> attrName) {
+      addAttrName(attrName);
+      removeStatements.add(attrName.getKey());
+      return this;
+    }
+
     UpdateBuilder withConditionExpression(final String conditionExpression) {
       this.conditionExpression = conditionExpression;
       return this;
@@ -345,23 +688,72 @@ public class BackupsDb {
       return this;
     }
 
+    UpdateBuilder clearMediaUsage(final Clock clock) {
+      addSetExpression("#mediaBytesUsed = :mediaBytesUsed",
+          Map.entry("#mediaBytesUsed", ATTR_MEDIA_BYTES_USED),
+          Map.entry(":mediaBytesUsed", AttributeValues.n(0L)));
+      addSetExpression("#mediaCount = :mediaCount",
+          Map.entry("#mediaCount", ATTR_MEDIA_COUNT),
+          Map.entry(":mediaCount", AttributeValues.n(0L)));
+      addSetExpression("#mediaRecalc = :mediaRecalc",
+          Map.entry("#mediaRecalc", ATTR_MEDIA_USAGE_LAST_RECALCULATION),
+          Map.entry(":mediaRecalc", AttributeValues.n(clock.instant().getEpochSecond())));
+      return this;
+    }
+
+    UpdateBuilder setDirectoryNamesIfMissing(final SecureRandom secureRandom) {
+      final String backupDir = generateDirName(secureRandom);
+      final String mediaDir = generateDirName(secureRandom);
+      addSetExpression("#backupDir = if_not_exists(#backupDir, :backupDir)",
+          Map.entry("#backupDir", ATTR_BACKUP_DIR),
+          Map.entry(":backupDir", AttributeValues.s(backupDir)));
+
+      addSetExpression("#mediaDir = if_not_exists(#mediaDir, :mediaDir)",
+          Map.entry("#mediaDir", ATTR_MEDIA_DIR),
+          Map.entry(":mediaDir", AttributeValues.s(mediaDir)));
+      return this;
+    }
+
+    UpdateBuilder expireDirectoryNames(
+        final SecureRandom secureRandom,
+        final ExpiredBackup.ExpirationType expirationType) {
+      final String backupDir = generateDirName(secureRandom);
+      final String mediaDir = generateDirName(secureRandom);
+      return switch (expirationType) {
+        case GARBAGE_COLLECTION -> this;
+        case MEDIA -> this.addSetExpression("#mediaDir = :mediaDir",
+            Map.entry("#mediaDir", ATTR_MEDIA_DIR),
+            Map.entry(":mediaDir", AttributeValues.s(mediaDir)));
+        case ALL -> this
+            .addSetExpression("#mediaDir = :mediaDir",
+                Map.entry("#mediaDir", ATTR_MEDIA_DIR),
+                Map.entry(":mediaDir", AttributeValues.s(mediaDir)))
+            .addSetExpression("#backupDir = :backupDir",
+                Map.entry("#backupDir", ATTR_BACKUP_DIR),
+                Map.entry(":backupDir", AttributeValues.s(backupDir)));
+      };
+    }
+
+    UpdateBuilder setRefreshTimes(final Clock clock) {
+      return setRefreshTimes(clock.instant().truncatedTo(ChronoUnit.DAYS));
+    }
+
     /**
      * Set the lastRefresh time as part of the update
      * <p>
      * This always updates lastRefreshTime, and updates lastMediaRefreshTime if the backup user has the appropriate
-     * tier.
+     * level.
      */
-    UpdateBuilder setRefreshTimes(final Clock clock) {
-      return this.setRefreshTimes(clock.instant());
-    }
-
     UpdateBuilder setRefreshTimes(final Instant refreshTime) {
+      if (!refreshTime.truncatedTo(ChronoUnit.DAYS).equals(refreshTime)) {
+        throw new IllegalArgumentException("Refresh time must be day aligned");
+      }
       addSetExpression("#lastRefreshTime = :lastRefreshTime",
           Map.entry("#lastRefreshTime", ATTR_LAST_REFRESH),
           Map.entry(":lastRefreshTime", AttributeValues.n(refreshTime.getEpochSecond())));
 
-      if (backupTier.compareTo(BackupTier.MEDIA) >= 0) {
-        // update the media time if we have the appropriate tier
+      if (backupLevel.compareTo(BackupLevel.PAID) >= 0) {
+        // update the media time if we have the appropriate level
         addSetExpression("#lastMediaRefreshTime = :lastMediaRefreshTime",
             Map.entry("#lastMediaRefreshTime", ATTR_LAST_MEDIA_REFRESH),
             Map.entry(":lastMediaRefreshTime", AttributeValues.n(refreshTime.getEpochSecond())));
@@ -369,6 +761,19 @@ public class BackupsDb {
       return this;
     }
 
+    private String updateExpression() {
+      final StringBuilder sb = new StringBuilder();
+      if (!setStatements.isEmpty()) {
+        sb.append("SET ");
+        sb.append(String.join(",", setStatements));
+      }
+      if (!removeStatements.isEmpty()) {
+        sb.append(" REMOVE ");
+        sb.append(String.join(",", removeStatements));
+      }
+      return sb.toString();
+    }
+
     /**
      * Prepare a non-transactional update
      *
@@ -378,9 +783,11 @@ public class BackupsDb {
       final UpdateItemRequest.Builder bldr = UpdateItemRequest.builder()
           .tableName(tableName)
           .key(Map.of(KEY_BACKUP_ID_HASH, AttributeValues.b(hashedBackupId)))
-          .updateExpression("SET %s".formatted(String.join(",", setStatements)))
-          .expressionAttributeNames(attrNames)
-          .expressionAttributeValues(attrValues);
+          .updateExpression(updateExpression())
+          .expressionAttributeNames(attrNames);
+      if (!this.attrValues.isEmpty()) {
+        bldr.expressionAttributeValues(attrValues);
+      }
       if (this.conditionExpression != null) {
         bldr.conditionExpression(conditionExpression);
       }
@@ -396,7 +803,7 @@ public class BackupsDb {
       final Update.Builder bldr = Update.builder()
           .tableName(tableName)
           .key(Map.of(KEY_BACKUP_ID_HASH, AttributeValues.b(hashedBackupId)))
-          .updateExpression("SET %s".formatted(String.join(",", setStatements)))
+          .updateExpression(updateExpression())
           .expressionAttributeNames(attrNames)
           .expressionAttributeValues(attrValues);
       if (this.conditionExpression != null) {
@@ -406,6 +813,11 @@ public class BackupsDb {
     }
   }
 
+  static String generateDirName(final SecureRandom secureRandom) {
+    final byte[] bytes = new byte[16];
+    secureRandom.nextBytes(bytes);
+    return Base64.getUrlEncoder().withoutPadding().encodeToString(bytes);
+  }
 
   private static byte[] hashedBackupId(final AuthenticatedBackupUser backupId) {
     return hashedBackupId(backupId.backupId());

service/src/main/java/org/whispersystems/textsecuregcm/backup/Cdn3BackupCredentialGenerator.java

@@ -49,7 +49,7 @@ public class Cdn3BackupCredentialGenerator {
         .build();
   }
 
-  public MessageBackupUploadDescriptor generateUpload(final String key) {
+  public BackupUploadDescriptor generateUpload(final String key) {
     if (key.isBlank()) {
       throw new IllegalArgumentException("Upload descriptors must have non-empty keys");
     }
@@ -60,7 +60,7 @@ public class Cdn3BackupCredentialGenerator {
         HttpHeaders.AUTHORIZATION, HeaderUtils.basicAuthHeader(credentials),
         "Upload-Metadata", String.format("filename %s", b64Key));
 
-    return new MessageBackupUploadDescriptor(
+    return new BackupUploadDescriptor(
         BACKUP_CDN,
         key,
         headers,

service/src/main/java/org/whispersystems/textsecuregcm/backup/Cdn3RemoteStorageManager.java

@@ -1,35 +1,32 @@
 package org.whispersystems.textsecuregcm.backup;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.Timer;
+import jakarta.validation.constraints.NotNull;
+import jakarta.ws.rs.core.Response;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.security.cert.CertificateException;
 import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.CompletionException;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
-import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.stream.Stream;
 import javax.annotation.Nullable;
-import javax.validation.constraints.NotNull;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Response;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.textsecuregcm.configuration.Cdn3StorageManagerConfiguration;
-import org.whispersystems.textsecuregcm.configuration.CircuitBreakerConfiguration;
-import org.whispersystems.textsecuregcm.configuration.RetryConfiguration;
 import org.whispersystems.textsecuregcm.http.FaultTolerantHttpClient;
 import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
 import org.whispersystems.textsecuregcm.util.ExceptionUtils;
@@ -40,20 +37,15 @@ public class Cdn3RemoteStorageManager implements RemoteStorageManager {
 
   private static final Logger logger = LoggerFactory.getLogger(Cdn3RemoteStorageManager.class);
 
-  private final FaultTolerantHttpClient cdnHttpClient;
   private final FaultTolerantHttpClient storageManagerHttpClient;
   private final String storageManagerBaseUrl;
   private final String clientId;
   private final String clientSecret;
+  private final Map<Integer, String> sourceSchemes;
+
   static final String CLIENT_ID_HEADER = "CF-Access-Client-Id";
   static final String CLIENT_SECRET_HEADER = "CF-Access-Client-Secret";
 
-  private static String TUS_UPLOAD_LENGTH_HEADER = "Upload-Length";
-  private static String TUS_UPLOAD_OFFSET_HEADER = "Upload-Offset";
-  private static String TUS_VERSION_HEADER = "Tus-Resumable";
-  private static String TUS_VERSION = "1.0.0";
-  private static String TUS_CONTENT_TYPE = "application/offset+octet-stream";
-
   private static final String STORAGE_MANAGER_STATUS_COUNTER_NAME = MetricsUtil.name(Cdn3RemoteStorageManager.class,
       "storageManagerStatus");
 
@@ -62,41 +54,27 @@ public class Cdn3RemoteStorageManager implements RemoteStorageManager {
   private static final String OPERATION_TAG_NAME = "op";
   private static final String STATUS_TAG_NAME = "status";
 
+  private static final String OBJECT_REMOVED_ON_DELETE_COUNTER_NAME = MetricsUtil.name(Cdn3RemoteStorageManager.class, "objectRemovedOnDelete");
+
   public Cdn3RemoteStorageManager(
+      final ExecutorService httpExecutor,
       final ScheduledExecutorService retryExecutor,
-      final CircuitBreakerConfiguration circuitBreakerConfiguration,
-      final RetryConfiguration retryConfiguration,
-      final List<String> cdnCaCertificates,
-      final Cdn3StorageManagerConfiguration configuration) throws CertificateException {
+      final Cdn3StorageManagerConfiguration configuration) {
 
     // strip trailing "/" for easier URI construction
     this.storageManagerBaseUrl = StringUtils.removeEnd(configuration.baseUri(), "/");
     this.clientId = configuration.clientId();
     this.clientSecret = configuration.clientSecret().value();
 
-    // Client used to read/write to cdn
-    this.cdnHttpClient = FaultTolerantHttpClient.newBuilder()
-        .withName("cdn-client")
-        .withCircuitBreaker(circuitBreakerConfiguration)
-        .withExecutor(Executors.newCachedThreadPool())
-        .withRetryExecutor(retryExecutor)
-        .withRetry(retryConfiguration)
-        .withConnectTimeout(Duration.ofSeconds(10))
-        .withVersion(HttpClient.Version.HTTP_2)
-        .withTrustedServerCertificates(cdnCaCertificates.toArray(new String[0]))
-        .build();
-
     // Client used for calls to storage-manager
-    // storage-manager has an external CA so uses a different client
-    this.storageManagerHttpClient = FaultTolerantHttpClient.newBuilder()
-        .withName("cdn3-storage-manager")
-        .withCircuitBreaker(circuitBreakerConfiguration)
-        .withExecutor(Executors.newCachedThreadPool())
-        .withRetryExecutor(retryExecutor)
-        .withRetry(retryConfiguration)
+    this.storageManagerHttpClient = FaultTolerantHttpClient.newBuilder("cdn3-storage-manager", httpExecutor)
+        .withCircuitBreaker(configuration.circuitBreakerConfigurationName())
+        .withRetry(configuration.retryConfigurationName(), retryExecutor)
         .withConnectTimeout(Duration.ofSeconds(10))
         .withVersion(HttpClient.Version.HTTP_2)
+        .withNumClients(configuration.numHttpClients())
         .build();
+    this.sourceSchemes = configuration.sourceSchemes();
   }
 
   @Override
@@ -106,71 +84,75 @@ public class Cdn3RemoteStorageManager implements RemoteStorageManager {
 
   @Override
   public CompletionStage<Void> copy(
-      final URI sourceUri,
+      final int sourceCdn,
+      final String sourceKey,
       final int expectedSourceLength,
       final MediaEncryptionParameters encryptionParameters,
-      final MessageBackupUploadDescriptor uploadDescriptor) {
-
-    if (uploadDescriptor.cdn() != cdnNumber()) {
-      throw new IllegalArgumentException("Cdn3RemoteStorageManager can only copy to cdn3");
+      final String destinationKey) {
+    final String sourceScheme = this.sourceSchemes.get(sourceCdn);
+    if (sourceScheme == null) {
+      return CompletableFuture.failedFuture(
+          new SourceObjectNotFoundException("Cdn3RemoteStorageManager cannot copy from " + sourceCdn));
     }
+    final String requestBody = new Cdn3CopyRequest(
+        encryptionParameters,
+        new Cdn3CopyRequest.SourceDescriptor(sourceScheme, sourceKey),
+        expectedSourceLength,
+        destinationKey).json();
 
     final Timer.Sample sample = Timer.start();
-    final BackupMediaEncrypter encrypter = new BackupMediaEncrypter(encryptionParameters);
-    final HttpRequest request = HttpRequest.newBuilder().GET().uri(sourceUri).build();
-    final int expectedEncryptedLength = encrypter.outputSize(expectedSourceLength);
-    return cdnHttpClient.sendAsync(request, HttpResponse.BodyHandlers.ofPublisher()).thenCompose(response -> {
-          if (response.statusCode() == Response.Status.NOT_FOUND.getStatusCode()) {
-            throw new CompletionException(new SourceObjectNotFoundException());
-          } else if (response.statusCode() != Response.Status.OK.getStatusCode()) {
-            throw new CompletionException(new IOException("error reading from source: " + response.statusCode()));
-          }
-
-          final int actualSourceLength = Math.toIntExact(response.headers().firstValueAsLong("Content-Length")
-              .orElseThrow(() -> new CompletionException(new IOException("upstream missing Content-Length"))));
-
-          if (actualSourceLength != expectedSourceLength) {
-            throw new CompletionException(
-                new InvalidLengthException("Provided sourceLength " + expectedSourceLength + " was " + actualSourceLength));
-          }
-
-          final HttpRequest.BodyPublisher encryptedBody = HttpRequest.BodyPublishers.fromPublisher(
-              encrypter.encryptBody(response.body()), expectedEncryptedLength);
-
-          final String[] headers = Stream.concat(
-                  uploadDescriptor.headers().entrySet()
-                      .stream()
-                      .flatMap(e -> Stream.of(e.getKey(), e.getValue())),
-                  Stream.of(
-                      TUS_VERSION_HEADER, TUS_VERSION,
-                      TUS_UPLOAD_LENGTH_HEADER, Integer.toString(expectedEncryptedLength),
-                      HttpHeaders.CONTENT_TYPE, TUS_CONTENT_TYPE))
-              .toArray(String[]::new);
-
-          final HttpRequest post = HttpRequest.newBuilder()
-              .uri(URI.create(uploadDescriptor.signedUploadLocation()))
-              .headers(headers)
-              .POST(encryptedBody)
-              .build();
-
-          return cdnHttpClient.sendAsync(post, HttpResponse.BodyHandlers.discarding());
-        })
+    final HttpRequest request = HttpRequest.newBuilder()
+        .PUT(HttpRequest.BodyPublishers.ofString(requestBody))
+        .uri(URI.create(copyUrl()))
+        .header("Content-Type", "application/json")
+        .header(CLIENT_ID_HEADER, clientId)
+        .header(CLIENT_SECRET_HEADER, clientSecret)
+        .build();
+    return this.storageManagerHttpClient.sendAsync(request, HttpResponse.BodyHandlers.ofString())
         .thenAccept(response -> {
-          if (response.statusCode() != Response.Status.CREATED.getStatusCode() &&
-              response.statusCode() != Response.Status.OK.getStatusCode()) {
-            throw new CompletionException(new IOException("Failed to copy object: " + response.statusCode()));
-          }
-          long uploadOffset = response.headers().firstValueAsLong(TUS_UPLOAD_OFFSET_HEADER)
-              .orElseThrow(() -> new CompletionException(new IOException("Tus server did not return Upload-Offset")));
-          if (uploadOffset != expectedEncryptedLength) {
-            throw new CompletionException(new IOException(
-                "Expected to upload %d bytes, uploaded %d".formatted(expectedEncryptedLength, uploadOffset)));
+          Metrics.counter(STORAGE_MANAGER_STATUS_COUNTER_NAME,
+                  OPERATION_TAG_NAME, "copy",
+                  STATUS_TAG_NAME, Integer.toString(response.statusCode()))
+              .increment();
+          if (response.statusCode() == Response.Status.NOT_FOUND.getStatusCode()) {
+            throw ExceptionUtils.wrap(new SourceObjectNotFoundException());
+          } else if (response.statusCode() == Response.Status.CONFLICT.getStatusCode()) {
+            throw ExceptionUtils.wrap(new InvalidLengthException(response.body()));
+          } else if (!HttpUtils.isSuccessfulResponse(response.statusCode())) {
+            logger.info("Failed to copy via storage-manager {} {}", response.statusCode(), response.body());
+            throw ExceptionUtils.wrap(new IOException("Failed to copy object: " + response.statusCode()));
           }
         })
         .whenComplete((ignored, ignoredException) ->
             sample.stop(Metrics.timer(STORAGE_MANAGER_TIMER_NAME, OPERATION_TAG_NAME, "copy")));
   }
 
+  /**
+   * Serialized copy request for cdn3 storage manager
+   */
+  record Cdn3CopyRequest(
+      String encryptionKey, String hmacKey,
+      SourceDescriptor source, int expectedSourceLength,
+      String dst) {
+
+    Cdn3CopyRequest(MediaEncryptionParameters parameters, SourceDescriptor source, int expectedSourceLength,
+        String dst) {
+      this(Base64.getEncoder().encodeToString(parameters.aesEncryptionKey().getEncoded()),
+          Base64.getEncoder().encodeToString(parameters.hmacSHA256Key().getEncoded()),
+          source, expectedSourceLength, dst);
+    }
+
+    record SourceDescriptor(String scheme, String key) {}
+
+    String json() {
+      try {
+        return SystemMapper.jsonMapper().writeValueAsString(this);
+      } catch (JsonProcessingException e) {
+        throw new IllegalStateException("Could not serialize copy request", e);
+      }
+    }
+  }
+
   @Override
   public CompletionStage<ListResult> list(
       final String prefix,
@@ -280,6 +262,7 @@ public class Cdn3RemoteStorageManager implements RemoteStorageManager {
   record DeleteResponse(@NotNull long bytesDeleted) {}
 
   public CompletionStage<Long> delete(final String key) {
+    final Timer.Sample sample = Timer.start();
     final HttpRequest request = HttpRequest.newBuilder().DELETE()
         .uri(URI.create(deleteUrl(key)))
         .header(CLIENT_ID_HEADER, clientId)
@@ -292,11 +275,17 @@ public class Cdn3RemoteStorageManager implements RemoteStorageManager {
                   STATUS_TAG_NAME, Integer.toString(response.statusCode()))
               .increment();
           try {
-            return parseDeleteResponse(response);
+            long bytesDeleted = parseDeleteResponse(response);
+            Metrics.counter(OBJECT_REMOVED_ON_DELETE_COUNTER_NAME,
+                    "removed", Boolean.toString(bytesDeleted > 0))
+                .increment();
+            return bytesDeleted;
           } catch (IOException e) {
             throw ExceptionUtils.wrap(e);
           }
-        });
+        })
+        .whenComplete((ignored, ignoredException) ->
+            sample.stop(Metrics.timer(STORAGE_MANAGER_TIMER_NAME, OPERATION_TAG_NAME, "delete")));
   }
 
   private long parseDeleteResponse(final HttpResponse<InputStream> httpDeleteResponse) throws IOException {
@@ -318,5 +307,7 @@ public class Cdn3RemoteStorageManager implements RemoteStorageManager {
     return "%s/%s/".formatted(storageManagerBaseUrl, Cdn3BackupCredentialGenerator.CDN_PATH);
   }
 
-
+  private String copyUrl() {
+    return "%s/copy".formatted(storageManagerBaseUrl);
+  }
 }

service/src/main/java/org/whispersystems/textsecuregcm/backup/CopyParameters.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+package org.whispersystems.textsecuregcm.backup;
+
+/**
+ * Descriptor for a single copy-and-encrypt operation
+ *
+ * @param sourceCdn            The cdn of the object to copy
+ * @param sourceKey            The mediaId within the cdn of the object to copy
+ * @param sourceLength         The length of the object to copy
+ * @param encryptionParameters Encryption parameters to double encrypt the object
+ * @param destinationMediaId   The mediaId of the destination object
+ */
+public record CopyParameters(
+    int sourceCdn,
+    String sourceKey,
+    int sourceLength,
+    MediaEncryptionParameters encryptionParameters,
+    byte[] destinationMediaId) {
+
+  /**
+   * @return The size of the double-encrypted destination object after it is copied
+   */
+  long destinationObjectSize() {
+    return encryptionParameters().outputSize(sourceLength());
+  }
+}

service/src/main/java/org/whispersystems/textsecuregcm/backup/CopyResult.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+package org.whispersystems.textsecuregcm.backup;
+
+import org.whispersystems.textsecuregcm.util.ExceptionUtils;
+
+import javax.annotation.Nullable;
+import java.util.Optional;
+
+
+/**
+ * The result of a copy operation
+ *
+ * @param outcome Whether the copy was a success
+ * @param mediaId The destination mediaId
+ * @param cdn On success, the destination cdn
+ */
+public record CopyResult(Outcome outcome, byte[] mediaId, @Nullable Integer cdn) {
+
+  public enum Outcome {
+    SUCCESS,
+    SOURCE_NOT_FOUND,
+    SOURCE_WRONG_LENGTH,
+    OUT_OF_QUOTA
+  }
+
+  /**
+   * Map an exception returned by {@link RemoteStorageManager#copy} to CopyResult with the appropriate outcome.
+   *
+   * @param throwable result of a failed copy operation
+   * @param key the copy destination mediaId
+   * @return The appropriate CopyResult, or empty if the exception does not match to an Outcome.
+   */
+  static Optional<CopyResult> fromCopyError(final Throwable throwable, final byte[] key) {
+    final Throwable unwrapped = ExceptionUtils.unwrap(throwable);
+    if (unwrapped instanceof SourceObjectNotFoundException) {
+      return Optional.of(new CopyResult(Outcome.SOURCE_NOT_FOUND, key, null));
+    } else if (unwrapped instanceof InvalidLengthException) {
+      return Optional.of(new CopyResult(Outcome.SOURCE_WRONG_LENGTH, key, null));
+    } else {
+      return Optional.empty();
+    }
+  }
+}

service/src/main/java/org/whispersystems/textsecuregcm/backup/ExpiredBackup.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+package org.whispersystems.textsecuregcm.backup;
+
+import java.time.Instant;
+
+/**
+ * Represents a backup that requires some or all of its content to be deleted
+ *
+ * @param hashedBackupId The hashedBackupId that owns this content
+ * @param expirationType What triggered the expiration
+ * @param lastRefresh    The timestamp of the last time the backup user was seen
+ * @param prefixToDelete The prefix on the CDN associated with this backup that should be deleted
+ */
+public record ExpiredBackup(
+    byte[] hashedBackupId,
+    ExpirationType expirationType,
+    Instant lastRefresh,
+    String prefixToDelete) {
+
+  public enum ExpirationType {
+    // The prefixToDelete expiration is for the entire backup
+    ALL,
+    // The prefixToDelete is for the media associated with the backup
+    MEDIA,
+    // The prefixToDelete is from a prior expiration attempt
+    GARBAGE_COLLECTION
+  }
+}

service/src/main/java/org/whispersystems/textsecuregcm/backup/MediaEncryptionParameters.java

@@ -1,24 +1,22 @@
 package org.whispersystems.textsecuregcm.backup;
 
-import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
 public record MediaEncryptionParameters(
     SecretKeySpec aesEncryptionKey,
-    SecretKeySpec hmacSHA256Key,
-    IvParameterSpec iv) {
+    SecretKeySpec hmacSHA256Key) {
 
-  public MediaEncryptionParameters(byte[] encryptionKey, byte[] macKey, byte[] iv) {
+  public MediaEncryptionParameters(byte[] encryptionKey, byte[] macKey) {
     this(
         new SecretKeySpec(encryptionKey, "AES"),
-        new SecretKeySpec(macKey, "HmacSHA256"),
-        new IvParameterSpec(iv));
+        new SecretKeySpec(macKey, "HmacSHA256"));
   }
 
   public int outputSize(final int inputSize) {
     // AES-256 has 16-byte block size, and always adds a block if the plaintext is a multiple of the block size
     final int numBlocks = (inputSize + 16) / 16;
+    // 16-byte IV will be generated and prepended to the ciphertext
     // IV + AES-256 encrypted data + HmacSHA256
-    return this.iv().getIV().length + (numBlocks * 16) + 32;
+    return 16 + (numBlocks * 16) + 32;
   }
 }

service/src/main/java/org/whispersystems/textsecuregcm/backup/RemoteStorageManager.java

@@ -1,6 +1,5 @@
 package org.whispersystems.textsecuregcm.backup;
 
-import java.net.URI;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletionStage;
@@ -18,12 +17,13 @@ public interface RemoteStorageManager {
   /**
    * Copy and the object from a remote source into the backup, adding an additional layer of encryption
    *
-   * @param sourceUri            The location of the object to copy
+   * @param sourceCdn            The cdn number where the source attachment is stored
+   * @param sourceKey            The key of the source attachment within the attachment cdn
    * @param expectedSourceLength The length of the source object, should match the content-length of the object returned
    *                             from the sourceUri.
    * @param encryptionParameters The encryption keys that should be used to apply an additional layer of encryption to
    *                             the object
-   * @param uploadDescriptor     The destination, which must be in the cdn returned by {@link #cdnNumber()}
+   * @param dstKey               The key within the backup cdn where the copied object will be written
    * @return A stage that completes successfully when the source has been successfully re-encrypted and copied into
    * uploadDescriptor. The returned CompletionStage can be completed exceptionally with the following exceptions.
    * <ul>
@@ -33,10 +33,11 @@ public interface RemoteStorageManager {
    * </ul>
    */
   CompletionStage<Void> copy(
-      URI sourceUri,
+      int sourceCdn,
+      String sourceKey,
       int expectedSourceLength,
       MediaEncryptionParameters encryptionParameters,
-      MessageBackupUploadDescriptor uploadDescriptor);
+      String dstKey);
 
   /**
    * Result of a {@link #list} operation

service/src/main/java/org/whispersystems/textsecuregcm/backup/SecureValueRecoveryBCredentialsGeneratorFactory.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2025 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.textsecuregcm.backup;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentialsGenerator;
+import org.whispersystems.textsecuregcm.configuration.SecureValueRecoveryConfiguration;
+import java.time.Clock;
+
+public class SecureValueRecoveryBCredentialsGeneratorFactory {
+  private SecureValueRecoveryBCredentialsGeneratorFactory() {}
+
+
+  @VisibleForTesting
+  static ExternalServiceCredentialsGenerator svrbCredentialsGenerator(
+      final SecureValueRecoveryConfiguration cfg,
+      final Clock clock) {
+    return ExternalServiceCredentialsGenerator
+        .builder(cfg.userAuthenticationTokenSharedSecret())
+        .withUserDerivationKey(cfg.userIdTokenSharedSecret().value())
+        .prependUsername(false)
+        .withDerivedUsernameTruncateLength(16)
+        .withClock(clock)
+        .build();
+  }
+
+  public static ExternalServiceCredentialsGenerator svrbCredentialsGenerator(final SecureValueRecoveryConfiguration cfg) {
+    return svrbCredentialsGenerator(cfg, Clock.systemUTC());
+  }
+}

service/src/main/java/org/whispersystems/textsecuregcm/backup/SourceObjectNotFoundException.java

@@ -8,4 +8,10 @@ package org.whispersystems.textsecuregcm.backup;
 import java.io.IOException;
 
 public class SourceObjectNotFoundException extends IOException {
+  public SourceObjectNotFoundException() {
+    super();
+  }
+  public SourceObjectNotFoundException(String message) {
+    super(message);
+  }
 }

service/src/main/java/org/whispersystems/textsecuregcm/backup/StoredBackupAttributes.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+package org.whispersystems.textsecuregcm.backup;
+
+import java.time.Instant;
+
+/**
+ * Attributes stored in the backups table for a single backup id
+ *
+ * @param hashedBackupId   The hashed backup-id of this entry
+ * @param backupDir        The cdn backupDir of this entry
+ * @param mediaDir         The cdn mediaDir (within the backupDir) of this entry
+ * @param lastRefresh      The last time the record was updated with a messages or media tier credential
+ * @param lastMediaRefresh The last time the record was updated with a media tier credential
+ * @param bytesUsed        The number of media bytes used by the backup
+ * @param numObjects       The number of media objects used byt the backup
+ */
+public record StoredBackupAttributes(
+    byte[] hashedBackupId,
+    String backupDir,
+    String mediaDir,
+    Instant lastRefresh,
+    Instant lastMediaRefresh,
+    long bytesUsed,
+    long numObjects) {}

service/src/main/java/org/whispersystems/textsecuregcm/badges/ConfiguredProfileBadgeConverter.java

@@ -76,22 +76,22 @@ public class ConfiguredProfileBadgeConverter implements ProfileBadgeConverter, B
     final ResourceBundle resourceBundle = headerControlledResourceBundleLookup.getResourceBundle(BASE_NAME,
         acceptableLanguages);
     List<Badge> badges = accountBadges.stream()
-        .filter(accountBadge -> (isSelf || accountBadge.isVisible())
-            && now.isBefore(accountBadge.getExpiration())
-            && knownBadges.containsKey(accountBadge.getId()))
+        .filter(accountBadge -> (isSelf || accountBadge.visible())
+            && now.isBefore(accountBadge.expiration())
+            && knownBadges.containsKey(accountBadge.id()))
         .map(accountBadge -> {
-          BadgeConfiguration configuration = knownBadges.get(accountBadge.getId());
+          BadgeConfiguration configuration = knownBadges.get(accountBadge.id());
           return newBadge(
               isSelf,
-              accountBadge.getId(),
+              accountBadge.id(),
               configuration.getCategory(),
-              resourceBundle.getString(accountBadge.getId() + "_name"),
-              resourceBundle.getString(accountBadge.getId() + "_description"),
+              resourceBundle.getString(accountBadge.id() + "_name"),
+              resourceBundle.getString(accountBadge.id() + "_description"),
               configuration.getSprites(),
               configuration.getSvg(),
               configuration.getSvgs(),
-              accountBadge.getExpiration(),
-              accountBadge.isVisible());
+              accountBadge.expiration(),
+              accountBadge.visible());
         })
         .collect(Collectors.toCollection(ArrayList::new));
     badges.addAll(badgeIdsEnabledForAll.stream().filter(knownBadges::containsKey).map(id -> {

service/src/main/java/org/whispersystems/textsecuregcm/badges/ResourceBundleLevelTranslator.java

@@ -1,32 +0,0 @@
-/*
- * Copyright 2021 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.badges;
-
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.ResourceBundle;
-import javax.annotation.Nonnull;
-import org.signal.i18n.HeaderControlledResourceBundleLookup;
-
-public class ResourceBundleLevelTranslator implements LevelTranslator {
-
-  private static final String BASE_NAME = "org.signal.subscriptions.Subscriptions";
-
-  private final HeaderControlledResourceBundleLookup headerControlledResourceBundleLookup;
-
-  public ResourceBundleLevelTranslator(
-      @Nonnull final HeaderControlledResourceBundleLookup headerControlledResourceBundleLookup) {
-    this.headerControlledResourceBundleLookup = Objects.requireNonNull(headerControlledResourceBundleLookup);
-  }
-
-  @Override
-  public String translate(final List<Locale> acceptableLanguages, final String badgeId) {
-    final ResourceBundle resourceBundle = headerControlledResourceBundleLookup.getResourceBundle(BASE_NAME,
-        acceptableLanguages);
-    return resourceBundle.getString(badgeId);
-  }
-}

service/src/main/java/org/whispersystems/textsecuregcm/calls/routing/CallDnsRecords.java

@@ -1,34 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.calls.routing;
-
-import javax.validation.constraints.NotNull;
-import java.net.InetAddress;
-import java.util.List;
-import java.util.Map;
-
-public record CallDnsRecords(
-  @NotNull
-  Map<String, List<InetAddress>> aByRegion,
-  @NotNull
-  Map<String, List<InetAddress>> aaaaByRegion
-) {
-  public String getSummary() {
-    int numARecords = aByRegion.values().stream().mapToInt(List::size).sum();
-    int numAAAARecords = aaaaByRegion.values().stream().mapToInt(List::size).sum();
-    return String.format(
-        "(A records, %s regions, %s records), (AAAA records, %s regions, %s records)",
-        aByRegion.size(),
-        numARecords,
-        aaaaByRegion.size(),
-        numAAAARecords
-    );
-  }
-
-  public static CallDnsRecords empty() {
-    return new CallDnsRecords(Map.of(), Map.of());
-  }
-}

service/src/main/java/org/whispersystems/textsecuregcm/calls/routing/CallDnsRecordsManager.java

@@ -1,92 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.calls.routing;
-
-import com.fasterxml.jackson.core.StreamReadFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.json.JsonMapper;
-import io.dropwizard.lifecycle.Managed;
-import io.micrometer.core.instrument.Metrics;
-import io.micrometer.core.instrument.Timer;
-import org.whispersystems.textsecuregcm.configuration.MonitoredS3ObjectConfiguration;
-import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
-import org.whispersystems.textsecuregcm.s3.S3ObjectMonitor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Nonnull;
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Supplier;
-
-public class CallDnsRecordsManager implements Supplier<CallDnsRecords>, Managed {
-
-  private final S3ObjectMonitor objectMonitor;
-
-  private final AtomicReference<CallDnsRecords> callDnsRecords = new AtomicReference<>();
-
-  private final Timer refreshTimer;
-
-  private static final Logger log = LoggerFactory.getLogger(CallDnsRecordsManager.class);
-
-  private static final ObjectMapper objectMapper = JsonMapper.builder()
-      .enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION)
-      .build();
-
-  public CallDnsRecordsManager(
-      @Nonnull final ScheduledExecutorService executorService,
-      @Nonnull final MonitoredS3ObjectConfiguration configuration
-  ){
-    this.objectMonitor = new S3ObjectMonitor(
-        configuration.s3Region(),
-        configuration.s3Bucket(),
-        configuration.objectKey(),
-        configuration.maxSize(),
-        executorService,
-        configuration.refreshInterval(),
-        this::handleDatabaseChanged
-    );
-
-    this.callDnsRecords.set(CallDnsRecords.empty());
-    this.refreshTimer = Metrics.timer(MetricsUtil.name(CallDnsRecordsManager.class, "refresh"));
-  }
-
-  private void handleDatabaseChanged(final InputStream inputStream) {
-    refreshTimer.record(() -> {
-      try (final InputStream bufferedInputStream = new BufferedInputStream(inputStream)) {
-        final CallDnsRecords newRecords = parseRecords(bufferedInputStream);
-        final CallDnsRecords oldRecords = callDnsRecords.getAndSet(newRecords);
-        log.info("Replaced dns records, old summary=[{}], new summary=[{}]", oldRecords != null ? oldRecords.getSummary() : "null", newRecords);
-      } catch (final IOException e) {
-        log.error("Failed to load Call DNS Records");
-      }
-    });
-  }
-
-  static CallDnsRecords parseRecords(InputStream inputStream) throws IOException {
-    return objectMapper.readValue(inputStream, CallDnsRecords.class);
-  }
-
-  @Override
-  public void start() throws Exception {
-    Managed.super.start();
-    objectMonitor.start();
-  }
-
-  @Override
-  public void stop() throws Exception {
-    objectMonitor.stop();
-    Managed.super.stop();
-    callDnsRecords.getAndSet(null);
-  }
-
-  @Override
-  public CallDnsRecords get() {
-    return this.callDnsRecords.get();
-  }
-}

service/src/main/java/org/whispersystems/textsecuregcm/calls/routing/CallRoutingTable.java

@@ -1,193 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.calls.routing;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.math.BigInteger;
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.TreeMap;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
-public class CallRoutingTable {
-  private final TreeMap<Integer, Map<Integer, List<String>>> ipv4Map;
-  private final TreeMap<Integer, Map<BigInteger, List<String>>> ipv6Map;
-  private final Map<GeoKey, List<String>> geoToDatacenter;
-
-  public CallRoutingTable(
-      Map<CidrBlock.IpV4CidrBlock, List<String>> ipv4SubnetToDatacenter,
-      Map<CidrBlock.IpV6CidrBlock, List<String>> ipv6SubnetToDatacenter,
-      Map<GeoKey, List<String>> geoToDatacenter
-  ) {
-    this.ipv4Map = new TreeMap<>();
-    for (Map.Entry<CidrBlock.IpV4CidrBlock, List<String>> t : ipv4SubnetToDatacenter.entrySet()) {
-      if (!this.ipv4Map.containsKey(t.getKey().cidrBlockSize())) {
-        this.ipv4Map.put(t.getKey().cidrBlockSize(), new HashMap<>());
-      }
-      this.ipv4Map
-          .get(t.getKey().cidrBlockSize())
-          .put(t.getKey().subnet(), t.getValue());
-    }
-
-    this.ipv6Map = new TreeMap<>();
-    for (Map.Entry<CidrBlock.IpV6CidrBlock, List<String>> t : ipv6SubnetToDatacenter.entrySet()) {
-      if (!this.ipv6Map.containsKey(t.getKey().cidrBlockSize())) {
-        this.ipv6Map.put(t.getKey().cidrBlockSize(), new HashMap<>());
-      }
-      this.ipv6Map
-          .get(t.getKey().cidrBlockSize())
-          .put(t.getKey().subnet(), t.getValue());
-    }
-
-    this.geoToDatacenter = geoToDatacenter;
-  }
-
-  public static CallRoutingTable empty() {
-    return new CallRoutingTable(Map.of(), Map.of(), Map.of());
-  }
-
-  public enum Protocol {
-    v4,
-    v6
-  }
-
-  public record GeoKey(
-      @NotBlank String continent,
-      @NotBlank String country,
-      @NotNull Optional<String> subdivision,
-      @NotBlank Protocol protocol
-  ) {}
-
-  /**
-   * Returns ordered list of fastest datacenters based on IP & Geo info. Prioritize the results based on subnet.
-   * Returns at most three, 2 by subnet and 1 by geo. Takes more from either bucket to hit 3.
-   */
-  public List<String> getDatacentersFor(
-      InetAddress address,
-      String continent,
-      String country,
-      Optional<String> subdivision
-  ) {
-    final int NUM_DATACENTERS = 3;
-
-    if(this.isEmpty()) {
-      return Collections.emptyList();
-    }
-
-    List<String> dcsBySubnet = getDatacentersBySubnet(address);
-    List<String> dcsByGeo = getDatacentersByGeo(continent, country, subdivision).stream()
-        .limit(NUM_DATACENTERS)
-        .filter(dc ->
-            (dcsBySubnet.isEmpty() || !dc.equals(dcsBySubnet.getFirst()))
-                && (dcsBySubnet.size() < 2 || !dc.equals(dcsBySubnet.get(1)))
-        ).toList();
-
-    return Stream.concat(
-            dcsBySubnet.stream().limit(dcsByGeo.isEmpty() ? NUM_DATACENTERS : NUM_DATACENTERS - 1),
-            dcsByGeo.stream())
-        .limit(NUM_DATACENTERS)
-        .toList();
-  }
-
-  public boolean isEmpty() {
-    return this.ipv4Map.isEmpty() && this.ipv6Map.isEmpty() && this.geoToDatacenter.isEmpty();
-  }
-
-  /**
-   * Returns ordered list of fastest datacenters based on ip info. Prioritizes V4 connections.
-   */
-  public List<String> getDatacentersBySubnet(InetAddress address) throws IllegalArgumentException {
-    if(address instanceof Inet4Address) {
-      for(Map.Entry<Integer, Map<Integer, List<String>>> t:  this.ipv4Map.descendingMap().entrySet()) {
-        int maskedIp = CidrBlock.IpV4CidrBlock.maskToSize((Inet4Address) address, t.getKey());
-        if(t.getValue().containsKey(maskedIp)) {
-          return t.getValue().get(maskedIp);
-        }
-      }
-    } else if (address instanceof  Inet6Address) {
-      for(Map.Entry<Integer, Map<BigInteger, List<String>>> t:  this.ipv6Map.descendingMap().entrySet()) {
-        BigInteger maskedIp = CidrBlock.IpV6CidrBlock.maskToSize((Inet6Address) address, t.getKey());
-        if(t.getValue().containsKey(maskedIp)) {
-          return t.getValue().get(maskedIp);
-        }
-      }
-    } else {
-      throw new IllegalArgumentException("Expected either an Inet4Address or Inet6Address");
-    }
-
-    return Collections.emptyList();
-  }
-
-  /**
-   * Returns ordered list of fastest datacenters based on geo info. Attempts to match based on subdivision, falls back
-   * to country based lookup. Does not attempt to look for nearby subdivisions. Prioritizes V4 connections.
-   */
-  public List<String> getDatacentersByGeo(
-      String continent,
-      String country,
-      Optional<String> subdivision
-  ) {
-    GeoKey v4Key = new GeoKey(continent, country, subdivision, Protocol.v4);
-    List<String> v4Options = this.geoToDatacenter.getOrDefault(v4Key, Collections.emptyList());
-    List<String> v4OptionsBackup = v4Options.isEmpty() && subdivision.isPresent() ?
-        this.geoToDatacenter.getOrDefault(
-            new GeoKey(continent, country, Optional.empty(), Protocol.v4),
-            Collections.emptyList())
-        : Collections.emptyList();
-
-    GeoKey v6Key = new GeoKey(continent, country, subdivision, Protocol.v6);
-    List<String> v6Options = this.geoToDatacenter.getOrDefault(v6Key, Collections.emptyList());
-    List<String> v6OptionsBackup = v6Options.isEmpty() && subdivision.isPresent() ?
-        this.geoToDatacenter.getOrDefault(
-            new GeoKey(continent, country, Optional.empty(), Protocol.v6),
-            Collections.emptyList())
-        : Collections.emptyList();
-
-    return Stream.of(
-            v4Options.stream(),
-            v6Options.stream(),
-            v4OptionsBackup.stream(),
-            v6OptionsBackup.stream()
-        )
-        .flatMap(Function.identity())
-        .distinct()
-        .toList();
-  }
-
-  public String toSummaryString() {
-    return String.format(
-        "[Ipv4Table=%s rows, Ipv6Table=%s rows, GeoTable=%s rows]",
-        ipv4Map.size(),
-        ipv6Map.size(),
-        geoToDatacenter.size()
-    );
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o)
-      return true;
-    if (o == null || getClass() != o.getClass())
-      return false;
-    CallRoutingTable that = (CallRoutingTable) o;
-    return Objects.equals(ipv4Map, that.ipv4Map) && Objects.equals(ipv6Map, that.ipv6Map) && Objects.equals(
-        geoToDatacenter, that.geoToDatacenter);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(ipv4Map, ipv6Map, geoToDatacenter);
-  }
-}

service/src/main/java/org/whispersystems/textsecuregcm/calls/routing/CallRoutingTableManager.java

@@ -1,85 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.calls.routing;
-
-import io.dropwizard.lifecycle.Managed;
-import io.micrometer.core.instrument.Metrics;
-import io.micrometer.core.instrument.Timer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.whispersystems.textsecuregcm.configuration.MonitoredS3ObjectConfiguration;
-import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
-import org.whispersystems.textsecuregcm.s3.S3ObjectMonitor;
-import javax.annotation.Nonnull;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Supplier;
-
-public class CallRoutingTableManager implements Supplier<CallRoutingTable>, Managed {
-
-  private final S3ObjectMonitor objectMonitor;
-
-  private final AtomicReference<CallRoutingTable> routingTable = new AtomicReference<>();
-
-  private final String tableTag;
-
-  private final Timer refreshTimer;
-
-  private static final Logger log = LoggerFactory.getLogger(CallRoutingTableManager.class);
-
-  public CallRoutingTableManager(
-      @Nonnull final ScheduledExecutorService executorService,
-      @Nonnull final MonitoredS3ObjectConfiguration configuration,
-      @Nonnull final String tableTag
-  ){
-    this.objectMonitor = new S3ObjectMonitor(
-        configuration.s3Region(),
-        configuration.s3Bucket(),
-        configuration.objectKey(),
-        configuration.maxSize(),
-        executorService,
-        configuration.refreshInterval(),
-        this::handleDatabaseChanged
-    );
-
-    this.tableTag = tableTag;
-    this.routingTable.set(CallRoutingTable.empty());
-    this.refreshTimer = Metrics.timer(MetricsUtil.name(CallRoutingTableManager.class, tableTag));
-  }
-
-  private void handleDatabaseChanged(final InputStream inputStream) {
-    refreshTimer.record(() -> {
-      try(InputStreamReader reader = new InputStreamReader(inputStream)) {
-        CallRoutingTable newTable = CallRoutingTableParser.fromJson(reader);
-        this.routingTable.set(newTable);
-        log.info("Replaced {} call routing table: {}", tableTag, newTable.toSummaryString());
-      } catch (final IOException e) {
-        log.error("Failed to parse and update {} call routing table", tableTag);
-      }
-    });
-  }
-
-  @Override
-  public void start() throws Exception {
-    Managed.super.start();
-    objectMonitor.start();
-  }
-
-  @Override
-  public void stop() throws Exception {
-    Managed.super.stop();
-    objectMonitor.stop();
-    routingTable.getAndSet(null);
-  }
-
-  @Override
-  public CallRoutingTable get() {
-    return this.routingTable.get();
-  }
-}

service/src/main/java/org/whispersystems/textsecuregcm/calls/routing/CallRoutingTableParser.java

@@ -1,185 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.calls.routing;
-
-import com.fasterxml.jackson.core.StreamReadFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.json.JsonMapper;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-
-final class CallRoutingTableParser {
-
-  private final static int IPV4_DEFAULT_BLOCK_SIZE = 24;
-  private final static int IPV6_DEFAULT_BLOCK_SIZE = 48;
-  private static final ObjectMapper objectMapper = JsonMapper.builder()
-      .enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION)
-      .build();
-
-  /** Used for parsing JSON */
-  private static class RawCallRoutingTable {
-      public Map<String, List<String>> ipv4GeoToDataCenters = Map.of();
-      public Map<String, List<String>> ipv6GeoToDataCenters = Map.of();
-      public Map<String, List<String>> ipv4SubnetsToDatacenters = Map.of();
-      public Map<String, List<String>> ipv6SubnetsToDatacenters = Map.of();
-  }
-
-  private final static String WHITESPACE_REGEX = "\\s+";
-
-  public static CallRoutingTable fromJson(final Reader inputReader) throws IOException {
-    try (final BufferedReader reader = new BufferedReader(inputReader)) {
-      RawCallRoutingTable rawTable = objectMapper.readValue(reader, RawCallRoutingTable.class);
-
-      Map<CidrBlock.IpV4CidrBlock, List<String>> ipv4SubnetToDatacenter = rawTable.ipv4SubnetsToDatacenters
-          .entrySet()
-          .stream()
-          .collect(Collectors.toUnmodifiableMap(
-              e -> (CidrBlock.IpV4CidrBlock) CidrBlock.parseCidrBlock(e.getKey(), IPV4_DEFAULT_BLOCK_SIZE),
-                  Map.Entry::getValue
-          ));
-
-      Map<CidrBlock.IpV6CidrBlock, List<String>> ipv6SubnetToDatacenter = rawTable.ipv6SubnetsToDatacenters
-          .entrySet()
-          .stream()
-          .collect(Collectors.toUnmodifiableMap(
-              e -> (CidrBlock.IpV6CidrBlock) CidrBlock.parseCidrBlock(e.getKey(), IPV6_DEFAULT_BLOCK_SIZE),
-              Map.Entry::getValue
-          ));
-
-      Map<CallRoutingTable.GeoKey, List<String>> geoToDatacenter = Stream.concat(
-          rawTable.ipv4GeoToDataCenters
-              .entrySet()
-              .stream()
-              .map(e -> Map.entry(parseRawGeoKey(e.getKey(), CallRoutingTable.Protocol.v4), e.getValue())),
-          rawTable.ipv6GeoToDataCenters
-              .entrySet()
-              .stream()
-              .map(e -> Map.entry(parseRawGeoKey(e.getKey(), CallRoutingTable.Protocol.v6), e.getValue()))
-      ).collect(Collectors.toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue));
-
-      return new CallRoutingTable(
-          ipv4SubnetToDatacenter,
-          ipv6SubnetToDatacenter,
-          geoToDatacenter
-      );
-    }
-  }
-
-  private static CallRoutingTable.GeoKey parseRawGeoKey(String rawKey, CallRoutingTable.Protocol protocol) {
-    String[] splits = rawKey.split("-");
-    if (splits.length < 2 || splits.length > 3) {
-      throw new IllegalArgumentException("Invalid raw key");
-    }
-
-    Optional<String> subdivision = splits.length < 3 ? Optional.empty() : Optional.of(splits[2]);
-    return new CallRoutingTable.GeoKey(splits[0], splits[1], subdivision, protocol);
-  }
-
-  /**
-   * Parses a call routing table in TSV format. Example below - see tests for more examples:
-   192.0.2.0/24 northamerica-northeast1
-   198.51.100.0/24 us-south1
-   203.0.113.0/24 asia-southeast1
-
-   2001:db8:b0a9::/48 us-east4
-   2001:db8:b0f5::/48 us-central1 northamerica-northeast1 us-east4
-   2001:db8:9406::/48 us-east1 us-central1
-
-   SA-SR-v4 us-east1 us-east4
-   SA-SR-v6 us-east1 us-south1
-   SA-UY-v4 southamerica-west1 southamerica-east1 europe-west3
-   SA-UY-v6 southamerica-west1 europe-west4
-   SA-VE-v4 us-east1 us-east4 us-south1
-   SA-VE-v6 us-east1 northamerica-northeast1 us-east4
-   ZZ-ZZ-v4 asia-south1 europe-southwest1 australia-southeast1
-   */
-  public static CallRoutingTable fromTsv(final Reader inputReader) throws IOException {
-    try (final BufferedReader reader = new BufferedReader(inputReader)) {
-      // use maps to silently dedupe CidrBlocks
-      Map<CidrBlock.IpV4CidrBlock, List<String>> ipv4Map = new HashMap<>();
-      Map<CidrBlock.IpV6CidrBlock, List<String>> ipv6Map = new HashMap<>();
-      Map<CallRoutingTable.GeoKey, List<String>> ipGeoTable = new HashMap<>();
-      String line;
-      while((line = reader.readLine()) != null) {
-        if(line.isBlank()) {
-          continue;
-        }
-
-        List<String> splits = Arrays.stream(line.split(WHITESPACE_REGEX)).filter(s -> !s.isBlank()).toList();
-        if (splits.size() < 2) {
-          throw new IllegalStateException("Invalid row, expected some key and list of values");
-        }
-
-        List<String> datacenters = splits.subList(1, splits.size());
-        switch (guessLineType(splits)) {
-          case v4 ->  {
-            CidrBlock cidrBlock = CidrBlock.parseCidrBlock(splits.getFirst());
-            if(!(cidrBlock instanceof CidrBlock.IpV4CidrBlock)) {
-              throw new IllegalArgumentException("Expected an ipv4 cidr block");
-            }
-            ipv4Map.put((CidrBlock.IpV4CidrBlock) cidrBlock, datacenters);
-          }
-          case v6 -> {
-            CidrBlock cidrBlock = CidrBlock.parseCidrBlock(splits.getFirst());
-            if(!(cidrBlock instanceof CidrBlock.IpV6CidrBlock)) {
-              throw new IllegalArgumentException("Expected an ipv6 cidr block");
-            }
-            ipv6Map.put((CidrBlock.IpV6CidrBlock) cidrBlock, datacenters);
-          }
-          case Geo -> {
-            String[] geo = splits.getFirst().split("-");
-            if(geo.length < 3) {
-              throw new IllegalStateException("Geo row key invalid, expected atleast continent, country, and protocol");
-            }
-            String continent = geo[0];
-            String country = geo[1];
-            Optional<String> subdivision = geo.length > 3 ? Optional.of(geo[2]) : Optional.empty();
-            CallRoutingTable.Protocol protocol = CallRoutingTable.Protocol.valueOf(geo[geo.length - 1].toLowerCase());
-            CallRoutingTable.GeoKey tableKey = new CallRoutingTable.GeoKey(
-                continent,
-                country,
-                subdivision,
-                protocol
-            );
-            ipGeoTable.put(tableKey, datacenters);
-          }
-        }
-      }
-
-      return new CallRoutingTable(
-          ipv4Map,
-          ipv6Map,
-          ipGeoTable
-      );
-    }
-  }
-
-  private static LineType guessLineType(List<String> splits) {
-    String first = splits.getFirst();
-    if (first.contains("-")) {
-      return LineType.Geo;
-    } else if(first.contains(":")) {
-      return LineType.v6;
-    } else if (first.contains(".")) {
-      return LineType.v4;
-    }
-
-    throw new IllegalArgumentException(String.format("Invalid line, could not determine type from '%s'", first));
-  }
-
-  private enum LineType {
-    v4, v6, Geo
-  }
-}

service/src/main/java/org/whispersystems/textsecuregcm/calls/routing/CidrBlock.java

@@ -1,137 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.calls.routing;
-
-import java.math.BigInteger;
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-/**
- * Can be used to check if an IP is in the CIDR block
- */
-public interface CidrBlock {
-
-  boolean ipInBlock(InetAddress address);
-
-  static CidrBlock parseCidrBlock(String cidrBlock, int defaultBlockSize) {
-    String[] splits = cidrBlock.split("/");
-    if(splits.length > 2) {
-      throw new IllegalArgumentException("Invalid cidr block format, expected {address}/{blocksize}");
-    }
-
-    try {
-      int blockSize = splits.length == 2 ? Integer.parseInt(splits[1]) : defaultBlockSize;
-      return parseCidrBlockInner(splits[0], blockSize);
-    } catch (NumberFormatException e) {
-      throw new IllegalArgumentException(String.format("Invalid block size specified: '%s'", splits[1]));
-    }
-  }
-
-  static CidrBlock parseCidrBlock(String cidrBlock) {
-    String[] splits = cidrBlock.split("/");
-    if (splits.length != 2) {
-      throw new IllegalArgumentException("Invalid cidr block format, expected {address}/{blocksize}");
-    }
-
-    try {
-      int blockSize = Integer.parseInt(splits[1]);
-      return parseCidrBlockInner(splits[0], blockSize);
-    } catch (NumberFormatException e) {
-      throw new IllegalArgumentException(String.format("Invalid block size specified: '%s'", splits[1]));
-    }
-  }
-
-  private static CidrBlock parseCidrBlockInner(String rawAddress, int blockSize) {
-    try {
-      InetAddress address = InetAddress.getByName(rawAddress);
-      if(address instanceof Inet4Address) {
-        return IpV4CidrBlock.of((Inet4Address) address, blockSize);
-      } else if (address instanceof Inet6Address) {
-        return IpV6CidrBlock.of((Inet6Address) address, blockSize);
-      } else {
-        throw new IllegalArgumentException("Must be an ipv4 or ipv6 string");
-      }
-    } catch (UnknownHostException e) {
-      throw new IllegalArgumentException(e);
-    }
-  }
-
-  record IpV4CidrBlock(int subnet, int subnetMask, int cidrBlockSize) implements CidrBlock {
-    public static IpV4CidrBlock of(Inet4Address subnet, int cidrBlockSize) {
-      if(cidrBlockSize > 32 || cidrBlockSize < 0) {
-        throw new IllegalArgumentException("Invalid cidrBlockSize");
-      }
-
-      int subnetMask = mask(cidrBlockSize);
-      int maskedIp = ipToInt(subnet) & subnetMask;
-      return new IpV4CidrBlock(maskedIp, subnetMask, cidrBlockSize);
-    }
-
-    public boolean ipInBlock(InetAddress address) {
-      if(!(address instanceof Inet4Address)) {
-        return false;
-      }
-      int ip = ipToInt((Inet4Address) address);
-      return (ip & subnetMask) == subnet;
-    }
-
-    private static int ipToInt(Inet4Address address) {
-      byte[] octets = address.getAddress();
-      return  (octets[0] & 0xff) << 24 |
-          (octets[1] & 0xff) << 16 |
-          (octets[2] & 0xff) << 8 |
-          octets[3] & 0xff;
-    }
-
-    private static int mask(int cidrBlockSize) {
-      return (int) (-1L << (32 - cidrBlockSize));
-    }
-
-    public static int maskToSize(Inet4Address address, int cidrBlockSize) {
-      return ipToInt(address) & mask(cidrBlockSize);
-    }
-  }
-
-  record IpV6CidrBlock(BigInteger subnet, BigInteger subnetMask, int cidrBlockSize) implements CidrBlock {
-
-    private static final BigInteger MINUS_ONE = BigInteger.valueOf(-1);
-
-    public static IpV6CidrBlock of(Inet6Address subnet, int cidrBlockSize) {
-      if(cidrBlockSize > 128 || cidrBlockSize < 0) {
-        throw new IllegalArgumentException("Invalid cidrBlockSize");
-      }
-
-      BigInteger subnetMask = mask(cidrBlockSize);
-      BigInteger maskedIp = ipToInt(subnet).and(subnetMask);
-      return new IpV6CidrBlock(maskedIp, subnetMask, cidrBlockSize);
-    }
-
-    public boolean ipInBlock(InetAddress address) {
-      if(!(address instanceof Inet6Address)) {
-        return false;
-      }
-      BigInteger ip = ipToInt((Inet6Address) address);
-      return ip.and(subnetMask).equals(subnet);
-    }
-
-    private static BigInteger ipToInt(Inet6Address ipAddress) {
-      byte[] octets = ipAddress.getAddress();
-      assert octets.length == 16;
-
-      return new BigInteger(octets);
-    }
-
-    private static BigInteger mask(int cidrBlockSize) {
-      return MINUS_ONE.shiftLeft(128 - cidrBlockSize);
-    }
-
-    public static BigInteger maskToSize(Inet6Address address, int cidrBlockSize) {
-      return ipToInt(address).and(mask(cidrBlockSize));
-    }
-  }
-}

service/src/main/java/org/whispersystems/textsecuregcm/calls/routing/DynamicConfigTurnRouter.java

@@ -1,69 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.calls.routing;
-
-import org.whispersystems.textsecuregcm.configuration.TurnUriConfiguration;
-import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;
-import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicTurnConfiguration;
-import org.whispersystems.textsecuregcm.storage.DynamicConfigurationManager;
-import org.whispersystems.textsecuregcm.util.Pair;
-import org.whispersystems.textsecuregcm.util.WeightedRandomSelect;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.Random;
-import java.util.UUID;
-
-/** Uses DynamicConfig to help route a turn request */
-public class DynamicConfigTurnRouter {
-
-  private static final Random rng = new Random();
-
-  public static final long RANDOMIZE_RATE_BASIS = 100_000;
-
-  private final DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager;
-
-  public DynamicConfigTurnRouter(final DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager) {
-    this.dynamicConfigurationManager = dynamicConfigurationManager;
-  }
-
-  public List<String> targetedUrls(final UUID aci) {
-    final DynamicTurnConfiguration turnConfig = dynamicConfigurationManager.getConfiguration().getTurnConfiguration();
-
-    final Optional<TurnUriConfiguration> enrolled = turnConfig.getUriConfigs().stream()
-        .filter(config -> config.getEnrolledAcis().contains(aci))
-        .findFirst();
-
-      return enrolled
-          .map(turnUriConfiguration -> turnUriConfiguration.getUris().stream().toList())
-          .orElse(Collections.emptyList());
-  }
-
-  public List<String> randomUrls() {
-    final DynamicTurnConfiguration turnConfig = dynamicConfigurationManager.getConfiguration().getTurnConfiguration();
-
-    // select from turn server sets by weighted choice
-    return WeightedRandomSelect.select(turnConfig
-        .getUriConfigs()
-        .stream()
-        .map(c -> new Pair<>(c.getUris(), c.getWeight())).toList());
-  }
-
-  public String getHostname() {
-    final DynamicTurnConfiguration turnConfig = dynamicConfigurationManager.getConfiguration().getTurnConfiguration();
-    return turnConfig.getHostname();
-  }
-
-  public long getRandomizeRate() {
-    final DynamicTurnConfiguration turnConfig = dynamicConfigurationManager.getConfiguration().getTurnConfiguration();
-    return turnConfig.getRandomizeRate();
-  }
-
-  public boolean shouldRandomize() {
-    long rate = getRandomizeRate();
-    return rate >= RANDOMIZE_RATE_BASIS || rng.nextLong(0, DynamicConfigTurnRouter.RANDOMIZE_RATE_BASIS) < rate;
-  }
-}

service/src/main/java/org/whispersystems/textsecuregcm/calls/routing/TurnCallRouter.java

@@ -1,168 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.calls.routing;
-
-import com.maxmind.geoip2.DatabaseReader;
-import com.maxmind.geoip2.exception.GeoIp2Exception;
-import com.maxmind.geoip2.model.CityResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.whispersystems.textsecuregcm.util.Util;
-import javax.annotation.Nonnull;
-import java.io.IOException;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.util.*;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
-/**
- * Returns routes based on performance tables, manually routing tables, and target routing. Falls back to a random Turn
- * instance that the server knows about.
- */
-public class TurnCallRouter {
-
-  private final Logger logger = LoggerFactory.getLogger(TurnCallRouter.class);
-
-  private final Supplier<CallDnsRecords> callDnsRecords;
-  private final Supplier<CallRoutingTable> performanceRouting;
-  private final Supplier<CallRoutingTable> manualRouting;
-  private final DynamicConfigTurnRouter configTurnRouter;
-  private final Supplier<DatabaseReader> geoIp;
-
-  public TurnCallRouter(
-      @Nonnull Supplier<CallDnsRecords> callDnsRecords,
-      @Nonnull Supplier<CallRoutingTable> performanceRouting,
-      @Nonnull Supplier<CallRoutingTable> manualRouting,
-      @Nonnull DynamicConfigTurnRouter configTurnRouter,
-      @Nonnull Supplier<DatabaseReader> geoIp
-  ) {
-    this.performanceRouting = performanceRouting;
-    this.callDnsRecords = callDnsRecords;
-    this.manualRouting = manualRouting;
-    this.configTurnRouter = configTurnRouter;
-    this.geoIp = geoIp;
-  }
-
-  /**
-   * Gets Turn Instance addresses. Returns both the IPv4 and IPv6 addresses. Prefers to match the IP protocol of the
-   * client address in datacenter selection. Returns 2 instance options of the preferred protocol for every one instance
-   * of the other.
-   * @param aci aci of client
-   * @param clientAddress IP address to base routing on
-   * @param instanceLimit max instances to return options for
-   */
-  public TurnServerOptions getRoutingFor(
-      @Nonnull final UUID aci,
-      @Nonnull final Optional<InetAddress> clientAddress,
-      final int instanceLimit
-  ) {
-    try {
-      return getRoutingForInner(aci, clientAddress, instanceLimit);
-    } catch(Exception e) {
-      logger.error("Failed to perform routing", e);
-      return new TurnServerOptions(this.configTurnRouter.getHostname(), null, this.configTurnRouter.randomUrls());
-    }
-  }
-
-  TurnServerOptions getRoutingForInner(
-      @Nonnull final UUID aci,
-      @Nonnull final Optional<InetAddress> clientAddress,
-      final int instanceLimit
-  ) {
-    if (instanceLimit < 1) {
-      throw new IllegalArgumentException("Limit cannot be less than one");
-    }
-
-    String hostname = this.configTurnRouter.getHostname();
-
-    List<String> targetedUrls = this.configTurnRouter.targetedUrls(aci);
-    if(!targetedUrls.isEmpty()) {
-      return new TurnServerOptions(hostname, null, targetedUrls);
-    }
-
-    if(clientAddress.isEmpty() || this.configTurnRouter.shouldRandomize()) {
-      return new TurnServerOptions(hostname, null, this.configTurnRouter.randomUrls());
-    }
-
-    CityResponse geoInfo;
-    try {
-      geoInfo = geoIp.get().city(clientAddress.get());
-    } catch (IOException | GeoIp2Exception e) {
-      throw new RuntimeException(e);
-    }
-    Optional<String> subdivision = !geoInfo.getSubdivisions().isEmpty()
-        ? Optional.of(geoInfo.getSubdivisions().getFirst().getIsoCode())
-        : Optional.empty();
-
-    List<String> datacenters = this.manualRouting.get().getDatacentersFor(
-        clientAddress.get(),
-        geoInfo.getContinent().getCode(),
-        geoInfo.getCountry().getIsoCode(),
-        subdivision
-    );
-
-    if (datacenters.isEmpty()){
-      datacenters = this.performanceRouting.get().getDatacentersFor(
-          clientAddress.get(),
-          geoInfo.getContinent().getCode(),
-          geoInfo.getCountry().getIsoCode(),
-          subdivision
-      );
-    }
-
-    List<String> urlsWithIps = getUrlsForInstances(
-        selectInstances(
-            datacenters,
-            instanceLimit,
-            (clientAddress.get() instanceof Inet6Address)
-        ));
-    return new TurnServerOptions(hostname, urlsWithIps, minimalRandomUrls());
-  }
-
-  // Includes only the udp options in the randomUrls
-  private List<String> minimalRandomUrls(){
-    return this.configTurnRouter.randomUrls().stream()
-        .filter(s -> s.startsWith("turn:") && !s.endsWith("transport=tcp"))
-        .toList();
-  }
-
-  private List<String> selectInstances(List<String> datacenters, int limit, boolean preferV6) {
-    if(datacenters.isEmpty() || limit == 0) {
-      return Collections.emptyList();
-    }
-    int numV6 = preferV6 ? (limit - limit / 3) : limit / 3;
-    int numV4  = limit - numV6;
-
-    CallDnsRecords dnsRecords = this.callDnsRecords.get();
-    List<InetAddress> ipv4Selection = datacenters.stream()
-        .flatMap(dc -> Util.randomNOfStable(dnsRecords.aByRegion().get(dc), limit).stream())
-        .toList();
-    List<InetAddress> ipv6Selection = datacenters.stream()
-        .flatMap(dc -> Util.randomNOfStable(dnsRecords.aaaaByRegion().get(dc), limit).stream())
-        .toList();
-
-    // increase numV4 if not enough v6 options. vice-versa is also true
-    numV4 = Math.max(numV4, limit - ipv6Selection.size());
-    ipv4Selection = ipv4Selection.stream().limit(numV4).toList();
-    ipv6Selection = ipv6Selection.stream().limit(limit - ipv4Selection.size()).toList();
-
-    return Stream.concat(
-        ipv4Selection.stream().map(InetAddress::getHostAddress),
-        // map ipv6 to RFC3986 format i.e. surrounded by brackets
-        ipv6Selection.stream().map(i -> String.format("[%s]", i.getHostAddress()))
-    ).toList();
-  }
-
-  private static List<String> getUrlsForInstances(List<String> instanceIps) {
-    return instanceIps.stream().flatMap(ip -> Stream.of(
-            String.format("turn:%s", ip),
-            String.format("turn:%s:80?transport=tcp", ip),
-            String.format("turns:%s:443?transport=tcp", ip)
-        )
-    ).toList();
-  }
-}

service/src/main/java/org/whispersystems/textsecuregcm/calls/routing/TurnServerOptions.java

@@ -1,11 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.calls.routing;
-
-import java.util.List;
-
-public record TurnServerOptions(String hostname, List<String> urlsWithIps, List<String> urlsWithHostname) {
-}

service/src/main/java/org/whispersystems/textsecuregcm/captcha/AssessmentResult.java

@@ -76,7 +76,13 @@ public class AssessmentResult {
     if (!solved) {
       return false;
     }
-    return this.actualScore >= scoreThreshold.orElse(this.defaultScoreThreshold);
+    // Since HCaptcha scores are truncated to 2 decimal places, we can multiply by 100 and round to the nearest int for
+    // comparison instead of floating point comparisons
+    return normalizedIntScore(this.actualScore) >= normalizedIntScore(scoreThreshold.orElse(this.defaultScoreThreshold));
+  }
+
+  private static int normalizedIntScore(final float score) {
+    return Math.round(score * 100);
   }
 
   public String getScoreString() {

service/src/main/java/org/whispersystems/textsecuregcm/captcha/CaptchaChecker.java

@@ -9,21 +9,20 @@ import static org.whispersystems.textsecuregcm.metrics.MetricsUtil.name;
 
 import com.google.common.annotations.VisibleForTesting;
 import io.micrometer.core.instrument.Metrics;
+import jakarta.ws.rs.BadRequestException;
 import java.io.IOException;
-import java.util.List;
 import java.util.Locale;
-import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
+import java.util.UUID;
 import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.ws.rs.BadRequestException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class CaptchaChecker {
   private static final Logger logger = LoggerFactory.getLogger(CaptchaChecker.class);
   private static final String INVALID_SITEKEY_COUNTER_NAME = name(CaptchaChecker.class, "invalidSiteKey");
-  private static final String ASSESSMENTS_COUNTER_NAME = name(RecaptchaClient.class, "assessments");
+  private static final String ASSESSMENTS_COUNTER_NAME = name(CaptchaChecker.class, "assessments");
   private static final String INVALID_ACTION_COUNTER_NAME = name(CaptchaChecker.class, "invalidActions");
 
   @VisibleForTesting
@@ -32,33 +31,36 @@ public class CaptchaChecker {
   private static final String SHORT_SUFFIX = "-short";
 
   private final ShortCodeExpander shortCodeExpander;
-  private final Map<String, CaptchaClient> captchaClientMap;
+  private final Function<String, CaptchaClient> captchaClientSupplier;
 
   public CaptchaChecker(
       final ShortCodeExpander shortCodeRetriever,
-      final List<CaptchaClient> captchaClients) {
+      final Function<String, CaptchaClient> captchaClientSupplier) {
     this.shortCodeExpander = shortCodeRetriever;
-    this.captchaClientMap = captchaClients.stream()
-        .collect(Collectors.toMap(CaptchaClient::scheme, Function.identity()));
+    this.captchaClientSupplier = captchaClientSupplier;
   }
 
 
   /**
    * Check if a solved captcha should be accepted
    *
+   * @param maybeAci       optional account UUID of the user solving the captcha
    * @param expectedAction the {@link Action} for which this captcha solution is intended
    * @param input          expected to contain a prefix indicating the captcha scheme, sitekey, token, and action. The
    *                       expected format is {@code version-prefix.sitekey.action.token}
    * @param ip             IP of the solver
+   * @param userAgent      User-Agent of the solver
    * @return An {@link AssessmentResult} indicating whether the solution should be accepted, and a score that can be
    * used for metrics
    * @throws IOException         if there is an error validating the captcha with the underlying service
    * @throws BadRequestException if input is not in the expected format
    */
   public AssessmentResult verify(
+      final Optional<UUID> maybeAci,
       final Action expectedAction,
       final String input,
-      final String ip) throws IOException {
+      final String ip,
+      final String userAgent) throws IOException {
     final String[] parts = input.split("\\" + SEPARATOR, 4);
 
     // we allow missing actions, if we're missing 1 part, assume it's the action
@@ -79,7 +81,7 @@ public class CaptchaChecker {
       token = shortCodeExpander.retrieve(token).orElseThrow(() -> new BadRequestException("invalid shortcode"));
     }
 
-    final CaptchaClient client = this.captchaClientMap.get(provider);
+    final CaptchaClient client = this.captchaClientSupplier.apply(provider);
     if (client == null) {
       throw new BadRequestException("invalid captcha scheme");
     }
@@ -87,7 +89,7 @@ public class CaptchaChecker {
     final Action parsedAction = Action.parse(action)
         .orElseThrow(() -> {
           Metrics.counter(INVALID_ACTION_COUNTER_NAME, "action", action).increment();
-          throw new BadRequestException("invalid captcha action");
+          return new BadRequestException("invalid captcha action");
         });
 
     if (!parsedAction.equals(expectedAction)) {
@@ -102,7 +104,7 @@ public class CaptchaChecker {
       throw new BadRequestException("invalid captcha site-key");
     }
 
-    final AssessmentResult result = client.verify(siteKey, parsedAction, token, ip);
+    final AssessmentResult result = client.verify(maybeAci, siteKey, parsedAction, token, ip, userAgent);
     Metrics.counter(ASSESSMENTS_COUNTER_NAME,
             "action", action,
             "score", result.getScoreString(),