Skip to content

Commit

Permalink
GEODE-8611: Fixes default KeyManagerFactory instantiation. (#5629)
Browse files Browse the repository at this point in the history
* Uses the default KeyManagerFactory algorithm property.
* Adds unit test.
* Adds integration test.
  • Loading branch information
jake-at-work committed Oct 22, 2020
1 parent fef7a76 commit a048a72
Show file tree
Hide file tree
Showing 3 changed files with 99 additions and 4 deletions.
@@ -0,0 +1,72 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
* agreements. See the NOTICE file distributed with this work for additional information regarding
* copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/

package org.apache.geode.internal.net;

import static org.assertj.core.api.Assertions.assertThat;

import java.security.NoSuchAlgorithmException;
import java.security.Security;

import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.TrustManagerFactory;

import org.junit.Test;

public class SSLUtilIntegrationTest {

static final String SSL_KEY_MANAGER_FACTORY_ALGORITHM = "ssl.KeyManagerFactory.algorithm";
static final String SSL_TRUST_MANAGER_FACTORY_ALGORITHM = "ssl.TrustManagerFactory.algorithm";
static final String PKIX = "PKIX";
static final String SUN_X_509 = "SunX509";

@Test
public void getDefaultKeyManagerFactoryControlledBySystemProperty()
throws NoSuchAlgorithmException {
String original = Security.getProperty(SSL_KEY_MANAGER_FACTORY_ALGORITHM);
try {
Security.setProperty(SSL_KEY_MANAGER_FACTORY_ALGORITHM, PKIX);
final KeyManagerFactory pkixKeyManagerFactory = SSLUtil.getDefaultKeyManagerFactory();
assertThat(pkixKeyManagerFactory).isNotNull();
assertThat(pkixKeyManagerFactory.getAlgorithm()).isEqualTo(PKIX);

Security.setProperty(SSL_KEY_MANAGER_FACTORY_ALGORITHM, SUN_X_509);
final KeyManagerFactory x509KeyManagerFactory = SSLUtil.getDefaultKeyManagerFactory();
assertThat(x509KeyManagerFactory).isNotNull();
assertThat(x509KeyManagerFactory.getAlgorithm()).isEqualTo(SUN_X_509);
} finally {
Security.setProperty(SSL_KEY_MANAGER_FACTORY_ALGORITHM, original);
}
}

@Test
public void getDefaultTrustManagerFactoryControlledBySystemProperty()
throws NoSuchAlgorithmException {
String original = Security.getProperty(SSL_TRUST_MANAGER_FACTORY_ALGORITHM);
try {
Security.setProperty(SSL_TRUST_MANAGER_FACTORY_ALGORITHM, PKIX);
final TrustManagerFactory pkixTrustManagerFactory = SSLUtil.getDefaultTrustManagerFactory();
assertThat(pkixTrustManagerFactory).isNotNull();
assertThat(pkixTrustManagerFactory.getAlgorithm()).isEqualTo(PKIX);

Security.setProperty(SSL_TRUST_MANAGER_FACTORY_ALGORITHM, SUN_X_509);
final TrustManagerFactory x509TrustManagerFactory = SSLUtil.getDefaultTrustManagerFactory();
assertThat(x509TrustManagerFactory).isNotNull();
assertThat(x509TrustManagerFactory.getAlgorithm()).isEqualTo(SUN_X_509);
} finally {
Security.setProperty(SSL_TRUST_MANAGER_FACTORY_ALGORITHM, original);
}
}
}
Expand Up @@ -120,8 +120,7 @@ private static KeyManager[] getKeyManagers(SSLConfig sslConfig) throws Exception
keyStoreStream = new FileInputStream(sslConfig.getKeystore());
clientKeys.load(keyStoreStream, sslConfig.getKeystorePassword().toCharArray());

keyManagerFactory =
KeyManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
keyManagerFactory = getDefaultKeyManagerFactory();
keyManagerFactory.init(clientKeys, sslConfig.getKeystorePassword().toCharArray());
}
} finally {
Expand All @@ -133,6 +132,10 @@ private static KeyManager[] getKeyManagers(SSLConfig sslConfig) throws Exception
return keyManagerFactory != null ? keyManagerFactory.getKeyManagers() : null;
}

static KeyManagerFactory getDefaultKeyManagerFactory() throws NoSuchAlgorithmException {
return KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
}

private static TrustManager[] getTrustManagers(SSLConfig sslConfig, boolean skipSslVerification)
throws Exception {
FileInputStream trustStoreStream = null;
Expand Down Expand Up @@ -162,8 +165,7 @@ public void checkServerTrusted(X509Certificate[] certs, String authType) {}
KeyStore serverPub = KeyStore.getInstance(trustStoreType);
trustStoreStream = new FileInputStream(sslConfig.getTruststore());
serverPub.load(trustStoreStream, sslConfig.getTruststorePassword().toCharArray());
trustManagerFactory =
TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
trustManagerFactory = getDefaultTrustManagerFactory();
trustManagerFactory.init(serverPub);
}
} finally {
Expand All @@ -174,4 +176,9 @@ public void checkServerTrusted(X509Certificate[] certs, String authType) {}
return trustManagerFactory != null ? trustManagerFactory.getTrustManagers() : null;
}

static TrustManagerFactory getDefaultTrustManagerFactory()
throws NoSuchAlgorithmException {
return TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
}

}
Expand Up @@ -21,7 +21,9 @@

import java.security.NoSuchAlgorithmException;

import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManagerFactory;

import org.junit.Test;

Expand Down Expand Up @@ -81,4 +83,18 @@ public void getARealProtocolAfterProcessingAny() throws Exception {
assertThat(sslContextInstance.getProtocol().equalsIgnoreCase("TLSv1.1")).isTrue();
}

@Test
public void getDefaultKeyManagerFactory() throws NoSuchAlgorithmException {
final KeyManagerFactory keyManagerFactory = SSLUtil.getDefaultKeyManagerFactory();
assertThat(keyManagerFactory).isNotNull();
assertThat(keyManagerFactory.getAlgorithm()).isEqualTo(KeyManagerFactory.getDefaultAlgorithm());
}

@Test
public void getDefaultTrustManagerFactory() throws NoSuchAlgorithmException {
final TrustManagerFactory trustManagerFactory = SSLUtil.getDefaultTrustManagerFactory();
assertThat(trustManagerFactory).isNotNull();
assertThat(trustManagerFactory.getAlgorithm())
.isEqualTo(TrustManagerFactory.getDefaultAlgorithm());
}
}

0 comments on commit a048a72

Please sign in to comment.