From a3c37aed47882ecfdd0574a3c78a54505f0a49c8 Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Fri, 19 May 2023 14:30:11 -0500
Subject: [PATCH] Remove obsolete field from
 `SecureValueRecovery2Configuration`

---
 service/config/sample.yml                                | 1 -
 .../textsecuregcm/WhisperServerService.java              | 2 +-
 .../configuration/SecureValueRecovery2Configuration.java | 1 -
 .../controllers/SecureValueRecovery2Controller.java      | 9 +--------
 .../securevaluerecovery/SecureValueRecovery2Client.java  | 6 ------
 .../controllers/SecureValueRecovery2ControllerTest.java  | 3 +--
 .../SecureValueRecovery2ClientTest.java                  | 2 +-
 7 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/service/config/sample.yml b/service/config/sample.yml
index 0931034fa..f3e93d56c 100644
--- a/service/config/sample.yml
+++ b/service/config/sample.yml
@@ -145,7 +145,6 @@ directoryV2:
     userIdTokenSharedSecret: secret://directoryV2.client.userIdTokenSharedSecret
 
 svr2:
-  enabled: false
   uri: svr2.example.com
   userAuthenticationTokenSharedSecret: secret://svr2.userAuthenticationTokenSharedSecret
   userIdTokenSharedSecret: secret://svr2.userIdTokenSharedSecret
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index 08ef99b52..f57912efb 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -773,7 +773,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
             config.getRemoteConfigConfiguration().globalConfig()),
         new SecureBackupController(backupCredentialsGenerator, accountsManager),
         new SecureStorageController(storageCredentialsGenerator),
-        new SecureValueRecovery2Controller(svr2CredentialsGenerator, accountsManager, config.getSvr2Configuration()),
+        new SecureValueRecovery2Controller(svr2CredentialsGenerator, accountsManager),
         new StickerController(rateLimiters, config.getCdnConfiguration().accessKey().value(),
             config.getCdnConfiguration().accessSecret().value(), config.getCdnConfiguration().region(),
             config.getCdnConfiguration().bucket()),
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/SecureValueRecovery2Configuration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/SecureValueRecovery2Configuration.java
index 6e6b5470a..a0a333195 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/SecureValueRecovery2Configuration.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/SecureValueRecovery2Configuration.java
@@ -13,7 +13,6 @@ import org.whispersystems.textsecuregcm.configuration.secrets.SecretBytes;
 import org.whispersystems.textsecuregcm.util.ExactlySize;
 
 public record SecureValueRecovery2Configuration(
-    boolean enabled,
     @NotBlank String uri,
     @ExactlySize(32) SecretBytes userAuthenticationTokenSharedSecret,
     @ExactlySize(32) SecretBytes userIdTokenSharedSecret,
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/SecureValueRecovery2Controller.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/SecureValueRecovery2Controller.java
index 858fe1cdb..d17a2e8f4 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/SecureValueRecovery2Controller.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/SecureValueRecovery2Controller.java
@@ -19,7 +19,6 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
@@ -60,14 +59,11 @@ public class SecureValueRecovery2Controller {
 
   private final ExternalServiceCredentialsGenerator backupServiceCredentialGenerator;
   private final AccountsManager accountsManager;
-  private final boolean enabled;
 
   public SecureValueRecovery2Controller(final ExternalServiceCredentialsGenerator backupServiceCredentialGenerator,
-      final AccountsManager accountsManager,
-      final SecureValueRecovery2Configuration cfg) {
+      final AccountsManager accountsManager) {
     this.backupServiceCredentialGenerator = backupServiceCredentialGenerator;
     this.accountsManager = accountsManager;
-    this.enabled = cfg.enabled();
   }
 
   @Timed
@@ -84,9 +80,6 @@ public class SecureValueRecovery2Controller {
   @ApiResponse(responseCode = "200", description = "`JSON` with generated credentials.", useReturnTypeSchema = true)
   @ApiResponse(responseCode = "401", description = "Account authentication check failed.")
   public ExternalServiceCredentials getAuth(@Auth final AuthenticatedAccount auth) {
-    if (!enabled) {
-      throw new NotFoundException();
-    }
     return backupServiceCredentialGenerator.generateFor(auth.getAccount().getUuid().toString());
   }
 
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/securevaluerecovery/SecureValueRecovery2Client.java b/service/src/main/java/org/whispersystems/textsecuregcm/securevaluerecovery/SecureValueRecovery2Client.java
index e9ac9bdd6..1d5233fc7 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/securevaluerecovery/SecureValueRecovery2Client.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/securevaluerecovery/SecureValueRecovery2Client.java
@@ -32,7 +32,6 @@ public class SecureValueRecovery2Client {
   private final ExternalServiceCredentialsGenerator secureValueRecoveryCredentialsGenerator;
   private final URI deleteUri;
   private final FaultTolerantHttpClient httpClient;
-  private final boolean enabled;
 
   @VisibleForTesting
   static final String DELETE_PATH = "/v1/delete";
@@ -53,15 +52,10 @@ public class SecureValueRecovery2Client {
         .withSecurityProtocol(FaultTolerantHttpClient.SECURITY_PROTOCOL_TLS_1_2)
         .withTrustedServerCertificates(configuration.svrCaCertificates().toArray(new String[0]))
         .build();
-    this.enabled = configuration.enabled();
   }
 
   public CompletableFuture<Void> deleteBackups(final UUID accountUuid) {
 
-    if (!enabled) {
-      return CompletableFuture.completedFuture(null);
-    }
-
     final ExternalServiceCredentials credentials = secureValueRecoveryCredentialsGenerator.generateForUuid(accountUuid);
 
     final HttpRequest request = HttpRequest.newBuilder()
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/SecureValueRecovery2ControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/SecureValueRecovery2ControllerTest.java
index b1f094c35..a7357d29c 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/SecureValueRecovery2ControllerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/SecureValueRecovery2ControllerTest.java
@@ -24,7 +24,6 @@ import org.whispersystems.textsecuregcm.util.SystemMapper;
 public class SecureValueRecovery2ControllerTest extends SecureValueRecoveryControllerBaseTest {
 
   private static final SecureValueRecovery2Configuration CFG = new SecureValueRecovery2Configuration(
-      true,
       "",
       randomSecretBytes(32),
       randomSecretBytes(32),
@@ -40,7 +39,7 @@ public class SecureValueRecovery2ControllerTest extends SecureValueRecoveryContr
 
   private static final AccountsManager ACCOUNTS_MANAGER = mock(AccountsManager.class);
   private static final SecureValueRecovery2Controller CONTROLLER =
-      new SecureValueRecovery2Controller(CREDENTIAL_GENERATOR, ACCOUNTS_MANAGER, CFG);
+      new SecureValueRecovery2Controller(CREDENTIAL_GENERATOR, ACCOUNTS_MANAGER);
 
   private static final ResourceExtension RESOURCES = ResourceExtension.builder()
       .addProvider(AuthHelper.getAuthFilter())
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/securevaluerecovery/SecureValueRecovery2ClientTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/securevaluerecovery/SecureValueRecovery2ClientTest.java
index 528a63e57..31f941c55 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/securevaluerecovery/SecureValueRecovery2ClientTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/securevaluerecovery/SecureValueRecovery2ClientTest.java
@@ -52,7 +52,7 @@ class SecureValueRecovery2ClientTest {
     credentialsGenerator = mock(ExternalServiceCredentialsGenerator.class);
     httpExecutor = Executors.newSingleThreadExecutor();
 
-    final SecureValueRecovery2Configuration config = new SecureValueRecovery2Configuration(true,
+    final SecureValueRecovery2Configuration config = new SecureValueRecovery2Configuration(
         "http://localhost:" + wireMock.getPort(),
         randomSecretBytes(32),
         randomSecretBytes(32),