GEODE-1372 Added security-udp-dhalgo property. Added this property in test and code. Fixed issue with InternalDistributedMember where it was using viewId for equal method.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/de16ac4d Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/de16ac4d Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/de16ac4d Branch: refs/heads/develop Commit: de16ac4d97942c73fc5d2ae0bc961d8e1731bb68 Parents: 78d8380 Author: Hitesh Khamesra <[email protected]> Authored: Wed Jun 8 09:26:14 2016 -0700 Committer: Hitesh Khamesra <[email protected]> Committed: Mon Aug 29 10:39:18 2016 -0700 ---------------------------------------------------------------------- .../distributed/ConfigurationProperties.java | 5 + .../DistributedSystemConfigProperties.java | 751 +++++++++++++++++++ .../internal/AbstractDistributionConfig.java | 4 + .../internal/DistributionConfig.java | 32 +- .../internal/DistributionConfigImpl.java | 14 +- .../membership/InternalDistributedMember.java | 20 +- .../membership/gms/membership/GMSJoinLeave.java | 20 +- .../membership/gms/messenger/GMSEncrypt.java | 36 +- .../gms/messenger/JGroupsMessenger.java | 12 +- .../gemfire/internal/i18n/LocalizedStrings.java | 3 +- .../DistributedMulticastRegionDUnitTest.java | 4 +- .../ReconnectWithUDPSecurityDUnitTest.java | 4 +- .../LocatorUDPSecurityDUnitTest.java | 3 +- .../membership/MembershipJUnitTest.java | 5 +- .../gms/membership/GMSJoinLeaveJUnitTest.java | 2 +- .../gms/messenger/GMSEncryptJUnitTest.java | 3 +- 16 files changed, 882 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de16ac4d/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 5c3a282..aaad75e 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 @@ -1202,6 +1202,11 @@ public interface ConfigurationProperties { */ String SECURITY_CLIENT_DHALGO = SECURITY_PREFIX + "client-dhalgo"; /** + * The static String definition of the <i>"security-udp-dhalgo"</i> + * property + */ + String SECURITY_UDP_DHALGO = SECURITY_PREFIX + "udp-dhalgo"; + /** * The static String definition of the <i>"security-log-file"</i> * property */ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de16ac4d/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemConfigProperties.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemConfigProperties.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemConfigProperties.java new file mode 100644 index 0000000..0907644 --- /dev/null +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemConfigProperties.java @@ -0,0 +1,751 @@ +/* + * 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 com.gemstone.gemfire.distributed; + + +public interface DistributedSystemConfigProperties { + /** + * The static definition of the <a href="DistributedSystem.html#ack-severe-alert-threshold">"ack-severe-alert-threshold"</a> + * property + */ + String ACK_SEVERE_ALERT_THRESHOLD = "ack-severe-alert-threshold"; + /** + * The static definition of the <a href="DistributedSystem.html#ack-wait-threshold">"ack-wait-threshold"</a> + * property + */ + String ACK_WAIT_THRESHOLD = "ack-wait-threshold"; + /** + * The static definition of the <a href="DistributedSystem.html#archive-disk-space-limit">"archive-disk-space-limit"</a> + * property + */ + String ARCHIVE_DISK_SPACE_LIMIT = "archive-disk-space-limit"; + /** + * The static definition of the <a href="DistributedSystem.html#archive-file-size-limit">"archive-file-size-limit"</a> + * property + */ + String ARCHIVE_FILE_SIZE_LIMIT = "archive-file-size-limit"; + /** + * The static definition of the <a href="DistributedSystem.html#async-distribution-timeout">"async-distribution-timeout"</a> + * property + */ + String ASYNC_DISTRIBUTION_TIMEOUT = "async-distribution-timeout"; + /** + * The static definition of the <a href="DistributedSystem.html#async-max-queue-size">"async-max-queue-size"</a> + * property + */ + String ASYNC_MAX_QUEUE_SIZE = "async-max-queue-size"; + /** + * The static definition of the <a href="DistributedSystem.html#async-queue-timeout">"async-queue-timeout"</a> + * property + */ + String ASYNC_QUEUE_TIMEOUT = "async-queue-timeout"; + /** + * The static definition of the <a href="DistributedSystem.html#bind-address">"bind-address"</a> + * property + */ + String BIND_ADDRESS = "bind-address"; + /** + * The static definition of the <a href="DistributedSystem.html#cache-xml-file">"cache-xml-file"</a> + * property + */ + String CACHE_XML_FILE = "cache-xml-file"; + /** + * The static definition of the <a href="DistributedSystem.html#cluster-configuration-dir">"cluster-configuration-dir"</a> + * property + */ + String CLUSTER_CONFIGURATION_DIR = "cluster-configuration-dir"; + /** + * The static definition of the <a href="DistributedSystem.html#cluster-ssl-ciphers">"cluster-ssl-ciphers"</a> + * property + */ + String CLUSTER_SSL_CIPHERS = "cluster-ssl-ciphers"; + /** + * The static definition of the <a href="DistributedSystem.html#cluster-ssl-enabled">"cluster-ssl-enabled"</a> + * property + */ + String CLUSTER_SSL_ENABLED = "cluster-ssl-enabled"; + /** + * The static definition of the <a href="DistributedSystem.html#cluster-ssl-keystore">"cluster-ssl-keystore"</a> + * property + */ + String CLUSTER_SSL_KEYSTORE = "cluster-ssl-keystore"; + /** + * The static definition of the <a href="DistributedSystem.html#cluster-ssl-keystore-password">"cluster-ssl-keystore-password"</a> + * property + */ + String CLUSTER_SSL_KEYSTORE_PASSWORD = "cluster-ssl-keystore-password"; + /** + * The static definition of the <a href="DistributedSystem.html#cluster-ssl-keystore-type">"cluster-ssl-keystore-type"</a> + * property + */ + String CLUSTER_SSL_KEYSTORE_TYPE = "cluster-ssl-keystore-type"; + /** + * The static definition of the <a href="DistributedSystem.html#cluster-ssl-protocols">"cluster-ssl-protocols"</a> + * property + */ + String CLUSTER_SSL_PROTOCOLS = "cluster-ssl-protocols"; + /** + * The static definition of the <a href="DistributedSystem.html#cluster-ssl-require-authentication">"cluster-ssl-require-authentication"</a> + * property + */ + String CLUSTER_SSL_REQUIRE_AUTHENTICATION = "cluster-ssl-require-authentication"; + /** + * The static definition of the <a href="DistributedSystem.html#cluster-ssl-truststore">"cluster-ssl-truststore"</a> + * property + */ + String CLUSTER_SSL_TRUSTSTORE = "cluster-ssl-truststore"; + /** + * The static definition of the <a href="DistributedSystem.html#cluster-ssl-truststore-password">"cluster-ssl-truststore-password"</a> + * property + */ + String CLUSTER_SSL_TRUSTSTORE_PASSWORD = "cluster-ssl-truststore-password"; + /** + * The static definition of the <a href="DistributedSystem.html#conflate-events">"conflate-events"</a> + * property + */ + String CONFLATE_EVENTS = "conflate-events"; + /** + * The static definition of the <a href="DistributedSystem.html#conserve-sockets">"conserve-sockets"</a> + * property + */ + String CONSERVE_SOCKETS = "conserve-sockets"; + /** + * The static definition of the <a href="DistributedSystem.html#delta-propagation">"delta-propagation"</a> + * property + */ + String DELTA_PROPAGATION = "delta-propagation"; + /** + * The static definition of the <a href="DistributedSystem.html#deploy-working-dir">"deploy-working-dir"</a> + * property + */ + String DEPLOY_WORKING_DIR = "deploy-working-dir"; + /** + * The static definition of the <a href="DistributedSystem.html#disable-auto-reconnect">"disable-auto-reconnect"</a> + * property + */ + String DISABLE_AUTO_RECONNECT = "disable-auto-reconnect"; + /** + * The static definition of the <a href="DistributedSystem.html#disable-tcp">"disable-tcp"</a> + * property + */ + String DISABLE_TCP = "disable-tcp"; + /** + * The static definition of the <a href="DistributedSystem.html#distributed-system-id">"distributed-system-id"</a> + * property + */ + String DISTRIBUTED_SYSTEM_ID = "distributed-system-id"; + /** + * The static definition of the <a href="DistributedSystem.html#durable-client-id">"durable-client-id"</a> + * property + */ + String DURABLE_CLIENT_ID = "durable-client-id"; + /** + * The static definition of the <a href="DistributedSystem.html#durable-client-timeout">"durable-client-timeout"</a> + * property + */ + String DURABLE_CLIENT_TIMEOUT = "durable-client-timeout"; + /** + * The static definition of the <a href="DistributedSystem.html#enable-cluster-configuration">"enable-cluster-configuration"</a> + * property + */ + String ENABLE_CLUSTER_CONFIGURATION = "enable-cluster-configuration"; + /** + * The static definition of the <a href="DistributedSystem.html#enable-network-partition-detection">"enable-network-partition-detection"</a> + * property + */ + String ENABLE_NETWORK_PARTITION_DETECTION = "enable-network-partition-detection"; + /** + * The static definition of the <a href="DistributedSystem.html#enable-time-statistics">"enable-time-statistics"</a> + * property + */ + String ENABLE_TIME_STATISTICS = "enable-time-statistics"; + /** + * The static definition of the <a href="DistributedSystem.html#enforce-unique-host">"enforce-unique-host"</a> + * property + */ + String ENFORCE_UNIQUE_HOST = "enforce-unique-host"; + /** + * The static definition of the <a href="DistributedSystem.html#gateway-ssl-ciphers">"gateway-ssl-ciphers"</a> + * property + */ + String GATEWAY_SSL_CIPHERS = "gateway-ssl-ciphers"; + /** + * The static definition of the <a href="DistributedSystem.html#gateway-ssl-enabled">"gateway-ssl-enabled"</a> + * property + */ + String GATEWAY_SSL_ENABLED = "gateway-ssl-enabled"; + /** + * The static definition of the <a href="DistributedSystem.html#gateway-ssl-keystore">"gateway-ssl-keystore"</a> + * property + */ + String GATEWAY_SSL_KEYSTORE = "gateway-ssl-keystore"; + /** + * The static definition of the <a href="DistributedSystem.html#gateway-ssl-keystore-password">"gateway-ssl-keystore-password"</a> + * property + */ + String GATEWAY_SSL_KEYSTORE_PASSWORD = "gateway-ssl-keystore-password"; + /** + * The static definition of the <a href="DistributedSystem.html#gateway-ssl-keystore-type">"gateway-ssl-keystore-type"</a> + * property + */ + String GATEWAY_SSL_KEYSTORE_TYPE = "gateway-ssl-keystore-type"; + /** + * The static definition of the <a href="DistributedSystem.html#gateway-ssl-protocols">"gateway-ssl-protocols"</a> + * property + */ + String GATEWAY_SSL_PROTOCOLS = "gateway-ssl-protocols"; + /** + * The static definition of the <a href="DistributedSystem.html#gateway-ssl-require-authentication">"gateway-ssl-require-authentication"</a> + * property + */ + String GATEWAY_SSL_REQUIRE_AUTHENTICATION = "gateway-ssl-require-authentication"; + /** + * The static definition of the <a href="DistributedSystem.html#gateway-ssl-truststore">"gateway-ssl-truststore"</a> + * property + */ + String GATEWAY_SSL_TRUSTSTORE = "gateway-ssl-truststore"; + /** + * The static definition of the <a href="DistributedSystem.html#gateway-ssl-truststore-password">"gateway-ssl-truststore-password"</a> + * property + */ + String GATEWAY_SSL_TRUSTSTORE_PASSWORD = "gateway-ssl-truststore-password"; + /** + * The static definition of the <a href="DistributedSystem.html#groups">"groups"</a> + * property + */ + String GROUPS = "groups"; + /** + * The static definition of the <a href="DistributedSystem.html#http-service-bind-address">"http-service-bind-address"</a> + * property + */ + String HTTP_SERVICE_BIND_ADDRESS = "http-service-bind-address"; + /** + * The static definition of the <a href="DistributedSystem.html#http-service-port">"http-service-port"</a> + * property + */ + String HTTP_SERVICE_PORT = "http-service-port"; + /** + * The static definition of the <a href="DistributedSystem.html#http-service-ssl-ciphers">"http-service-ssl-ciphers"</a> + * property + */ + String HTTP_SERVICE_SSL_CIPHERS = "http-service-ssl-ciphers"; + /** + * The static definition of the <a href="DistributedSystem.html#http-service-ssl-enabled">"http-service-ssl-enabled"</a> + * property + */ + String HTTP_SERVICE_SSL_ENABLED = "http-service-ssl-enabled"; + /** + * The static definition of the <a href="DistributedSystem.html#http-service-ssl-keystore">"http-service-ssl-keystore"</a> + * property + */ + String HTTP_SERVICE_SSL_KEYSTORE = "http-service-ssl-keystore"; + /** + * The static definition of the <a href="DistributedSystem.html#http-service-ssl-keystore-password">"http-service-ssl-keystore-password"</a> + * property + */ + String HTTP_SERVICE_SSL_KEYSTORE_PASSWORD = "http-service-ssl-keystore-password"; + /** + * The static definition of the <a href="DistributedSystem.html#http-service-ssl-keystore-type">"http-service-ssl-keystore-type"</a> + * property + */ + String HTTP_SERVICE_SSL_KEYSTORE_TYPE = "http-service-ssl-keystore-type"; + /** + * The static definition of the <a href="DistributedSystem.html#http-service-ssl-protocols">"http-service-ssl-protocols"</a> + * property + */ + String HTTP_SERVICE_SSL_PROTOCOLS = "http-service-ssl-protocols"; + /** + * The static definition of the <a href="DistributedSystem.html#http-service-ssl-require-authentication">"http-service-ssl-require-authentication"</a> + * property + */ + String HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION = "http-service-ssl-require-authentication"; + /** + * The static definition of the <a href="DistributedSystem.html#http-service-ssl-truststore">"http-service-ssl-truststore"</a> + * property + */ + String HTTP_SERVICE_SSL_TRUSTSTORE = "http-service-ssl-truststore"; + /** + * The static definition of the <a href="DistributedSystem.html#http-service-ssl-truststore-password">"http-service-ssl-truststore-password"</a> + * property + */ + String HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD = "http-service-ssl-truststore-password"; + /** + * The static definition of the <a href="DistributedSystem.html#jmx-manager">"jmx-manager"</a> + * property + */ + String JMX_MANAGER = "jmx-manager"; + /** + * The static definition of the <a href="DistributedSystem.html#jmx-manager-access-file">"jmx-manager-access-file"</a> + * property + */ + String JMX_MANAGER_ACCESS_FILE = "jmx-manager-access-file"; + /** + * The static definition of the <a href="DistributedSystem.html#jmx-manager-bind-address">"jmx-manager-bind-address"</a> + * property + */ + String JMX_MANAGER_BIND_ADDRESS = "jmx-manager-bind-address"; + /** + * The static definition of the <a href="DistributedSystem.html#jmx-manager-hostname-for-clients">"jmx-manager-hostname-for-clients"</a> + * property + */ + String JMX_MANAGER_HOSTNAME_FOR_CLIENTS = "jmx-manager-hostname-for-clients"; + /** + * The static definition of the <a href="DistributedSystem.html#jmx-manager-http-port">"jmx-manager-http-port"</a> + * property + * + * @deprecated as of GemFire 8.0 use {@link #HTTP_SERVICE_PORT} instead. + */ + String JMX_MANAGER_HTTP_PORT = "jmx-manager-http-port"; + /** + * The static definition of the <a href="DistributedSystem.html#jmx-manager-password-file">"jmx-manager-password-file"</a> + * property + */ + String JMX_MANAGER_PASSWORD_FILE = "jmx-manager-password-file"; + /** + * The static definition of the <a href="DistributedSystem.html#jmx-manager-port">"jmx-manager-port"</a> + * property + */ + String JMX_MANAGER_PORT = "jmx-manager-port"; + /** + * * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl">"jmx-manager-ssl"</a> + * property + * @deprecated as of GemFire 8.0 use {@link #JMX_MANAGER_SSL_ENABLED} instead. + */ + String JMX_MANAGER_SSL = "jmx-manager-ssl"; + /** + * The static definition of the <a href="DistributedSystem.html#jmx-manager-start">"jmx-manager-start"</a> + * property + */ + String JMX_MANAGER_START = "jmx-manager-start"; + /** + * The static definition of the <a href="DistributedSystem.html#jmx-manager-update-rate">"jmx-manager-update-rate"</a> + * property + */ + String JMX_MANAGER_UPDATE_RATE = "jmx-manager-update-rate"; + /** + * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-ciphers">"jmx-manager-ssl-ciphers"</a> + * property + */ + String JMX_MANAGER_SSL_CIPHERS = "jmx-manager-ssl-ciphers"; + /** + * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-enabled">"jmx-manager-ssl-enabled"</a> + * property + */ + String JMX_MANAGER_SSL_ENABLED = "jmx-manager-ssl-enabled"; + /** + * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-keystore">"jmx-manager-ssl-keystore"</a> + * property + */ + String JMX_MANAGER_SSL_KEYSTORE = "jmx-manager-ssl-keystore"; + /** + * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-keystore-password">"jmx-manager-ssl-keystore-password"</a> + * property + */ + String JMX_MANAGER_SSL_KEYSTORE_PASSWORD = "jmx-manager-ssl-keystore-password"; + /** + * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-keystore-type">"jmx-manager-ssl-keystore-type"</a> + * property + */ + String JMX_MANAGER_SSL_KEYSTORE_TYPE = "jmx-manager-ssl-keystore-type"; + /** + * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-protocols">"jmx-manager-ssl-protocols"</a> + * property + */ + String JMX_MANAGER_SSL_PROTOCOLS = "jmx-manager-ssl-protocols"; + /** + * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-require-authentication">"jmx-manager-ssl-require-authentication"</a> + * property + */ + String JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION = "jmx-manager-ssl-require-authentication"; + /** + * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-truststore">"jmx-manager-ssl-truststore"</a> + * property + */ + String JMX_MANAGER_SSL_TRUSTSTORE = "jmx-manager-ssl-truststore"; + /** + * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-truststore-password">"jmx-manager-ssl-truststore-password"</a> + * property + */ + String JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD = "jmx-manager-ssl-truststore-password"; + String LICENCE_APPLICATION_CACHE = "license-application-cache"; + String LICENCE_DATA_MANAGEMENT = "license-data-management"; + String LICENCE_SERVER_TIMEOUT = "license-server-timeout"; + String LICENCE_WORKING_DIR = "license-working-dir"; + /** + * The static definition of the <a href="DistributedSystem.html#load-cluster-configuration-from-dir">"load-cluster-configuration-from-dir"</a> + * property + */ + String LOAD_CLUSTER_CONFIGURATION_FROM_DIR = "load-cluster-configuration-from-dir"; + /** + * The static definition of the <a href="DistributedSystem.html#locator-wait-time">"locator-wait-time"</a> + * property + */ + String LOCATOR_WAIT_TIME = "locator-wait-time"; + /** + * The static definition of the <a href="DistributedSystem.html#locators">"locators"</a> + * property + */ + String LOCATORS = "locators"; + /** + * The static definition of the <a href="DistributedSystem.html#log-disk-space-limit">"log-disk-space-limit"</a> + * property + */ + String LOG_DISK_SPACE_LIMIT = "log-disk-space-limit"; + /** + * The static definition of the <a href="DistributedSystem.html#log-file">"log-file"</a> + * property + */ + String LOG_FILE = "log-file"; + /** + * The static definition of the <a href="DistributedSystem.html#log-file-size-limit">"log-file-size-limit"</a> + * property + */ + String LOG_FILE_SIZE_LIMIT = "log-file-size-limit"; + /** + * The static definition of the <a href="DistributedSystem.html#log-level">"log-level"</a> + * property + */ + String LOG_LEVEL = "log-level"; + /** + * The static definition of the <a href="DistributedSystem.html#max-num-reconnect-tries">"max-num-reconnect-tries"</a> + * property + */ + String MAX_NUM_RECONNECT_TRIES = "max-num-reconnect-tries"; + /** + * The static definition of the <a href="DistributedSystem.html#max-wait-time-reconnect">"max-wait-time-reconnect"</a> + * property + */ + String MAX_WAIT_TIME_RECONNECT = "max-wait-time-reconnect"; + /** + * The static definition of the <a href="DistributedSystem.html#mcast-address">"mcast-address"</a> + * property + */ + String MCAST_ADDRESS = "mcast-address"; + /** + * The static definition of the <a href="DistributedSystem.html#mcast-flow-control">"mcast-flow-control"</a> + * property + */ + String MCAST_FLOW_CONTROL = "mcast-flow-control"; + /** + * The static definition of the <a href="DistributedSystem.html#mcast-port">"mcast-port"</a> + * property + */ + String MCAST_PORT = "mcast-port"; + /** + * The static definition of the <a href="DistributedSystem.html#mcast-recv-buffer-size">"mcast-recv-buffer-size"</a> + * property + */ + String MCAST_RECV_BUFFER_SIZE = "mcast-recv-buffer-size"; + /** + * The static definition of the <a href="DistributedSystem.html#mcast-send-buffer-size">"mcast-send-buffer-size"</a> + * property + */ + String MCAST_SEND_BUFFER_SIZE = "mcast-send-buffer-size"; + /** + * The static definition of the <a href="DistributedSystem.html#mcast-ttl">"mcast-ttl"</a> + * property + */ + String MCAST_TTL = "mcast-ttl"; + /** + * The static definition of the <a href="DistributedSystem.html#member-timeout">"member-timeout"</a> + * property + */ + String MEMBER_TIMEOUT = "member-timeout"; + /** + * The static definition of the <a href="DistributedSystem.html#membership-port-range">"membership-port-range"</a> + * property + */ + String MEMBERSHIP_PORT_RANGE = "membership-port-range"; + /** + * The static definition of the <a href="DistributedSystem.html#memcached-bind-address">"memcached-bind-address"</a> + * property + */ + String MEMCACHED_BIND_ADDRESS = "memcached-bind-address"; + /** + * The static definition of the <a href="DistributedSystem.html#memcached-port">"memcached-port"</a> + * property + */ + String MEMCACHED_PORT = "memcached-port"; + /** + * The static definition of the <a href="DistributedSystem.html#memcached-protocol">"memcached-protocol"</a> + * property + */ + String MEMCACHED_PROTOCOL = "memcached-protocol"; + /** + * The static definition of the <a href="DistributedSystem.html#name">"name"</a> + * property + */ + String NAME = "name"; + /** + * The static definition of the <a href="DistributedSystem.html#redundancy-zone">"redundancy-zone"</a> + * property + */ + String REDUNDANCY_ZONE = "redundancy-zone"; + /** + * The static definition of the <a href="DistributedSystem.html#remote-locators">"remote-locators"</a> + * property + */ + String REMOTE_LOCATORS = "remote-locators"; + /** + * The static definition of the <a href="DistributedSystem.html#remove-unresponsive-client">"remove-unresponsive-client"</a> + * property + */ + String REMOVE_UNRESPONSIVE_CLIENT = "remove-unresponsive-client"; + /** + * The static definition of the <a href="DistributedSystem.html#roles">"roles"</a> + * property + */ + String ROLES = "roles"; + /** + * The static definition of the security prefix "security-" used in conjuntion with other security-* properties</a> + * property + */ + String SECURITY_PREFIX = "security-"; + /** + * The static definition of the <a href="DistributedSystem.html#security-client-accessor">"security-client-accessor"</a> + * property + */ + String SECURITY_CLIENT_ACCESSOR = SECURITY_PREFIX + "client-accessor"; + /** + * The static definition of the <a href="DistributedSystem.html#security-client-accessor-pp">"security-client-accessor-pp"</a> + * property + */ + String SECURITY_CLIENT_ACCESSOR_PP = SECURITY_PREFIX + "client-accessor-pp"; + /** + * The static definition of the <a href="DistributedSystem.html#security-client-auth-init">"security-client-auth-init"</a> + * property + */ + String SECURITY_CLIENT_AUTH_INIT = SECURITY_PREFIX + "client-auth-init"; + /** + * The static definition of the <a href="DistributedSystem.html#security-client-authenticator">"security-client-authenticator"</a> + * property + */ + String SECURITY_CLIENT_AUTHENTICATOR = SECURITY_PREFIX + "client-authenticator"; + /** + * The static definition of the <a href="DistributedSystem.html#security-client-dhalgo">"security-client-dhalgo"</a> + * property + */ + String SECURITY_CLIENT_DHALGO = SECURITY_PREFIX + "client-dhalgo"; + /** + * The static definition of the <a href="DistributedSystem.html#security-udp-dhalgo">"security-udp-dhalgo"</a> + * property + */ + String SECURITY_UDP_DHALGO = SECURITY_PREFIX + "udp-dhalgo"; + /** + * The static definition of the <a href="DistributedSystem.html#security-log-file">"security-log-file"</a> + * property + */ + String SECURITY_LOG_FILE = SECURITY_PREFIX + "log-file"; + /** + * The static definition of the <a href="DistributedSystem.html#security-log-level">"security-log-level"</a> + * property + */ + String SECURITY_LOG_LEVEL = SECURITY_PREFIX + "log-level"; + /** + * The static definition of the <a href="DistributedSystem.html#security-peer-auth-init">"security-peer-auth-init"</a> + * property + */ + String SECURITY_PEER_AUTH_INIT = SECURITY_PREFIX + "peer-auth-init"; + /** + * The static definition of the <a href="DistributedSystem.html#security-peer-authenticator">"security-peer-authenticator"</a> + * property + */ + String SECURITY_PEER_AUTHENTICATOR = SECURITY_PREFIX + "peer-authenticator"; + /** + * The static definition of the <a href="DistributedSystem.html#security-peer-verifymember-timeout">"security-peer-verifymember-timeout"</a> + * property + */ + String SECURITY_PEER_VERIFY_MEMBER_TIMEOUT = SECURITY_PREFIX + "peer-verifymember-timeout"; + /** + * The static definition of the <a href="DistributedSystem.html#server-bind-address">"server-bind-address"</a> + * property + */ + String SERVER_BIND_ADDRESS = "server-bind-address"; + /** + * The static definition of the <a href="DistributedSystem.html#server-ssl-ciphers">"server-ssl-ciphers"</a> + * property + */ + String SERVER_SSL_CIPHERS = "server-ssl-ciphers"; + /** + * The static definition of the <a href="DistributedSystem.html#server-ssl-enabled">"server-ssl-enabled"</a> + * property + */ + String SERVER_SSL_ENABLED = "server-ssl-enabled"; + /** + * The static definition of the <a href="DistributedSystem.html#server-ssl-keystore">"server-ssl-keystore"</a> + * property + */ + String SERVER_SSL_KEYSTORE = "server-ssl-keystore"; + /** + * The static definition of the <a href="DistributedSystem.html#server-ssl-keystore-password">"server-ssl-keystore-password"</a> + * property + */ + String SERVER_SSL_KEYSTORE_PASSWORD = "server-ssl-keystore-password"; + /** + * The static definition of the <a href="DistributedSystem.html#server-ssl-keystore-type">"server-ssl-keystore-type"</a> + * property + */ + String SERVER_SSL_KEYSTORE_TYPE = "server-ssl-keystore-type"; + /** + * The static definition of the <a href="DistributedSystem.html#server-ssl-protocols">"server-ssl-protocols"</a> + * property + */ + String SERVER_SSL_PROTOCOLS = "server-ssl-protocols"; + /** + * The static definition of the <a href="DistributedSystem.html#server-ssl-require-authentication">"server-ssl-require-authentication"</a> + * property + */ + String SERVER_SSL_REQUIRE_AUTHENTICATION = "server-ssl-require-authentication"; + /** + * The static definition of the <a href="DistributedSystem.html#server-ssl-truststore">"server-ssl-truststore"</a> + * property + */ + String SERVER_SSL_TRUSTSTORE = "server-ssl-truststore"; + /** + * The static definition of the <a href="DistributedSystem.html#server-ssl-truststore-password">"server-ssl-truststore-password"</a> + * property + */ + String SERVER_SSL_TRUSTSTORE_PASSWORD = "server-ssl-truststore-password"; + /** + * The static definition of the <a href="DistributedSystem.html#socket-buffer-size">"socket-buffer-size"</a> + * property + */ + String SOCKET_BUFFER_SIZE = "socket-buffer-size"; + /** + * The static definition of the <a href="DistributedSystem.html#socket-lease-time">"socket-lease-time"</a> + * property + */ + String SOCKET_LEASE_TIME = "socket-lease-time"; + /** + * The static definition of the <a href="DistributedSystem.html#start-dev-rest-api">"start-dev-rest-api"</a> + * property + */ + String START_DEV_REST_API = "start-dev-rest-api"; + /** + * The static definition of the <a href="DistributedSystem.html#start-locator">"start-locator"</a> + * property + */ + String START_LOCATOR = "start-locator"; + /** + * The static definition of the <a href="DistributedSystem.html#statistic-archive-file">"statistic-archive-file"</a> + * property + */ + String STATISTIC_ARCHIVE_FILE = "statistic-archive-file"; + /** + * The static definition of the <a href="DistributedSystem.html#statistic-sample-rate">"statistic-sample-rate"</a> + * property + */ + String STATISTIC_SAMPLE_RATE = "statistic-sample-rate"; + /** + * The static definition of the <a href="DistributedSystem.html#statistic-sampling-enabled">"statistic-sampling-enabled"</a> + * property + */ + String STATISTIC_SAMPLING_ENABLED = "statistic-sampling-enabled"; + /** + * The static definition of the <a href="DistributedSystem.html#tcp-port">"tcp-port"</a> + * property + */ + String TCP_PORT = "tcp-port"; + /** + * The static definition of the <a href="DistributedSystem.html#udp-fragment-size">"udp-fragment-size"</a> + * property + */ + String UDP_FRAGMENT_SIZE = "udp-fragment-size"; + /** + * The static definition of the <a href="DistributedSystem.html#udp-recv-buffer-size">"udp-recv-buffer-size"</a> + * property + */ + String UDP_RECV_BUFFER_SIZE = "udp-recv-buffer-size"; + /** + * The static definition of the <a href="DistributedSystem.html#udp-send-buffer-size">"udp-send-buffer-size"</a> + * property + */ + String UDP_SEND_BUFFER_SIZE = "udp-send-buffer-size"; + /** + * The static definition of the <a href="DistributedSystem.html#use-cluster-configuration">"use-cluster-configuration"</a> + * property + */ + String USE_CLUSTER_CONFIGURATION = "use-cluster-configuration"; + /** + * The static definition of the <a href="DistributedSystem.html#user-command-packages">"user-command-packages"</a> + * property + */ + String USER_COMMAND_PACKAGES = "user-command-packages"; + /** + * The static definition of the <a href="DistributedSystem.html#off-heap-memory-size">"off-heap-memory-size"</a> + * property + */ + String OFF_HEAP_MEMORY_SIZE = "off-heap-memory-size"; + /** + * The static definition of the <a href="DistributedSystem.html#redis-port">"redis-port"</a> + * property + */ + String REDIS_PORT = "redis-port"; + /** + * The static definition of the <a href="DistributedSystem.html#redis-bind-address">"redis-bind-address"</a> + * property + */ + String REDIS_BIND_ADDRESS = "redis-bind-address"; + /** + * The static definition of the <a href="DistributedSystem.html#redis-password">"redis-password"</a> + * property + */ + String REDIS_PASSWORD = "redis-password"; + /** + * The static definition of the <a href="DistributedSystem.html#lock-memory">"lock-memory"</a> + * property + */ + String LOCK_MEMORY = "lock-memory"; + /** + * The static definition of the <a href="DistributedSystem.html#shiro-init">"shiro-init"</a> + * property + */ + String SECURITY_SHIRO_INIT = SECURITY_PREFIX + "shiro-init"; + /** + * The static definition of the <a href="DistributedSystem.html#distributed-transactions">"distributed-transactions"</a> + * property + */ + String DISTRIBUTED_TRANSACTIONS = "distributed-transactions"; + /** + * The static definition of the <a href="DistributedSystem.html#ssl-enabled">"ssl-enabled"</a> + * property + * + * @deprecated as of Gemfire 8.0 use {@link #CLUSTER_SSL_ENABLED} instead. + */ + String SSL_ENABLED = "ssl-enabled"; + /** + * The static definition of the <a href="DistributedSystem.html#ssl-protocols">"ssl-protocols"</a> + * property + * + * @deprecated as of GemFire 8.0 use {@link #CLUSTER_SSL_PROTOCOLS} instead. + */ + String SSL_PROTOCOLS = "ssl-protocols"; + /** + * The static definition of the <a href="DistributedSystem.html#ssl-ciphers">"ssl-ciphers"</a> + * property + * + * @deprecated as of GemFire 8.0 use {@link #CLUSTER_SSL_CIPHERS} instead. + */ + String SSL_CIPHERS = "ssl-ciphers"; + /** + * The static definition of the <a href="DistributedSystem.html#ssl-require-authentication">"ssl-require-authentication"</a> + * property + * + * @deprecated as of GemFire 8.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION} instead. + */ + String SSL_REQUIRE_AUTHENTICATION = "ssl-require-authentication"; +} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de16ac4d/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java index cc544f6..d4c3b90 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java @@ -971,6 +971,10 @@ public abstract class AbstractDistributionConfig m.put(SECURITY_CLIENT_DHALGO, LocalizedStrings.AbstractDistributionConfig_SECURITY_CLIENT_DHALGO_NAME_0 .toLocalizedString(DEFAULT_SECURITY_CLIENT_DHALGO)); + + m.put(SECURITY_UDP_DHALGO, + LocalizedStrings.AbstractDistributionConfig_SECURITY_UDP_DHALGO_NAME_0 + .toLocalizedString(DEFAULT_SECURITY_UDP_DHALGO)); m.put(SECURITY_PEER_AUTH_INIT, LocalizedStrings.AbstractDistributionConfig_SECURITY_PEER_AUTH_INIT_NAME_0 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de16ac4d/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java index 2ff6540..e122189 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java @@ -2157,13 +2157,28 @@ public interface DistributionConfig extends Config, LogConfig { */ @ConfigAttributeGetter(name = SECURITY_CLIENT_DHALGO) String getSecurityClientDHAlgo(); - + /** * Set the name of algorithm to use for Diffie-Hellman key exchange {@link ConfigurationProperties#SECURITY_CLIENT_DHALGO} * property. */ @ConfigAttributeSetter(name = SECURITY_CLIENT_DHALGO) void setSecurityClientDHAlgo(String attValue); + + /** + * Returns name of algorithm to use for Diffie-Hellman key exchange <a + * href="../DistributedSystem.html#security-udp-dhalgo">"security-udp-dhalgo"</a> + */ + @ConfigAttributeGetter(name = SECURITY_UDP_DHALGO) + String getSecurityUDPDHAlgo(); + + /** + * Set the name of algorithm to use for Diffie-Hellman key exchange <a + * href="../DistributedSystem.html#security-udp-dhalgo">"security-udp-dhalgo"</a> + * property. + */ + @ConfigAttributeSetter(name = SECURITY_UDP_DHALGO) + void setSecurityUDPDHAlgo(String attValue); /** * The name of the Diffie-Hellman symmetric algorithm {@link ConfigurationProperties#SECURITY_CLIENT_DHALGO} @@ -2171,6 +2186,13 @@ public interface DistributionConfig extends Config, LogConfig { */ @ConfigAttribute(type = String.class) String SECURITY_CLIENT_DHALGO_NAME = SECURITY_CLIENT_DHALGO; + + /** + * The name of the Diffie-Hellman symmetric algorithm "security-client-dhalgo" + * property. + */ + @ConfigAttribute(type = String.class) + String SECURITY_UDP_DHALGO_NAME = SECURITY_UDP_DHALGO; /** * The default Diffie-Hellman symmetric algorithm name. @@ -2179,6 +2201,14 @@ public interface DistributionConfig extends Config, LogConfig { * JDK like "DES", "DESede", "AES", "Blowfish". */ String DEFAULT_SECURITY_CLIENT_DHALGO = ""; + + /** + * The default Diffie-Hellman symmetric algorithm name. + * <p> + * Actual value of this is one of the available symmetric algorithm names in + * JDK like "DES", "DESede", "AES", "Blowfish". + */ + String DEFAULT_SECURITY_UDP_DHALGO = ""; /** * Returns user defined method name for peer authentication initializer in {@link ConfigurationProperties#SECURITY_PEER_AUTH_INIT} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de16ac4d/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java index fd4743b..2ebb7d0 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java @@ -225,6 +225,9 @@ public class DistributionConfigImpl /** The client Diffie-Hellman method name*/ private String securityClientDHAlgo = DEFAULT_SECURITY_CLIENT_DHALGO; + + /** The udp Diffie-Hellman method name*/ + private String securityUDPDHAlgo = DEFAULT_SECURITY_UDP_DHALGO; /** The peer authentication initialization method name*/ private String securityPeerAuthInit = DEFAULT_SECURITY_PEER_AUTH_INIT; @@ -487,6 +490,7 @@ public class DistributionConfigImpl this.securityClientAuthInit = other.getSecurityClientAuthInit(); this.securityClientAuthenticator = other.getSecurityClientAuthenticator(); this.securityClientDHAlgo = other.getSecurityClientDHAlgo(); + this.securityUDPDHAlgo = other.getSecurityUDPDHAlgo(); this.securityPeerAuthInit = other.getSecurityPeerAuthInit(); this.securityPeerAuthenticator = other.getSecurityPeerAuthenticator(); this.securityClientAccessor = other.getSecurityClientAccessor(); @@ -1967,10 +1971,18 @@ public class DistributionConfigImpl public String getSecurityClientDHAlgo() { return securityClientDHAlgo; } - + public void setSecurityClientDHAlgo(String value) { securityClientDHAlgo = (String)checkAttribute(SECURITY_CLIENT_DHALGO, value); } + + public String getSecurityUDPDHAlgo() { + return securityUDPDHAlgo; + } + + public void setSecurityUDPDHAlgo(String value) { + securityUDPDHAlgo = (String)checkAttribute(SECURITY_UDP_DHALGO, value); + } public String getSecurityPeerAuthInit() { return securityPeerAuthInit; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de16ac4d/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java index 2d8b8e1..067b71b 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java @@ -581,6 +581,10 @@ public class InternalDistributedMember } public int compareTo(DistributedMember o, boolean checkNetMembersIfEqual) { + return compareTo(o, checkNetMembersIfEqual, true); + } + + public int compareTo(DistributedMember o, boolean checkNetMembersIfEqual, boolean verifyViewId) { if (this == o) { return 0; } @@ -647,13 +651,15 @@ public class InternalDistributedMember } if (this.uniqueTag == null && other.uniqueTag == null) { - // not loners, so look at P2P view ID - if (this.vmViewId >= 0 && other.vmViewId >= 0) { - if (this.vmViewId < other.vmViewId) { - return -1; - } else if (this.vmViewId > other.vmViewId) { - return 1; - } // else they're the same, so continue + if (verifyViewId) { + // not loners, so look at P2P view ID + if (this.vmViewId >= 0 && other.vmViewId >= 0) { + if (this.vmViewId < other.vmViewId) { + return -1; + } else if (this.vmViewId > other.vmViewId) { + return 1; + } // else they're the same, so continue + } } } else if (this.uniqueTag == null) { return -1; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de16ac4d/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java index 2ce1058..840070c 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java @@ -876,17 +876,15 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler { private void addPublickeysToView(NetView view) { //TODO: is this check is correct - if (services != null && services.getConfig() != null && services.getConfig().getDistributionConfig() != null) { - String sDHAlgo = services.getConfig().getDistributionConfig().getSecurityClientDHAlgo(); - if (sDHAlgo != null && !sDHAlgo.isEmpty()) { - List<InternalDistributedMember> mbrs = view.getMembers(); - Iterator<InternalDistributedMember> itr = mbrs.iterator(); + String sDHAlgo = services.getConfig().getDistributionConfig().getSecurityUDPDHAlgo(); + if (sDHAlgo != null && !sDHAlgo.isEmpty()) { + List<InternalDistributedMember> mbrs = view.getMembers(); + Iterator<InternalDistributedMember> itr = mbrs.iterator(); - while (itr.hasNext()) { - InternalDistributedMember mbr = itr.next(); - byte[] pk = services.getMessenger().getPublickey(mbr); - view.setPublicKey(mbr, pk); - } + while (itr.hasNext()) { + InternalDistributedMember mbr = itr.next(); + byte[] pk = services.getMessenger().getPublickey(mbr); + view.setPublicKey(mbr, pk); } } } @@ -1123,7 +1121,7 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler { state.responses.clear(); } - if (!services.getConfig().getDistributionConfig().getSecurityClientDHAlgo().isEmpty()) { + if (!services.getConfig().getDistributionConfig().getSecurityUDPDHAlgo().isEmpty()) { for (InternalDistributedMember mbr : v.getMembers()) { Set<InternalDistributedMember> r = new HashSet<>(); r.add(mbr); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de16ac4d/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncrypt.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncrypt.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncrypt.java index 2a6947b..fe2bb2d 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncrypt.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncrypt.java @@ -76,7 +76,7 @@ public class GMSEncrypt implements Cloneable{ private ConcurrentHashMap<InternalDistributedMember, PeerEncryptor>[] copyOfPeerEncryptors; private ClusterEncryptor[] clusterEncryptors; - private Map<InternalDistributedMember, byte[]> memberToPeerEncryptor = new ConcurrentHashMap<>(); + private Map<GMSEncrypt.InternalDistrubtedMemberWrapper, byte[]> memberToPeerEncryptor = new ConcurrentHashMap<>(); private ClusterEncryptor clusterEncryptor; @@ -168,7 +168,7 @@ public class GMSEncrypt implements Cloneable{ protected void setPublicKey(byte[] publickey, InternalDistributedMember mbr) { try { //createPeerEncryptor(mbr, publickey); - memberToPeerEncryptor.put(mbr, publickey); + memberToPeerEncryptor.put(new InternalDistrubtedMemberWrapper(mbr), publickey); synchronized (copyOfPeerEncryptors) { //remove all the existing keys.. for(Map m : copyOfPeerEncryptors) { @@ -211,7 +211,7 @@ public class GMSEncrypt implements Cloneable{ */ private void initDHKeys(DistributionConfig config) throws Exception { - dhSKAlgo = config.getSecurityClientDHAlgo(); + dhSKAlgo = config.getSecurityUDPDHAlgo(); // Initialize the keys when either the host is a peer that has // non-blank setting for DH symmetric algo, or this is a server // that has authenticator defined. @@ -227,6 +227,34 @@ public class GMSEncrypt implements Cloneable{ } } + static class InternalDistrubtedMemberWrapper { + InternalDistributedMember mbr; + + public InternalDistrubtedMemberWrapper(InternalDistributedMember m) { + this.mbr = m; + } + + public InternalDistributedMember getMbr() { + return mbr; + } + + @Override + public int hashCode() { + return mbr.hashCode(); + } + + @Override + public boolean equals(Object obj) { + InternalDistributedMember other = ((InternalDistrubtedMemberWrapper)obj).mbr; + return mbr.compareTo(other, false, false) == 0; + } + + @Override + public String toString() { + return "InternalDistrubtedMemberWrapper [mbr=" + mbr + "]"; + } + } + protected PeerEncryptor getPeerEncryptor(InternalDistributedMember member) throws Exception { Map<InternalDistributedMember, PeerEncryptor> m = getPeerEncryptorMap(); @@ -235,7 +263,7 @@ public class GMSEncrypt implements Cloneable{ synchronized (this) { result = m.get(member); if (result == null) { - byte[] pk = (byte[])memberToPeerEncryptor.get(member); + byte[] pk = (byte[])memberToPeerEncryptor.get(new InternalDistrubtedMemberWrapper(member)); result = createPeerEncryptor(member, pk != null ? pk : (byte[]) view.getPublicKey(member)); m.put(member, result); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de16ac4d/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java index 42064cf..178cc08 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java @@ -282,7 +282,7 @@ public class JGroupsMessenger implements Messenger { this.jgStackConfig = properties; - if ( !dc.getSecurityClientDHAlgo().isEmpty() ) { + if ( !dc.getSecurityUDPDHAlgo().isEmpty() ) { try { this.encrypt = new GMSEncrypt(services); logger.info("Initializing GMSEncrypt "); @@ -1105,7 +1105,15 @@ public class JGroupsMessenger implements Messenger { setSender(result, m, ordinal); if (pk != null) { - encryptLocal.setPublicKey(pk, result.getSender()); + + /*InternalDistributedMember mbr = null; + if (result instanceof JoinRequestMessage) { + mbr = ((JoinRequestMessage)result).getMemberID(); + } else { + mbr = ((FindCoordinatorRequest)result).getMemberID(); + }*/ + logger.info("Setting public key for " + result.getSender() + " len " + pk.length); + setPublicKey(pk, result.getSender()); } return result; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de16ac4d/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java index 95bf700..d2965d4 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java @@ -2400,7 +2400,7 @@ public class LocalizedStrings { public static final StringId GemFireCacheImpl_STARTING_GEMFIRE_MEMCACHED_SERVER_ON_PORT_0_FOR_1_PROTOCOL = new StringId(3868, "Starting GemFireMemcachedServer on port {0} for {1} protocol"); public static final StringId TransactionManagerImpl_TRANSACTIONMANAGERIMPL_SETTRANSACTIONTIMEOUT_TRANSACTION_HAS_EITHER_EXPIRED_OR_ROLLEDBACK_OR_COMITTED = new StringId(3869, "Transaction has either expired or rolledback or comitted"); public static final StringId TransactionManagerImpl_TRANSACTIONMANAGERIMPL_RESUME_CANNOT_RESUME_A_NULL_TRANSACTION = new StringId(3870, "cannot resume a null transaction"); - public static final StringId AbstractDistributionConfig_SECURITY_CLIENT_DHALGO_NAME_0 = new StringId(3871, "User defined name for the symmetric encryption algorithm to use in Diffie-Hellman key exchange for encryption of credentials. Defaults to \"{0}\". Legal values can be any of the available symmetric algorithm names in JDK like \"DES\", \"DESede\", \"AES\", \"Blowfish\". It may be required to install Unlimited Strength Jurisdiction Policy Files from Sun for some symmetric algorithms to work (like \"AES\")"); + public static final StringId AbstractDistributionConfig_SECURITY_CLIENT_DHALGO_NAME_0 = new StringId(3871, "User defined name for the symmetric encryption algorithm to use in Diffie-Hellman key exchange for encryption of credentials. Defaults to \"{0}\". Legal values can be any of the available symmetric algorithm names in JDK like \"DES\", \"DESede\", \"AES\", \"Blowfish\". It may be required to install Unlimited Strength Jurisdiction Policy Files from Sun for some symmetric algorithms to work (like \"AES\")"); public static final StringId TransactionManagerImpl_TRANSACTIONMANAGERIMPL_RESUME_ERROR_IN_LISTING_THREAD_TO_TRANSACTION_MAP_DUE_TO_0 = new StringId(3872, "Error in listing thread to transaction map due to {0}"); public static final StringId TransactionManagerImpl_TRANSACTIONMANAGERIMPL_GETGLOBALTRANSACTION_NO_TRANSACTION_EXISTS = new StringId(3873, "no transaction exists"); public static final StringId UserTransactionImpl_USERTRANSACTIONIMPL_SETTRANSACTIONTIMEOUT_CANNOT_SET_A_NEGATIVE_TIME_OUT_FOR_TRANSACTIONS = new StringId(3874, "Cannot set a negative Time Out for transactions"); @@ -2495,6 +2495,7 @@ public class LocalizedStrings { public static final StringId PasswordUtil_ENCRYPTED_TO_0 = new StringId(3981, "Encrypted to {0}"); public static final StringId DistributionManager_SHUTDOWN_MESSAGE_THREAD_FOR_0 = new StringId(3982, "Shutdown Message Thread for {0}"); public static final StringId HealthMonitorImpl_HEALTH_MONITOR_OWNED_BY_0 = new StringId(3983, "Health Monitor owned by {0}"); + public static final StringId AbstractDistributionConfig_SECURITY_UDP_DHALGO_NAME_0 = new StringId(3984, "User defined name for the symmetric encryption algorithm to use in Diffie-Hellman key exchange for encryption of udp messages. Defaults to \"{0}\". Legal values can be any of the available symmetric algorithm names in JDK like \"DES\", \"DESede\", \"AES\", \"Blowfish\". It may be required to install Unlimited Strength Jurisdiction Policy Files from Sun for some symmetric algorithms to work (like \"AES\")"); // ok to reuse 3984 public static final StringId InternalDistributedSystem_COULD_NOT_RENAME_0_TO_1 = new StringId(3985, "Could not rename \"{0}\" to \"{1}\"."); public static final StringId InternalDistributedSystem_RENAMED_OLD_LOG_FILE_TO_0 = new StringId(3986, "Renamed old log file to \"{0}\"."); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de16ac4d/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java index e180326..033fe67 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java @@ -254,7 +254,7 @@ public class DistributedMulticastRegionDUnitTest extends JUnit4CacheTestCase { p.put(MCAST_TTL, mcastttl); p.put(LOCATORS, "localhost[" + locatorPort + "]"); p.put(LOG_LEVEL, "info"); - p.put(DistributionConfig.SECURITY_CLIENT_DHALGO_NAME, "AES:128"); + p.put(SECURITY_UDP_DHALGO, "AES:128"); return p; } @@ -287,7 +287,7 @@ public class DistributedMulticastRegionDUnitTest extends JUnit4CacheTestCase { locatorProps.setProperty(DistributionConfig.MCAST_PORT_NAME, mcastport); locatorProps.setProperty(DistributionConfig.MCAST_TTL_NAME, mcastttl); locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); - locatorProps.setProperty(DistributionConfig.SECURITY_CLIENT_DHALGO_NAME, "AES:128"); + locatorProps.setProperty(SECURITY_UDP_DHALGO, "AES:128"); //locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true"); try { final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, null, null, http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de16ac4d/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectWithUDPSecurityDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectWithUDPSecurityDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectWithUDPSecurityDUnitTest.java index 956d1fe..23762a6 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectWithUDPSecurityDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectWithUDPSecurityDUnitTest.java @@ -3,7 +3,7 @@ package com.gemstone.gemfire.cache30; import java.util.Properties; import com.gemstone.gemfire.distributed.internal.DistributionConfig; - +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; public class ReconnectWithUDPSecurityDUnitTest extends ReconnectDUnitTest{ public ReconnectWithUDPSecurityDUnitTest() { @@ -12,6 +12,6 @@ public class ReconnectWithUDPSecurityDUnitTest extends ReconnectDUnitTest{ @Override protected void addDSProps(Properties p) { - p.setProperty(DistributionConfig.SECURITY_CLIENT_DHALGO_NAME, "AES:128"); + p.setProperty(SECURITY_UDP_DHALGO, "AES:128"); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de16ac4d/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorUDPSecurityDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorUDPSecurityDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorUDPSecurityDUnitTest.java index be88d50..be24f39 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorUDPSecurityDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorUDPSecurityDUnitTest.java @@ -5,6 +5,7 @@ import java.util.Properties; import org.junit.Test; import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; public class LocatorUDPSecurityDUnitTest extends LocatorDUnitTest{ @@ -22,6 +23,6 @@ public class LocatorUDPSecurityDUnitTest extends LocatorDUnitTest{ @Override protected void addDSProps(Properties p) { - p.setProperty(DistributionConfig.SECURITY_CLIENT_DHALGO_NAME, "AES:128"); + p.setProperty(SECURITY_UDP_DHALGO, "AES:128"); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de16ac4d/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java index bd1c9fe..14884de 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java @@ -36,6 +36,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import com.gemstone.gemfire.GemFireConfigException; +import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties; import com.gemstone.gemfire.distributed.Locator; import com.gemstone.gemfire.distributed.internal.*; import com.gemstone.gemfire.distributed.internal.membership.gms.GMSUtil; @@ -49,6 +50,7 @@ import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.SocketCreator; import com.gemstone.gemfire.internal.admin.remote.RemoteTransportConfig; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; + import org.apache.logging.log4j.Level; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -259,7 +261,7 @@ public class MembershipJUnitTest { nonDefault.put(DistributionConfig.GROUPS_NAME, "red, blue"); nonDefault.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000"); nonDefault.put(DistributionConfig.LOCATORS_NAME, localHost.getHostName()+'['+port+']'); - nonDefault.put(DistributionConfig.SECURITY_CLIENT_DHALGO_NAME, "AES:128"); + nonDefault.put(DistributedSystemConfigProperties.SECURITY_CLIENT_DHALGO, "AES:128"); DistributionConfigImpl config = new DistributionConfigImpl(nonDefault); RemoteTransportConfig transport = new RemoteTransportConfig(config, DistributionManager.NORMAL_DM_TYPE); @@ -340,7 +342,6 @@ public class MembershipJUnitTest { assertTrue(m1.getView().size() == 1); - System.out.println("encodings performed: " + GMSEncrypt.encodingsPerformed + "; decodings performed: " + GMSEncrypt.decodingsPerformed); } finally { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de16ac4d/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java index c44c327..c4e4181 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java @@ -87,7 +87,7 @@ public class GMSJoinLeaveJUnitTest { mockDistConfig = mock(DistributionConfig.class); when(mockDistConfig.getEnableNetworkPartitionDetection()).thenReturn(enableNetworkPartition); when(mockDistConfig.getLocators()).thenReturn("localhost[8888]"); - when(mockDistConfig.getSecurityClientDHAlgo()).thenReturn(""); + when(mockDistConfig.getSecurityUDPDHAlgo()).thenReturn(""); mockConfig = mock(ServiceConfig.class); when(mockDistConfig.getStartLocator()).thenReturn("localhost[12345]"); when(mockConfig.getDistributionConfig()).thenReturn(mockDistConfig); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de16ac4d/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java index 1156295..dc52024 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java @@ -1,6 +1,7 @@ package com.gemstone.gemfire.distributed.internal.membership.gms.messenger; import static org.mockito.Mockito.*; +import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl; import com.gemstone.gemfire.distributed.internal.DistributionManager; @@ -52,7 +53,7 @@ public class GMSEncryptJUnitTest { private void initMocks(String algo) throws Exception { Properties nonDefault = new Properties(); - nonDefault.put(DistributionConfig.SECURITY_CLIENT_DHALGO_NAME, algo); + nonDefault.put(DistributedSystemConfigProperties.SECURITY_UDP_DHALGO, algo); DistributionConfigImpl config = new DistributionConfigImpl(nonDefault); RemoteTransportConfig tconfig = new RemoteTransportConfig(config, DistributionManager.NORMAL_DM_TYPE);
