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

jnimeh · 2023-02-01T18:10:41Z

Hello all,

This addresses a test bug where the SimpleOCSPServer would reset the connections made by a client CertPathValidator. I've made some minor changes to how the network data is read and sent from OCSP HTTP GET URLs and on responses, respectively. This will take the test off the problem list as well.

This has been taken through hundreds of test runs and does not see the failure any longer where there used to be intermittent failures. Also multiple tier2 runs have been executed with no failures.

JBS: https://bugs.openjdk.org/browse/JDK-8300939

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

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

Reviewers

Daniel Jeliński (@djelinski - Committer) ⚠️ Review applies to 6bbb337e
Weijun Wang (@wangweij - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/12370/head:pull/12370
$ git checkout pull/12370

Update a local copy of the PR:
$ git checkout pull/12370
$ git pull https://git.openjdk.org/jdk pull/12370/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12370

View PR using the GUI difftool:
$ git pr show -t 12370

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/12370.diff

… tests

…to ProblemList

… fails due to network errors

jnimeh · 2023-02-01T18:10:51Z

/label security

jnimeh · 2023-02-01T18:11:31Z

/issue 8300939

bridgekeeper · 2023-02-01T18:11:40Z

👋 Welcome back jnimeh! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2023-02-01T18:13:14Z

@jnimeh
The security label was successfully added.

openjdk · 2023-02-01T18:14:39Z

@jnimeh This issue is referenced in the PR title - it will now be updated.

mlbridge · 2023-02-01T18:18:37Z

Webrevs

02: Full (b2d25b7e)
01: Full (6bbb337e)
00: Full (c64f765b)

mcpowers

It's not clear to me what is causing this test failure, but your fix is to drain the input stream and flush the output?

mcpowers · 2023-02-03T17:08:59Z

test/jdk/sun/security/provider/certpath/OCSP/OCSPNoContentLength.java

@@ -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;


Do you intend to leave this true?

Yes, I would like to leave this in the off chance this does rear its ugly head again. I've done hundreds upon hundreds of iterations of this test both by itself and as part of tier2 runs and no failures occur. If it did fail though, I'd like to have the extra logging. It doesn't add very much to the output, but the info is useful.

jnimeh · 2023-02-03T17:56:32Z

It's not clear to me what is causing this test failure, but your fix is to drain the input stream and flush the output?

Yes, that's the gist of it. I didn't realize originally that I was leaving unread data in the input stream, so draining that and making sure everything was flushed definitely improved things. The other changes were just minor extras (additional logging, etc.) that made sense while I was in this class.

openjdk · 2023-02-17T18:54:51Z

@jnimeh this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout JDK-8300939
git fetch https://git.openjdk.org/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

djelinski

Draining the input stream is the right fix.

wangweij

Looks fine. Just one comment.

wangweij · 2023-03-14T15:01:07Z

test/jdk/java/security/testlibrary/SimpleOCSPServer.java

-    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) {


You always call with dataLen = data.length. Is it still necessary to add this argument?

Yes, I would prefer to keep this. I made the change in order to help me debug draining the input stream and I felt it prudent to leave it in place, along with the main test's debug flag just in case.

openjdk · 2023-03-14T15:08:09Z

@jnimeh This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

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

Reviewed-by: djelinski, weijun

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 1 new commit pushed to the master branch:

c466cdf: 8299546: C2: MulLNode::mul_ring() wrongly returns bottom type due to casting errors with large numbers

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

jnimeh · 2023-03-14T15:39:20Z

/integrate

openjdk · 2023-03-14T15:43:06Z

Going to push as commit da044dd.
Since your change was applied there has been 1 commit pushed to the master branch:

c466cdf: 8299546: C2: MulLNode::mul_ring() wrongly returns bottom type due to casting errors with large numbers

Your commit was automatically rebased without conflicts.

openjdk · 2023-03-14T15:43:31Z

@jnimeh Pushed as commit da044dd.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

jnimeh added 9 commits January 9, 2023 21:59

8296343: CPVE thrown on missing content-length in OCSP response

16a60c8

Moved SimpleOCSPServer to use CountdownLatch for ready state, updated…

beff50a

… tests

Throw exception directly from non 200 HTTP response codes

36a0911

Remove dead commented code

ddcd124

8300946: Add sun/security/provider/certpath/OCSP/OCSPNoContentLength …

db3e086

…to ProblemList

Merge with main

c7c8b4a

Restore policy Root.java lost during merge

3ac7750

Merge with main

197d246

8300939: sun/security/provider/certpath/OCSP/OCSPNoContentLength.java…

c64f765

… fails due to network errors

openjdk bot added rfr Pull request is ready for review security security-dev@openjdk.org labels Feb 1, 2023

merge with main

6bbb337

mcpowers reviewed Feb 3, 2023

View reviewed changes

openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Feb 17, 2023

djelinski approved these changes Mar 14, 2023

View reviewed changes

openjdk bot removed the rfr Pull request is ready for review label Mar 14, 2023

merge with main

b2d25b7

openjdk bot added rfr Pull request is ready for review and removed merge-conflict Pull request has merge conflict with target branch labels Mar 14, 2023

wangweij reviewed Mar 14, 2023

View reviewed changes

wangweij approved these changes Mar 14, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Mar 14, 2023

openjdk bot added the integrated Pull request has been integrated label Mar 14, 2023

openjdk bot closed this Mar 14, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 14, 2023

jnimeh deleted the JDK-8300939 branch December 12, 2023 19:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

jnimeh commented Feb 1, 2023 •

edited by openjdk bot

Loading

jnimeh commented Feb 1, 2023

jnimeh commented Feb 1, 2023

bridgekeeper bot commented Feb 1, 2023

openjdk bot commented Feb 1, 2023

openjdk bot commented Feb 1, 2023

mlbridge bot commented Feb 1, 2023 •

edited

Loading

mcpowers left a comment

mcpowers Feb 3, 2023

jnimeh Feb 3, 2023

jnimeh commented Feb 3, 2023

openjdk bot commented Feb 17, 2023

djelinski left a comment

wangweij left a comment

wangweij Mar 14, 2023

jnimeh Mar 14, 2023

openjdk bot commented Mar 14, 2023

jnimeh commented Mar 14, 2023

openjdk bot commented Mar 14, 2023

openjdk bot commented Mar 14, 2023

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

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

Conversation

jnimeh commented Feb 1, 2023 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

jnimeh commented Feb 1, 2023

jnimeh commented Feb 1, 2023

bridgekeeper bot commented Feb 1, 2023

openjdk bot commented Feb 1, 2023

openjdk bot commented Feb 1, 2023

mlbridge bot commented Feb 1, 2023 • edited Loading

Webrevs

mcpowers left a comment

Choose a reason for hiding this comment

mcpowers Feb 3, 2023

Choose a reason for hiding this comment

jnimeh Feb 3, 2023

Choose a reason for hiding this comment

jnimeh commented Feb 3, 2023

openjdk bot commented Feb 17, 2023

djelinski left a comment

Choose a reason for hiding this comment

wangweij left a comment

Choose a reason for hiding this comment

wangweij Mar 14, 2023

Choose a reason for hiding this comment

jnimeh Mar 14, 2023

Choose a reason for hiding this comment

openjdk bot commented Mar 14, 2023

jnimeh commented Mar 14, 2023

openjdk bot commented Mar 14, 2023

openjdk bot commented Mar 14, 2023

jnimeh commented Feb 1, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Feb 1, 2023 •

edited

Loading