summaryrefslogtreecommitdiffstats
path: root/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java')
-rw-r--r--jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java95
1 files changed, 71 insertions, 24 deletions
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 49656775dc0..7a03d805864 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
@@ -1,29 +1,36 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.jdisc.http.server.jetty;
+import com.google.common.collect.ImmutableMap;
import com.yahoo.jdisc.Metric;
-import com.yahoo.jdisc.http.CertificateStore;
import com.yahoo.jdisc.http.ConnectorConfig;
-import com.yahoo.jdisc.http.HttpRequest;
import com.yahoo.jdisc.http.SecretStore;
import com.yahoo.jdisc.http.ssl.ReaderForPath;
+import com.yahoo.jdisc.http.ssl.SslContextFactory;
import com.yahoo.jdisc.http.ssl.SslKeyStore;
-import com.yahoo.jdisc.http.ssl.SslKeyStoreFactory;
+import com.yahoo.jdisc.http.ssl.pem.PemKeyStore;
+import com.yahoo.jdisc.http.ssl.pem.PemSslKeyStore;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.testng.annotations.Test;
+import javax.net.ssl.SSLContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.InetSocketAddress;
+import java.nio.channels.FileChannel;
import java.nio.channels.ServerSocketChannel;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
import java.util.Collections;
import java.util.Map;
-import static com.yahoo.jdisc.http.ConnectorConfig.*;
+import static com.yahoo.jdisc.http.ConnectorConfig.Ssl;
import static com.yahoo.jdisc.http.ConnectorConfig.Ssl.KeyStoreType.Enum.JKS;
import static com.yahoo.jdisc.http.ConnectorConfig.Ssl.KeyStoreType.Enum.PEM;
import static org.hamcrest.CoreMatchers.equalTo;
@@ -44,8 +51,7 @@ public class ConnectorFactoryTest {
new Ssl.PemKeyStore.Builder()
.keyPath("nonEmpty"))));
- ConnectorFactory willThrowException = new ConnectorFactory(config, new ThrowingSslKeyStoreFactory(),
- new ThrowingSecretStore());
+ ConnectorFactory willThrowException = new ConnectorFactory(config, new ThrowingSecretStore());
}
@Test(expectedExceptions = IllegalArgumentException.class)
@@ -57,8 +63,7 @@ public class ConnectorFactoryTest {
.keyStoreType(PEM)
.keyStorePath("nonEmpty")));
- ConnectorFactory willThrowException = new ConnectorFactory(config, new ThrowingSslKeyStoreFactory(),
- new ThrowingSecretStore());
+ ConnectorFactory willThrowException = new ConnectorFactory(config, new ThrowingSecretStore());
}
@Test
@@ -66,7 +71,6 @@ public class ConnectorFactoryTest {
Server server = new Server();
try {
ConnectorFactory factory = new ConnectorFactory(new ConnectorConfig(new ConnectorConfig.Builder()),
- new ThrowingSslKeyStoreFactory(),
new ThrowingSecretStore());
ConnectorFactory.JDiscServerConnector connector =
(ConnectorFactory.JDiscServerConnector)factory.createConnector(new DummyMetric(), server, null, Collections.emptyMap());
@@ -94,7 +98,7 @@ public class ConnectorFactoryTest {
ServerSocketChannel serverChannel = ServerSocketChannel.open();
serverChannel.socket().bind(new InetSocketAddress(0));
- ConnectorFactory factory = new ConnectorFactory(new ConnectorConfig(new ConnectorConfig.Builder()), new ThrowingSslKeyStoreFactory(), new ThrowingSecretStore());
+ ConnectorFactory factory = new ConnectorFactory(new ConnectorConfig(new ConnectorConfig.Builder()), new ThrowingSecretStore());
ConnectorFactory.JDiscServerConnector connector = (ConnectorFactory.JDiscServerConnector) factory.createConnector(new DummyMetric(), server, serverChannel, Collections.emptyMap());
server.addConnector(connector);
server.setHandler(new HelloWorldHandler());
@@ -113,6 +117,63 @@ public class ConnectorFactoryTest {
}
}
+ @Test
+ public void pre_bound_keystore_file_channels_are_used() throws Exception {
+ Path pemKeyStoreDirectory = Paths.get("src/test/resources/pem/");
+
+ Path certificateFile = pemKeyStoreDirectory.resolve("test.crt");
+ Path privateKeyFile = pemKeyStoreDirectory.resolve("test.key");
+
+ Server server = new Server();
+ try {
+ ServerSocketChannel serverChannel = ServerSocketChannel.open();
+ serverChannel.socket().bind(new InetSocketAddress(0));
+
+ String fakeCertificatePath = "ensure-certificate-path-is-not-used-to-open-the-file";
+ String fakeKeyPath = "ensure-key-path-is-not-used-to-open-the-file";
+
+ ConnectorConfig.Builder builder = new ConnectorConfig.Builder();
+ builder.ssl(
+ new Ssl.Builder().
+ enabled(true).
+ keyStoreType(PEM).
+ pemKeyStore(new Ssl.PemKeyStore.Builder().
+ certificatePath(fakeCertificatePath).
+ keyPath(fakeKeyPath)));
+
+ FileChannel certificateChannel = FileChannel.open(certificateFile, StandardOpenOption.READ);
+ FileChannel privateKeyChannel = FileChannel.open(privateKeyFile, StandardOpenOption.READ);
+
+ Map<Path, FileChannel> keyStoreChannels = ImmutableMap.<Path, FileChannel>builder().
+ put(Paths.get(fakeCertificatePath), certificateChannel).
+ put(Paths.get(fakeKeyPath), privateKeyChannel).
+ build();
+
+
+ ConnectorFactory factory = new ConnectorFactory(new ConnectorConfig(builder), new ThrowingSecretStore());
+ ConnectorFactory.JDiscServerConnector connector = (ConnectorFactory.JDiscServerConnector) factory.createConnector(new DummyMetric(), server, serverChannel, keyStoreChannels);
+ server.addConnector(connector);
+ server.setHandler(new HelloWorldHandler());
+ server.start();
+
+ SslKeyStore trustStore = new PemSslKeyStore(
+ new PemKeyStore.TrustStoreLoadParameter(
+ new ReaderForPath(Files.newBufferedReader(certificateFile), certificateFile)));
+
+ SSLContext clientSslContext = SslContextFactory.newInstanceFromTrustStore(trustStore).getServerSSLContext();
+ SimpleHttpClient client = new SimpleHttpClient(clientSslContext, connector.getLocalPort(), false);
+ SimpleHttpClient.RequestExecutor ex = client.newGet("/ignored");
+ SimpleHttpClient.ResponseValidator val = ex.execute();
+ val.expectContent(equalTo("Hello world"));
+ } finally {
+ try {
+ server.stop();
+ } catch (Exception e) {
+ //ignore
+ }
+ }
+ }
+
private static class HelloWorldHandler extends AbstractHandler {
@Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
@@ -139,20 +200,6 @@ public class ConnectorFactoryTest {
private static class DummyContext implements Metric.Context {
}
- private static final class ThrowingSslKeyStoreFactory implements SslKeyStoreFactory {
-
- @Override
- public SslKeyStore createKeyStore(ReaderForPath certificateFile, ReaderForPath keyFile) {
- throw new UnsupportedOperationException("A SSL key store factory component is not available");
- }
-
- @Override
- public SslKeyStore createTrustStore(ReaderForPath certificateFile) {
- throw new UnsupportedOperationException("A SSL key store factory component is not available");
- }
-
- }
-
private static final class ThrowingSecretStore implements SecretStore {
@Override