Skip to content
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.

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

8282511: Use fixed certificate validation date in SSLExampleCert template #7651

Closed
wants to merge 3 commits into from

Conversation

XueleiFan
Copy link
Member

@XueleiFan XueleiFan commented Mar 1, 2022

May I have this test update reviewed?

The certificates used in SSL testing template SSLExampleCert could expired in the future (for example JDK-8282398). It is not always easy to replace the certificates if the template has been used a lot.

This update is trying to use a fixed validation date, so that even the certificates are expired the test will continue to work with no surprises.

I also did a few code clean up in this patch.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8282511: Use fixed certificate validation date in SSLExampleCert template

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/7651/head:pull/7651
$ git checkout pull/7651

Update a local copy of the PR:
$ git checkout pull/7651
$ git pull https://git.openjdk.java.net/jdk pull/7651/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7651

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/7651.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 1, 2022

👋 Welcome back xuelei! 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 openjdk bot added the rfr label Mar 1, 2022
@openjdk
Copy link

openjdk bot commented Mar 1, 2022

@XueleiFan The following label will be automatically applied to this pull request:

  • security

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the security label Mar 1, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 1, 2022

Webrevs

@@ -23,10 +23,11 @@

/**
* @test
* @bug 8065422
* @bug 8806542 8282511
Copy link
Member

@rhalade rhalade Mar 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to add a bug id here as this is test only change

Copy link
Member Author

@XueleiFan XueleiFan Mar 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep.

@@ -359,18 +368,41 @@ private static SSLContext createSSLContext(
}
}

// Set the date for the verifying of certificates.
@SuppressWarnings("deprecation")
Date verifyingDate = new Date(123, 3, 3);
Copy link
Member

@rhalade rhalade Mar 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can DateFormat be used instead to parse Date from a readable string representation?

Copy link
Member Author

@XueleiFan XueleiFan Mar 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! Updated in the last commit. Thank you!

@@ -23,10 +23,11 @@

/**
* @test
* @bug 8065422
* @bug 8806542
Copy link
Member

@rhalade rhalade Mar 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missed to note earlier. 8806542 is not a valid bug number. It was updated to 8065422 so this change is not needed.

Copy link
Member Author

@XueleiFan XueleiFan Mar 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, definitely not an expected update. Thank you for the nice catch. Updated.

rhalade
rhalade approved these changes Mar 3, 2022
@openjdk
Copy link

openjdk bot commented Mar 3, 2022

@XueleiFan 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:

8282511: Use fixed certificate validation date in SSLExampleCert template

Reviewed-by: rhalade

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 23 new commits pushed to the master branch:

  • c777bb3: 8282619: G1: Fix indentation in G1CollectedHeap::mark_evac_failure_object
  • 080baff: 8282483: Ensure that Utils.getAllInterfaces returns unique instances
  • 57020fd: 8282582: Unused methods in Utils
  • 5c187e3: 8282593: JDK-8281472 breaks 32-bit builds and gtests
  • 7822cbc: 8276711: compiler/codecache/cli tests failing when SegmentedCodeCache used with -Xint
  • 832729b: 6911375: mouseWheel has no effect without vertical scrollbar
  • 0402a28: 8037965: NullPointerException in TextLayout.getBaselineFromGraphic() for JTextComponents
  • d4d1fbc: 8282484: G1: Predicted old time in log always zero
  • b1f935c: 8277055: Assert "missing inlining msg" with -XX:+PrintIntrinsics
  • 2da6777: 8281122: [IR Framework] Cleanup IR matching code in preparation for JDK-8280378
  • ... and 13 more: https://git.openjdk.java.net/jdk/compare/eac80214aea4f5c148e859b4b163fe42e89596cd...master

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.

@openjdk openjdk bot added the ready label Mar 3, 2022
@XueleiFan
Copy link
Member Author

XueleiFan commented Mar 3, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Mar 3, 2022

Going to push as commit 268fa69.
Since your change was applied there have been 23 commits pushed to the master branch:

  • c777bb3: 8282619: G1: Fix indentation in G1CollectedHeap::mark_evac_failure_object
  • 080baff: 8282483: Ensure that Utils.getAllInterfaces returns unique instances
  • 57020fd: 8282582: Unused methods in Utils
  • 5c187e3: 8282593: JDK-8281472 breaks 32-bit builds and gtests
  • 7822cbc: 8276711: compiler/codecache/cli tests failing when SegmentedCodeCache used with -Xint
  • 832729b: 6911375: mouseWheel has no effect without vertical scrollbar
  • 0402a28: 8037965: NullPointerException in TextLayout.getBaselineFromGraphic() for JTextComponents
  • d4d1fbc: 8282484: G1: Predicted old time in log always zero
  • b1f935c: 8277055: Assert "missing inlining msg" with -XX:+PrintIntrinsics
  • 2da6777: 8281122: [IR Framework] Cleanup IR matching code in preparation for JDK-8280378
  • ... and 13 more: https://git.openjdk.java.net/jdk/compare/eac80214aea4f5c148e859b4b163fe42e89596cd...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Mar 3, 2022
@openjdk openjdk bot closed this Mar 3, 2022
@openjdk openjdk bot removed ready rfr labels Mar 3, 2022
@openjdk
Copy link

openjdk bot commented Mar 3, 2022

@XueleiFan Pushed as commit 268fa69.

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

@XueleiFan XueleiFan deleted the JDK-8282511 branch Mar 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated security
2 participants