Skip to content

DATAREDIS-990 - Propagate SSL configuration to Lettuce driver when using Redis Sentinel #462

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.

Sign up for GitHub

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

DATAREDIS-990 - Propagate SSL configuration to Lettuce driver when using Redis Sentinel #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47a1c9e
DATAREDIS-990 - Prepare issue branch.
mp911de Jun 28, 2019
3b8c7b0
DATAREDIS-990 - Propagate SSL configuration to Lettuce driver when us…
mp911de Jun 28, 2019
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
View file
Open in desktop
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>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.DATAREDIS-990-SNAPSHOT</version>

<name>Spring Data Redis</name>

Expand Down
4 changes: 4 additions & 0 deletions ...main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,6 +1031,10 @@ private RedisURI getSentinelRedisURI() {

getRedisPassword().toOptional().ifPresent(redisUri::setPassword);
clientConfiguration.getClientName().ifPresent(redisUri::setClientName);

redisUri.setSsl(clientConfiguration.isUseSsl());
redisUri.setVerifyPeer(clientConfiguration.isVerifyPeer());
redisUri.setStartTls(clientConfiguration.isStartTls());
redisUri.setTimeout(clientConfiguration.getCommandTimeout());
redisUri.setDatabase(getDatabase());

Expand Down
62 changes: 62 additions & 0 deletions .../org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,68 @@ public void startTLSOptionShouldBeSetCorrectlyOnClient() {
assertThat(connectionFactory.isStartTls()).isTrue();
}

@Test // DATAREDIS-990
public void sslShouldBeSetCorrectlyOnSentinelClient() {

RedisSentinelConfiguration sentinelConfiguration = new RedisSentinelConfiguration("myMaster",
Collections.singleton("localhost:1234"));
LettuceConnectionFactory connectionFactory = new LettuceConnectionFactory(sentinelConfiguration);
connectionFactory.setClientResources(getSharedClientResources());
connectionFactory.setUseSsl(true);
connectionFactory.afterPropertiesSet();
ConnectionFactoryTracker.add(connectionFactory);

AbstractRedisClient client = (AbstractRedisClient) getField(connectionFactory, "client");
assertThat(client).isInstanceOf(RedisClient.class);

RedisURI redisUri = (RedisURI) getField(client, "redisURI");

assertThat(redisUri.isSsl()).isTrue();
assertThat(connectionFactory.isUseSsl()).isTrue();
assertThat(redisUri.isVerifyPeer()).isTrue();
assertThat(connectionFactory.isVerifyPeer()).isTrue();
}

@Test // DATAREDIS-990
public void verifyPeerOptionShouldBeSetCorrectlyOnSentinelClient() {

RedisSentinelConfiguration sentinelConfiguration = new RedisSentinelConfiguration("myMaster",
Collections.singleton("localhost:1234"));
LettuceConnectionFactory connectionFactory = new LettuceConnectionFactory(sentinelConfiguration);
connectionFactory.setClientResources(getSharedClientResources());
connectionFactory.setVerifyPeer(false);
connectionFactory.afterPropertiesSet();
ConnectionFactoryTracker.add(connectionFactory);

AbstractRedisClient client = (AbstractRedisClient) getField(connectionFactory, "client");
assertThat(client).isInstanceOf(RedisClient.class);

RedisURI redisUri = (RedisURI) getField(client, "redisURI");

assertThat(redisUri.isVerifyPeer()).isFalse();
assertThat(connectionFactory.isVerifyPeer()).isFalse();
}

@Test // DATAREDIS-990
public void startTLSOptionShouldBeSetCorrectlyOnSentinelClient() {

RedisSentinelConfiguration sentinelConfiguration = new RedisSentinelConfiguration("myMaster",
Collections.singleton("localhost:1234"));
LettuceConnectionFactory connectionFactory = new LettuceConnectionFactory(sentinelConfiguration);
connectionFactory.setClientResources(getSharedClientResources());
connectionFactory.setStartTls(true);
connectionFactory.afterPropertiesSet();
ConnectionFactoryTracker.add(connectionFactory);

AbstractRedisClient client = (AbstractRedisClient) getField(connectionFactory, "client");
assertThat(client).isInstanceOf(RedisClient.class);

RedisURI redisUri = (RedisURI) getField(client, "redisURI");

assertThat(redisUri.isStartTls()).isTrue();
assertThat(connectionFactory.isStartTls()).isTrue();
}

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

Expand Down