Spring/spring-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add 'ssl-client-protocols' and 'ssl-server-protocols' properties to GemFireProperties.

Browse Source 
Closes #581.
This commit is contained in:
John Blum
2022-03-29 16:00:35 -07:00
parent c253feff2d
commit f518576a4a
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-geode/src/main/java/org/springframework/data/gemfire/GemFireProperties.java
View File

@@ -116,9 +116,11 @@ public enum GemFireProperties {
SERVER_BIND_ADDRESS(ConfigurationProperties.SERVER_BIND_ADDRESS, String.class), SERVER_BIND_ADDRESS(ConfigurationProperties.SERVER_BIND_ADDRESS, String.class),
SOCKET_BUFFER_SIZE(ConfigurationProperties.SOCKET_BUFFER_SIZE, Integer.class, 32768), SOCKET_BUFFER_SIZE(ConfigurationProperties.SOCKET_BUFFER_SIZE, Integer.class, 32768),
SOCKET_LEASE_TIME(ConfigurationProperties.SOCKET_LEASE_TIME, Long.class, 60000L), SOCKET_LEASE_TIME(ConfigurationProperties.SOCKET_LEASE_TIME, Long.class, 60000L),
SSL_CLIENT_PROTOCOLS(ConfigurationProperties.SSL_CLIENT_PROTOCOLS, String.class, ""),
SSL_ENABLED_COMPONENTS(ConfigurationProperties.SSL_ENABLED_COMPONENTS, String.class, "all"), SSL_ENABLED_COMPONENTS(ConfigurationProperties.SSL_ENABLED_COMPONENTS, String.class, "all"),
SSL_ENDPOINT_IDENTIFICATION_ENABLED(ConfigurationProperties.SSL_ENDPOINT_IDENTIFICATION_ENABLED, Boolean.class, false), SSL_ENDPOINT_IDENTIFICATION_ENABLED(ConfigurationProperties.SSL_ENDPOINT_IDENTIFICATION_ENABLED, Boolean.class, false),
SSL_REQUIRE_AUTHENTICATION(ConfigurationProperties.SSL_REQUIRE_AUTHENTICATION, Boolean.class, true), SSL_REQUIRE_AUTHENTICATION(ConfigurationProperties.SSL_REQUIRE_AUTHENTICATION, Boolean.class, true),
SSL_SERVER_PROTOCOLS(ConfigurationProperties.SSL_SERVER_PROTOCOLS, String.class, ""),
SSL_CIPHERS(ConfigurationProperties.SSL_CIPHERS, String.class, "any"), SSL_CIPHERS(ConfigurationProperties.SSL_CIPHERS, String.class, "any"),
SSL_CLUSTER_ALIAS(ConfigurationProperties.SSL_CLUSTER_ALIAS, String.class), SSL_CLUSTER_ALIAS(ConfigurationProperties.SSL_CLUSTER_ALIAS, String.class),
SSL_DEFAULT_ALIAS(ConfigurationProperties.SSL_DEFAULT_ALIAS, String.class), SSL_DEFAULT_ALIAS(ConfigurationProperties.SSL_DEFAULT_ALIAS, String.class),

9
spring-data-geode/src/test/java/org/springframework/data/gemfire/GemFirePropertiesUnitTests.java
View File

@@ -43,7 +43,7 @@ import org.springframework.util.ReflectionUtils;
*/ */
public class GemFirePropertiesUnitTests { public class GemFirePropertiesUnitTests {
private static final Set<String> deprecatedGemFireProperties = Collections.unmodifiableSet(new HashSet<>(Arrays.asList( private static final Set<String> deprecatedGemFireProperties = asUnmodifiableSet(
"cluster-ssl-ciphers", // all 'cluster-ssl-*' properties replaced by 'ssl-*' properties "cluster-ssl-ciphers", // all 'cluster-ssl-*' properties replaced by 'ssl-*' properties
"cluster-ssl-enabled", "cluster-ssl-enabled",
"cluster-ssl-keystore", "cluster-ssl-keystore",
@@ -60,7 +60,12 @@ public class GemFirePropertiesUnitTests {
"security-client-authenticator", // replaced by SecurityManager "security-client-authenticator", // replaced by SecurityManager
"security-client-dhalgo", // use SSL instead "security-client-dhalgo", // use SSL instead
"security-peer-authenticator" // replaced by SecurityManager "security-peer-authenticator" // replaced by SecurityManager
))); );
@SuppressWarnings("unchecked")
private static <T> Set<T> asUnmodifiableSet(T... array) {
return Collections.unmodifiableSet(new HashSet<>(Arrays.asList(array)));
}
private Set<String> resolveActualGemFirePropertyNames() { private Set<String> resolveActualGemFirePropertyNames() {