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

8337664: Distrust TLS server certificates issued after Oct 2024 and anchored by Entrust Root CAs #20731

Closed
wants to merge 8 commits into from

Conversation

mcpowers
Copy link
Contributor

@mcpowers mcpowers commented Aug 27, 2024

Please review this change to distrust TLS server certificates issued after October 31, 2024 and anchored by Entrust Root CAs. This change is in line with similar plans recently announced by Google and Mozilla. TLS server certificates issued before this date will continue to be valid until they expire. This restriction should have minimal compatibility impact since Entrust has announced they will be using a partner (SSL.com) for all TLS server certificates issued after Oct 31, 2024.

See the CSR for more details: https://bugs.openjdk.org/browse/JDK-8339194


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
  • Change requires CSR request JDK-8339194 to be approved

Issues

  • JDK-8337664: Distrust TLS server certificates issued after Oct 2024 and anchored by Entrust Root CAs (Enhancement - P3)
  • JDK-8339194: Distrust TLS server certificates issued after Oct 2024 and anchored by Entrust Root CAs (CSR)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 20731

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 27, 2024

👋 Welcome back mpowers! 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 Aug 27, 2024

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

8337664: Distrust TLS server certificates issued after Oct 2024 and anchored by Entrust Root CAs

Reviewed-by: mullan, 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 322 new commits pushed to the master branch:

  • a22e932: 8337163: Improve SA error message when failing to attach to a core file
  • a7120e2: 8311993: Test serviceability/sa/UniqueVtableTest.java failed: duplicate vtables detected
  • 5ebdf2d: 8338708: Don't create/destroy debug agent cmdQueueLock for each connection
  • 130ac13: 8337265: Test static-libs build in GitHub Actions
  • cfec3ac: 8337317: serviceability/jvmti tests failed with FATAL ERROR in native method: Failed during the GetClassSignature call
  • 0d593cd: 8339419: [s390x] Problemlist compiler/c2/irTests/TestIfMinMax.java
  • c3adcb8: 8338916: Build warnings about overriding recipe for jvm-ldflags.txt
  • 66945e5: 8339336: Fix build system whitespace to adhere to coding conventions
  • ad40a12: 8339214: Remove misleading CodeBuilder.loadConstant(Opcode, ConstantDesc)
  • 4ca2c20: 8338740: java/net/httpclient/HttpsTunnelAuthTest.java fails with java.io.IOException: HTTP/1.1 header parser received no bytes
  • ... and 312 more: https://git.openjdk.org/jdk/compare/7deee745254e5f32b75a09d84ac5078a122c8b8d...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
Copy link

openjdk bot commented Aug 27, 2024

@mcpowers 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 Aug 27, 2024
@mcpowers mcpowers marked this pull request as draft August 27, 2024 17:21
@mcpowers mcpowers changed the title 8337664 Distrust TLS server certificates anchored by Entrust Root CAs 8337664: Distrust TLS server certificates anchored by Entrust Root CAs Aug 27, 2024
@mcpowers
Copy link
Contributor Author

/csr

@openjdk openjdk bot added the csr Pull request needs approved CSR before integration label Aug 27, 2024
@openjdk
Copy link

openjdk bot commented Aug 27, 2024

@mcpowers has indicated that a compatibility and specification (CSR) request is needed for this pull request.

@mcpowers this pull request must refer to an issue in JBS to be able to link it to a CSR request. To refer this pull request to an issue in JBS, please update the title of this pull request to just the issue ID.

@mcpowers mcpowers changed the title 8337664: Distrust TLS server certificates anchored by Entrust Root CAs 8337664 Aug 27, 2024
@openjdk openjdk bot changed the title 8337664 8337664: Aug 27, 2024
@mcpowers mcpowers changed the title 8337664: 8337664: Distrust TLS server certificates issued after Oct 2024 and anchored by Entrust Root CAs Aug 30, 2024
@mcpowers mcpowers marked this pull request as ready for review August 30, 2024 18:54
@openjdk openjdk bot added rfr Pull request is ready for review and removed csr Pull request needs approved CSR before integration labels Aug 30, 2024
@mlbridge
Copy link

mlbridge bot commented Aug 30, 2024

Webrevs

Copy link
Member

@seanjmullan seanjmullan left a comment

Choose a reason for hiding this comment

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

Looks good. Please also have Rajan review.

@@ -0,0 +1,136 @@
/*
* Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
Copy link
Member

Choose a reason for hiding this comment

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

Copyright only needs 2024.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

test/jdk/sun/security/ssl/X509TrustManagerImpl/Entrust/Distrust.java has the same problem.
Both have been fixed.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 30, 2024
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Aug 31, 2024
@mcpowers
Copy link
Contributor Author

mcpowers commented Sep 2, 2024

@rhalade You'll need to review this.

X509TrustManager xtm = (X509TrustManager)tm;
return xtm;
}
throw new Exception("No TrustManager for " + type);
Copy link
Member

Choose a reason for hiding this comment

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

Please update this and other Exception thrown in loadCertificateChain and testTM function to RuntimeException.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will address with separate bug.

} catch (CertificateException ce) {
// expired TLS certificates should not be treated as failure
if (expired(ce)) {
System.err.println("Test is N/A, chain is expired");
Copy link
Member

Choose a reason for hiding this comment

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

Should this be updated to throw SkippedException so we know that certificates are expired?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The comment indicates this is normal and not deserving of an exception to grab someone's attention. Sean might think otherwise.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 3, 2024
@mcpowers
Copy link
Contributor Author

mcpowers commented Sep 3, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Sep 3, 2024

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

  • a22e932: 8337163: Improve SA error message when failing to attach to a core file
  • a7120e2: 8311993: Test serviceability/sa/UniqueVtableTest.java failed: duplicate vtables detected
  • 5ebdf2d: 8338708: Don't create/destroy debug agent cmdQueueLock for each connection
  • 130ac13: 8337265: Test static-libs build in GitHub Actions
  • cfec3ac: 8337317: serviceability/jvmti tests failed with FATAL ERROR in native method: Failed during the GetClassSignature call
  • 0d593cd: 8339419: [s390x] Problemlist compiler/c2/irTests/TestIfMinMax.java
  • c3adcb8: 8338916: Build warnings about overriding recipe for jvm-ldflags.txt
  • 66945e5: 8339336: Fix build system whitespace to adhere to coding conventions
  • ad40a12: 8339214: Remove misleading CodeBuilder.loadConstant(Opcode, ConstantDesc)
  • 4ca2c20: 8338740: java/net/httpclient/HttpsTunnelAuthTest.java fails with java.io.IOException: HTTP/1.1 header parser received no bytes
  • ... and 312 more: https://git.openjdk.org/jdk/compare/7deee745254e5f32b75a09d84ac5078a122c8b8d...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 3, 2024

@mcpowers Pushed as commit bbb5161.

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

@mcpowers mcpowers deleted the JDK-8337664 branch September 4, 2024 19:12
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.

3 participants