Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-420 245454088 -> 255202891
GEODE-420: Fixing test failures Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/25520289 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/25520289 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/25520289 Branch: refs/heads/feature/GEODE-420 Commit: 255202891916ce864d27adabf658487d88638bae Parents: 2454540 Author: Udo Kohlmeyer <[email protected]> Authored: Thu Aug 25 04:50:05 2016 +1000 Committer: Udo Kohlmeyer <[email protected]> Committed: Thu Aug 25 04:50:05 2016 +1000 ---------------------------------------------------------------------- .../distributed/ConfigurationProperties.java | 2 +- .../internal/net/SSLConfigurationFactory.java | 141 ++++++++++--------- .../internal/net/SocketCreatorFactory.java | 16 ++- .../geode/security/SecurableComponents.java | 2 +- .../gemfire/management/JMXMBeanDUnitTest.java | 11 +- .../internal/JettyHelperJUnitTest.java | 45 ++++-- 6 files changed, 126 insertions(+), 91 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/25520289/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java index 9f41a64..4813d2b 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java @@ -1716,7 +1716,7 @@ public interface ConfigurationProperties { * <a name="ssl-enabled-components"/a></p> * <U>Description</U>: This setting is a comma delimited fields which works in conjunction with the {@link #CLUSTER_SSL_PREFIX} properties. * This property will determine which components will use SSL for their communications.</p> - * <U>Options</U>: "all","server","cluster","gateway","http","jmx","none" -- As described {@link SSLEnabledComponents} + * <U>Options</U>: "all","server","cluster","gateway","http","jmx","none" -- As described {@link SecurableComponents} * <U>Since</U>: Geode 1.0 */ String SSL_ENABLED_COMPONENTS = "ssl-enabled-components"; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/25520289/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactory.java index 12528e3..df4f49c 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactory.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactory.java @@ -26,14 +26,13 @@ import org.springframework.util.StringUtils; import com.gemstone.gemfire.GemFireConfigException; import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl; import com.gemstone.gemfire.internal.admin.SSLConfig; import com.gemstone.gemfire.internal.security.SecurableComponent; public class SSLConfigurationFactory { private static SSLConfigurationFactory instance = new SSLConfigurationFactory(); - private DistributionConfig distributionConfig = new DistributionConfigImpl(new Properties()); + private DistributionConfig distributionConfig = null; private Map<SecurableComponent, SSLConfig> registeredSSLConfig = new HashMap<>(); private SSLConfigurationFactory() { @@ -46,6 +45,14 @@ public class SSLConfigurationFactory { return instance; } + private DistributionConfig getDistributionConfig() { + if(distributionConfig == null) + { + throw new GemFireConfigException("SSL Configuration requires a valid distribution config."); + } + return distributionConfig; + } + public static void setDistributionConfig(final DistributionConfig distributionConfig) { if(distributionConfig == null) { @@ -69,7 +76,7 @@ public class SSLConfigurationFactory { private SSLConfig createSSLConfigForComponent(final SecurableComponent sslEnabledComponent) { SSLConfig sslConfig = createSSLConfig(sslEnabledComponent); - SecurableComponent[] sslEnabledComponents = distributionConfig.getSSLEnabledComponents(); + SecurableComponent[] sslEnabledComponents = getDistributionConfig().getSSLEnabledComponents(); if (sslEnabledComponents.length == 0) { sslConfig = configureLegacyClusterSSL(sslConfig); } @@ -82,7 +89,7 @@ public class SSLConfigurationFactory { } case CLUSTER: { if (sslEnabledComponents.length > 0) { - sslConfig = setAliasForComponent(sslConfig, distributionConfig.getClusterSSLAlias()); + sslConfig = setAliasForComponent(sslConfig, getDistributionConfig().getClusterSSLAlias()); }else { sslConfig = configureLegacyClusterSSL(sslConfig); } @@ -90,13 +97,13 @@ public class SSLConfigurationFactory { } case LOCATOR: { if (sslEnabledComponents.length > 0) { - sslConfig = setAliasForComponent(sslConfig, distributionConfig.getLocatorSSLAlias()); + sslConfig = setAliasForComponent(sslConfig, getDistributionConfig().getLocatorSSLAlias()); } break; } case SERVER: { if (sslEnabledComponents.length > 0) { - sslConfig = setAliasForComponent(sslConfig, distributionConfig.getServerSSLAlias()); + sslConfig = setAliasForComponent(sslConfig, getDistributionConfig().getServerSSLAlias()); } else { sslConfig = configureLegacyServerSSL(sslConfig); } @@ -104,7 +111,7 @@ public class SSLConfigurationFactory { } case GATEWAY: { if (sslEnabledComponents.length > 0) { - sslConfig = setAliasForComponent(sslConfig, distributionConfig.getGatewaySSLAlias()); + sslConfig = setAliasForComponent(sslConfig, getDistributionConfig().getGatewaySSLAlias()); } else { sslConfig = configureLegacyGatewaySSL(sslConfig); } @@ -112,8 +119,8 @@ public class SSLConfigurationFactory { } case HTTP_SERVICE: { if (sslEnabledComponents.length > 0) { - sslConfig = setAliasForComponent(sslConfig, distributionConfig.getHTTPServiceSSLAlias()); - sslConfig.setRequireAuth(distributionConfig.getSSLHTTPRequireAuthentication()); + sslConfig = setAliasForComponent(sslConfig, getDistributionConfig().getHTTPServiceSSLAlias()); + sslConfig.setRequireAuth(getDistributionConfig().getSSLHTTPRequireAuthentication()); } else { sslConfig = configureLegacyHttpServiceSSL(sslConfig); } @@ -121,7 +128,7 @@ public class SSLConfigurationFactory { } case JMX: { if (sslEnabledComponents.length > 0) { - sslConfig = setAliasForComponent(sslConfig, distributionConfig.getJMXManagerSSLAlias()); + sslConfig = setAliasForComponent(sslConfig, getDistributionConfig().getJMXManagerSSLAlias()); } else { sslConfig = configureLegacyJMXSSL(sslConfig); } @@ -141,27 +148,27 @@ public class SSLConfigurationFactory { private SSLConfig createSSLConfig(final SecurableComponent sslEnabledComponent) { SSLConfig sslConfig = new SSLConfig(); - sslConfig.setCiphers(distributionConfig.getSSLCiphers()); + sslConfig.setCiphers(getDistributionConfig().getSSLCiphers()); sslConfig.setEnabled(determineIfSSLEnabledForSSLComponent(sslEnabledComponent)); - sslConfig.setKeystore(distributionConfig.getSSLKeyStore()); - sslConfig.setKeystorePassword(distributionConfig.getSSLKeyStorePassword()); - sslConfig.setKeystoreType(distributionConfig.getSSLKeyStoreType()); - sslConfig.setTruststore(distributionConfig.getSSLTrustStore()); - sslConfig.setTruststorePassword(distributionConfig.getSSLTrustStorePassword()); - sslConfig.setProtocols(distributionConfig.getSSLProtocols()); - sslConfig.setRequireAuth(distributionConfig.getSSLRequireAuthentication()); - sslConfig.setAlias(distributionConfig.getSSLDefaultAlias()); + sslConfig.setKeystore(getDistributionConfig().getSSLKeyStore()); + sslConfig.setKeystorePassword(getDistributionConfig().getSSLKeyStorePassword()); + sslConfig.setKeystoreType(getDistributionConfig().getSSLKeyStoreType()); + sslConfig.setTruststore(getDistributionConfig().getSSLTrustStore()); + sslConfig.setTruststorePassword(getDistributionConfig().getSSLTrustStorePassword()); + sslConfig.setProtocols(getDistributionConfig().getSSLProtocols()); + sslConfig.setRequireAuth(getDistributionConfig().getSSLRequireAuthentication()); + sslConfig.setAlias(getDistributionConfig().getSSLDefaultAlias()); return sslConfig; } private boolean determineIfSSLEnabledForSSLComponent(final SecurableComponent sslEnabledComponent) { - if (ArrayUtils.contains(distributionConfig.getSSLEnabledComponents(), SecurableComponent.NONE)) { + if (ArrayUtils.contains(getDistributionConfig().getSSLEnabledComponents(), SecurableComponent.NONE)) { return false; } - if (ArrayUtils.contains(distributionConfig.getSSLEnabledComponents(), SecurableComponent.ALL)) { + if (ArrayUtils.contains(getDistributionConfig().getSSLEnabledComponents(), SecurableComponent.ALL)) { return true; } - return ArrayUtils.contains(distributionConfig.getSSLEnabledComponents(), sslEnabledComponent) ? true : false; + return ArrayUtils.contains(getDistributionConfig().getSSLEnabledComponents(), sslEnabledComponent) ? true : false; } /** @@ -171,15 +178,15 @@ public class SSLConfigurationFactory { * @deprecated as of Geode 1.0 */ private SSLConfig configureLegacyClusterSSL(SSLConfig sslConfig) { - sslConfig.setCiphers(distributionConfig.getClusterSSLCiphers()); - sslConfig.setEnabled(distributionConfig.getClusterSSLEnabled()); - sslConfig.setKeystore(distributionConfig.getClusterSSLKeyStore()); - sslConfig.setKeystorePassword(distributionConfig.getClusterSSLKeyStorePassword()); - sslConfig.setKeystoreType(distributionConfig.getClusterSSLKeyStoreType()); - sslConfig.setTruststore(distributionConfig.getClusterSSLTrustStore()); - sslConfig.setTruststorePassword(distributionConfig.getClusterSSLTrustStorePassword()); - sslConfig.setProtocols(distributionConfig.getClusterSSLProtocols()); - sslConfig.setRequireAuth(distributionConfig.getClusterSSLRequireAuthentication()); + sslConfig.setCiphers(getDistributionConfig().getClusterSSLCiphers()); + sslConfig.setEnabled(getDistributionConfig().getClusterSSLEnabled()); + sslConfig.setKeystore(getDistributionConfig().getClusterSSLKeyStore()); + sslConfig.setKeystorePassword(getDistributionConfig().getClusterSSLKeyStorePassword()); + sslConfig.setKeystoreType(getDistributionConfig().getClusterSSLKeyStoreType()); + sslConfig.setTruststore(getDistributionConfig().getClusterSSLTrustStore()); + sslConfig.setTruststorePassword(getDistributionConfig().getClusterSSLTrustStorePassword()); + sslConfig.setProtocols(getDistributionConfig().getClusterSSLProtocols()); + sslConfig.setRequireAuth(getDistributionConfig().getClusterSSLRequireAuthentication()); return sslConfig; } @@ -190,15 +197,15 @@ public class SSLConfigurationFactory { * @deprecated as of Geode 1.0 */ private SSLConfig configureLegacyServerSSL(SSLConfig sslConfig) { - sslConfig.setCiphers(distributionConfig.getServerSSLCiphers()); - sslConfig.setEnabled(distributionConfig.getServerSSLEnabled()); - sslConfig.setKeystore(distributionConfig.getServerSSLKeyStore()); - sslConfig.setKeystorePassword(distributionConfig.getServerSSLKeyStorePassword()); - sslConfig.setKeystoreType(distributionConfig.getServerSSLKeyStoreType()); - sslConfig.setTruststore(distributionConfig.getServerSSLTrustStore()); - sslConfig.setTruststorePassword(distributionConfig.getServerSSLTrustStorePassword()); - sslConfig.setProtocols(distributionConfig.getServerSSLProtocols()); - sslConfig.setRequireAuth(distributionConfig.getServerSSLRequireAuthentication()); + sslConfig.setCiphers(getDistributionConfig().getServerSSLCiphers()); + sslConfig.setEnabled(getDistributionConfig().getServerSSLEnabled()); + sslConfig.setKeystore(getDistributionConfig().getServerSSLKeyStore()); + sslConfig.setKeystorePassword(getDistributionConfig().getServerSSLKeyStorePassword()); + sslConfig.setKeystoreType(getDistributionConfig().getServerSSLKeyStoreType()); + sslConfig.setTruststore(getDistributionConfig().getServerSSLTrustStore()); + sslConfig.setTruststorePassword(getDistributionConfig().getServerSSLTrustStorePassword()); + sslConfig.setProtocols(getDistributionConfig().getServerSSLProtocols()); + sslConfig.setRequireAuth(getDistributionConfig().getServerSSLRequireAuthentication()); return sslConfig; } @@ -209,15 +216,15 @@ public class SSLConfigurationFactory { * @deprecated as of Geode 1.0 */ private SSLConfig configureLegacyJMXSSL(SSLConfig sslConfig) { - sslConfig.setCiphers(distributionConfig.getJmxManagerSSLCiphers()); - sslConfig.setEnabled(distributionConfig.getJmxManagerSSLEnabled()); - sslConfig.setKeystore(distributionConfig.getJmxManagerSSLKeyStore()); - sslConfig.setKeystorePassword(distributionConfig.getJmxManagerSSLKeyStorePassword()); - sslConfig.setKeystoreType(distributionConfig.getJmxManagerSSLKeyStoreType()); - sslConfig.setTruststore(distributionConfig.getJmxManagerSSLTrustStore()); - sslConfig.setTruststorePassword(distributionConfig.getJmxManagerSSLTrustStorePassword()); - sslConfig.setProtocols(distributionConfig.getJmxManagerSSLProtocols()); - sslConfig.setRequireAuth(distributionConfig.getJmxManagerSSLRequireAuthentication()); + sslConfig.setCiphers(getDistributionConfig().getJmxManagerSSLCiphers()); + sslConfig.setEnabled(getDistributionConfig().getJmxManagerSSLEnabled()); + sslConfig.setKeystore(getDistributionConfig().getJmxManagerSSLKeyStore()); + sslConfig.setKeystorePassword(getDistributionConfig().getJmxManagerSSLKeyStorePassword()); + sslConfig.setKeystoreType(getDistributionConfig().getJmxManagerSSLKeyStoreType()); + sslConfig.setTruststore(getDistributionConfig().getJmxManagerSSLTrustStore()); + sslConfig.setTruststorePassword(getDistributionConfig().getJmxManagerSSLTrustStorePassword()); + sslConfig.setProtocols(getDistributionConfig().getJmxManagerSSLProtocols()); + sslConfig.setRequireAuth(getDistributionConfig().getJmxManagerSSLRequireAuthentication()); return sslConfig; } @@ -228,15 +235,15 @@ public class SSLConfigurationFactory { * @deprecated as of Geode 1.0 */ private SSLConfig configureLegacyGatewaySSL(SSLConfig sslConfig) { - sslConfig.setCiphers(distributionConfig.getGatewaySSLCiphers()); - sslConfig.setEnabled(distributionConfig.getGatewaySSLEnabled()); - sslConfig.setKeystore(distributionConfig.getGatewaySSLKeyStore()); - sslConfig.setKeystorePassword(distributionConfig.getGatewaySSLKeyStorePassword()); - sslConfig.setKeystoreType(distributionConfig.getGatewaySSLKeyStoreType()); - sslConfig.setTruststore(distributionConfig.getGatewaySSLTrustStore()); - sslConfig.setTruststorePassword(distributionConfig.getGatewaySSLTrustStorePassword()); - sslConfig.setProtocols(distributionConfig.getGatewaySSLProtocols()); - sslConfig.setRequireAuth(distributionConfig.getGatewaySSLRequireAuthentication()); + sslConfig.setCiphers(getDistributionConfig().getGatewaySSLCiphers()); + sslConfig.setEnabled(getDistributionConfig().getGatewaySSLEnabled()); + sslConfig.setKeystore(getDistributionConfig().getGatewaySSLKeyStore()); + sslConfig.setKeystorePassword(getDistributionConfig().getGatewaySSLKeyStorePassword()); + sslConfig.setKeystoreType(getDistributionConfig().getGatewaySSLKeyStoreType()); + sslConfig.setTruststore(getDistributionConfig().getGatewaySSLTrustStore()); + sslConfig.setTruststorePassword(getDistributionConfig().getGatewaySSLTrustStorePassword()); + sslConfig.setProtocols(getDistributionConfig().getGatewaySSLProtocols()); + sslConfig.setRequireAuth(getDistributionConfig().getGatewaySSLRequireAuthentication()); return sslConfig; } @@ -247,15 +254,15 @@ public class SSLConfigurationFactory { * @deprecated as of Geode 1.0 */ private SSLConfig configureLegacyHttpServiceSSL(SSLConfig sslConfig) { - sslConfig.setCiphers(distributionConfig.getHttpServiceSSLCiphers()); - sslConfig.setEnabled(distributionConfig.getHttpServiceSSLEnabled()); - sslConfig.setKeystore(distributionConfig.getHttpServiceSSLKeyStore()); - sslConfig.setKeystorePassword(distributionConfig.getHttpServiceSSLKeyStorePassword()); - sslConfig.setKeystoreType(distributionConfig.getHttpServiceSSLKeyStoreType()); - sslConfig.setTruststore(distributionConfig.getHttpServiceSSLTrustStore()); - sslConfig.setTruststorePassword(distributionConfig.getHttpServiceSSLTrustStorePassword()); - sslConfig.setProtocols(distributionConfig.getHttpServiceSSLProtocols()); - sslConfig.setRequireAuth(distributionConfig.getHttpServiceSSLRequireAuthentication()); + sslConfig.setCiphers(getDistributionConfig().getHttpServiceSSLCiphers()); + sslConfig.setEnabled(getDistributionConfig().getHttpServiceSSLEnabled()); + sslConfig.setKeystore(getDistributionConfig().getHttpServiceSSLKeyStore()); + sslConfig.setKeystorePassword(getDistributionConfig().getHttpServiceSSLKeyStorePassword()); + sslConfig.setKeystoreType(getDistributionConfig().getHttpServiceSSLKeyStoreType()); + sslConfig.setTruststore(getDistributionConfig().getHttpServiceSSLTrustStore()); + sslConfig.setTruststorePassword(getDistributionConfig().getHttpServiceSSLTrustStorePassword()); + sslConfig.setProtocols(getDistributionConfig().getHttpServiceSSLProtocols()); + sslConfig.setRequireAuth(getDistributionConfig().getHttpServiceSSLRequireAuthentication()); return sslConfig; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/25520289/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketCreatorFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketCreatorFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketCreatorFactory.java index 20b649c..4686fe2 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketCreatorFactory.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketCreatorFactory.java @@ -26,7 +26,6 @@ import org.apache.commons.lang.ArrayUtils; import com.gemstone.gemfire.GemFireConfigException; import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl; import com.gemstone.gemfire.internal.admin.SSLConfig; import com.gemstone.gemfire.internal.security.SecurableComponent; @@ -48,6 +47,13 @@ public class SocketCreatorFactory { SSLConfigurationFactory.setDistributionConfig(this.distributionConfig); } + private DistributionConfig getDistributionConfig() { + if (distributionConfig == null) { + throw new GemFireConfigException("SocketCreatorFactory requires a valid distribution config."); + } + return distributionConfig; + } + private synchronized static SocketCreatorFactory getInstance(boolean closing) { if (instance == null && !closing) { instance = new SocketCreatorFactory(); @@ -64,11 +70,11 @@ public class SocketCreatorFactory { return getInstance().getOrCreateSocketCreatorForSSLEnabledComponent(sslEnabledComponent, sslConfigForComponent); } - private SocketCreator getSSLSocketCreator(final SecurableComponent sslComponent, final DistributionConfig distributionConfig, final SSLConfig sslConfig) { + private SocketCreator getSSLSocketCreator(final SecurableComponent sslComponent, final SSLConfig sslConfig) { if (sslConfig.isEnabled()) { - if (ArrayUtils.contains(distributionConfig.getSSLEnabledComponents(), SecurableComponent.ALL)) { + if (ArrayUtils.contains(getDistributionConfig().getSSLEnabledComponents(), SecurableComponent.ALL)) { return createSSLSocketCreator(SecurableComponent.ALL, sslConfig); - } else if (ArrayUtils.contains(distributionConfig.getSSLEnabledComponents(), sslComponent)) { + } else if (ArrayUtils.contains(getDistributionConfig().getSSLEnabledComponents(), sslComponent)) { return createSSLSocketCreator(sslComponent, sslConfig); } } @@ -79,7 +85,7 @@ public class SocketCreatorFactory { private SocketCreator getOrCreateSocketCreatorForSSLEnabledComponent(final SecurableComponent sslEnabledComponent, final SSLConfig sslConfig) { SocketCreator socketCreator = getSocketCreatorForComponent(sslEnabledComponent); if (socketCreator == null) { - return getSSLSocketCreator(sslEnabledComponent, distributionConfig, sslConfig); + return getSSLSocketCreator(sslEnabledComponent, sslConfig); } else { return socketCreator; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/25520289/geode-core/src/main/java/org/apache/geode/security/SecurableComponents.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/security/SecurableComponents.java b/geode-core/src/main/java/org/apache/geode/security/SecurableComponents.java index 2c739b9..20da649 100644 --- a/geode-core/src/main/java/org/apache/geode/security/SecurableComponents.java +++ b/geode-core/src/main/java/org/apache/geode/security/SecurableComponents.java @@ -45,7 +45,7 @@ public interface SecurableComponents { */ String JMX = "jmx"; /** - * This determines that the http service communcation will be secured. + * This determines that the http service communication will be secured. * <U>Since</U>: Geode 1.0 */ String HTTP_SERVICE = "http"; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/25520289/geode-core/src/test/java/com/gemstone/gemfire/management/JMXMBeanDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/JMXMBeanDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/JMXMBeanDUnitTest.java index 86a735e..f92136e 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/JMXMBeanDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/JMXMBeanDUnitTest.java @@ -39,9 +39,9 @@ import javax.rmi.ssl.SslRMIClientSocketFactory; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.junit.experimental.categories.Category; import com.gemstone.gemfire.distributed.LocatorLauncher; -import com.gemstone.gemfire.distributed.ServerLauncher; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.net.SocketCreator; import com.gemstone.gemfire.internal.security.SecurableComponent; @@ -51,6 +51,7 @@ import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.NetworkUtils; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.rules.DistributedRestoreSystemProperties; +import com.gemstone.gemfire.test.junit.categories.FlakyTest; import com.gemstone.gemfire.test.junit.rules.serializable.SerializableTemporaryFolder; import com.gemstone.gemfire.util.test.TestUtil; @@ -127,12 +128,14 @@ public class JMXMBeanDUnitTest extends DistributedTestCase { } @Test + @Category(FlakyTest.class) + // To be fixed in GEODE-1716 public void testJMXOverLegacySSL() throws Exception { Properties properties = configureLocatorProperties(new Properties(), jmxPort, serverHostName, true, true, false); -// locator.invoke("Configure and start Locator", () -> { + locator.invoke("Configure and start Locator", () -> { System.setProperty("javax.ssl.debug", "true"); configureAndStartLocator(locatorPort, jmxPort, serverHostName, properties); -// }); + }); jmxClient.invoke("Configure and start JMX Client", () -> { System.setProperty("javax.ssl.debug", "true"); @@ -141,8 +144,6 @@ public class JMXMBeanDUnitTest extends DistributedTestCase { } @Test - // @Category(FlakyTest.class) - //To be fixed in GEODE-1716 public void testJMXOverNonSSL() throws Exception { Properties properties = configureLocatorProperties(new Properties(), jmxPort, serverHostName, false, false, false); locator.invoke("Configure and start Locator", () -> configureAndStartLocator(locatorPort, jmxPort, serverHostName, properties)); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/25520289/geode-core/src/test/java/com/gemstone/gemfire/management/internal/JettyHelperJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/JettyHelperJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/JettyHelperJUnitTest.java index 5aac277..8fca500 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/JettyHelperJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/JettyHelperJUnitTest.java @@ -18,11 +18,17 @@ package com.gemstone.gemfire.management.internal; import static org.junit.Assert.*; +import java.util.Properties; + import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; +import com.gemstone.gemfire.GemFireConfigException; +import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl; import com.gemstone.gemfire.internal.net.SSLConfigurationFactory; import com.gemstone.gemfire.internal.security.SecurableComponent; import com.gemstone.gemfire.test.junit.categories.UnitTest; @@ -30,7 +36,6 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest; /** * The JettyHelperJUnitTest class is a test suite of test cases testing the * contract and functionality of the JettyHelper class. Does not start Jetty. - * * @see com.gemstone.gemfire.management.internal.JettyHelper * @see org.jmock.Mockery * @see org.junit.Assert @@ -39,24 +44,40 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest; @Category(UnitTest.class) public class JettyHelperJUnitTest { + @Before + public void setup() { + SSLConfigurationFactory.setDistributionConfig(new DistributionConfigImpl(new Properties())); + } + + @After + public void teardown() { + SSLConfigurationFactory.close(); + } + @Test public void testSetPortNoBindAddress() throws Exception { - final Server jetty = JettyHelper.initJetty(null, 8090, SSLConfigurationFactory.getSSLConfigForComponent(SecurableComponent.HTTP_SERVICE)); - - assertNotNull(jetty); - assertNotNull(jetty.getConnectors()[0]); - assertEquals(8090, ((ServerConnector) jetty.getConnectors()[0]).getPort()); + final Server jetty; + try { + jetty = JettyHelper.initJetty(null, 8090, SSLConfigurationFactory.getSSLConfigForComponent(SecurableComponent.HTTP_SERVICE)); + assertNotNull(jetty); + assertNotNull(jetty.getConnectors()[0]); + assertEquals(8090, ((ServerConnector) jetty.getConnectors()[0]).getPort()); + } catch (GemFireConfigException e) { + fail(e.getMessage()); + } } @Test public void testSetPortWithBindAddress() throws Exception { + try { + final Server jetty = JettyHelper.initJetty("10.123.50.1", 10480, SSLConfigurationFactory.getSSLConfigForComponent(SecurableComponent.HTTP_SERVICE)); - final Server jetty = JettyHelper.initJetty("10.123.50.1", 10480, SSLConfigurationFactory.getSSLConfigForComponent(SecurableComponent.HTTP_SERVICE)); - - assertNotNull(jetty); - assertNotNull(jetty.getConnectors()[0]); - assertEquals(10480, ((ServerConnector) jetty.getConnectors()[0]).getPort()); + assertNotNull(jetty); + assertNotNull(jetty.getConnectors()[0]); + assertEquals(10480, ((ServerConnector) jetty.getConnectors()[0]).getPort()); + } catch (GemFireConfigException e) { + fail(e.getMessage()); + } } - }
