diff options
author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2020-03-04 17:36:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-04 17:36:03 +0100 |
commit | 3c6b797693abd6c4a69688d1c9948c3506038127 (patch) | |
tree | 0511ed0a513d7d284f569229d9af898637b9a4d6 /jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDrivers.java | |
parent | 2009f0385e2d3ee39e19242ad215ea7065320bdc (diff) |
Revert "Revert "Bjorncs/ssl handshake metric""
Diffstat (limited to 'jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDrivers.java')
-rw-r--r-- | jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDrivers.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDrivers.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDrivers.java index e0933ac485e..4908da2ba75 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDrivers.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDrivers.java @@ -20,6 +20,7 @@ import java.nio.file.Path; /** * @author Simon Thoresen Hult + * @author bjorncs */ public class TestDrivers { @@ -45,9 +46,12 @@ public class TestDrivers { )); } + public enum TlsClientAuth { NEED, WANT } + public static TestDriver newInstanceWithSsl(final RequestHandler requestHandler, Path certificateFile, Path privateKeyFile, + TlsClientAuth tlsClientAuth, final Module... guiceModules) throws IOException { return TestDriver.newInstance( JettyHttpServer.class, @@ -61,7 +65,9 @@ public class TestDrivers { .pathWhitelist("/status.html")) .ssl(new ConnectorConfig.Ssl.Builder() .enabled(true) - .clientAuth(ConnectorConfig.Ssl.ClientAuth.Enum.WANT_AUTH) + .clientAuth(tlsClientAuth == TlsClientAuth.NEED + ? ConnectorConfig.Ssl.ClientAuth.Enum.NEED_AUTH + : ConnectorConfig.Ssl.ClientAuth.Enum.WANT_AUTH) .privateKeyFile(privateKeyFile.toString()) .certificateFile(certificateFile.toString()) .caCertificateFile(certificateFile.toString())), |