You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2016/10/05 00:31:40 UTC
incubator-geode git commit: GEODE-420: Adding test to
SSLConfigurationFactoryJUnitTest.java to test for non-ssl configurations
Repository: incubator-geode
Updated Branches:
refs/heads/develop 18c2dc3fb -> f3b0d0e15
GEODE-420: Adding test to SSLConfigurationFactoryJUnitTest.java to test for non-ssl configurations
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f3b0d0e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f3b0d0e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f3b0d0e1
Branch: refs/heads/develop
Commit: f3b0d0e15df54b4014dbec976c62cfbdde6f34db
Parents: 18c2dc3
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Wed Oct 5 11:31:30 2016 +1100
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Wed Oct 5 11:31:30 2016 +1100
----------------------------------------------------------------------
.../net/SSLConfigurationFactoryJUnitTest.java | 37 ++++++++++++--------
1 file changed, 23 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f3b0d0e1/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
index 29ef943..80d195d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
@@ -41,6 +41,16 @@ public class SSLConfigurationFactoryJUnitTest {
}
@Test
+ public void getNonSSLConfiguration() throws Exception {
+ Properties properties = new Properties();
+ DistributionConfigImpl distributionConfig = new DistributionConfigImpl(properties);
+ SSLConfigurationFactory.setDistributionConfig(distributionConfig);
+ for (SecurableCommunicationChannel securableComponent : SecurableCommunicationChannel.values()) {
+ assertSSLConfig(properties, SSLConfigurationFactory.getSSLConfigForComponent(securableComponent), securableComponent, distributionConfig);
+ }
+ }
+
+ @Test
public void getSSLConfigWithCommaDelimitedProtocols() throws Exception {
Properties properties = new Properties();
properties.setProperty(SSL_ENABLED_COMPONENTS, "all");
@@ -157,21 +167,20 @@ public class SSLConfigurationFactoryJUnitTest {
}
}
- private void assertSSLConfig(final Properties properties,
- final SSLConfig sslConfig,
- final SecurableCommunicationChannel expectedSecurableComponent,
- final DistributionConfigImpl distributionConfig) {
+ private void assertSSLConfig(final Properties properties, final SSLConfig sslConfig, final SecurableCommunicationChannel expectedSecurableComponent, final DistributionConfigImpl distributionConfig) {
assertEquals(isSSLComponentEnabled(expectedSecurableComponent, distributionConfig.getSecurableCommunicationChannels()), sslConfig.isEnabled());
- assertEquals(properties.getProperty(SSL_KEYSTORE), sslConfig.getKeystore());
- assertEquals(properties.getProperty(SSL_KEYSTORE_PASSWORD), sslConfig.getKeystorePassword());
- assertEquals(properties.getProperty(SSL_KEYSTORE_TYPE), sslConfig.getKeystoreType());
- assertEquals(properties.getProperty(SSL_TRUSTSTORE), sslConfig.getTruststore());
- assertEquals(properties.getProperty(SSL_TRUSTSTORE_PASSWORD), sslConfig.getTruststorePassword());
- assertEquals(properties.getProperty(SSL_CIPHERS).replace(","," "), sslConfig.getCiphers());
- assertEquals(properties.getProperty(SSL_PROTOCOLS).replace(","," "), sslConfig.getProtocols());
- assertEquals(getCorrectAlias(expectedSecurableComponent, properties), sslConfig.getAlias());
- assertEquals(requiresAuthentication(properties, expectedSecurableComponent), sslConfig.isRequireAuth());
- assertEquals(expectedSecurableComponent, sslConfig.getSecuredCommunicationChannel());
+ if (sslConfig.isEnabled()) {
+ assertEquals(properties.getProperty(SSL_KEYSTORE), sslConfig.getKeystore());
+ assertEquals(properties.getProperty(SSL_KEYSTORE_PASSWORD), sslConfig.getKeystorePassword());
+ assertEquals(properties.getProperty(SSL_KEYSTORE_TYPE), sslConfig.getKeystoreType());
+ assertEquals(properties.getProperty(SSL_TRUSTSTORE), sslConfig.getTruststore());
+ assertEquals(properties.getProperty(SSL_TRUSTSTORE_PASSWORD), sslConfig.getTruststorePassword());
+ assertEquals(properties.getProperty(SSL_CIPHERS).replace(",", " "), sslConfig.getCiphers());
+ assertEquals(properties.getProperty(SSL_PROTOCOLS).replace(",", " "), sslConfig.getProtocols());
+ assertEquals(getCorrectAlias(expectedSecurableComponent, properties), sslConfig.getAlias());
+ assertEquals(requiresAuthentication(properties, expectedSecurableComponent), sslConfig.isRequireAuth());
+ assertEquals(expectedSecurableComponent, sslConfig.getSecuredCommunicationChannel());
+ }
}
private boolean requiresAuthentication(final Properties properties, final SecurableCommunicationChannel expectedSecurableComponent) {