diff options
3 files changed, 41 insertions, 36 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/DefaultSslProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/DefaultSslProvider.java index 36ab07f977a..8c4ef9ddf72 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/DefaultSslProvider.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/DefaultSslProvider.java @@ -4,6 +4,7 @@ package com.yahoo.vespa.model.container.http.ssl; import com.yahoo.component.ComponentId; import com.yahoo.container.bundle.BundleInstantiationSpecification; import com.yahoo.jdisc.http.ConnectorConfig; +import com.yahoo.jdisc.http.ssl.DefaultSslContextFactoryProvider; import com.yahoo.osgi.provider.model.ComponentModel; import com.yahoo.vespa.model.container.component.SimpleComponent; @@ -16,7 +17,7 @@ import static com.yahoo.component.ComponentSpecification.fromString; */ public class DefaultSslProvider extends SimpleComponent implements ConnectorConfig.Producer { public static final String COMPONENT_ID = "default-ssl-provider"; - public static final String COMPONENT_CLASS = "com.yahoo.jdisc.http.ssl.DefaultSslContextFactoryProvider"; + public static final String COMPONENT_CLASS = DefaultSslContextFactoryProvider.class.getName(); public static final String COMPONENT_BUNDLE = "jdisc_http_service"; private final String privateKeyPath; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/DummySslProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/DummySslProvider.java index e1cefbf675f..c87467ed4c5 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/DummySslProvider.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/DummySslProvider.java @@ -4,18 +4,22 @@ package com.yahoo.vespa.model.container.http.ssl; import com.yahoo.component.ComponentId; import com.yahoo.container.bundle.BundleInstantiationSpecification; import com.yahoo.jdisc.http.ConnectorConfig; +import com.yahoo.jdisc.http.ssl.SslContextFactoryProvider; +import com.yahoo.jdisc.http.ssl.ThrowingSslContextFactoryProvider; import com.yahoo.osgi.provider.model.ComponentModel; import com.yahoo.vespa.model.container.component.SimpleComponent; import static com.yahoo.component.ComponentSpecification.fromString; /** + * Provides a dummy implementation of {@link SslContextFactoryProvider} to be injected into non-ssl connectors + * * @author bjorncs */ public class DummySslProvider extends SimpleComponent implements ConnectorConfig.Producer { public static final String COMPONENT_ID_PREFIX = "dummy-ssl-provider@"; - public static final String COMPONENT_CLASS = "com.yahoo.jdisc.http.ssl.ThrowingSslContextFactoryProvider"; + public static final String COMPONENT_CLASS = ThrowingSslContextFactoryProvider.class.getName(); public static final String COMPONENT_BUNDLE = "jdisc_http_service"; public DummySslProvider(String serverName) { 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 71e0deeb9b0..5d06e616a11 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 @@ -235,33 +235,33 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas } @Test - public void verify_default_ssl_configuration() { + public void verify_that_ssl_element_generates_connector_config_and_inject_provider_component() { Element clusterElem = DomBuilderTest.parse( - "<jdisc id='default' version='1.0' jetty='true'>\n" + - " <http>\n" + - " <server port='9000' id='minimal'>\n" + - " <ssl>\n" + - " <private-key-file>/foo/key</private-key-file>\n" + - " <certificate-file>/foo/cert</certificate-file>\n" + - " </ssl>\n" + - " </server>\n" + - " <server port='9001' id='with-cacerts'>\n" + - " <ssl>\n" + - " <private-key-file>/foo/key</private-key-file>\n" + - " <certificate-file>/foo/cert</certificate-file>\n" + - " <ca-certificates-file>/foo/cacerts</ca-certificates-file>\n" + - " </ssl>\n" + - " </server>\n" + - " <server port='9002' id='need-client-auth'>\n" + - " <ssl>\n" + - " <private-key-file>/foo/key</private-key-file>\n" + - " <certificate-file>/foo/cert</certificate-file>\n" + - " <client-authentication>need</client-authentication>\n" + - " </ssl>\n" + - " </server>\n" + - " </http>" + - nodesXml + - "\n" + + "<jdisc id='default' version='1.0' jetty='true'>", + " <http>", + " <server port='9000' id='minimal'>", + " <ssl>", + " <private-key-file>/foo/key</private-key-file>", + " <certificate-file>/foo/cert</certificate-file>", + " </ssl>", + " </server>", + " <server port='9001' id='with-cacerts'>", + " <ssl>", + " <private-key-file>/foo/key</private-key-file>", + " <certificate-file>/foo/cert</certificate-file>", + " <ca-certificates-file>/foo/cacerts</ca-certificates-file>", + " </ssl>", + " </server>", + " <server port='9002' id='need-client-auth'>", + " <ssl>", + " <private-key-file>/foo/key</private-key-file>", + " <certificate-file>/foo/cert</certificate-file>", + " <client-authentication>need</client-authentication>", + " </ssl>", + " </server>", + " </http>", + nodesXml, + "", "</jdisc>"); createModel(root, clusterElem); @@ -294,14 +294,14 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas @Test public void verify_ssl_provider_configuration() { Element clusterElem = DomBuilderTest.parse( - "<jdisc id='default' version='1.0' jetty='true'>\n" + - " <http>\n" + - " <server port='9000' id='ssl'>\n" + - " <ssl-provider id='ssl-provider' class='com.yahoo.CustomSslProvider' bundle='mybundle'/>\n" + - " </server>\n" + - " </http>" + - nodesXml + - "\n" + + "<jdisc id='default' version='1.0' jetty='true'>", + " <http>", + " <server port='9000' id='ssl'>", + " <ssl-provider id='ssl-provider' class='com.yahoo.CustomSslProvider' bundle='mybundle'/>", + " </server>", + " </http>", + nodesXml, + "", "</jdisc>"); createModel(root, clusterElem); |