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

8344924: Default CA certificates loaded despite request to use custom keystore #22616

Closed
wants to merge 2 commits into from

Conversation

driverkt
Copy link
Member

@driverkt driverkt commented Dec 6, 2024

A regression was introduced by JDK-8338383. Remove the forced static eager initialization.


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-8344924: Default CA certificates loaded despite request to use custom keystore (Bug - P3)(⚠️ The fixVersion in this issue is [24] but the fixVersion in .jcheck/conf is 25, a new backport will be created when this pr is integrated.)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22616

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

Using diff file

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

Using Webrev

Link to Webrev Comment

Sorry, something went wrong.

Verified

This commit was signed with the committer’s verified signature. The key has expired.
maximedenes Maxime Dénès
@bridgekeeper
Copy link

bridgekeeper bot commented Dec 6, 2024

👋 Welcome back kdriver! 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
Copy link

openjdk bot commented Dec 6, 2024

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

8344924: Default CA certificates loaded despite request to use custom keystore

Reviewed-by: ascarpino

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:

  • e0d6398: 8344575: Examine usage of ReflectUtil.forName() in java.sql.rowset - XmlReaderContentHandler

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.

@openjdk
Copy link

openjdk bot commented Dec 6, 2024

@driverkt 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 security-dev@openjdk.org label Dec 6, 2024
@driverkt driverkt marked this pull request as ready for review December 6, 2024 21:24
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 6, 2024
@mlbridge
Copy link

mlbridge bot commented Dec 6, 2024

Webrevs

Copy link
Contributor

@ascarpino ascarpino left a comment

Choose a reason for hiding this comment

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

After reading the comments in the bug from @AlanBateman, removing the code appears to have been agreed upon.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 6, 2024
@AlanBateman
Copy link
Contributor

AlanBateman commented Dec 7, 2024

Would it be possible to create some follow-up issues to re-visit the class initialisers and the coarseness of locking in this area? As noted in the bug, the use of class locks is surprising.

Also I'm not sure about saying "regression". I assume the only negative impact of eager initialising AnchorCertificates is when using a custom implementation. In that case, the default truststore is needlessly loaded, is that right?

@driverkt
Copy link
Member Author

@AlanBateman, sure, I can create some follow-up issues.

Unfortunately, I do feel that this was to fix a regression. Using a custom trust store is quite common, I believe, and the previous change broke that functionality.

@driverkt
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Dec 10, 2024

Going to push as commit 4c39e9f.
Since your change was applied there have been 35 commits pushed to the master branch:

  • 0f03554: 8342469: Improve API documentation for java.lang.classfile.instruction
  • 9bd70ec: 8345888: Broken links in the JDK 24 JavaDoc API documentation, build 27
  • 1def2d8: 8345700: tier{1,2,3}_compiler don't cover all compiler tests
  • d6b5264: 8345746: Remove :resourcehogs/compiler from :hotspot_slow_compiler
  • 4f855d1: 8345818: Fix SM cleanup of parsing of System property resource.bundle.debug
  • a24b08f: 8345669: RISC-V: fix client build failure due to AlignVector after JDK-8343827
  • 25d9deb: 8335367: [s390] Add support for load immediate on condition instructions.
  • a6277bb: 8340212: -Xshare:off -XX:CompressedClassSpaceBaseAddress=0x40001000000 crashes on macos-aarch64
  • 165fd84: 8342987: Update --release 24 symbol information for JDK 24 build 27
  • 06c44dd: 8345465: Fix performance regression on x64 after JDK-8345120
  • ... and 25 more: https://git.openjdk.org/jdk/compare/470701f0bb269834cc0e1cb40f7d34e92226454b...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 10, 2024
@openjdk openjdk bot closed this Dec 10, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 10, 2024
@openjdk
Copy link

openjdk bot commented Dec 10, 2024

@driverkt Pushed as commit 4c39e9f.

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

@driverkt
Copy link
Member Author

/backport :jdk24

@openjdk
Copy link

openjdk bot commented Dec 10, 2024

@driverkt the backport was successfully created on the branch backport-driverkt-4c39e9fa-jdk24 in my personal fork of openjdk/jdk. To create a pull request with this backport targeting openjdk/jdk:jdk24, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 4c39e9fa from the openjdk/jdk repository.

The commit being backported was authored by Kevin Driver on 10 Dec 2024 and was reviewed by Anthony Scarpino.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk:

$ git fetch https://github.com/openjdk-bots/jdk.git backport-driverkt-4c39e9fa-jdk24:backport-driverkt-4c39e9fa-jdk24
$ git checkout backport-driverkt-4c39e9fa-jdk24
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk.git backport-driverkt-4c39e9fa-jdk24

⚠️ @driverkt You are not yet a collaborator in my fork openjdk-bots/jdk. An invite will be sent out and you need to accept it before you can proceed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated security security-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

None yet

3 participants