Skip to content

Conversation

@jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Nov 28, 2023

Backport so as to add the Let's Encrypt ISRG Root X2 CA. Applies clean after path shuffeling. Please review!

Testing:

  • GHA
  • jdk/test/security/infra/java/security/cert/CertPathValidator and jdk/test/sun/security/lib/cacerts jtreg tests.

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
  • JDK-8317374 needs maintainer approval

Issue

  • JDK-8317374: Add Let's Encrypt ISRG Root X2 (Enhancement - P2 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 398

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 28, 2023

👋 Welcome back sgehwolf! A progress list of the required criteria for merging this PR into pr/397 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 e6f46a43268808d0cbbb3bb93c73aa8e4cbfad83 8317374: Add Let's Encrypt ISRG Root X2 Nov 28, 2023
@openjdk
Copy link

openjdk bot commented Nov 28, 2023

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Nov 28, 2023
@jerboaa
Copy link
Contributor Author

jerboaa commented Nov 28, 2023

Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#actalisauthenticationrootca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#amazonrootca1
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#amazonrootca2
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#amazonrootca3
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#amazonrootca4
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#buypassclass2ca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#buypassclass3ca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#certignarootca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#comodoeccca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#comodorsaca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#entrustrootcaec1
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#entrustrootcag4
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#globalsigneccrootcar4
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#globalsignrootcar6
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#godaddyrootg2ca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#gtsrootcar1
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#gtsrootcar2
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#gtsrootecccar3
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#gtsrootecccar4
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#letsencryptisrgx1
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#letsencryptisrgx2
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#microsoftecc2017
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#microsoftrsa2017
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#quovadisrootca1g3
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#quovadisrootca2g3
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#quovadisrootca3g3
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#sslrooteccca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#sslrootevrsaca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#sslrootrsaca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#starfieldrootg2ca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#teliarootcav2
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#teliasonerarootcav1
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#twcaglobalrootca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#usertrusteccca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#usertrustrsaca
Passed: security/infra/java/security/cert/CertPathValidator/certification/CertignaCA.java
Passed: security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java
Passed: security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java
Passed: security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java
Passed: sun/security/lib/cacerts/VerifyCACerts.java
Test results: passed: 40

@mlbridge
Copy link

mlbridge bot commented Nov 28, 2023

Webrevs

@phohensee
Copy link
Member

linux-x86 failure appears unrelated.

@jerboaa jerboaa force-pushed the jdk-8317374-letsencrypt-isrg2-root-x2 branch from 71a0ada to a49e7ce Compare December 4, 2023 13:41
@openjdk
Copy link

openjdk bot commented Dec 4, 2023

@jerboaa 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.

@jerboaa jerboaa force-pushed the jdk-8317374-letsencrypt-isrg2-root-x2 branch from a49e7ce to d26d6e9 Compare December 6, 2023 14:36
@openjdk
Copy link

openjdk bot commented Dec 6, 2023

@jerboaa 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.

@jerboaa jerboaa mentioned this pull request Dec 6, 2023
6 tasks
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/397 to master December 11, 2023 10:46
@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 jdk-8317374-letsencrypt-isrg2-root-x2
git fetch https://git.openjdk.org/jdk8u-dev.git 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 Dec 11, 2023

⚠️ @jerboaa This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@gnu-andrew
Copy link
Member

Waiting for rebase now that #397 is integrated

@jerboaa jerboaa force-pushed the jdk-8317374-letsencrypt-isrg2-root-x2 branch from d26d6e9 to 59a8780 Compare December 11, 2023 13:31
@jerboaa
Copy link
Contributor Author

jerboaa commented Dec 11, 2023

Waiting for rebase now that #397 is integrated

Done.

@openjdk
Copy link

openjdk bot commented Dec 11, 2023

@jerboaa 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 openjdk bot added the approval Requires approval; will be removed when approval is received label Dec 11, 2023
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. Patch looks clean (sans paths) and tests pass.

@jerboaa
Copy link
Contributor Author

jerboaa commented Dec 11, 2023

Linux x64 test failure of security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#usertrusteccca seems infra flakiness. We have seen it fail a couple of times now:

Caused by: sun.security.validator.ValidatorException: PKIX path validation failed: java.security.cert.CertPathValidatorException: OCSP response error: INTERNAL_ERROR

@gnu-andrew
Copy link
Member

Linux x64 test failure of security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#usertrusteccca seems infra flakiness. We have seen it fail a couple of times now:

Caused by: sun.security.validator.ValidatorException: PKIX path validation failed: java.security.cert.CertPathValidatorException: OCSP response error: INTERNAL_ERROR

Thanks, I hadn't seen that one yet. I don't think it's a blocker for this, as it's not one of the certificates being added.

@gnu-andrew
Copy link
Member

/approve yes

@openjdk
Copy link

openjdk bot commented Dec 11, 2023

@gnu-andrew
8317374: The approval request has been approved.

@openjdk
Copy link

openjdk bot commented Dec 11, 2023

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

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

8317374: Add Let's Encrypt ISRG Root X2

Reviewed-by: phh, 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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Dec 11, 2023
@jerboaa
Copy link
Contributor Author

jerboaa commented Dec 11, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Dec 11, 2023

Going to push as commit 4d1c3a6.

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

openjdk bot commented Dec 11, 2023

@jerboaa Pushed as commit 4d1c3a6.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants