Skip to content

8300939: sun/security/provider/certpath/OCSP/OCSPNoContentLength.java fails due to network errors #333

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

Closed
wants to merge 2 commits into from
Closed

8300939: sun/security/provider/certpath/OCSP/OCSPNoContentLength.java fails due to network errors #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74ba0e0
Backport 57d0a7f1b69214bd2de951c9907fe1321a66f3b8
Jun 7, 2023
3eb32dc
remove trailing whitespaces
Jun 7, 2023
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
58 changes: 46 additions & 12 deletions jdk/test/java/security/testlibrary/SimpleOCSPServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ public String toString() {
* @return the hexdump of the byte array
*/
private static String dumpHexBytes(byte[] data) {
return dumpHexBytes(data, 16, "\n", " ");
return dumpHexBytes(data, data.length, 16, "\n", " ");
}

/**
Expand All @@ -341,11 +341,11 @@ private static String dumpHexBytes(byte[] data) {
*
* @return The hexdump of the byte array
*/
private static String dumpHexBytes(byte[] data, int itemsPerLine,
String lineDelim, String itemDelim) {
private static String dumpHexBytes(byte[] data, int dataLen,
int itemsPerLine, String lineDelim, String itemDelim) {
StringBuilder sb = new StringBuilder();
if (data != null) {
for (int i = 0; i < data.length; i++) {
for (int i = 0; i < dataLen; i++) {
if (i % itemsPerLine == 0 && i != 0) {
sb.append(lineDelim);
}
Expand Down Expand Up @@ -495,6 +495,7 @@ public void setSignatureAlgorithm(String algName)
throws NoSuchAlgorithmException {
if (!started) {
sigAlgId = AlgorithmId.get(algName);
log("Signature algorithm set to " + sigAlgId.getName());
}
}

Expand Down Expand Up @@ -558,6 +559,8 @@ public void setDelay(long delayMillis) {
public void setDisableContentLength(boolean isDisabled) {
if (!started) {
omitContentLength = isDisabled;
log("Response Content-Length field " +
(isDisabled ? "disabled" : "enabled"));
}
}

Expand Down Expand Up @@ -740,12 +743,12 @@ public void run() {
if (headerTokens[0] != null) {
log("Received incoming HTTP " + headerTokens[0] +
" from " + peerSockAddr);
switch (headerTokens[0]) {
switch (headerTokens[0].toUpperCase()) {
case "POST":
ocspReq = parseHttpOcspPost(in);
break;
case "GET":
ocspReq = parseHttpOcspGet(headerTokens);
ocspReq = parseHttpOcspGet(headerTokens, in);
break;
default:
respStat = ResponseStatus.MALFORMED_REQUEST;
Expand Down Expand Up @@ -779,6 +782,9 @@ public void run() {
ocspResp = new LocalOcspResponse(respStat);
}
sendResponse(out, ocspResp);
out.flush();

log("Closing " + ocspSocket);
} catch (IOException | CertificateException exc) {
err(exc);
}
Expand Down Expand Up @@ -876,6 +882,8 @@ private LocalOcspRequest parseHttpOcspPost(InputStream inStream)
*
* @param headerTokens the individual String tokens from the first
* line of the HTTP GET.
* @param inStream the input stream from the socket bound to this
* {@code OcspHandler}.
*
* @return the OCSP Request as a {@code LocalOcspRequest}
*
Expand All @@ -884,8 +892,26 @@ private LocalOcspRequest parseHttpOcspPost(InputStream inStream)
* @throws CertificateException if one or more of the certificates in
* the OCSP request cannot be read/parsed.
*/
private LocalOcspRequest parseHttpOcspGet(String[] headerTokens)
throws IOException, CertificateException {
private LocalOcspRequest parseHttpOcspGet(String[] headerTokens,
InputStream inStream) throws IOException, CertificateException {
// Before we process the remainder of the GET URL, we should drain
// the InputStream of any other header data. We (for now) won't
// use it, but will display the contents if logging is enabled.
boolean endOfHeader = false;
while (!endOfHeader) {
String[] lineTokens = readLine(inStream).split(":", 2);
// We expect to see a type and value pair delimited by a colon.
if (lineTokens[0].isEmpty()) {
endOfHeader = true;
} else if (lineTokens.length == 2) {
log(String.format("ReqHdr: %s: %s", lineTokens[0].trim(),
lineTokens[1].trim()));
} else {
// A colon wasn't found and token 0 should be the whole line
log("ReqHdr: " + lineTokens[0].trim());
}
}

// We have already established headerTokens[0] to be "GET".
// We should have the URL-encoded base64 representation of the
// OCSP request in headerTokens[1]. We need to strip any leading
Expand Down Expand Up @@ -1206,10 +1232,14 @@ public String toString() {
sb.append("CertId, Algorithm = ");
sb.append(cid.getHashAlgorithm()).append("\n");
sb.append("\tIssuer Name Hash: ");
sb.append(dumpHexBytes(cid.getIssuerNameHash(), 256, "", ""));
byte[] cidHashBuf = cid.getIssuerNameHash();
sb.append(dumpHexBytes(cidHashBuf, cidHashBuf.length,
256, "", ""));
sb.append("\n");
sb.append("\tIssuer Key Hash: ");
sb.append(dumpHexBytes(cid.getIssuerKeyHash(), 256, "", ""));
cidHashBuf = cid.getIssuerKeyHash();
sb.append(dumpHexBytes(cidHashBuf, cidHashBuf.length,
256, "", ""));
sb.append("\n");
sb.append("\tSerial Number: ").append(cid.getSerialNumber());
if (!extensions.isEmpty()) {
Expand Down Expand Up @@ -1549,10 +1579,14 @@ public String toString() {
sb.append("CertId, Algorithm = ");
sb.append(certId.getHashAlgorithm()).append("\n");
sb.append("\tIssuer Name Hash: ");
sb.append(dumpHexBytes(certId.getIssuerNameHash(), 256, "", ""));
byte[] cidHashBuf = certId.getIssuerNameHash();
sb.append(dumpHexBytes(cidHashBuf, cidHashBuf.length,
256, "", ""));
sb.append("\n");
sb.append("\tIssuer Key Hash: ");
sb.append(dumpHexBytes(certId.getIssuerKeyHash(), 256, "", ""));
cidHashBuf = certId.getIssuerKeyHash();
sb.append(dumpHexBytes(cidHashBuf, cidHashBuf.length,
256, "", ""));
sb.append("\n");
sb.append("\tSerial Number: ").append(certId.getSerialNumber());
sb.append("\n");
Expand Down
3 changes: 1 addition & 2 deletions jdk/test/sun/security/provider/certpath/OCSP/OCSPNoContentLength.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public class OCSPNoContentLength {
static String EE_ALIAS = "endentity";

// Enable debugging for additional output
static final boolean debug = false;
static final boolean debug = true;

// PKI components we will need for this test
static X509Certificate rootCert; // The root CA certificate
Expand All @@ -67,7 +67,6 @@ public class OCSPNoContentLength {
static SimpleOCSPServer rootOcsp; // Root CA OCSP Responder
static int rootOcspPort; // Port number for root OCSP


public static void main(String[] args) throws Exception {

try {
Expand Down