Merge pull request #4299 from vespa-engine/bjorncs/ssl-truststore-configurator

Bjorncs/ssl truststore configurator

2 files changed, 40 insertions, 16 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java
index 1e24b055095..54c4aabf44c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java
@@ -7,6 +7,7 @@ import com.yahoo.container.bundle.BundleInstantiationSpecification;
 import com.yahoo.container.jdisc.FilterBindingsProvider;
 import com.yahoo.jdisc.http.ConnectorConfig;
 import com.yahoo.jdisc.http.ssl.DefaultSslKeyStoreConfigurator;
+import com.yahoo.jdisc.http.ssl.DefaultSslTrustStoreConfigurator;
 import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.container.component.SimpleComponent;
 import com.yahoo.vespa.model.container.http.ConnectorFactory;
@@ -16,7 +17,9 @@ import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 
 import static com.yahoo.jdisc.http.ConnectorConfig.Ssl.KeyStoreType;
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -28,7 +31,6 @@ import static org.junit.Assert.assertThat;
 
 /**
  * @author einarmr
- * @since 5.15
  */
 public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBase {
 
@@ -190,12 +192,13 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
     }
 
     @Test
-    public void ssl_keystore_configurator_can_be_overriden() throws IOException, SAXException {
+    public void ssl_keystore_and_truststore_configurator_can_be_overriden() throws IOException, SAXException {
         Element clusterElem = DomBuilderTest.parse(
                 "<jdisc id='default' version='1.0' jetty='true'>",
                 "  <http>",
                 "    <server port='9000' id='foo'>",
                 "      <ssl-keystore-configurator class='com.yahoo.MySslKeyStoreConfigurator' bundle='mybundle'/>",
+                "      <ssl-truststore-configurator class='com.yahoo.MySslTrustStoreConfigurator' bundle='mybundle'/>",
                 "    </server>",
                 "    <server port='9001' id='bar'/>",
                 "  </http>",
@@ -204,27 +207,47 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
         createModel(root, clusterElem);
         ContainerCluster cluster = (ContainerCluster) root.getChildren().get("default");
         List<ConnectorFactory> connectorFactories = cluster.getChildrenByTypeRecursive(ConnectorFactory.class);
-
         {
             ConnectorFactory firstConnector = connectorFactories.get(0);
-            assertThat(firstConnector.getInjectedComponentIds(), hasItem("ssl-keystore-configurator@foo"));
-            assertThat(firstConnector.getInjectedComponentIds().size(), equalTo(1));
-            SimpleComponent sslKeystoreConfigurator = firstConnector.getChildrenByTypeRecursive(SimpleComponent.class).get(0);
-            BundleInstantiationSpecification spec = sslKeystoreConfigurator.model.bundleInstantiationSpec;
-            assertThat(spec.classId.toString(), is("com.yahoo.MySslKeyStoreConfigurator"));
-            assertThat(spec.bundle.toString(), is("mybundle"));
+            assertConnectorHasInjectedComponents(firstConnector, "ssl-keystore-configurator@foo", "ssl-truststore-configurator@foo");
+            assertComponentHasClassNameAndBundle(getChildComponent(firstConnector, 0),
+                                                 "com.yahoo.MySslKeyStoreConfigurator",
+                                                 "mybundle");
+            assertComponentHasClassNameAndBundle(getChildComponent(firstConnector, 1),
+                                                 "com.yahoo.MySslTrustStoreConfigurator",
+                                                 "mybundle");
         }
         {
-            ConnectorFactory secondFactory = connectorFactories.get(1);
-            assertThat(secondFactory.getInjectedComponentIds(), hasItem("ssl-keystore-configurator@bar"));
-            assertThat(secondFactory.getInjectedComponentIds().size(), equalTo(1));
-            SimpleComponent sslKeystoreConfigurator = secondFactory.getChildrenByTypeRecursive(SimpleComponent.class).get(0);
-            BundleInstantiationSpecification spec = sslKeystoreConfigurator.model.bundleInstantiationSpec;
-            assertThat(spec.classId.toString(), is(DefaultSslKeyStoreConfigurator.class.getName()));
-            assertThat(spec.bundle.toString(), is("jdisc_http_service"));
+            ConnectorFactory secondConnector = connectorFactories.get(1);
+            assertConnectorHasInjectedComponents(secondConnector, "ssl-keystore-configurator@bar", "ssl-truststore-configurator@bar");
+            assertComponentHasClassNameAndBundle(getChildComponent(secondConnector, 0),
+                                                 DefaultSslKeyStoreConfigurator.class.getName(),
+                                                 "jdisc_http_service");
+            assertComponentHasClassNameAndBundle(getChildComponent(secondConnector, 1),
+                                                 DefaultSslTrustStoreConfigurator.class.getName(),
+                                                 "jdisc_http_service");
         }
     }
 
+    private static void assertConnectorHasInjectedComponents(ConnectorFactory connectorFactory, String... componentNames) {
+        Set<String> injectedComponentIds = connectorFactory.getInjectedComponentIds();
+        assertThat(injectedComponentIds.size(), equalTo(componentNames.length));
+        Arrays.stream(componentNames)
+                .forEach(name -> assertThat(injectedComponentIds, hasItem(name)));
+    }
+
+    private static SimpleComponent getChildComponent(ConnectorFactory connectorFactory, int index) {
+        return connectorFactory.getChildrenByTypeRecursive(SimpleComponent.class).get(index);
+    }
+
+    private static void assertComponentHasClassNameAndBundle(SimpleComponent simpleComponent,
+                                                             String className,
+                                                             String bundleName) {
+        BundleInstantiationSpecification spec = simpleComponent.model.bundleInstantiationSpec;
+        assertThat(spec.classId.toString(), is(className));
+        assertThat(spec.bundle.toString(), is(bundleName));
+    }
+
     private void assertJettyServerInConfig() {
         ContainerCluster cluster = (ContainerCluster) root.getChildren().get("default");
         List<JettyHttpServer> jettyServers = cluster.getChildrenByTypeRecursive(JettyHttpServer.class);
diff --git a/config-model/src/test/schema-test-files/services.xml b/config-model/src/test/schema-test-files/services.xml
index a02346193cc..af316c2e3a7 100644
--- a/config-model/src/test/schema-test-files/services.xml
+++ b/config-model/src/test/schema-test-files/services.xml
@@ -108,6 +108,7 @@
 
       <server port="4080" id="myServer">
         <ssl-keystore-configurator class="com.yahoo.MySslKeyStoreConfigurator" bundle="mybundle" />
+        <ssl-truststore-configurator class="com.yahoo.MySslTrustStoreConfigurator" bundle="mybundle" />
       </server>
       <server port="4081" id="anotherServer">
         <config name="container.jdisc.config.http-server">