anmolnar commented on code in PR #2292:
URL: https://github.com/apache/zookeeper/pull/2292#discussion_r2271206120
##########
zookeeper-server/src/main/java/org/apache/zookeeper/common/X509Util.java:
##########
@@ -548,13 +553,22 @@ public static X509TrustManager createTrustManager(
try {
KeyStore ts = loadTrustStore(trustStoreLocation,
trustStorePassword, trustStoreTypeProp);
PKIXBuilderParameters pbParams = new PKIXBuilderParameters(ts, new
X509CertSelector());
- if (crlEnabled || ocspEnabled) {
- pbParams.setRevocationEnabled(true);
- System.setProperty("com.sun.net.ssl.checkRevocation", "true");
- System.setProperty("com.sun.security.enableCRLDP", "true");
- if (ocspEnabled) {
- Security.setProperty("ocsp.enable", "true");
+ if (crlEnabled) {
+ // See [RevocationChecker][1] for details. Basically, we are
mimicking legacy path as
+ // that is the path we are routing before(i.e. no explicit
`PKIXRevocationChecker`).
+ //
+ // [1]:
https://github.com/openjdk/jdk/blob/jdk-11%2B28/src/java.base/share/classes/sun/security/provider/certpath/RevocationChecker.java#L98
+ Set<PKIXRevocationChecker.Option> options = new HashSet<>();
+ if (!ocspEnabled) {
+ options.add(PKIXRevocationChecker.Option.NO_FALLBACK);
+ options.add(PKIXRevocationChecker.Option.PREFER_CRLS);
+ }
+ if
(Boolean.parseBoolean(Security.getProperty("com.sun.security.onlyCheckRevocationOfEECert")))
{
+ options.add(PKIXRevocationChecker.Option.ONLY_END_ENTITY);
Review Comment:
You're basically following the guide here:
https://docs.oracle.com/javase/8/docs/technotes/guides/security/certpath/CertPathProgGuide.html#PKIXRevocationChecker
##########
zookeeper-server/src/main/java/org/apache/zookeeper/common/X509Util.java:
##########
@@ -548,13 +553,22 @@ public static X509TrustManager createTrustManager(
try {
KeyStore ts = loadTrustStore(trustStoreLocation,
trustStorePassword, trustStoreTypeProp);
PKIXBuilderParameters pbParams = new PKIXBuilderParameters(ts, new
X509CertSelector());
- if (crlEnabled || ocspEnabled) {
- pbParams.setRevocationEnabled(true);
- System.setProperty("com.sun.net.ssl.checkRevocation", "true");
- System.setProperty("com.sun.security.enableCRLDP", "true");
- if (ocspEnabled) {
- Security.setProperty("ocsp.enable", "true");
+ if (crlEnabled) {
+ // See [RevocationChecker][1] for details. Basically, we are
mimicking legacy path as
+ // that is the path we are routing before(i.e. no explicit
`PKIXRevocationChecker`).
+ //
+ // [1]:
https://github.com/openjdk/jdk/blob/jdk-11%2B28/src/java.base/share/classes/sun/security/provider/certpath/RevocationChecker.java#L98
+ Set<PKIXRevocationChecker.Option> options = new HashSet<>();
+ if (!ocspEnabled) {
+ options.add(PKIXRevocationChecker.Option.NO_FALLBACK);
+ options.add(PKIXRevocationChecker.Option.PREFER_CRLS);
+ }
+ if
(Boolean.parseBoolean(Security.getProperty("com.sun.security.onlyCheckRevocationOfEECert")))
{
+ options.add(PKIXRevocationChecker.Option.ONLY_END_ENTITY);
Review Comment:
This is super weird. Is it really necessary?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
