Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-417 [created] 389030d66
started work on fixing ssl prop inheritance Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/93840484 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/93840484 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/93840484 Branch: refs/heads/feature/GEODE-417 Commit: 938404841c2503c979d719ed95abcc138a987379 Parents: c8043d8 Author: Darrel Schneider <[email protected]> Authored: Thu Oct 8 14:05:50 2015 -0700 Committer: Darrel Schneider <[email protected]> Committed: Fri Oct 16 16:28:04 2015 -0700 ---------------------------------------------------------------------- .../internal/DistributionConfigImpl.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/93840484/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java index 3707ff3..1fca4df 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java @@ -819,6 +819,20 @@ public class DistributionConfigImpl } this.clusterSSLProperties.putAll(this.sslProperties); } + if (false/*clusterSSLOverriden*/) { + if (this.sourceMap.get(CLUSTER_SSL_CIPHERS_NAME)==null && this.sourceMap.get(SSL_CIPHERS_NAME) != null) { + this.setServerSSLCiphers(this.sslCiphers); + this.sourceMap.put(CLUSTER_SSL_CIPHERS_NAME, this.sourceMap.get(SSL_CIPHERS_NAME)); + } + if (this.sourceMap.get(CLUSTER_SSL_PROTOCOLS_NAME)==null && this.sourceMap.get(SSL_PROTOCOLS_NAME) != null) { + this.setServerSSLProtocols(this.sslProtocols); + this.sourceMap.put(CLUSTER_SSL_PROTOCOLS_NAME, this.sourceMap.get(SSL_PROTOCOLS_NAME)); + } + if (this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME)==null && this.sourceMap.get(SSL_REQUIRE_AUTHENTICATION_NAME) != null) { + this.setServerSSLRequireAuthentication(this.sslRequireAuthentication); + this.sourceMap.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, this.sourceMap.get(SSL_REQUIRE_AUTHENTICATION_NAME)); + } + } } /* @@ -2120,6 +2134,12 @@ public class DistributionConfigImpl // use sslProperties as base and let props with suffix GATEWAY_SSL_PROPS_SUFFIX override that base this.gatewaySslProperties.setProperty(attName, attValue); } +// if (!this.httpServiceSSLProperties.containsKey(attName)) { +// this.httpServiceSSLProperties.setProperty(attName, attValue); +// } +// if (!this.clusterSSLProperties.containsKey(attName)) { +// this.clusterSSLProperties.setProperty(attName, attValue); +// } } }
