GEODE-1947: Renaming of SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION to SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/61d3ec3c Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/61d3ec3c Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/61d3ec3c Branch: refs/heads/feature/e2e-testing Commit: 61d3ec3c05d13d5f3b8895a9141b59ddc8cb7248 Parents: 7254cf3 Author: Udo Kohlmeyer <ukohlme...@pivotal.io> Authored: Thu Sep 29 05:10:35 2016 +1000 Committer: Udo Kohlmeyer <ukohlme...@pivotal.io> Committed: Thu Sep 29 05:10:35 2016 +1000 ---------------------------------------------------------------------- .../web/controllers/RestAPIsWithSSLDUnitTest.java | 8 ++++---- .../distributed/ConfigurationProperties.java | 6 +++--- .../internal/AbstractDistributionConfig.java | 2 +- .../distributed/internal/DistributionConfig.java | 18 +++++++++--------- .../internal/DistributionConfigImpl.java | 16 ++++++++-------- .../internal/net/SSLConfigurationFactory.java | 2 +- .../geode/management/GemFireProperties.java | 10 +++++----- .../management/internal/beans/BeanUtilFuncs.java | 2 +- .../net/SSLConfigurationFactoryJUnitTest.java | 13 ++++++------- 9 files changed, 38 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/61d3ec3c/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java index cd6b590..fde41f1 100644 --- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java +++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java @@ -325,7 +325,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase { sslPropertyConverter(sslProperties, props, SSL_TRUSTSTORE_PASSWORD, null); sslPropertyConverter(sslProperties, props, SSL_WEB_ALIAS, null); sslPropertyConverter(sslProperties, props, SSL_ENABLED_COMPONENTS, null); - sslPropertyConverter(sslProperties, props, SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION, null); + sslPropertyConverter(sslProperties, props, SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION, null); sslPropertyConverter(sslProperties, props, SSL_DEFAULT_ALIAS, null); } return props; @@ -497,7 +497,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase { props.setProperty(SSL_KEYSTORE_TYPE, "JKS"); props.setProperty(SSL_ENABLED_COMPONENTS, SecurableCommunicationChannel.WEB.getConstant()); props.setProperty(SSL_WEB_ALIAS, "httpservicekey"); - props.setProperty(SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION, "true"); + props.setProperty(SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION, "true"); String restEndpoint = startInfraWithSSL(props, false); validateConnection(restEndpoint, "SSL", props); } @@ -512,7 +512,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase { props.setProperty(SSL_TRUSTSTORE_PASSWORD, "password"); props.setProperty(SSL_KEYSTORE_TYPE, "JKS"); props.setProperty(SSL_ENABLED_COMPONENTS, SecurableCommunicationChannel.WEB.getConstant()); - props.setProperty(SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION, "true"); + props.setProperty(SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION, "true"); props.setProperty(SSL_WEB_ALIAS, "httpservicekey"); props.setProperty(INVALID_CLIENT_ALIAS, "someAlias"); String restEndpoint = startInfraWithSSL(props, false); @@ -663,7 +663,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase { props.setProperty(SSL_KEYSTORE_TYPE, "JKS"); props.setProperty(SSL_PROTOCOLS, "SSL"); props.setProperty(SSL_REQUIRE_AUTHENTICATION, "true"); - props.setProperty(SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION, "true"); + props.setProperty(SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION, "true"); props.setProperty(SSL_ENABLED_COMPONENTS, SecurableCommunicationChannel.WEB.getConstant()); String restEndpoint = startInfraWithSSL(props, false); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/61d3ec3c/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java b/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java index 66b1472..08f79b9 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java @@ -691,7 +691,7 @@ public interface ConfigurationProperties { * </p> * <U>Default</U>: <code>false</code></p> * <U>Since</U>: GemFire 8.1 - * @deprecated Since Geode 1.0 use {@link #SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION} + * @deprecated Since Geode 1.0 use {@link #SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION} */ @Deprecated String HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION = "http-service-ssl-require-authentication"; @@ -1803,12 +1803,12 @@ public interface ConfigurationProperties { */ String SSL_DEFAULT_ALIAS = "ssl-default-alias"; /** - * The static String definition of the <i>"ssl-http-require-authentication"</i> property + * The static String definition of the <i>"ssl-web-require-authentication"</i> property * * <U>Description</U>If false allows client side's http connection to be authenticated without a 2-way SSL authentication. * </p> * <U>Default</U>: "false"</p> * <U>Since</U>: Geode 1.0 */ - String SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION = "ssl-http-require-authentication"; + String SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION = "ssl-web-require-authentication"; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/61d3ec3c/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java index 31fa4f6..d111c3e 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java @@ -961,7 +961,7 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen m.put(SSL_TRUSTSTORE, "Location of the Java keystore file containing the collection of trusted certificates."); m.put(SSL_TRUSTSTORE_PASSWORD, "Password to unlock the truststore."); m.put(SSL_DEFAULT_ALIAS, "The default certificate alias to be used in a multi-key keystore"); - m.put(SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION, "This property determines is the HTTP service with use mutual ssl authentication."); + m.put(SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION, "This property determines is the HTTP service with use mutual ssl authentication."); dcAttDescriptions = Collections.unmodifiableMap(m); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/61d3ec3c/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java index 9da08da..3b863e4 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java @@ -4571,29 +4571,29 @@ public interface DistributionConfig extends Config, LogConfig { String SSL_TRUSTSTORE_PASSWORD_NAME = SSL_TRUSTSTORE_PASSWORD; /** - * Returns the value of the {@link ConfigurationProperties#SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION} + * Returns the value of the {@link ConfigurationProperties#SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION} * property. */ - @ConfigAttributeGetter(name = SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION) - boolean getSSLHTTPRequireAuthentication(); + @ConfigAttributeGetter(name = SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION) + boolean getSSLWebRequireAuthentication(); /** - * Sets the value of the {@link ConfigurationProperties#SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION} + * Sets the value of the {@link ConfigurationProperties#SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION} * property. */ - @ConfigAttributeSetter(name = SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION) - void setSSLHTTPRequireAuthentication(boolean requiresAuthentication); + @ConfigAttributeSetter(name = SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION) + void setSSLWebRequireAuthentication(boolean requiresAuthentication); /** - * The name of the {@link ConfigurationProperties#SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION} property + * The name of the {@link ConfigurationProperties#SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION} property */ @ConfigAttribute(type = Boolean.class) - String SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION_NAME = SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION; + String SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION_NAME = SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION; /** * The default value for http service ssl mutual authentication */ - boolean DEFAULT_SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION = false; + boolean DEFAULT_SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION = false; //*************** Initializers to gather all the annotations in this class ************************ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/61d3ec3c/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigImpl.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigImpl.java index 4d3d751..6e7333e 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigImpl.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigImpl.java @@ -562,7 +562,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement private String sslKeyStorePassword = DEFAULT_SSL_KEYSTORE_PASSWORD; private String sslTrustStore = DEFAULT_SSL_TRUSTSTORE; private String sslTrustStorePassword = DEFAULT_SSL_TRUSTSTORE_PASSWORD; - private boolean sslHttpServiceRequireAuthentication = DEFAULT_SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION; + private boolean sslWebServiceRequireAuthentication = DEFAULT_SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION; private String locatorSSLAlias = DEFAULT_SSL_ALIAS; @@ -782,7 +782,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement this.sslTrustStorePassword = other.getSSLTrustStorePassword(); this.sslProperties = other.getSSLProperties(); this.sslDefaultAlias = other.getSSLDefaultAlias(); - this.sslHttpServiceRequireAuthentication = other.getSSLHTTPRequireAuthentication(); + this.sslWebServiceRequireAuthentication = other.getSSLWebRequireAuthentication(); } @@ -2668,13 +2668,13 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement } @Override - public boolean getSSLHTTPRequireAuthentication() { - return sslHttpServiceRequireAuthentication; + public boolean getSSLWebRequireAuthentication() { + return sslWebServiceRequireAuthentication; } @Override - public void setSSLHTTPRequireAuthentication(final boolean requiresAuthenatication) { - this.sslHttpServiceRequireAuthentication = requiresAuthenatication; + public void setSSLWebRequireAuthentication(final boolean requiresAuthenatication) { + this.sslWebServiceRequireAuthentication = requiresAuthenatication; } /////////////////////// Utility Methods /////////////////////// @@ -2760,7 +2760,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement .append(httpServiceSSLEnabled, that.httpServiceSSLEnabled) .append(httpServiceSSLRequireAuthentication, that.httpServiceSSLRequireAuthentication) .append(sslRequireAuthentication, that.sslRequireAuthentication) - .append(sslHttpServiceRequireAuthentication, that.sslHttpServiceRequireAuthentication) + .append(sslWebServiceRequireAuthentication, that.sslWebServiceRequireAuthentication) .append(lockMemory, that.lockMemory) .append(modifiable, that.modifiable) .append(name, that.name) @@ -3032,7 +3032,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement .append(sslKeyStorePassword) .append(sslTrustStore) .append(sslTrustStorePassword) - .append(sslHttpServiceRequireAuthentication) + .append(sslWebServiceRequireAuthentication) .append(locatorSSLAlias) .append(sslDefaultAlias) .append(sourceMap) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/61d3ec3c/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java b/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java index 4261248..41fdb96 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java +++ b/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java @@ -120,7 +120,7 @@ public class SSLConfigurationFactory { case WEB: { if (sslEnabledComponents.length > 0) { sslConfig = setAliasForComponent(sslConfig, getDistributionConfig().getHTTPServiceSSLAlias()); - sslConfig.setRequireAuth(getDistributionConfig().getSSLHTTPRequireAuthentication()); + sslConfig.setRequireAuth(getDistributionConfig().getSSLWebRequireAuthentication()); } else { sslConfig = configureLegacyHttpServiceSSL(sslConfig); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/61d3ec3c/geode-core/src/main/java/org/apache/geode/management/GemFireProperties.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/GemFireProperties.java b/geode-core/src/main/java/org/apache/geode/management/GemFireProperties.java index 2b2c1a6..c9cf0b6 100644 --- a/geode-core/src/main/java/org/apache/geode/management/GemFireProperties.java +++ b/geode-core/src/main/java/org/apache/geode/management/GemFireProperties.java @@ -649,7 +649,7 @@ public class GemFireProperties { private String sslKeyStorePassword; private String sslTrustStore; private String sslTrustStorePassword; - private boolean sslHttpServiceRequireAuthentication; + private boolean sslWebServiceRequireAuthentication; private String sslDefaultAlias; @@ -1857,12 +1857,12 @@ public class GemFireProperties { this.sslTrustStorePassword = sslTrustStorePassword; } - public boolean isSSLHttpServiceRequireAuthentication() { - return sslHttpServiceRequireAuthentication; + public boolean getSSLWebServiceRequireAuthentication() { + return sslWebServiceRequireAuthentication; } - public void setSSLHttpServiceRequireAuthentication(final boolean sslHttpServiceRequireAuthentication) { - this.sslHttpServiceRequireAuthentication = sslHttpServiceRequireAuthentication; + public void setSSLWebServiceRequireAuthentication(final boolean sslWebServiceRequireAuthentication) { + this.sslWebServiceRequireAuthentication = sslWebServiceRequireAuthentication; } public String getSSLDefaultAlias() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/61d3ec3c/geode-core/src/main/java/org/apache/geode/management/internal/beans/BeanUtilFuncs.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/BeanUtilFuncs.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/BeanUtilFuncs.java index 92d2f62..60f11cc 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/BeanUtilFuncs.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/BeanUtilFuncs.java @@ -335,7 +335,7 @@ public class BeanUtilFuncs { gemFirePropertyData.setSSLCiphers(config.getSSLCiphers()); gemFirePropertyData.setSecurableCommunicationChannel(config.getSecurableCommunicationChannels()); - gemFirePropertyData.setSSLHttpServiceRequireAuthentication(config.getSSLHTTPRequireAuthentication()); + gemFirePropertyData.setSSLWebServiceRequireAuthentication(config.getSSLWebRequireAuthentication()); gemFirePropertyData.setSSLKeyStore(config.getSSLKeyStore()); gemFirePropertyData.setSSLKeyStoreType(config.getSSLKeyStoreType()); gemFirePropertyData.setSSLKeyStorePassword(config.getSSLKeyStorePassword()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/61d3ec3c/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 8b760df..29ef943 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 @@ -30,7 +30,6 @@ import org.apache.geode.distributed.internal.DistributionConfig; import org.apache.geode.distributed.internal.DistributionConfigImpl; import org.apache.geode.internal.admin.SSLConfig; import org.apache.geode.internal.security.SecurableCommunicationChannel; -import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; import org.apache.geode.test.junit.categories.UnitTest; @Category(UnitTest.class) @@ -148,7 +147,7 @@ public class SSLConfigurationFactoryJUnitTest { properties.setProperty(SSL_TRUSTSTORE_PASSWORD, "keystorePassword"); properties.setProperty(SSL_DEFAULT_ALIAS, "defaultAlias"); properties.setProperty(SSL_WEB_ALIAS, "httpAlias"); - properties.setProperty(SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION, "true"); + properties.setProperty(SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION, "true"); properties.setProperty(SSL_CIPHERS, "any"); properties.setProperty(SSL_PROTOCOLS, "any"); DistributionConfigImpl distributionConfig = new DistributionConfigImpl(properties); @@ -176,8 +175,8 @@ public class SSLConfigurationFactoryJUnitTest { } private boolean requiresAuthentication(final Properties properties, final SecurableCommunicationChannel expectedSecurableComponent) { - boolean defaultAuthentication = expectedSecurableComponent.equals(SecurableCommunicationChannel.WEB) ? DistributionConfig.DEFAULT_SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION : DistributionConfig.DEFAULT_SSL_REQUIRE_AUTHENTICATION; - String httpRequiresAuthentication = properties.getProperty(SSL_HTTP_SERVICE_REQUIRE_AUTHENTICATION); + boolean defaultAuthentication = expectedSecurableComponent.equals(SecurableCommunicationChannel.WEB) ? DistributionConfig.DEFAULT_SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION : DistributionConfig.DEFAULT_SSL_REQUIRE_AUTHENTICATION; + String httpRequiresAuthentication = properties.getProperty(SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION); return httpRequiresAuthentication == null ? defaultAuthentication : Boolean.parseBoolean(httpRequiresAuthentication); } @@ -208,9 +207,9 @@ public class SSLConfigurationFactoryJUnitTest { return !StringUtils.isEmpty(aliasProperty) ? aliasProperty : properties.getProperty(SSL_DEFAULT_ALIAS); } - private boolean isSSLComponentEnabled(final SecurableCommunicationChannel expectedSecurableComponent, final SecurableCommunicationChannel[] SecurableComponents) { - for (SecurableCommunicationChannel securableCommunicationChannel : SecurableComponents) { - if (securableCommunicationChannel.ALL.equals(securableCommunicationChannel) || securableCommunicationChannel.equals(expectedSecurableComponent)) { + private boolean isSSLComponentEnabled(final SecurableCommunicationChannel expectedSecurableComponent, final SecurableCommunicationChannel[] securableComponents) { + for (SecurableCommunicationChannel securableCommunicationChannel : securableComponents) { + if (SecurableCommunicationChannel.ALL.equals(securableCommunicationChannel) || securableCommunicationChannel.equals(expectedSecurableComponent)) { return true; } }
