Skip to content

DATAREDIS-537 - Add support for Redis Cluster and SSL. #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
<version>1.8.0.BUILD-SNAPSHOT</version>
<version>1.8.0.DATAREDIS-537-SNAPSHOT</version>

<name>Spring Data Redis</name>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,10 @@ private AbstractRedisClient createRedisClient() {

RedisURI redisURI = new RedisURI(node.getHost(), node.getPort(), timeout, TimeUnit.MILLISECONDS);

redisURI.setSsl(useSsl);
redisURI.setVerifyPeer(verifyPeer);
redisURI.setStartTls(startTls);

if (StringUtils.hasText(password)) {
redisURI.setPassword(password);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.junit.Before;
import org.junit.Test;
import org.springframework.data.redis.ConnectionFactoryTracker;
import org.springframework.data.redis.connection.ClusterTestVariables;
import org.springframework.data.redis.connection.RedisClusterConfiguration;
import org.springframework.data.redis.connection.RedisSentinelConfiguration;

Expand Down Expand Up @@ -243,4 +244,69 @@ public void startTLSOptionShouldBeSetCorrectlyOnClient() {
assertThat(connectionFactory.isStartTls(), is(true));
}

/**
* @see DATAREDIS-537
*/
@Test
public void sslShouldBeSetCorrectlyOnClusterClient() {

LettuceConnectionFactory connectionFactory = new LettuceConnectionFactory(new RedisClusterConfiguration().clusterNode(ClusterTestVariables.CLUSTER_NODE_1));
connectionFactory.setClientResources(LettuceTestClientResources.getSharedClientResources());
connectionFactory.setUseSsl(true);
connectionFactory.afterPropertiesSet();
ConnectionFactoryTracker.add(connectionFactory);

AbstractRedisClient client = (AbstractRedisClient) getField(connectionFactory, "client");
assertThat(client, instanceOf(RedisClusterClient.class));

Iterable<RedisURI> initialUris = (Iterable<RedisURI>) getField(client, "initialUris");

for (RedisURI uri : initialUris) {
assertThat(uri.isSsl(), is(true));
}
}

/**
* @see DATAREDIS-537
*/
@Test
public void startTLSOptionShouldBeSetCorrectlyOnClusterClient() {

LettuceConnectionFactory connectionFactory = new LettuceConnectionFactory(new RedisClusterConfiguration().clusterNode(ClusterTestVariables.CLUSTER_NODE_1));
connectionFactory.setClientResources(LettuceTestClientResources.getSharedClientResources());
connectionFactory.setStartTls(true);
connectionFactory.afterPropertiesSet();
ConnectionFactoryTracker.add(connectionFactory);

AbstractRedisClient client = (AbstractRedisClient) getField(connectionFactory, "client");
assertThat(client, instanceOf(RedisClusterClient.class));

Iterable<RedisURI> initialUris = (Iterable<RedisURI>) getField(client, "initialUris");

for (RedisURI uri : initialUris) {
assertThat(uri.isStartTls(), is(true));
}
}

/**
* @see DATAREDIS-537
*/
@Test
public void verifyPeerTLSOptionShouldBeSetCorrectlyOnClusterClient() {

LettuceConnectionFactory connectionFactory = new LettuceConnectionFactory(new RedisClusterConfiguration().clusterNode(ClusterTestVariables.CLUSTER_NODE_1));
connectionFactory.setClientResources(LettuceTestClientResources.getSharedClientResources());
connectionFactory.setVerifyPeer(true);
connectionFactory.afterPropertiesSet();
ConnectionFactoryTracker.add(connectionFactory);

AbstractRedisClient client = (AbstractRedisClient) getField(connectionFactory, "client");
assertThat(client, instanceOf(RedisClusterClient.class));

Iterable<RedisURI> initialUris = (Iterable<RedisURI>) getField(client, "initialUris");

for (RedisURI uri : initialUris) {
assertThat(uri.isVerifyPeer(), is(true));
}
}
}