stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8168969: Merge SSLSocketSample and SSLSocketTemplate

Browse Source 
Reviewed-by: xuelei
This commit is contained in:
Artem Smotrakov 2016-11-16 12:50:29 -08:00
parent 16a386fb56
commit 3d0c012270
6 changed files with 523 additions and 1163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

404
jdk/test/javax/net/ssl/templates/SSLSocketSample.java
View File

@ -1,404 +0,0 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
// Please run in othervm mode. SunJSSE does not support dynamic system
// properties, no way to re-use system properties in samevm/agentvm mode.
/*
* @test
* @bug 8161106
* @summary Improve SSLSocket test template
* @run main/othervm SSLSocketSample
*/
import java.io.*;
import javax.net.ssl.*;
import java.net.*;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
/**
* Template to help speed your client/server tests.
*/
public final class SSLSocketSample {
/*
* =============================================================
* Set the various variables needed for the tests, then
* specify what tests to run on each side.
*/
/*
* Should we run the client or server in a separate thread?
* Both sides can throw exceptions, but do you have a preference
* as to which side should be the main thread.
*/
private static final boolean separateServerThread = false;
/*
* Where do we find the keystores?
*/
private static final String pathToStores = "../etc";
private static final String keyStoreFile = "keystore";
private static final String trustStoreFile = "truststore";
private static final String passwd = "passphrase";
/*
* Turn on SSL debugging?
*/
private static final boolean debug = false;
/*
* Is the server ready to serve?
*/
private static final CountDownLatch serverCondition = new CountDownLatch(1);
/*
* Is the client ready to handshake?
*/
private static final CountDownLatch clientCondition = new CountDownLatch(1);
/*
* What's the server port? Use any free port by default
*/
private volatile int serverPort = 0;
/*
* If the client or server is doing some kind of object creation
* that the other side depends on, and that thread prematurely
* exits, you may experience a hang. The test harness will
* terminate all hung threads after its timeout has expired,
* currently 3 minutes by default, but you might try to be
* smart about it....
*/
/*
* Define the server side of the test.
*/
void doServerSide() throws Exception {
SSLServerSocket sslServerSocket;
// kick start the server side service
SSLServerSocketFactory sslssf =
(SSLServerSocketFactory)SSLServerSocketFactory.getDefault();
sslServerSocket =
(SSLServerSocket)sslssf.createServerSocket(serverPort);
serverPort = sslServerSocket.getLocalPort();
// Signal the client, the server is ready to accept connection.
serverCondition.countDown();
// Try to accept a connection in 30 seconds.
SSLSocket sslSocket;
try {
sslServerSocket.setSoTimeout(30000);
sslSocket = (SSLSocket)sslServerSocket.accept();
} catch (SocketTimeoutException ste) {
sslServerSocket.close();
// Ignore the test case if no connection within 30 seconds.
System.out.println(
"No incoming client connection in 30 seconds. " +
"Ignore in server side.");
return;
}
// handle the connection
try {
// Is it the expected client connection?
//
// Naughty test cases or third party routines may try to
// connection to this server port unintentionally. In
// order to mitigate the impact of unexpected client
// connections and avoid intermittent failure, it should
// be checked that the accepted connection is really linked
// to the expected client.
boolean clientIsReady =
clientCondition.await(30L, TimeUnit.SECONDS);
if (clientIsReady) {
// Run the application in server side.
runServerApplication(sslSocket);
} else { // Otherwise, ignore
// We don't actually care about plain socket connections
// for TLS communication testing generally. Just ignore
// the test if the accepted connection is not linked to
// the expected client or the client connection timeout
// in 30 seconds.
System.out.println(
"The client is not the expected one or timeout. " +
"Ignore in server side.");
}
} finally {
sslSocket.close();
sslServerSocket.close();
}
}
/*
* Define the server side application of the test for the specified socket.
*/
void runServerApplication(SSLSocket socket) throws Exception {
// here comes the test logic
InputStream sslIS = socket.getInputStream();
OutputStream sslOS = socket.getOutputStream();
sslIS.read();
sslOS.write(85);
sslOS.flush();
}
/*
* Define the client side of the test.
*/
void doClientSide() throws Exception {
// Wait for server to get started.
//
// The server side takes care of the issue if the server cannot
// get started in 90 seconds. The client side would just ignore
// the test case if the serer is not ready.
boolean serverIsReady =
serverCondition.await(90L, TimeUnit.SECONDS);
if (!serverIsReady) {
System.out.println(
"The server is not ready yet in 90 seconds. " +
"Ignore in client side.");
return;
}
SSLSocketFactory sslsf =
(SSLSocketFactory)SSLSocketFactory.getDefault();
try (SSLSocket sslSocket = (SSLSocket)sslsf.createSocket()) {
try {
sslSocket.connect(
new InetSocketAddress("localhost", serverPort), 15000);
} catch (IOException ioe) {
// The server side may be impacted by naughty test cases or
// third party routines, and cannot accept connections.
//
// Just ignore the test if the connection cannot be
// established.
System.out.println(
"Cannot make a connection in 15 seconds. " +
"Ignore in client side.");
return;
}
// OK, here the client and server get connected.
// Signal the server, the client is ready to communicate.
clientCondition.countDown();
// There is still a chance in theory that the server thread may
// wait client-ready timeout and then quit. The chance should
// be really rare so we don't consider it until it becomes a
// real problem.
// Run the application in client side.
runClientApplication(sslSocket);
}
}
/*
* Define the server side application of the test for the specified socket.
*/
void runClientApplication(SSLSocket socket) throws Exception {
InputStream sslIS = socket.getInputStream();
OutputStream sslOS = socket.getOutputStream();
sslOS.write(280);
sslOS.flush();
sslIS.read();
}
/*
* =============================================================
* The remainder is just support stuff
*/
private volatile Exception serverException = null;
private volatile Exception clientException = null;
public static void main(String[] args) throws Exception {
String keyFilename =
System.getProperty("test.src", ".") + "/" + pathToStores +
"/" + keyStoreFile;
String trustFilename =
System.getProperty("test.src", ".") + "/" + pathToStores +
"/" + trustStoreFile;
System.setProperty("javax.net.ssl.keyStore", keyFilename);
System.setProperty("javax.net.ssl.keyStorePassword", passwd);
System.setProperty("javax.net.ssl.trustStore", trustFilename);
System.setProperty("javax.net.ssl.trustStorePassword", passwd);
if (debug) {
System.setProperty("javax.net.debug", "all");
}
/*
* Start the tests.
*/
new SSLSocketSample();
}
private Thread clientThread = null;
private Thread serverThread = null;
/*
* Primary constructor, used to drive remainder of the test.
*
* Fork off the other side, then do your work.
*/
SSLSocketSample() throws Exception {
Exception startException = null;
try {
if (separateServerThread) {
startServer(true);
startClient(false);
} else {
startClient(true);
startServer(false);
}
} catch (Exception e) {
startException = e;
}
/*
* Wait for other side to close down.
*/
if (separateServerThread) {
if (serverThread != null) {
serverThread.join();
}
} else {
if (clientThread != null) {
clientThread.join();
}
}
/*
* When we get here, the test is pretty much over.
* Which side threw the error?
*/
Exception local;
Exception remote;
if (separateServerThread) {
remote = serverException;
local = clientException;
} else {
remote = clientException;
local = serverException;
}
Exception exception = null;
/*
* Check various exception conditions.
*/
if ((local != null) && (remote != null)) {
// If both failed, return the curthread's exception.
local.initCause(remote);
exception = local;
} else if (local != null) {
exception = local;
} else if (remote != null) {
exception = remote;
} else if (startException != null) {
exception = startException;
}
/*
* If there was an exception *AND* a startException,
* output it.
*/
if (exception != null) {
if (exception != startException && startException != null) {
exception.addSuppressed(startException);
}
throw exception;
}
// Fall-through: no exception to throw!
}
void startServer(boolean newThread) throws Exception {
if (newThread) {
serverThread = new Thread() {
@Override
public void run() {
try {
doServerSide();
} catch (Exception e) {
/*
* Our server thread just died.
*
* Release the client, if not active already...
*/
System.out.println("Server died: " + e);
serverException = e;
}
}
};
serverThread.start();
} else {
try {
doServerSide();
} catch (Exception e) {
System.out.println("Server failed: " + e);
serverException = e;
}
}
}
void startClient(boolean newThread) throws Exception {
if (newThread) {
clientThread = new Thread() {
@Override
public void run() {
try {
doClientSide();
} catch (Exception e) {
/*
* Our client thread just died.
*/
System.out.println("Client died: " + e);
clientException = e;
}
}
};
clientThread.start();
} else {
try {
doClientSide();
} catch (Exception e) {
System.out.println("Client failed: " + e);
clientException = e;
}
}
}
}

687
jdk/test/javax/net/ssl/templates/SSLSocketTemplate.java
View File

@ -21,251 +21,561 @@
* questions.
*/
// SunJSSE does not support dynamic system properties, no way to re-use
// system properties in samevm/agentvm mode.
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.InetSocketAddress;
import java.net.SocketTimeoutException;
import java.security.KeyStore;
import java.security.Security;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLServerSocket;
import javax.net.ssl.SSLServerSocketFactory;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
/**
* This class defines a framework for JSSE tests.
*
* Please run in othervm mode. SunJSSE does not support dynamic system
* properties, no way to re-use system properties in samevm/agentvm mode.
*/
/*
* @test
* @bug 1234567
* @summary Use this template to help speed your client/server tests.
* @summary Use this class for JSSE tests
* @run main/othervm SSLSocketTemplate
* @author Brad Wetmore
*/
import java.io.*;
import javax.net.ssl.*;
public class SSLSocketTemplate {
public static final String TEST_SRC = System.getProperty("test.src", ".");
/*
* =============================================================
* Set the various variables needed for the tests, then
* specify what tests to run on each side.
* Where do we find the keystores?
*/
public static final String PATH_TO_STORES = "../etc";
public static final String KEY_STORE_FILE = "keystore";
public static final String TRUST_STORE_FILE = "truststore";
public static final String PASSWORD = "passphrase";
public static final int FREE_PORT = 0;
// in seconds
public static final long CLIENT_SIGNAL_TIMEOUT = 30L;
public static final long SERVER_SIGNAL_TIMEOUT = 90L;
// in millis
public static final int CLIENT_TIMEOUT = 15000;
public static final int SERVER_TIMEOUT = 30000;
/*
* Should we run the client or server in a separate thread?
* Both sides can throw exceptions, but do you have a preference
* as to which side should be the main thread.
*/
static boolean separateServerThread = false;
private boolean separateServerThread = false;
/*
* Where do we find the keystores?
* What's the server port? Use any free port by default
*/
static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
private volatile int serverPort;
private volatile Exception serverException;
private volatile Exception clientException;
private Thread clientThread;
private Thread serverThread;
private Peer serverPeer;
private Peer clientPeer;
private Application serverApplication;
private Application clientApplication;
private SSLContext context;
/*
* Is the server ready to serve?
*/
volatile static boolean serverReady = false;
private final CountDownLatch serverReadyCondition = new CountDownLatch(1);
/*
* Turn on SSL debugging?
* Is the client ready to handshake?
*/
static boolean debug = false;
private final CountDownLatch clientReadyCondition = new CountDownLatch(1);
/*
* If the client or server is doing some kind of object creation
* that the other side depends on, and that thread prematurely
* exits, you may experience a hang. The test harness will
* terminate all hung threads after its timeout has expired,
* currently 3 minutes by default, but you might try to be
* smart about it....
* Is the server done?
*/
private final CountDownLatch serverDoneCondition = new CountDownLatch(1);
/*
* Is the client done?
*/
private final CountDownLatch clientDoneCondition = new CountDownLatch(1);
/*
* Public API.
*/
public static interface Peer {
void run(SSLSocketTemplate test) throws Exception;
}
public static interface Application {
void run(SSLSocket socket, SSLSocketTemplate test) throws Exception;
}
public static void debug() {
debug("ssl");
}
public static void debug(String mode) {
System.setProperty("javax.net.debug", mode);
}
public static void setup(String keyFilename, String trustFilename,
String password) {
System.setProperty("javax.net.ssl.keyStore", keyFilename);
System.setProperty("javax.net.ssl.keyStorePassword", password);
System.setProperty("javax.net.ssl.trustStore", trustFilename);
System.setProperty("javax.net.ssl.trustStorePassword", password);
}
public static void setup() throws Exception {
String keyFilename = TEST_SRC + "/" + PATH_TO_STORES + "/"
+ KEY_STORE_FILE;
String trustFilename = TEST_SRC + "/" + PATH_TO_STORES + "/"
+ TRUST_STORE_FILE;
setup(keyFilename, trustFilename, PASSWORD);
}
public static void print(String message, Throwable... errors) {
synchronized (System.out) {
System.out.println(message);
for (Throwable e : errors) {
e.printStackTrace(System.out);
}
}
}
public static KeyStore loadJksKeyStore(String filename, String password)
throws Exception {
return loadKeyStore(filename, password, "JKS");
}
public static KeyStore loadKeyStore(String filename, String password,
String type) throws Exception {
KeyStore keystore = KeyStore.getInstance(type);
FileInputStream fis = new FileInputStream(filename);
try {
keystore.load(fis, password.toCharArray());
} finally {
fis.close();
}
return keystore;
}
// Try to accept a connection in 30 seconds.
public static SSLSocket accept(SSLServerSocket sslServerSocket)
throws IOException {
return accept(sslServerSocket, SERVER_TIMEOUT);
}
public static SSLSocket accept(SSLServerSocket sslServerSocket, int timeout)
throws IOException {
try {
sslServerSocket.setSoTimeout(timeout);
return (SSLSocket) sslServerSocket.accept();
} catch (SocketTimeoutException ste) {
print("Warning: ", ste);
return null;
}
}
public SSLSocketTemplate setSeparateServerThread(
boolean separateServerThread) {
this.separateServerThread = separateServerThread;
return this;
}
public SSLSocketTemplate setServerPort(int serverPort) {
this.serverPort = serverPort;
return this;
}
public int getServerPort() {
return serverPort;
}
public SSLSocketTemplate setSSLContext(SSLContext context) {
this.context = context;
return this;
}
public SSLContext getSSLContext() {
return context;
}
public SSLServerSocketFactory getSSLServerSocketFactory() {
if (context != null) {
return context.getServerSocketFactory();
}
return (SSLServerSocketFactory) SSLServerSocketFactory.getDefault();
}
public SSLSocketFactory getSSLSocketFactory() {
if (context != null) {
return context.getSocketFactory();
}
return (SSLSocketFactory) SSLSocketFactory.getDefault();
}
public void signalServerReady() {
serverReadyCondition.countDown();
}
public void signalServerDone() {
serverDoneCondition.countDown();
}
public boolean waitForClientSignal(long timeout, TimeUnit unit)
throws InterruptedException {
return clientReadyCondition.await(timeout, unit);
}
public boolean waitForClientSignal() throws InterruptedException {
return waitForClientSignal(CLIENT_SIGNAL_TIMEOUT, TimeUnit.SECONDS);
}
public boolean waitForClientDone(long timeout, TimeUnit unit)
throws InterruptedException {
return clientDoneCondition.await(timeout, unit);
}
public boolean waitForClientDone() throws InterruptedException {
return waitForClientDone(CLIENT_SIGNAL_TIMEOUT, TimeUnit.SECONDS);
}
public void signalClientReady() {
clientReadyCondition.countDown();
}
public void signalClientDone() {
clientDoneCondition.countDown();
}
public boolean waitForServerSignal(long timeout, TimeUnit unit)
throws InterruptedException {
return serverReadyCondition.await(timeout, unit);
}
public boolean waitForServerSignal() throws InterruptedException {
return waitForServerSignal(SERVER_SIGNAL_TIMEOUT, TimeUnit.SECONDS);
}
public boolean waitForServerDone(long timeout, TimeUnit unit)
throws InterruptedException {
return serverDoneCondition.await(timeout, unit);
}
public boolean waitForServerDone() throws InterruptedException {
return waitForServerDone(SERVER_SIGNAL_TIMEOUT, TimeUnit.SECONDS);
}
public SSLSocketTemplate setServerPeer(Peer serverPeer) {
this.serverPeer = serverPeer;
return this;
}
public Peer getServerPeer() {
return serverPeer;
}
public SSLSocketTemplate setServerApplication(
Application serverApplication) {
this.serverApplication = serverApplication;
return this;
}
public Application getServerApplication() {
return serverApplication;
}
public SSLSocketTemplate setClientPeer(Peer clientPeer) {
this.clientPeer = clientPeer;
return this;
}
public Peer getClientPeer() {
return clientPeer;
}
public SSLSocketTemplate setClientApplication(
Application clientApplication) {
this.clientApplication = clientApplication;
return this;
}
public Application getClientApplication() {
return clientApplication;
}
public void runTest() throws Exception {
if (separateServerThread) {
startServer(true, this);
startClient(false, this);
serverThread.join();
} else {
startClient(true, this);
startServer(false, this);
clientThread.join();
}
if (clientException != null || serverException != null) {
throw new RuntimeException("Test failed");
}
}
public SSLSocketTemplate() {
serverPeer = new Peer() {
@Override
public void run(SSLSocketTemplate test) throws Exception {
doServerSide(test);
}
};
clientPeer = new Peer() {
@Override
public void run(SSLSocketTemplate test) throws Exception {
doClientSide(test);
}
};
serverApplication = new Application() {
@Override
public void run(SSLSocket socket, SSLSocketTemplate test)
throws Exception {
runServerApplication(socket);
}
};
clientApplication = new Application() {
@Override
public void run(SSLSocket socket, SSLSocketTemplate test)
throws Exception {
runClientApplication(socket);
}
};
}
public static void main(String args[]) throws Exception {
// reset the security property to make sure that the algorithms
// and keys used in this test are not disabled.
Security.setProperty("jdk.tls.disabledAlgorithms", "");
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
setup();
new SSLSocketTemplate().runTest();
}
/*
* Private part.
*/
/*
* Define the server side of the test.
*
* If the server prematurely exits, serverReady will be set to true
* to avoid infinite hangs.
*/
void doServerSide() throws Exception {
SSLServerSocketFactory sslssf =
(SSLServerSocketFactory)SSLServerSocketFactory.getDefault();
try (SSLServerSocket sslServerSocket =
(SSLServerSocket)sslssf.createServerSocket(serverPort)) {
private static void doServerSide(SSLSocketTemplate test) throws Exception {
SSLServerSocket sslServerSocket;
serverPort = sslServerSocket.getLocalPort();
// kick start the server side service
SSLServerSocketFactory sslssf = test.getSSLServerSocketFactory();
sslServerSocket = (SSLServerSocket)sslssf.createServerSocket(FREE_PORT);
/*
* Signal Client, we're ready for his connect.
*/
serverReady = true;
test.setServerPort(sslServerSocket.getLocalPort());
print("Server is listening on port " + test.getServerPort());
try (SSLSocket sslSocket = (SSLSocket)sslServerSocket.accept()) {
InputStream sslIS = sslSocket.getInputStream();
OutputStream sslOS = sslSocket.getOutputStream();
// Signal the client, the server is ready to accept connection.
test.signalServerReady();
sslIS.read();
sslOS.write(85);
sslOS.flush();
}
// Try to accept a connection in 30 seconds.
SSLSocket sslSocket = accept(sslServerSocket);
if (sslSocket == null) {
// Ignore the test case if no connection within 30 seconds.
print("No incoming client connection in 30 seconds. "
+ "Ignore in server side.");
return;
}
print("Server accepted connection");
// handle the connection
try {
// Is it the expected client connection?
//
// Naughty test cases or third party routines may try to
// connection to this server port unintentionally. In
// order to mitigate the impact of unexpected client
// connections and avoid intermittent failure, it should
// be checked that the accepted connection is really linked
// to the expected client.
boolean clientIsReady = test.waitForClientSignal();
if (clientIsReady) {
// Run the application in server side.
print("Run server application");
test.getServerApplication().run(sslSocket, test);
} else { // Otherwise, ignore
// We don't actually care about plain socket connections
// for TLS communication testing generally. Just ignore
// the test if the accepted connection is not linked to
// the expected client or the client connection timeout
// in 30 seconds.
print("The client is not the expected one or timeout. "
+ "Ignore in server side.");
}
} finally {
sslSocket.close();
sslServerSocket.close();
}
test.signalServerDone();
}
/*
* Define the server side application of the test for the specified socket.
*/
private static void runServerApplication(SSLSocket socket)
throws Exception {
// here comes the test logic
InputStream sslIS = socket.getInputStream();
OutputStream sslOS = socket.getOutputStream();
sslIS.read();
sslOS.write(85);
sslOS.flush();
}
/*
* Define the client side of the test.
*
* If the server prematurely exits, serverReady will be set to true
* to avoid infinite hangs.
*/
void doClientSide() throws Exception {
private static void doClientSide(SSLSocketTemplate test) throws Exception {
/*
* Wait for server to get started.
*/
while (!serverReady) {
Thread.sleep(50);
// Wait for server to get started.
//
// The server side takes care of the issue if the server cannot
// get started in 90 seconds. The client side would just ignore
// the test case if the serer is not ready.
boolean serverIsReady = test.waitForServerSignal();
if (!serverIsReady) {
print("The server is not ready yet in 90 seconds. "
+ "Ignore in client side.");
return;
}
SSLSocketFactory sslsf =
(SSLSocketFactory)SSLSocketFactory.getDefault();
try (SSLSocket sslSocket =
(SSLSocket)sslsf.createSocket("localhost", serverPort)) {
InputStream sslIS = sslSocket.getInputStream();
OutputStream sslOS = sslSocket.getOutputStream();
sslOS.write(280);
sslOS.flush();
sslIS.read();
}
}
/*
* =============================================================
* The remainder is just support stuff
*/
// use any free port by default
volatile int serverPort = 0;
volatile Exception serverException = null;
volatile Exception clientException = null;
public static void main(String[] args) throws Exception {
String keyFilename =
System.getProperty("test.src", ".") + "/" + pathToStores +
"/" + keyStoreFile;
String trustFilename =
System.getProperty("test.src", ".") + "/" + pathToStores +
"/" + trustStoreFile;
System.setProperty("javax.net.ssl.keyStore", keyFilename);
System.setProperty("javax.net.ssl.keyStorePassword", passwd);
System.setProperty("javax.net.ssl.trustStore", trustFilename);
System.setProperty("javax.net.ssl.trustStorePassword", passwd);
if (debug) {
System.setProperty("javax.net.debug", "all");
}
/*
* Start the tests.
*/
new SSLSocketTemplate();
}
Thread clientThread = null;
Thread serverThread = null;
/*
* Primary constructor, used to drive remainder of the test.
*
* Fork off the other side, then do your work.
*/
SSLSocketTemplate() throws Exception {
Exception startException = null;
SSLSocketFactory sslsf = test.getSSLSocketFactory();
SSLSocket sslSocket = (SSLSocket)sslsf.createSocket();
try {
if (separateServerThread) {
startServer(true);
startClient(false);
} else {
startClient(true);
startServer(false);
try {
sslSocket.connect(
new InetSocketAddress("localhost",
test.getServerPort()), CLIENT_TIMEOUT);
print("Client connected to server");
} catch (IOException ioe) {
// The server side may be impacted by naughty test cases or
// third party routines, and cannot accept connections.
//
// Just ignore the test if the connection cannot be
// established.
print("Cannot make a connection in 15 seconds. "
+ "Ignore in client side.", ioe);
return;
}
} catch (Exception e) {
startException = e;
// OK, here the client and server get connected.
// Signal the server, the client is ready to communicate.
test.signalClientReady();
// There is still a chance in theory that the server thread may
// wait client-ready timeout and then quit. The chance should
// be really rare so we don't consider it until it becomes a
// real problem.
// Run the application in client side.
print("Run client application");
test.getClientApplication().run(sslSocket, test);
} finally {
sslSocket.close();
}
/*
* Wait for other side to close down.
*/
if (separateServerThread) {
if (serverThread != null) {
serverThread.join();
}
} else {
if (clientThread != null) {
clientThread.join();
}
}
/*
* When we get here, the test is pretty much over.
* Which side threw the error?
*/
Exception local;
Exception remote;
if (separateServerThread) {
remote = serverException;
local = clientException;
} else {
remote = clientException;
local = serverException;
}
Exception exception = null;
/*
* Check various exception conditions.
*/
if ((local != null) && (remote != null)) {
// If both failed, return the curthread's exception.
local.initCause(remote);
exception = local;
} else if (local != null) {
exception = local;
} else if (remote != null) {
exception = remote;
} else if (startException != null) {
exception = startException;
}
/*
* If there was an exception *AND* a startException,
* output it.
*/
if (exception != null) {
if (exception != startException && startException != null) {
exception.addSuppressed(startException);
}
throw exception;
}
// Fall-through: no exception to throw!
test.signalClientDone();
}
void startServer(boolean newThread) throws Exception {
/*
* Define the client side application of the test for the specified socket.
*/
private static void runClientApplication(SSLSocket socket)
throws Exception {
InputStream sslIS = socket.getInputStream();
OutputStream sslOS = socket.getOutputStream();
sslOS.write(280);
sslOS.flush();
sslIS.read();
}
private void startServer(boolean newThread, SSLSocketTemplate test)
throws Exception {
if (newThread) {
serverThread = new Thread() {
@Override
public void run() {
try {
doServerSide();
serverPeer.run(test);
} catch (Exception e) {
/*
* Our server thread just died.
*
* Release the client, if not active already...
*/
System.err.println("Server died...");
serverReady = true;
print("Server died ...", e);
serverException = e;
}
}
@ -273,27 +583,29 @@ public class SSLSocketTemplate {
serverThread.start();
} else {
try {
doServerSide();
serverPeer.run(test);
} catch (Exception e) {
print("Server failed ...", e);
serverException = e;
} finally {
serverReady = true;
}
}
}
void startClient(boolean newThread) throws Exception {
private void startClient(boolean newThread, SSLSocketTemplate test)
throws Exception {
if (newThread) {
clientThread = new Thread() {
@Override
public void run() {
try {
doClientSide();
clientPeer.run(test);
} catch (Exception e) {
/*
* Our client thread just died.
*/
System.err.println("Client died...");
print("Client died ...", e);
clientException = e;
}
}
@ -301,8 +613,9 @@ public class SSLSocketTemplate {
clientThread.start();
} else {
try {
doClientSide();
clientPeer.run(test);
} catch (Exception e) {
print("Client failed ...", e);
clientException = e;
}
}

549
jdk/test/javax/net/ssl/templates/SSLTest.java
View File

@ -1,549 +0,0 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.InetSocketAddress;
import java.net.SocketTimeoutException;
import java.security.KeyStore;
import java.util.Arrays;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLServerSocket;
import javax.net.ssl.SSLServerSocketFactory;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
/**
* Helper class for JSSE tests.
*
* Please run in othervm mode. SunJSSE does not support dynamic system
* properties, no way to re-use system properties in samevm/agentvm mode.
*/
public class SSLTest {
public static final String TEST_SRC = System.getProperty("test.src", ".");
/*
* Where do we find the keystores?
*/
public static final String PATH_TO_STORES = "../etc";
public static final String KEY_STORE_FILE = "keystore";
public static final String TRUST_STORE_FILE = "truststore";
public static final String PASSWORD = "passphrase";
public static final int FREE_PORT = 0;
// in seconds
public static final long CLIENT_SIGNAL_TIMEOUT = 30L;
public static final long SERVER_SIGNAL_TIMEOUT = 90L;
// in millis
public static final int CLIENT_TIMEOUT = 15000;
public static final int SERVER_TIMEOUT = 30000;
/*
* Should we run the client or server in a separate thread?
* Both sides can throw exceptions, but do you have a preference
* as to which side should be the main thread.
*/
private boolean separateServerThread = false;
/*
* What's the server port? Use any free port by default
*/
private volatile int serverPort;
private volatile Exception serverException;
private volatile Exception clientException;
private Thread clientThread;
private Thread serverThread;
private Peer serverPeer;
private Peer clientPeer;
private Application serverApplication;
private Application clientApplication;
private SSLContext context;
/*
* Is the server ready to serve?
*/
private final CountDownLatch serverReadyCondition = new CountDownLatch(1);
/*
* Is the client ready to handshake?
*/
private final CountDownLatch clientReadyCondition = new CountDownLatch(1);
/*
* Is the server done?
*/
private final CountDownLatch serverDoneCondition = new CountDownLatch(1);
/*
* Is the client done?
*/
private final CountDownLatch clientDoneCondition = new CountDownLatch(1);
/*
* Public API.
*/
public static interface Peer {
void run(SSLTest test) throws Exception;
}
public static interface Application {
void run(SSLSocket socket, SSLTest test) throws Exception;
}
public static void debug() {
debug("ssl");
}
public static void debug(String mode) {
System.setProperty("javax.net.debug", mode);
}
public static void setup(String keyFilename, String trustFilename,
String password) {
System.setProperty("javax.net.ssl.keyStore", keyFilename);
System.setProperty("javax.net.ssl.keyStorePassword", password);
System.setProperty("javax.net.ssl.trustStore", trustFilename);
System.setProperty("javax.net.ssl.trustStorePassword", password);
}
public static void setup() throws Exception {
String keyFilename = TEST_SRC + "/" + PATH_TO_STORES + "/"
+ KEY_STORE_FILE;
String trustFilename = TEST_SRC + "/" + PATH_TO_STORES + "/"
+ TRUST_STORE_FILE;
setup(keyFilename, trustFilename, PASSWORD);
}
public static void print(String message, Throwable... errors) {
synchronized (System.out) {
System.out.println(message);
Arrays.stream(errors).forEach(e -> e.printStackTrace(System.out));
}
}
public static KeyStore loadJksKeyStore(String filename, String password)
throws Exception {
return loadKeyStore(filename, password, "JKS");
}
public static KeyStore loadKeyStore(String filename, String password,
String type) throws Exception {
KeyStore keystore = KeyStore.getInstance(type);
try (FileInputStream fis = new FileInputStream(filename)) {
keystore.load(fis, password.toCharArray());
}
return keystore;
}
// Try to accept a connection in 30 seconds.
public static SSLSocket accept(SSLServerSocket sslServerSocket)
throws IOException {
return accept(sslServerSocket, SERVER_TIMEOUT);
}
public static SSLSocket accept(SSLServerSocket sslServerSocket, int timeout)
throws IOException {
try {
sslServerSocket.setSoTimeout(timeout);
return (SSLSocket) sslServerSocket.accept();
} catch (SocketTimeoutException ste) {
sslServerSocket.close();
return null;
}
}
public SSLTest setSeparateServerThread(boolean separateServerThread) {
this.separateServerThread = separateServerThread;
return this;
}
public SSLTest setServerPort(int serverPort) {
this.serverPort = serverPort;
return this;
}
public int getServerPort() {
return serverPort;
}
public SSLTest setSSLContext(SSLContext context) {
this.context = context;
return this;
}
public SSLContext getSSLContext() {
return context;
}
public SSLServerSocketFactory getSSLServerSocketFactory() {
if (context != null) {
return context.getServerSocketFactory();
}
return (SSLServerSocketFactory) SSLServerSocketFactory.getDefault();
}
public SSLSocketFactory getSSLSocketFactory() {
if (context != null) {
return context.getSocketFactory();
}
return (SSLSocketFactory) SSLSocketFactory.getDefault();
}
public void signalServerReady() {
serverReadyCondition.countDown();
}
public void signalServerDone() {
serverDoneCondition.countDown();
}
public boolean waitForClientSignal(long timeout, TimeUnit unit)
throws InterruptedException {
return clientReadyCondition.await(timeout, unit);
}
public boolean waitForClientSignal() throws InterruptedException {
return waitForClientSignal(CLIENT_SIGNAL_TIMEOUT, TimeUnit.SECONDS);
}
public boolean waitForClientDone(long timeout, TimeUnit unit)
throws InterruptedException {
return clientDoneCondition.await(timeout, unit);
}
public boolean waitForClientDone() throws InterruptedException {
return waitForClientDone(CLIENT_SIGNAL_TIMEOUT, TimeUnit.SECONDS);
}
public void signalClientReady() {
clientReadyCondition.countDown();
}
public void signalClientDone() {
clientDoneCondition.countDown();
}
public boolean waitForServerSignal(long timeout, TimeUnit unit)
throws InterruptedException {
return serverReadyCondition.await(timeout, unit);
}
public boolean waitForServerSignal() throws InterruptedException {
return waitForServerSignal(SERVER_SIGNAL_TIMEOUT, TimeUnit.SECONDS);
}
public boolean waitForServerDone(long timeout, TimeUnit unit)
throws InterruptedException {
return serverDoneCondition.await(timeout, unit);
}
public boolean waitForServerDone() throws InterruptedException {
return waitForServerDone(SERVER_SIGNAL_TIMEOUT, TimeUnit.SECONDS);
}
public SSLTest setServerPeer(Peer serverPeer) {
this.serverPeer = serverPeer;
return this;
}
public Peer getServerPeer() {
return serverPeer;
}
public SSLTest setServerApplication(Application serverApplication) {
this.serverApplication = serverApplication;
return this;
}
public Application getServerApplication() {
return serverApplication;
}
public SSLTest setClientPeer(Peer clientPeer) {
this.clientPeer = clientPeer;
return this;
}
public Peer getClientPeer() {
return clientPeer;
}
public SSLTest setClientApplication(Application clientApplication) {
this.clientApplication = clientApplication;
return this;
}
public Application getClientApplication() {
return clientApplication;
}
public void runTest() throws Exception {
if (separateServerThread) {
startServer(true, this);
startClient(false, this);
serverThread.join();
} else {
startClient(true, this);
startServer(false, this);
clientThread.join();
}
if (clientException != null || serverException != null) {
throw new RuntimeException("Test failed");
}
}
public SSLTest() {
serverPeer = (test) -> doServerSide(test);
clientPeer = (test) -> doClientSide(test);
serverApplication = (socket, test) -> runServerApplication(socket);
clientApplication = (socket, test) -> runClientApplication(socket);
}
/*
* Private part.
*/
/*
* Define the server side of the test.
*/
private static void doServerSide(SSLTest test) throws Exception {
SSLServerSocket sslServerSocket;
// kick start the server side service
SSLServerSocketFactory sslssf = test.getSSLServerSocketFactory();
sslServerSocket = (SSLServerSocket)sslssf.createServerSocket(FREE_PORT);
test.setServerPort(sslServerSocket.getLocalPort());
print("Server is listening on port " + test.getServerPort());
// Signal the client, the server is ready to accept connection.
test.signalServerReady();
// Try to accept a connection in 30 seconds.
SSLSocket sslSocket = accept(sslServerSocket);
if (sslSocket == null) {
// Ignore the test case if no connection within 30 seconds.
print("No incoming client connection in 30 seconds. "
+ "Ignore in server side.");
return;
}
print("Server accepted connection");
// handle the connection
try {
// Is it the expected client connection?
//
// Naughty test cases or third party routines may try to
// connection to this server port unintentionally. In
// order to mitigate the impact of unexpected client
// connections and avoid intermittent failure, it should
// be checked that the accepted connection is really linked
// to the expected client.
boolean clientIsReady = test.waitForClientSignal();
if (clientIsReady) {
// Run the application in server side.
print("Run server application");
test.getServerApplication().run(sslSocket, test);
} else { // Otherwise, ignore
// We don't actually care about plain socket connections
// for TLS communication testing generally. Just ignore
// the test if the accepted connection is not linked to
// the expected client or the client connection timeout
// in 30 seconds.
print("The client is not the expected one or timeout. "
+ "Ignore in server side.");
}
} finally {
sslSocket.close();
sslServerSocket.close();
}
test.signalServerDone();
}
/*
* Define the server side application of the test for the specified socket.
*/
private static void runServerApplication(SSLSocket socket)
throws Exception {
// here comes the test logic
InputStream sslIS = socket.getInputStream();
OutputStream sslOS = socket.getOutputStream();
sslIS.read();
sslOS.write(85);
sslOS.flush();
}
/*
* Define the client side of the test.
*/
private static void doClientSide(SSLTest test) throws Exception {
// Wait for server to get started.
//
// The server side takes care of the issue if the server cannot
// get started in 90 seconds. The client side would just ignore
// the test case if the serer is not ready.
boolean serverIsReady = test.waitForServerSignal();
if (!serverIsReady) {
print("The server is not ready yet in 90 seconds. "
+ "Ignore in client side.");
return;
}
SSLSocketFactory sslsf = test.getSSLSocketFactory();
try (SSLSocket sslSocket = (SSLSocket)sslsf.createSocket()) {
try {
sslSocket.connect(
new InetSocketAddress("localhost",
test.getServerPort()), CLIENT_TIMEOUT);
print("Client connected to server");
} catch (IOException ioe) {
// The server side may be impacted by naughty test cases or
// third party routines, and cannot accept connections.
//
// Just ignore the test if the connection cannot be
// established.
print("Cannot make a connection in 15 seconds. "
+ "Ignore in client side.", ioe);
return;
}
// OK, here the client and server get connected.
// Signal the server, the client is ready to communicate.
test.signalClientReady();
// There is still a chance in theory that the server thread may
// wait client-ready timeout and then quit. The chance should
// be really rare so we don't consider it until it becomes a
// real problem.
// Run the application in client side.
print("Run client application");
test.getClientApplication().run(sslSocket, test);
}
test.signalClientDone();
}
/*
* Define the client side application of the test for the specified socket.
*/
private static void runClientApplication(SSLSocket socket)
throws Exception {
InputStream sslIS = socket.getInputStream();
OutputStream sslOS = socket.getOutputStream();
sslOS.write(280);
sslOS.flush();
sslIS.read();
}
private void startServer(boolean newThread, SSLTest test) throws Exception {
if (newThread) {
serverThread = new Thread() {
@Override
public void run() {
try {
serverPeer.run(test);
} catch (Exception e) {
/*
* Our server thread just died.
*
* Release the client, if not active already...
*/
print("Server died ...", e);
serverException = e;
}
}
};
serverThread.start();
} else {
try {
serverPeer.run(test);
} catch (Exception e) {
print("Server failed ...", e);
serverException = e;
}
}
}
private void startClient(boolean newThread, SSLTest test) throws Exception {
if (newThread) {
clientThread = new Thread() {
@Override
public void run() {
try {
clientPeer.run(test);
} catch (Exception e) {
/*
* Our client thread just died.
*/
print("Client died ...", e);
clientException = e;
}
}
};
clientThread.start();
} else {
try {
clientPeer.run(test);
} catch (Exception e) {
print("Client failed ...", e);
clientException = e;
}
}
}
}

12
jdk/test/sun/net/www/protocol/https/HttpsClient/ProxyAuthTest.java
View File

@ -63,7 +63,7 @@ import static java.nio.charset.StandardCharsets.US_ASCII;
* authentication proxy
*/
public class ProxyAuthTest {
public class ProxyAuthTest extends SSLSocketTemplate {
/*
* Where do we find the keystores?
*/
@ -96,13 +96,13 @@ public class ProxyAuthTest {
expectSuccess = args[0].equals("succeed");
String keyFilename =
SSLTest.TEST_SRC + "/" + pathToStores + "/" + keyStoreFile;
TEST_SRC + "/" + pathToStores + "/" + keyStoreFile;
String trustFilename =
SSLTest.TEST_SRC + "/" + pathToStores + "/" + trustStoreFile;
TEST_SRC + "/" + pathToStores + "/" + trustStoreFile;
SSLTest.setup(keyFilename, trustFilename, passwd);
setup(keyFilename, trustFilename, passwd);
new SSLTest()
new SSLSocketTemplate()
.setServerApplication((socket, test) -> {
DataOutputStream out = new DataOutputStream(
socket.getOutputStream());
@ -164,7 +164,7 @@ public class ProxyAuthTest {
.runTest();
}
static void doClientSide(SSLTest test) throws IOException {
static void doClientSide(SSLSocketTemplate test) throws IOException {
// Wait for server to get started.
//

16
jdk/test/sun/net/www/protocol/https/HttpsClient/ServerIdentityTest.java
View File

@ -45,20 +45,20 @@ import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLContext;
public class ServerIdentityTest {
public class ServerIdentityTest extends SSLSocketTemplate {
private static final String PASSWORD = "changeit";
public static void main(String[] args) throws Exception {
final String keystore = args[0];
String keystoreFilename = SSLTest.TEST_SRC + "/" + keystore;
String keystoreFilename = TEST_SRC + "/" + keystore;
SSLTest.setup(keystoreFilename, keystoreFilename, PASSWORD);
setup(keystoreFilename, keystoreFilename, PASSWORD);
SSLContext context = SSLContext.getInstance("SSL");
KeyManager[] kms = new KeyManager[1];
KeyStore ks = SSLTest.loadJksKeyStore(keystoreFilename, PASSWORD);
KeyStore ks = loadJksKeyStore(keystoreFilename, PASSWORD);
KeyManager km = new MyKeyManager(ks, PASSWORD.toCharArray());
kms[0] = km;
context.init(kms, null, null);
@ -70,7 +70,7 @@ public class ServerIdentityTest {
*/
System.out.println("Testing " + keystore);
new SSLTest()
new SSLSocketTemplate()
.setSSLContext(context)
.setServerApplication((socket, test) -> {
BufferedWriter bw = new BufferedWriter(
@ -79,12 +79,12 @@ public class ServerIdentityTest {
bw.flush();
Thread.sleep(2000);
socket.getSession().invalidate();
SSLTest.print("Server application is done");
print("Server application is done");
})
.setClientPeer((test) -> {
boolean serverIsReady = test.waitForServerSignal();
if (!serverIsReady) {
SSLTest.print(
print(
"The server is not ready, ignore on client side.");
return;
}
@ -100,7 +100,7 @@ public class ServerIdentityTest {
((HttpURLConnection) url.openConnection())
.getInputStream().close();
SSLTest.print("Client is done");
print("Client is done");
}).runTest();
}
}

18
jdk/test/sun/security/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java
View File

@ -42,7 +42,7 @@ import javax.net.ssl.SSLServerSocket;
import javax.net.ssl.SSLServerSocketFactory;
import javax.net.ssl.SSLSocket;
public class AnonCipherWithWantClientAuth {
public class AnonCipherWithWantClientAuth extends SSLSocketTemplate {
/*
* Where do we find the keystores?
@ -62,16 +62,16 @@ public class AnonCipherWithWantClientAuth {
String trustFilename =
System.getProperty("test.src", "./") + "/" + pathToStores +
"/" + trustStoreFile;
SSLTest.setup(keyFilename, trustFilename, passwd);
setup(keyFilename, trustFilename, passwd);
new SSLTest()
new SSLSocketTemplate()
.setServerPeer(test -> {
SSLServerSocketFactory sslssf =
(SSLServerSocketFactory) SSLServerSocketFactory.getDefault();
SSLServerSocket sslServerSocket =
(SSLServerSocket) sslssf.createServerSocket(SSLTest.FREE_PORT);
(SSLServerSocket) sslssf.createServerSocket(FREE_PORT);
test.setServerPort(sslServerSocket.getLocalPort());
SSLTest.print("Server is listening on port "
print("Server is listening on port "
+ test.getServerPort());
String ciphers[] = {
@ -85,14 +85,14 @@ public class AnonCipherWithWantClientAuth {
test.signalServerReady();
// Try to accept a connection in 30 seconds.
SSLSocket sslSocket = SSLTest.accept(sslServerSocket);
SSLSocket sslSocket = accept(sslServerSocket);
if (sslSocket == null) {
// Ignore the test case if no connection within 30 seconds.
SSLTest.print("No incoming client connection in 30 seconds."
print("No incoming client connection in 30 seconds."
+ " Ignore in server side.");
return;
}
SSLTest.print("Server accepted connection");
print("Server accepted connection");
// handle the connection
try {
@ -108,7 +108,7 @@ public class AnonCipherWithWantClientAuth {
if (clientIsReady) {
// Run the application in server side.
SSLTest.print("Run server application");
print("Run server application");
InputStream sslIS = sslSocket.getInputStream();
OutputStream sslOS = sslSocket.getOutputStream();