mirror of
https://github.com/jetty/jetty.project.git
synced 2025-03-03 20:39:18 +00:00
Fixes #1452 - Add tests for [want|need]ClientAuth.
This commit is contained in:
parent
7fc3dac5f3
commit
e7ac447d63
@ -0,0 +1,233 @@
|
|||||||
|
//
|
||||||
|
// ========================================================================
|
||||||
|
// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd.
|
||||||
|
// ------------------------------------------------------------------------
|
||||||
|
// All rights reserved. This program and the accompanying materials
|
||||||
|
// are made available under the terms of the Eclipse Public License v1.0
|
||||||
|
// and Apache License v2.0 which accompanies this distribution.
|
||||||
|
//
|
||||||
|
// The Eclipse Public License is available at
|
||||||
|
// http://www.eclipse.org/legal/epl-v10.html
|
||||||
|
//
|
||||||
|
// The Apache License v2.0 is available at
|
||||||
|
// http://www.opensource.org/licenses/apache2.0.php
|
||||||
|
//
|
||||||
|
// You may elect to redistribute this code under either of these licenses.
|
||||||
|
// ========================================================================
|
||||||
|
//
|
||||||
|
|
||||||
|
package org.eclipse.jetty.client.ssl;
|
||||||
|
|
||||||
|
import java.security.cert.Certificate;
|
||||||
|
import java.util.concurrent.CountDownLatch;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
import javax.net.ssl.SSLHandshakeException;
|
||||||
|
import javax.net.ssl.SSLSession;
|
||||||
|
|
||||||
|
import org.eclipse.jetty.client.EmptyServerHandler;
|
||||||
|
import org.eclipse.jetty.client.HttpClient;
|
||||||
|
import org.eclipse.jetty.client.api.ContentResponse;
|
||||||
|
import org.eclipse.jetty.http.HttpStatus;
|
||||||
|
import org.eclipse.jetty.io.ssl.SslHandshakeListener;
|
||||||
|
import org.eclipse.jetty.server.Handler;
|
||||||
|
import org.eclipse.jetty.server.Server;
|
||||||
|
import org.eclipse.jetty.server.ServerConnector;
|
||||||
|
import org.eclipse.jetty.util.ssl.SslContextFactory;
|
||||||
|
import org.eclipse.jetty.util.thread.QueuedThreadPool;
|
||||||
|
import org.hamcrest.Matchers;
|
||||||
|
import org.junit.After;
|
||||||
|
import org.junit.Assert;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* In order to work, client authentication needs a certificate
|
||||||
|
* signed by a CA that also signed the server certificate.
|
||||||
|
* <p>
|
||||||
|
* For this test, the client certificate is signed with the server
|
||||||
|
* certificate, and the server certificate is self-signed.
|
||||||
|
*/
|
||||||
|
public class NeedWantClientAuthTest
|
||||||
|
{
|
||||||
|
private Server server;
|
||||||
|
private ServerConnector connector;
|
||||||
|
private HttpClient client;
|
||||||
|
|
||||||
|
private void startServer(SslContextFactory sslContextFactory, Handler handler) throws Exception
|
||||||
|
{
|
||||||
|
QueuedThreadPool serverThreads = new QueuedThreadPool();
|
||||||
|
serverThreads.setName("server");
|
||||||
|
server = new Server(serverThreads);
|
||||||
|
|
||||||
|
connector = new ServerConnector(server, sslContextFactory);
|
||||||
|
server.addConnector(connector);
|
||||||
|
|
||||||
|
server.setHandler(handler);
|
||||||
|
server.start();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void startClient(SslContextFactory sslContextFactory) throws Exception
|
||||||
|
{
|
||||||
|
QueuedThreadPool clientThreads = new QueuedThreadPool();
|
||||||
|
clientThreads.setName("client");
|
||||||
|
client = new HttpClient(sslContextFactory);
|
||||||
|
client.setExecutor(clientThreads);
|
||||||
|
client.start();
|
||||||
|
}
|
||||||
|
|
||||||
|
private SslContextFactory createSslContextFactory()
|
||||||
|
{
|
||||||
|
SslContextFactory sslContextFactory = new SslContextFactory();
|
||||||
|
sslContextFactory.setEndpointIdentificationAlgorithm("");
|
||||||
|
sslContextFactory.setKeyStorePath("src/test/resources/keystore.jks");
|
||||||
|
sslContextFactory.setKeyStorePassword("storepwd");
|
||||||
|
return sslContextFactory;
|
||||||
|
}
|
||||||
|
|
||||||
|
@After
|
||||||
|
public void dispose() throws Exception
|
||||||
|
{
|
||||||
|
if (client != null)
|
||||||
|
client.stop();
|
||||||
|
if (server != null)
|
||||||
|
server.stop();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testWantClientAuthWithoutAuth() throws Exception
|
||||||
|
{
|
||||||
|
SslContextFactory serverSSL = new SslContextFactory();
|
||||||
|
serverSSL.setKeyStorePath("src/test/resources/keystore.jks");
|
||||||
|
serverSSL.setKeyStorePassword("storepwd");
|
||||||
|
serverSSL.setWantClientAuth(true);
|
||||||
|
startServer(serverSSL, new EmptyServerHandler());
|
||||||
|
|
||||||
|
SslContextFactory clientSSL = new SslContextFactory(true);
|
||||||
|
startClient(clientSSL);
|
||||||
|
|
||||||
|
ContentResponse response = client.newRequest("https://localhost:" + connector.getLocalPort())
|
||||||
|
.timeout(5, TimeUnit.SECONDS)
|
||||||
|
.send();
|
||||||
|
|
||||||
|
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testWantClientAuthWithAuth() throws Exception
|
||||||
|
{
|
||||||
|
SslContextFactory serverSSL = new SslContextFactory();
|
||||||
|
serverSSL.setKeyStorePath("src/test/resources/keystore.jks");
|
||||||
|
serverSSL.setKeyStorePassword("storepwd");
|
||||||
|
serverSSL.setWantClientAuth(true);
|
||||||
|
startServer(serverSSL, new EmptyServerHandler());
|
||||||
|
CountDownLatch handshakeLatch = new CountDownLatch(1);
|
||||||
|
connector.addBean(new SslHandshakeListener()
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void handshakeSucceeded(Event event)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
SSLSession session = event.getSSLEngine().getSession();
|
||||||
|
Certificate[] clientCerts = session.getPeerCertificates();
|
||||||
|
Assert.assertNotNull(clientCerts);
|
||||||
|
Assert.assertThat(clientCerts.length, Matchers.greaterThan(0));
|
||||||
|
handshakeLatch.countDown();
|
||||||
|
}
|
||||||
|
catch (Throwable x)
|
||||||
|
{
|
||||||
|
x.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
SslContextFactory clientSSL = new SslContextFactory(true);
|
||||||
|
clientSSL.setKeyStorePath("src/test/resources/client_keystore.jks");
|
||||||
|
clientSSL.setKeyStorePassword("storepwd");
|
||||||
|
startClient(clientSSL);
|
||||||
|
|
||||||
|
ContentResponse response = client.newRequest("https://localhost:" + connector.getLocalPort())
|
||||||
|
.timeout(5, TimeUnit.SECONDS)
|
||||||
|
.send();
|
||||||
|
|
||||||
|
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
|
||||||
|
Assert.assertTrue(handshakeLatch.await(5, TimeUnit.SECONDS));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testNeedClientAuthWithoutAuth() throws Exception
|
||||||
|
{
|
||||||
|
SslContextFactory serverSSL = new SslContextFactory();
|
||||||
|
serverSSL.setKeyStorePath("src/test/resources/keystore.jks");
|
||||||
|
serverSSL.setKeyStorePassword("storepwd");
|
||||||
|
serverSSL.setNeedClientAuth(true);
|
||||||
|
startServer(serverSSL, new EmptyServerHandler());
|
||||||
|
|
||||||
|
SslContextFactory clientSSL = new SslContextFactory(true);
|
||||||
|
startClient(clientSSL);
|
||||||
|
CountDownLatch handshakeLatch = new CountDownLatch(1);
|
||||||
|
client.addBean(new SslHandshakeListener()
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void handshakeFailed(Event event, Throwable failure)
|
||||||
|
{
|
||||||
|
Assert.assertThat(failure, Matchers.instanceOf(SSLHandshakeException.class));
|
||||||
|
handshakeLatch.countDown();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
CountDownLatch latch = new CountDownLatch(1);
|
||||||
|
client.newRequest("https://localhost:" + connector.getLocalPort())
|
||||||
|
.timeout(5, TimeUnit.SECONDS)
|
||||||
|
.send(result ->
|
||||||
|
{
|
||||||
|
if (result.isFailed())
|
||||||
|
latch.countDown();
|
||||||
|
});
|
||||||
|
|
||||||
|
Assert.assertTrue(handshakeLatch.await(5, TimeUnit.SECONDS));
|
||||||
|
Assert.assertTrue(latch.await(5, TimeUnit.SECONDS));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testNeedClientAuthWithAuth() throws Exception
|
||||||
|
{
|
||||||
|
SslContextFactory serverSSL = new SslContextFactory();
|
||||||
|
serverSSL.setKeyStorePath("src/test/resources/keystore.jks");
|
||||||
|
serverSSL.setKeyStorePassword("storepwd");
|
||||||
|
serverSSL.setNeedClientAuth(true);
|
||||||
|
startServer(serverSSL, new EmptyServerHandler());
|
||||||
|
CountDownLatch handshakeLatch = new CountDownLatch(1);
|
||||||
|
connector.addBean(new SslHandshakeListener()
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void handshakeSucceeded(Event event)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
SSLSession session = event.getSSLEngine().getSession();
|
||||||
|
Certificate[] clientCerts = session.getPeerCertificates();
|
||||||
|
Assert.assertNotNull(clientCerts);
|
||||||
|
Assert.assertThat(clientCerts.length, Matchers.greaterThan(0));
|
||||||
|
handshakeLatch.countDown();
|
||||||
|
}
|
||||||
|
catch (Throwable x)
|
||||||
|
{
|
||||||
|
x.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
SslContextFactory clientSSL = new SslContextFactory(true);
|
||||||
|
clientSSL.setKeyStorePath("src/test/resources/client_keystore.jks");
|
||||||
|
clientSSL.setKeyStorePassword("storepwd");
|
||||||
|
startClient(clientSSL);
|
||||||
|
|
||||||
|
ContentResponse response = client.newRequest("https://localhost:" + connector.getLocalPort())
|
||||||
|
.timeout(5, TimeUnit.SECONDS)
|
||||||
|
.send();
|
||||||
|
|
||||||
|
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
|
||||||
|
Assert.assertTrue(handshakeLatch.await(5, TimeUnit.SECONDS));
|
||||||
|
}
|
||||||
|
}
|
BIN
jetty-client/src/test/resources/client_keystore.jks
Normal file
BIN
jetty-client/src/test/resources/client_keystore.jks
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user