Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-19 14:48:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add support for secondary credentials for registration service"

Browse Source 
This reverts commit 4b8fc2950f.
This commit is contained in:
Chris Eager
2024-01-25 12:16:37 -06:00
committed by Chris Eager
parent 422e8e6f3e
commit ca05df5172
4 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
View File

@@ -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,