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 #207

Conversation

wkia
Copy link

@wkia wkia commented Dec 9, 2022

Test files changed only.

The original changes use JDK17 strings in SSLExampleCert.java, so it was adapted for JDK8 with the additional commit as it was done for JDK11 backport.

Additionaly the test uses 'hosts' file substitution that is not available in JDK8. So, it was replaced with a custom NameService implementation.

There were 2 changes with test files paths:

  • Original test/jdk/javax/net/ssl/ServerName/EndingDotHostname.java path changed to jdk/test/javax/net/ssl/ServerName/EndingDotHostname.java.
  • Original test/jdk/javax/net/ssl/templates/SSLExampleCert.java path changed to jdk/test/javax/net/ssl/templates/SSLExampleCert.java.

Please note that this PR is a part of dependant PR chain
Prev PRs:


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (2 reviews required, with at least 2 Reviewers)

Issues

  • JDK-8282511: Use fixed certificate validation date in SSLExampleCert template
  • JDK-8299445: EndingDotHostname.java fails because of compilation errors

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev pull/207/head:pull/207
$ git checkout pull/207

Update a local copy of the PR:
$ git checkout pull/207
$ git pull https://git.openjdk.org/jdk8u-dev pull/207/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 207

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/207.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 9, 2022

👋 Welcome back rmarchenko! A progress list of the required criteria for merging this PR into pr/206 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 changed the title Backport 268fa693188b685de6289927ee5a1e99473a50f6 8282511: Use fixed certificate validation date in SSLExampleCert template Dec 9, 2022
@openjdk
Copy link

openjdk bot commented Dec 9, 2022

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Dec 9, 2022
@mlbridge
Copy link

mlbridge bot commented Dec 9, 2022

Webrevs

@wkia
Copy link
Author

wkia commented Dec 12, 2022

/clean

@openjdk
Copy link

openjdk bot commented Dec 12, 2022

@wkia Only OpenJDK Committers can use the /clean command

@gnu-andrew
Copy link
Member

/reviewers 2 reviewer

@openjdk
Copy link

openjdk bot commented Jan 4, 2023

@gnu-andrew
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 2 Reviewers).

@wkia wkia force-pushed the backport-268fa693188b685de6289927ee5a1e99473a50f6 branch from 7781cea to 58e3086 Compare January 18, 2023 08:33
@openjdk
Copy link

openjdk bot commented Jan 18, 2023

@wkia Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@openjdk
Copy link

openjdk bot commented Jan 18, 2023

⚠️ @wkia This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@wkia wkia force-pushed the backport-268fa693188b685de6289927ee5a1e99473a50f6 branch from 58e3086 to 491b6b9 Compare January 18, 2023 08:43
@wkia
Copy link
Author

wkia commented Jan 18, 2023

The original changes use JDK17 strings in SSLExampleCert.java, so it was adapted for JDK8 with the additional commit as it was done for JDK11 backport.

Additionaly the test uses 'hosts' file substitution that is not available in JDK8. So, it was replaced with a custom NameService implementation.

Force-pushed to keep the commit history clean to make reviewing easier.

@openjdk
Copy link

openjdk bot commented Jan 18, 2023

@wkia Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@wkia wkia requested a review from yan-too January 18, 2023 08:48
@wkia
Copy link
Author

wkia commented Jan 18, 2023

@gnu-andrew Could you also review this, please?

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/206 to master January 19, 2023 15:44
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout backport-268fa693188b685de6289927ee5a1e99473a50f6
git fetch https://git.openjdk.org/jdk8u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Jan 19, 2023

@wkia 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 backport-268fa693188b685de6289927ee5a1e99473a50f6
git fetch https://git.openjdk.org/jdk8u-dev master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Jan 19, 2023
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Jan 19, 2023
@wkia
Copy link
Author

wkia commented Jan 26, 2023

@gnu-andrew Could you re-review, please?

@gnu-andrew
Copy link
Member

The original changes use JDK17 strings in SSLExampleCert.java, so it was adapted for JDK8 with the additional commit as it was done for JDK11 backport.

As far as I can see, the 11u backport still had text blocks. Do you mean you've also included the changes in JDK-8299445 here? If so, we should reference it too.

Additionaly the test uses 'hosts' file substitution that is not available in JDK8. So, it was replaced with a custom NameService implementation.

Force-pushed to keep the commit history clean to make reviewing easier.

Thanks for removing the superfluous module line.

Is there a reason the custom NameService creates an InetAddress using an internal API rather than just returning InetAddress.getLoopbackAddress() which would be closer to the 11u code?

Has the test been run successfully on 8u? The follow-up fix on 11u suggests this wasn't done before committing the fix to 11u.

@gnu-andrew
Copy link
Member

/issue JDK-8299445

@openjdk
Copy link

openjdk bot commented Feb 7, 2023

@gnu-andrew Only the author (@wkia) is allowed to issue the /issue command.

@wkia
Copy link
Author

wkia commented Feb 8, 2023

/issue JDK-8299445

@openjdk
Copy link

openjdk bot commented Feb 8, 2023

@wkia
Adding additional issue to issue list: 8299445: EndingDotHostname.java fails because of compilation errors.

@wkia
Copy link
Author

wkia commented Feb 8, 2023

As far as I can see, the 11u backport still had text blocks. Do you mean you've also included the changes in JDK-8299445 here? If so, we should reference it too.

Thanks, I added the reference. Should I add "jdk8u-fix-request" label to JDK-8299445?

Is there a reason the custom NameService creates an InetAddress using an internal API rather than just returning InetAddress.getLoopbackAddress() which would be closer to the 11u code?

Sounds reasonable, thanks. I've updated the code.

Has the test been run successfully on 8u? The follow-up fix on 11u suggests this wasn't done before committing the fix to 11u.

Yes, it passes successfully on my Win11/Cygwin.

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

Thanks, that looks a lot simpler.

Yes, jdk8u-fix-request can be added to the bug now all reviews are complete. Once you've done that, I'll approve and you can run the integrate command.

Thanks for persisting with this one.

@openjdk
Copy link

openjdk bot commented Feb 9, 2023

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

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

8282511: Use fixed certificate validation date in SSLExampleCert template
8299445: EndingDotHostname.java fails because of compilation errors

Reviewed-by: yan, andrew

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 26 new commits pushed to 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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@yan-too, @gnu-andrew) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Feb 9, 2023
@wkia
Copy link
Author

wkia commented Feb 13, 2023

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Feb 13, 2023
@openjdk
Copy link

openjdk bot commented Feb 13, 2023

@wkia
Your change (at version 740b5da) is now ready to be sponsored by a Committer.

@yan-too
Copy link
Contributor

yan-too commented Feb 13, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Feb 13, 2023

Going to push as commit 3af19d3.
Since your change was applied there have been 26 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Feb 13, 2023
@openjdk openjdk bot closed this Feb 13, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Feb 13, 2023
@openjdk
Copy link

openjdk bot commented Feb 13, 2023

@yan-too @wkia Pushed as commit 3af19d3.

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

@wkia wkia deleted the backport-268fa693188b685de6289927ee5a1e99473a50f6 branch February 13, 2023 06:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants