Add interface for custom keystore implementation with hot-reloading

2 files changed, 24 insertions, 7 deletions

diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/guiceModules/ConnectorFactoryRegistryModule.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/guiceModules/ConnectorFactoryRegistryModule.java
index 1200a06be2c..0d8f433cc39 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/guiceModules/ConnectorFactoryRegistryModule.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/guiceModules/ConnectorFactoryRegistryModule.java
@@ -11,6 +11,7 @@ import com.yahoo.jdisc.http.ConnectorConfig.Builder;
 import com.yahoo.jdisc.http.SecretStore;
 import com.yahoo.jdisc.http.server.jetty.ConnectorFactory;
 import com.yahoo.jdisc.http.server.jetty.TestDrivers;
+import com.yahoo.jdisc.http.ssl.DefaultSslKeyStoreConfigurator;
 
 /**
  * Guice module for test ConnectorFactories
@@ -46,7 +47,9 @@ public class ConnectorFactoryRegistryModule implements Module {
     private static class StaticKeyDbConnectorFactory extends ConnectorFactory {
 
         public StaticKeyDbConnectorFactory(ConnectorConfig connectorConfig) {
-            super(connectorConfig, new MockSecretStore());
+            super(connectorConfig,
+                  new MockSecretStore(),
+                  new DefaultSslKeyStoreConfigurator(connectorConfig, new MockSecretStore()));
         }
 
     }
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java
index fceec51231a..70037a59b32 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java
@@ -4,6 +4,7 @@ package com.yahoo.jdisc.http.server.jetty;
 import com.yahoo.jdisc.Metric;
 import com.yahoo.jdisc.http.ConnectorConfig;
 import com.yahoo.jdisc.http.SecretStore;
+import com.yahoo.jdisc.http.ssl.DefaultSslKeyStoreConfigurator;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.AbstractHandler;
@@ -23,7 +24,7 @@ import static com.yahoo.jdisc.http.ConnectorConfig.Ssl.KeyStoreType.Enum.PEM;
 import static org.hamcrest.CoreMatchers.equalTo;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class ConnectorFactoryTest {
 
@@ -38,7 +39,10 @@ public class ConnectorFactoryTest {
                                              new Ssl.PemKeyStore.Builder()
                                                      .keyPath("nonEmpty"))));
 
-        ConnectorFactory willThrowException = new ConnectorFactory(config, new ThrowingSecretStore());
+        ThrowingSecretStore secretStore = new ThrowingSecretStore();
+        ConnectorFactory willThrowException = new ConnectorFactory(config,
+                                                                   secretStore,
+                                                                   new DefaultSslKeyStoreConfigurator(config, secretStore));
     }
 
     @Test(expectedExceptions = IllegalArgumentException.class)
@@ -50,15 +54,21 @@ public class ConnectorFactoryTest {
                                      .keyStoreType(PEM)
                                      .keyStorePath("nonEmpty")));
 
-        ConnectorFactory willThrowException = new ConnectorFactory(config, new ThrowingSecretStore());
+        ThrowingSecretStore secretStore = new ThrowingSecretStore();
+        ConnectorFactory willThrowException = new ConnectorFactory(config,
+                                                                   secretStore,
+                                                                   new DefaultSslKeyStoreConfigurator(config, secretStore));
     }
 
     @Test
     public void requireThatNoPreBoundChannelWorks() throws Exception {
         Server server = new Server();
         try {
-            ConnectorFactory factory = new ConnectorFactory(new ConnectorConfig(new ConnectorConfig.Builder()),
-                                                            new ThrowingSecretStore());
+            ConnectorConfig config = new ConnectorConfig(new ConnectorConfig.Builder());
+            ThrowingSecretStore secretStore = new ThrowingSecretStore();
+            ConnectorFactory factory = new ConnectorFactory(config,
+                                                            secretStore,
+                                                            new DefaultSslKeyStoreConfigurator(config, secretStore));
             JDiscServerConnector connector =
                     (JDiscServerConnector)factory.createConnector(new DummyMetric(), server, null);
             server.addConnector(connector);
@@ -85,7 +95,11 @@ public class ConnectorFactoryTest {
             ServerSocketChannel serverChannel = ServerSocketChannel.open();
             serverChannel.socket().bind(new InetSocketAddress(0));
 
-            ConnectorFactory factory = new ConnectorFactory(new ConnectorConfig(new ConnectorConfig.Builder()), new ThrowingSecretStore());
+            ConnectorConfig config = new ConnectorConfig(new ConnectorConfig.Builder());
+            ThrowingSecretStore secretStore = new ThrowingSecretStore();
+            ConnectorFactory factory = new ConnectorFactory(config,
+                                                            secretStore,
+                                                            new DefaultSslKeyStoreConfigurator(config, secretStore));
             JDiscServerConnector connector = (JDiscServerConnector) factory.createConnector(new DummyMetric(), server, serverChannel);
             server.addConnector(connector);
             server.setHandler(new HelloWorldHandler());