forked from openjdk/jdk11u-dev
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
19 changed files
with
1,305 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
136 changes: 136 additions & 0 deletions
136
src/java.base/share/classes/sun/security/validator/EntrustTLSPolicy.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| /* | ||
| * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. Oracle designates this | ||
| * particular file as subject to the "Classpath" exception as provided | ||
| * by Oracle in the LICENSE file that accompanied this code. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
| package sun.security.validator; | ||
|
|
||
| import java.security.cert.X509Certificate; | ||
| import java.time.LocalDate; | ||
| import java.time.Month; | ||
| import java.time.ZoneOffset; | ||
| import java.util.Date; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
||
| import sun.security.util.Debug; | ||
| import sun.security.x509.X509CertImpl; | ||
|
|
||
| /** | ||
| * This class checks if Entrust issued TLS Server certificates should be | ||
| * restricted. | ||
| */ | ||
| final class EntrustTLSPolicy { | ||
|
|
||
| private static final Debug debug = Debug.getInstance("certpath"); | ||
|
|
||
| // SHA-256 certificate fingerprints of distrusted roots | ||
| private static final Set<String> FINGERPRINTS = Set.of( | ||
| // cacerts alias: entrustevca | ||
| // DN: CN=Entrust Root Certification Authority, | ||
| // OU=(c) 2006 Entrust, Inc., | ||
| // OU=www.entrust.net/CPS is incorporated by reference, | ||
| // O=Entrust, Inc., C=US | ||
| "73C176434F1BC6D5ADF45B0E76E727287C8DE57616C1E6E6141A2B2CBC7D8E4C", | ||
| // cacerts alias: entrustrootcaec1 | ||
| // DN: CN=Entrust Root Certification Authority - EC1, | ||
| // OU=(c) 2012 Entrust, Inc. - for authorized use only, | ||
| // OU=See www.entrust.net/legal-terms, O=Entrust, Inc., C=US | ||
| "02ED0EB28C14DA45165C566791700D6451D7FB56F0B2AB1D3B8EB070E56EDFF5", | ||
| // cacerts alias: entrustrootcag2 | ||
| // DN: CN=Entrust Root Certification Authority - G2, | ||
| // OU=(c) 2009 Entrust, Inc. - for authorized use only, | ||
| // OU=See www.entrust.net/legal-terms, O=Entrust, Inc., C=US | ||
| "43DF5774B03E7FEF5FE40D931A7BEDF1BB2E6B42738C4E6D3841103D3AA7F339", | ||
| // cacerts alias: entrustrootcag4 | ||
| // DN: CN=Entrust Root Certification Authority - G4 | ||
| // OU=(c) 2015 Entrust, Inc. - for authorized use only, | ||
| // OU=See www.entrust.net/legal-terms, O=Entrust, Inc., C=US, | ||
| "DB3517D1F6732A2D5AB97C533EC70779EE3270A62FB4AC4238372460E6F01E88", | ||
| // cacerts alias: entrust2048ca | ||
| // DN: CN=Entrust.net Certification Authority (2048), | ||
| // OU=(c) 1999 Entrust.net Limited, | ||
| // OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.), | ||
| // O=Entrust.net | ||
| "6DC47172E01CBCB0BF62580D895FE2B8AC9AD4F873801E0C10B9C837D21EB177", | ||
| // cacerts alias: affirmtrustcommercialca | ||
| // DN: CN=AffirmTrust Commercial, O=AffirmTrust, C=US | ||
| "0376AB1D54C5F9803CE4B2E201A0EE7EEF7B57B636E8A93C9B8D4860C96F5FA7", | ||
| // cacerts alias: affirmtrustnetworkingca | ||
| // DN: CN=AffirmTrust Networking, O=AffirmTrust, C=US | ||
| "0A81EC5A929777F145904AF38D5D509F66B5E2C58FCDB531058B0E17F3F0B41B", | ||
| // cacerts alias: affirmtrustpremiumca | ||
| // DN: CN=AffirmTrust Premium, O=AffirmTrust, C=US | ||
| "70A73F7F376B60074248904534B11482D5BF0E698ECC498DF52577EBF2E93B9A", | ||
| // cacerts alias: affirmtrustpremiumeccca | ||
| // DN: CN=AffirmTrust Premium ECC, O=AffirmTrust, C=US | ||
| "BD71FDF6DA97E4CF62D1647ADD2581B07D79ADF8397EB4ECBA9C5E8488821423" | ||
| ); | ||
|
|
||
| // Any TLS Server certificate that is anchored by one of the Entrust | ||
| // roots above and is issued after this date will be distrusted. | ||
| private static final LocalDate OCTOBER_31_2024 = | ||
| LocalDate.of(2024, Month.OCTOBER, 31); | ||
|
|
||
| /** | ||
| * This method assumes the eeCert is a TLS Server Cert and chains back to | ||
| * the anchor. | ||
| * | ||
| * @param chain the end-entity's certificate chain. The end entity cert | ||
| * is at index 0, the trust anchor at index n-1. | ||
| * @throws ValidatorException if the certificate is distrusted | ||
| */ | ||
| static void checkDistrust(X509Certificate[] chain) | ||
| throws ValidatorException { | ||
| X509Certificate anchor = chain[chain.length-1]; | ||
| String fp = fingerprint(anchor); | ||
| if (fp == null) { | ||
| throw new ValidatorException("Cannot generate fingerprint for " | ||
| + "trust anchor of TLS server certificate"); | ||
| } | ||
| if (FINGERPRINTS.contains(fp)) { | ||
| Date notBefore = chain[0].getNotBefore(); | ||
| LocalDate ldNotBefore = LocalDate.ofInstant(notBefore.toInstant(), | ||
| ZoneOffset.UTC); | ||
| // reject if certificate is issued after October 31, 2024 | ||
| checkNotBefore(ldNotBefore, OCTOBER_31_2024, anchor); | ||
| } | ||
| } | ||
|
|
||
| private static String fingerprint(X509Certificate cert) { | ||
| return X509CertImpl.getFingerprint("SHA-256", cert); | ||
| } | ||
|
|
||
| private static void checkNotBefore(LocalDate notBeforeDate, | ||
| LocalDate distrustDate, X509Certificate anchor) | ||
| throws ValidatorException { | ||
| if (notBeforeDate.isAfter(distrustDate)) { | ||
| throw new ValidatorException | ||
| ("TLS Server certificate issued after " + distrustDate + | ||
| " and anchored by a distrusted legacy Entrust root CA: " | ||
| + anchor.getSubjectX500Principal(), | ||
| ValidatorException.T_UNTRUSTED_CERT, anchor); | ||
| } | ||
| } | ||
|
|
||
| private EntrustTLSPolicy() {} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
test/jdk/java/lang/management/ClassLoadingMXBean/TestVerboseClassLoading.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
|
|
||
| /* | ||
| * @test | ||
| * @bug 8338139 | ||
| * @summary Basic unit test of ClassLoadingMXBean.set/isVerbose() when | ||
| * related unified logging is enabled. | ||
| * | ||
| * @run main/othervm -Xlog:class+load=trace:file=vm.log TestVerboseClassLoading false | ||
| * @run main/othervm -Xlog:class+load=debug:file=vm.log TestVerboseClassLoading false | ||
| * @run main/othervm -Xlog:class+load=info:file=vm.log TestVerboseClassLoading false | ||
| * | ||
| * @run main/othervm -Xlog:class+load=trace TestVerboseClassLoading false | ||
| * @run main/othervm -Xlog:class+load=debug TestVerboseClassLoading false | ||
| * @run main/othervm -Xlog:class+load=info TestVerboseClassLoading false | ||
| * @run main/othervm -Xlog:class+load=warning TestVerboseClassLoading false | ||
| * @run main/othervm -Xlog:class+load=error TestVerboseClassLoading false | ||
| * @run main/othervm -Xlog:class+load=off TestVerboseClassLoading false | ||
| * | ||
| * @run main/othervm -Xlog:class+load*=trace TestVerboseClassLoading true | ||
| * @run main/othervm -Xlog:class+load*=debug TestVerboseClassLoading true | ||
| * @run main/othervm -Xlog:class+load*=info TestVerboseClassLoading true | ||
| * @run main/othervm -Xlog:class+load*=warning TestVerboseClassLoading false | ||
| * @run main/othervm -Xlog:class+load*=error TestVerboseClassLoading false | ||
| * @run main/othervm -Xlog:class+load*=off TestVerboseClassLoading false | ||
| * | ||
| * @run main/othervm -Xlog:class+load*=info,class+load=trace TestVerboseClassLoading true | ||
| * @run main/othervm -Xlog:class+load*=info,class+load=debug TestVerboseClassLoading true | ||
| * @run main/othervm -Xlog:class+load*=info,class+load=info TestVerboseClassLoading true | ||
| * @run main/othervm -Xlog:class+load*=info,class+load=warning TestVerboseClassLoading false | ||
| * @run main/othervm -Xlog:class+load*=info,class+load=error TestVerboseClassLoading false | ||
| * @run main/othervm -Xlog:class+load*=info,class+load=off TestVerboseClassLoading false | ||
| * | ||
| * @run main/othervm -Xlog:all=trace:file=vm.log TestVerboseClassLoading false | ||
| */ | ||
|
|
||
| import java.lang.management.ManagementFactory; | ||
| import java.lang.management.ClassLoadingMXBean; | ||
|
|
||
| public class TestVerboseClassLoading { | ||
|
|
||
| public static void main(String[] args) throws Exception { | ||
| ClassLoadingMXBean mxBean = ManagementFactory.getClassLoadingMXBean(); | ||
| boolean expected = Boolean.parseBoolean(args[0]); | ||
| boolean initial = mxBean.isVerbose(); | ||
| if (expected != initial) { | ||
| throw new Error("Initial verbosity setting was unexpectedly " + initial); | ||
| } | ||
| mxBean.setVerbose(false); | ||
| if (mxBean.isVerbose()) { | ||
| throw new Error("Verbosity was still enabled"); | ||
| } | ||
| mxBean.setVerbose(true); | ||
| if (!mxBean.isVerbose()) { | ||
| throw new Error("Verbosity was still disabled"); | ||
| } | ||
| // Turn off again as a double-check and also to avoid excessive logging | ||
| mxBean.setVerbose(false); | ||
| if (mxBean.isVerbose()) { | ||
| throw new Error("Verbosity was still enabled"); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.