From ca05df517254ed722a29ead5b6a62f34600ce7c7 Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Thu, 25 Jan 2024 12:16:37 -0600
Subject: [PATCH] Revert "Add support for secondary credentials for
 registration service"

This reverts commit 4b8fc2950f730c223ce373920fb02e72af21790a.
---
 service/config/sample.yml                                 | 4 ----
 .../textsecuregcm/WhisperServerService.java               | 8 +-------
 .../configuration/RegistrationServiceConfiguration.java   | 1 -
 spam-filter                                               | 2 +-
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/service/config/sample.yml b/service/config/sample.yml
index ec0b1fcc5..3e244a1c7 100644
--- a/service/config/sample.yml
+++ b/service/config/sample.yml
@@ -421,10 +421,6 @@ registrationService:
     {
       "example": "example"
     }
-  secondaryCredentialConfigurationJson: |
-    {
-      "example": "example"
-    }
   identityTokenAudience: https://registration.example.com
   registrationCaCertificate: | # Registration service TLS certificate trust root
     -----BEGIN CERTIFICATE-----
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index dddc2ddbd..44f969218 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -46,7 +46,6 @@ import java.util.concurrent.ThreadPoolExecutor;
 import javax.servlet.DispatcherType;
 import javax.servlet.FilterRegistration;
 import javax.servlet.ServletRegistration;
-import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jetty.servlets.CrossOriginFilter;
 import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
 import org.glassfish.jersey.server.ServerProperties;
@@ -518,15 +517,10 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
         registrationRecoveryPasswords);
     UsernameHashZkProofVerifier usernameHashZkProofVerifier = new UsernameHashZkProofVerifier();
 
-    final boolean useSecondaryCredentialConfiguration = StringUtils.isNotBlank(
-        System.getenv("SIGNAL_USE_SECONDARY_CREDENTIAL_CONFIGURATION"));
-
     RegistrationServiceClient registrationServiceClient = new RegistrationServiceClient(
         config.getRegistrationServiceConfiguration().host(),
         config.getRegistrationServiceConfiguration().port(),
-        useSecondaryCredentialConfiguration ? config.getRegistrationServiceConfiguration()
-            .secondaryCredentialConfigurationJson()
-            : config.getRegistrationServiceConfiguration().credentialConfigurationJson(),
+        config.getRegistrationServiceConfiguration().credentialConfigurationJson(),
         config.getRegistrationServiceConfiguration().identityTokenAudience(),
         config.getRegistrationServiceConfiguration().registrationCaCertificate(),
         registrationCallbackExecutor,
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/RegistrationServiceConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/RegistrationServiceConfiguration.java
index bf5247e04..cb50f6f2d 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/RegistrationServiceConfiguration.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/RegistrationServiceConfiguration.java
@@ -5,7 +5,6 @@ import javax.validation.constraints.NotBlank;
 public record RegistrationServiceConfiguration(@NotBlank String host,
                                                int port,
                                                @NotBlank String credentialConfigurationJson,
-                                               @NotBlank String secondaryCredentialConfigurationJson,
                                                @NotBlank String identityTokenAudience,
                                                @NotBlank String registrationCaCertificate) {
 }
diff --git a/spam-filter b/spam-filter
index 05daa0a37..b9c6ce5b7 160000
--- a/spam-filter
+++ b/spam-filter
@@ -1 +1 @@
-Subproject commit 05daa0a373da2b23185c2242c0ae3794b268f3df
+Subproject commit b9c6ce5b7648ebd59946e8cca7ba944c587d85a2