Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GEODE-8611: Fixes default KeyManagerFactory instantiation. (#5629)
* Uses the default KeyManagerFactory algorithm property. * Adds unit test. * Adds integration test.
- Loading branch information
1 parent
fef7a76
commit a048a72
Showing
3 changed files
with
99 additions
and
4 deletions.
There are no files selected for viewing
72 changes: 72 additions & 0 deletions
72
...e-core/src/integrationTest/java/org/apache/geode/internal/net/SSLUtilIntegrationTest.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,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); | ||
} | ||
} | ||
} |
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