Skip to content

8371559: Intermittent timeouts in test javax/net/ssl/Stapling/HttpsUrlConnClient.java #780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xiezhaokun wants to merge 1 commit into
base: master
Choose a base branch
from
Open

8371559: Intermittent timeouts in test javax/net/ssl/Stapling/HttpsUrlConnClient.java #780

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 48 additions & 38 deletions jdk/test/javax/net/ssl/Stapling/HttpsUrlConnClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,21 @@
* @run main/othervm HttpsUrlConnClient
*/

import java.io.*;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.math.BigInteger;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.net.Socket;
import java.net.URL;
import java.net.HttpURLConnection;
import java.net.InetAddress;

import javax.net.ssl.*;

import java.security.KeyStore;
import java.security.PublicKey;
import java.security.Security;
Expand All @@ -55,7 +61,16 @@
import java.security.cert.PKIXRevocationChecker;
import java.security.spec.PKCS8EncodedKeySpec;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Base64;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;

import sun.security.testlibrary.SimpleOCSPServer;
Expand Down Expand Up @@ -90,10 +105,6 @@ public class HttpsUrlConnClient {
static String INT_ALIAS = "intermediate";
static String SSL_ALIAS = "ssl";

/*
* Is the server ready to serve?
*/
volatile static boolean serverReady = false;
volatile int serverPort = 0;

volatile Exception serverException = null;
Expand Down Expand Up @@ -159,7 +170,7 @@ static void testPKIXParametersRevEnabled(String[] allowedProts)
ClientParameters cliParams = new ClientParameters();
cliParams.protocols = allowedProts;
ServerParameters servParams = new ServerParameters();
serverReady = false;
CountDownLatch serverReady = new CountDownLatch(1);

System.out.println("=====================================");
System.out.println("Stapling enabled, PKIXParameters with");
Expand Down Expand Up @@ -187,7 +198,7 @@ static void testPKIXParametersRevEnabled(String[] allowedProts)
Security.setProperty("ocsp.enable", "false");

HttpsUrlConnClient sslTest = new HttpsUrlConnClient(cliParams,
servParams);
servParams, serverReady);
TestResult tr = sslTest.getResult();
if (!checkClientValidationFailure(tr.clientExc, BasicReason.REVOKED)) {
if (tr.clientExc != null) {
Expand All @@ -214,10 +225,11 @@ static void testPKIXParametersRevEnabled(String[] allowedProts)
/*
* Define the server side of the test.
*
* If the server prematurely exits, serverReady will be set to true
* If the server prematurely exits, serverReady will be counted down
* to avoid infinite hangs.
*/
void doServerSide(ServerParameters servParams) throws Exception {
void doServerSide(ServerParameters servParams, CountDownLatch serverReady)
throws Exception {

// Selectively enable or disable the feature
System.setProperty("jdk.tls.server.enableStatusRequestExtension",
Expand Down Expand Up @@ -269,7 +281,7 @@ void doServerSide(ServerParameters servParams) throws Exception {
/*
* Signal Client, we're ready for his connect.
*/
serverReady = true;
serverReady.countDown();

try (SSLSocket sslSocket = (SSLSocket) sslServerSocket.accept();
BufferedReader in = new BufferedReader(
Expand Down Expand Up @@ -301,18 +313,13 @@ void doServerSide(ServerParameters servParams) throws Exception {
/*
* Define the client side of the test.
*
* If the server prematurely exits, serverReady will be set to true
* If the server prematurely exits, serverReady will be counted down
* to avoid infinite hangs.
*/
void doClientSide(ClientParameters cliParams) throws Exception {
void doClientSide(ClientParameters cliParams, CountDownLatch serverReady)
throws Exception {

// Wait 5 seconds for server ready
for (int i = 0; (i < 100 && !serverReady); i++) {
Thread.sleep(50);
}
if (!serverReady) {
throw new RuntimeException("Server not ready yet");
}
serverReady.await();

// Selectively enable or disable the feature
System.setProperty("jdk.tls.client.enableStatusRequestExtension",
Expand Down Expand Up @@ -368,16 +375,16 @@ void doClientSide(ClientParameters cliParams) throws Exception {
*
* Fork off the other side, then do your work.
*/
HttpsUrlConnClient(ClientParameters cliParams,
ServerParameters servParams) throws Exception {
HttpsUrlConnClient(ClientParameters cliParams, ServerParameters servParams,
CountDownLatch serverReady) throws Exception {
Exception startException = null;
try {
if (separateServerThread) {
startServer(servParams, true);
startClient(cliParams, false);
startServer(servParams, true, serverReady);
startClient(cliParams, false, serverReady);
} else {
startClient(cliParams, true);
startServer(servParams, false);
startClient(cliParams, true, serverReady);
startServer(servParams, false, serverReady);
}
} catch (Exception e) {
startException = e;
Expand Down Expand Up @@ -448,61 +455,64 @@ TestResult getResult() {
return tr;
}

final void startServer(ServerParameters servParams, boolean newThread)
throws Exception {
final void startServer(ServerParameters servParams, boolean newThread,
CountDownLatch serverReady) throws IOException {
if (newThread) {
serverThread = new Thread() {
@Override
public void run() {
try {
doServerSide(servParams);
doServerSide(servParams, serverReady);
} catch (Exception e) {
/*
* Our server thread just died.
*
* Release the client, if not active already...
*/
System.err.println("Server died...");
serverReady = true;
System.err.println("Server died: " + e);
serverException = e;
} finally {
serverReady.countDown();
}
}
};
serverThread.start();
} else {
try {
doServerSide(servParams);
doServerSide(servParams, serverReady);
} catch (Exception e) {
System.err.println("Server died: " + e);
serverException = e;
} finally {
serverReady = true;
serverReady.countDown();
}
}
}

final void startClient(ClientParameters cliParams, boolean newThread)
throws Exception {
final void startClient(ClientParameters cliParams, boolean newThread,
CountDownLatch serverReady) throws Exception {
if (newThread) {
clientThread = new Thread() {
@Override
public void run() {
try {
doClientSide(cliParams);
doClientSide(cliParams, serverReady);
} catch (Exception e) {
/*
* Our client thread just died.
*/
System.err.println("Client died...");
System.err.println("Client died: " + e);
clientException = e;
}
}
};
clientThread.start();
} else {
try {
doClientSide(cliParams);
doClientSide(cliParams, serverReady);
} catch (Exception e) {
clientException = e;
System.err.println("Client died: " + e);
}
}
}
Expand Down