MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set TLS keystore password in secondary persistent services

This commit is contained in:
Chris Eager 2023-12-15 13:29:31 -06:00 committed by Chris Eager
parent 3090de56b8
commit 06800043a9
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
service/src/main/java/org/whispersystems/textsecuregcm/workers/MessagePersisterServiceCommand.java
View File

@ -7,8 +7,10 @@ package org.whispersystems.textsecuregcm.workers;
import io.dropwizard.core.Application; import io.dropwizard.core.Application;
import io.dropwizard.core.cli.ServerCommand; import io.dropwizard.core.cli.ServerCommand;
import io.dropwizard.core.server.DefaultServerFactory;
import io.dropwizard.core.setup.Environment; import io.dropwizard.core.setup.Environment;
import java.time.Duration; import java.time.Duration;
import io.dropwizard.jetty.HttpsConnectorFactory;
import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Namespace;
import net.sourceforge.argparse4j.inf.Subparser; import net.sourceforge.argparse4j.inf.Subparser;
import org.whispersystems.textsecuregcm.WhisperServerConfiguration; import org.whispersystems.textsecuregcm.WhisperServerConfiguration;
@ -50,6 +52,15 @@ public class MessagePersisterServiceCommand extends ServerCommand<WhisperServerC
MetricsUtil.configureRegistries(configuration, environment); MetricsUtil.configureRegistries(configuration, environment);
if (configuration.getServerFactory() instanceof DefaultServerFactory defaultServerFactory) {
defaultServerFactory.getApplicationConnectors()
.forEach(connectorFactory -> {
if (connectorFactory instanceof HttpsConnectorFactory h) {
h.setKeyStorePassword(configuration.getTlsKeyStoreConfiguration().password().value());
}
});
}
final CommandDependencies deps = CommandDependencies.build("message-persister-service", environment, configuration); final CommandDependencies deps = CommandDependencies.build("message-persister-service", environment, configuration);
final DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager = new DynamicConfigurationManager<>( final DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager = new DynamicConfigurationManager<>(

12
service/src/main/java/org/whispersystems/textsecuregcm/workers/ScheduledApnPushNotificationSenderServiceCommand.java
View File

@ -9,8 +9,9 @@ import static com.codahale.metrics.MetricRegistry.name;
import io.dropwizard.core.Application; import io.dropwizard.core.Application;
import io.dropwizard.core.cli.ServerCommand; import io.dropwizard.core.cli.ServerCommand;
import io.dropwizard.core.server.DefaultServerFactory;
import io.dropwizard.core.setup.Environment; import io.dropwizard.core.setup.Environment;
import java.util.Optional; import io.dropwizard.jetty.HttpsConnectorFactory;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Namespace;
import net.sourceforge.argparse4j.inf.Subparser; import net.sourceforge.argparse4j.inf.Subparser;
@ -53,6 +54,15 @@ public class ScheduledApnPushNotificationSenderServiceCommand extends ServerComm
MetricsUtil.configureRegistries(configuration, environment); MetricsUtil.configureRegistries(configuration, environment);
if (configuration.getServerFactory() instanceof DefaultServerFactory defaultServerFactory) {
defaultServerFactory.getApplicationConnectors()
.forEach(connectorFactory -> {
if (connectorFactory instanceof HttpsConnectorFactory h) {
h.setKeyStorePassword(configuration.getTlsKeyStoreConfiguration().password().value());
}
});
}
final CommandDependencies deps = CommandDependencies.build("scheduled-apn-sender", environment, configuration); final CommandDependencies deps = CommandDependencies.build("scheduled-apn-sender", environment, configuration);
final FaultTolerantRedisCluster pushSchedulerCluster = new FaultTolerantRedisCluster("push_scheduler", final FaultTolerantRedisCluster pushSchedulerCluster = new FaultTolerantRedisCluster("push_scheduler",