Remove deprecated /v1/accounts/turn

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

@@ -669,8 +669,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
 
     final MessageSender messageSender = new MessageSender(messagesManager, pushNotificationManager);
     final ReceiptSender receiptSender = new ReceiptSender(accountsManager, messageSender, receiptSenderExecutor);
-    final TurnTokenGenerator turnTokenGenerator = new TurnTokenGenerator(dynamicConfigurationManager,
-        config.getTurnConfiguration().secret().value());
+    final TurnTokenGenerator turnTokenGenerator = new TurnTokenGenerator(config.getTurnConfiguration().secret().value());
     final CloudflareTurnCredentialsManager cloudflareTurnCredentialsManager = new CloudflareTurnCredentialsManager(
         config.getTurnConfiguration().cloudflare().apiToken().value(),
         config.getTurnConfiguration().cloudflare().endpoint(),
@@ -1101,7 +1100,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     final PhoneVerificationTokenManager phoneVerificationTokenManager = new PhoneVerificationTokenManager(
         phoneNumberIdentifiers, registrationServiceClient, registrationRecoveryPasswordsManager, registrationRecoveryChecker);
     final List<Object> commonControllers = Lists.newArrayList(
-        new AccountController(accountsManager, rateLimiters, turnTokenGenerator, registrationRecoveryPasswordsManager,
+        new AccountController(accountsManager, rateLimiters, registrationRecoveryPasswordsManager,
             usernameHashZkProofVerifier),
         new AccountControllerV2(accountsManager, changeNumberManager, phoneVerificationTokenManager,
             registrationLockVerificationManager, rateLimiters),

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

@@ -27,8 +27,6 @@ import org.whispersystems.textsecuregcm.util.WeightedRandomSelect;
 
 public class TurnTokenGenerator {
 
-  private final DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager;
-
   private final byte[] turnSecret;
 
   private static final String ALGORITHM = "HmacSHA1";
@@ -37,17 +35,10 @@ public class TurnTokenGenerator {
 
   private static final String WithIpsProtocol = "01";
 
-  public TurnTokenGenerator(final DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager,
-      final byte[] turnSecret) {
-    this.dynamicConfigurationManager = dynamicConfigurationManager;
+  public TurnTokenGenerator(final byte[] turnSecret) {
     this.turnSecret = turnSecret;
   }
 
-  @Deprecated
-  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());
   }
@@ -71,23 +62,4 @@ public class TurnTokenGenerator {
       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/controllers/AccountController.java

@@ -35,11 +35,8 @@ import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import javax.annotation.Nullable;
 import org.signal.libsignal.usernames.BaseUsernameException;
-import org.whispersystems.textsecuregcm.auth.AccountAndAuthenticatedDeviceHolder;
 import org.whispersystems.textsecuregcm.auth.AuthenticatedDevice;
 import org.whispersystems.textsecuregcm.auth.SaltedTokenHash;
-import org.whispersystems.textsecuregcm.auth.TurnToken;
-import org.whispersystems.textsecuregcm.auth.TurnTokenGenerator;
 import org.whispersystems.textsecuregcm.entities.AccountAttributes;
 import org.whispersystems.textsecuregcm.entities.AccountIdentifierResponse;
 import org.whispersystems.textsecuregcm.entities.AccountIdentityResponse;
@@ -61,7 +58,6 @@ import org.whispersystems.textsecuregcm.limits.RateLimiters;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.AccountsManager;
 import org.whispersystems.textsecuregcm.storage.Device;
-import org.whispersystems.textsecuregcm.storage.DeviceCapability;
 import org.whispersystems.textsecuregcm.storage.RegistrationRecoveryPasswordsManager;
 import org.whispersystems.textsecuregcm.storage.UsernameHashNotAvailableException;
 import org.whispersystems.textsecuregcm.storage.UsernameReservationNotFoundException;
@@ -82,33 +78,20 @@ public class AccountController {
 
   private final AccountsManager accounts;
   private final RateLimiters rateLimiters;
-  private final TurnTokenGenerator turnTokenGenerator;
   private final RegistrationRecoveryPasswordsManager registrationRecoveryPasswordsManager;
   private final UsernameHashZkProofVerifier usernameHashZkProofVerifier;
 
   public AccountController(
       AccountsManager accounts,
       RateLimiters rateLimiters,
-      TurnTokenGenerator turnTokenGenerator,
       RegistrationRecoveryPasswordsManager registrationRecoveryPasswordsManager,
       UsernameHashZkProofVerifier usernameHashZkProofVerifier) {
     this.accounts = accounts;
     this.rateLimiters = rateLimiters;
-    this.turnTokenGenerator = turnTokenGenerator;
     this.registrationRecoveryPasswordsManager = registrationRecoveryPasswordsManager;
     this.usernameHashZkProofVerifier = usernameHashZkProofVerifier;
   }
 
-  // may be removed after 2024-07-16
-  @Deprecated(forRemoval = true)
-  @GET
-  @Path("/turn/")
-  @Produces(MediaType.APPLICATION_JSON)
-  public TurnToken getTurnToken(@ReadOnly @Auth AuthenticatedDevice auth) throws RateLimitExceededException {
-    rateLimiters.getTurnLimiter().validate(auth.getAccount().getUuid());
-    return turnTokenGenerator.generate(auth.getAccount().getUuid());
-  }
-
   @PUT
   @Path("/gcm/")
   @Consumes(MediaType.APPLICATION_JSON)

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

@@ -1,39 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.grpc;
-
-import org.signal.chat.calling.GetTurnCredentialsRequest;
-import org.signal.chat.calling.GetTurnCredentialsResponse;
-import org.signal.chat.calling.ReactorCallingGrpc;
-import org.whispersystems.textsecuregcm.auth.TurnTokenGenerator;
-import org.whispersystems.textsecuregcm.auth.grpc.AuthenticatedDevice;
-import org.whispersystems.textsecuregcm.auth.grpc.AuthenticationUtil;
-import org.whispersystems.textsecuregcm.limits.RateLimiters;
-import reactor.core.publisher.Mono;
-
-public class CallingGrpcService extends ReactorCallingGrpc.CallingImplBase {
-
-  private final TurnTokenGenerator turnTokenGenerator;
-  private final RateLimiters rateLimiters;
-
-  public CallingGrpcService(final TurnTokenGenerator turnTokenGenerator, final RateLimiters rateLimiters) {
-    this.turnTokenGenerator = turnTokenGenerator;
-    this.rateLimiters = rateLimiters;
-  }
-
-  @Override
-  public Mono<GetTurnCredentialsResponse> getTurnCredentials(final GetTurnCredentialsRequest request) {
-    final AuthenticatedDevice authenticatedDevice = AuthenticationUtil.requireAuthenticatedDevice();
-
-    return rateLimiters.getTurnLimiter().validateReactive(authenticatedDevice.accountIdentifier())
-        .then(Mono.fromSupplier(() -> turnTokenGenerator.generate(authenticatedDevice.accountIdentifier())))
-        .map(turnToken -> GetTurnCredentialsResponse.newBuilder()
-            .setUsername(turnToken.username())
-            .setPassword(turnToken.password())
-            .addAllUrls(turnToken.urls())
-            .build());
-  }
-}