Skip to content

Allowed connect to redis-master with ssl. #2024

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 4 commits into from
Closed

Allowed connect to redis-master with ssl. #2024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e57e4d
allowed connect to redis-master with ssl from sentinelPool
Jul 17, 2019
f232be7
fix to last commit
Jul 17, 2019
aa02bac
added ssl properties to main constructor of JedisSentinelPool
Jul 18, 2019
d658729
Trigger
Jul 18, 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
5 changes: 5 additions & 0 deletions src/main/java/redis/clients/jedis/JedisFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ class JedisFactory implements PooledObjectFactory<Jedis> {
this(host, port, connectionTimeout, soTimeout, password, database, clientName,
false, null, null, null);
}
JedisFactory(final String host, final int port, final int connectionTimeout,
final int soTimeout, final String password, final int database, final String clientName, final boolean isRedisSslEnabled) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this constructor? Isn't following constructor enough?

I'm asking this because JedisFactory is kept to have fewest constructors.

this(host, port, connectionTimeout, soTimeout, password, database, clientName,
isRedisSslEnabled, null, null, null);
}

JedisFactory(final String host, final int port, final int connectionTimeout,
final int soTimeout, final String password, final int database, final String clientName,
Expand Down
63 changes: 56 additions & 7 deletions src/main/java/redis/clients/jedis/JedisSentinelPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,20 @@
import redis.clients.jedis.exceptions.JedisConnectionException;
import redis.clients.jedis.exceptions.JedisException;

import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLParameters;
import javax.net.ssl.SSLSocketFactory;

public class JedisSentinelPool extends JedisPoolAbstract {

protected GenericObjectPoolConfig poolConfig;

protected int connectionTimeout = Protocol.DEFAULT_TIMEOUT;
protected int soTimeout = Protocol.DEFAULT_TIMEOUT;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An empty line would make code more readable.

protected Boolean isRedisSslEnabled;
protected SSLSocketFactory sslSocketFactory;
protected SSLParameters sslParameters;
protected HostnameVerifier hostnameVerifier;
protected String password;

protected int database = Protocol.DEFAULT_DATABASE;
Expand All @@ -41,10 +48,24 @@ public JedisSentinelPool(String masterName, Set<String> sentinels,
Protocol.DEFAULT_DATABASE);
}

public JedisSentinelPool(String masterName, Set<String> sentinels,
final GenericObjectPoolConfig poolConfig, final Boolean isRedisSslEnabled) {
this(masterName, sentinels, poolConfig, Protocol.DEFAULT_TIMEOUT, null,
Protocol.DEFAULT_DATABASE, isRedisSslEnabled);
}

public JedisSentinelPool(String masterName, Set<String> sentinels) {
this(masterName, sentinels, new GenericObjectPoolConfig(), Protocol.DEFAULT_TIMEOUT, null,
Protocol.DEFAULT_DATABASE);
}
public JedisSentinelPool(String masterName, Set<String> sentinels, final Boolean isRedisSslEnabled) {
this(masterName, sentinels, new GenericObjectPoolConfig(), Protocol.DEFAULT_TIMEOUT, null,
Protocol.DEFAULT_DATABASE, isRedisSslEnabled);
}

public JedisSentinelPool(String masterName, Set<String> sentinels, String password, final Boolean isRedisSslEnabled) {
this(masterName, sentinels, new GenericObjectPoolConfig(), Protocol.DEFAULT_TIMEOUT, password);
}

public JedisSentinelPool(String masterName, Set<String> sentinels, String password) {
this(masterName, sentinels, new GenericObjectPoolConfig(), Protocol.DEFAULT_TIMEOUT, password);
Expand All @@ -68,30 +89,57 @@ public JedisSentinelPool(String masterName, Set<String> sentinels,
public JedisSentinelPool(String masterName, Set<String> sentinels,
final GenericObjectPoolConfig poolConfig, int timeout, final String password,
final int database) {
this(masterName, sentinels, poolConfig, timeout, timeout, password, database);
this(masterName, sentinels, poolConfig, timeout, timeout, password, database, false);
}

public JedisSentinelPool(String masterName, Set<String> sentinels,
final GenericObjectPoolConfig poolConfig, int timeout, final String password,
final int database, final Boolean isRedisSslEnabled) {
this(masterName, sentinels, poolConfig, timeout, timeout, password, database, isRedisSslEnabled);
}

public JedisSentinelPool(String masterName, Set<String> sentinels,
final GenericObjectPoolConfig poolConfig, int timeout, final String password,
final int database, final String clientName) {
this(masterName, sentinels, poolConfig, timeout, timeout, password, database, clientName);
this(masterName, sentinels, poolConfig, timeout, timeout, password, database, clientName, false,
null, null, null);
}

public JedisSentinelPool(String masterName, Set<String> sentinels,
final GenericObjectPoolConfig poolConfig, int timeout, final String password,
final int database, final String clientName, final Boolean isRedisSslEnabled) {
this(masterName, sentinels, poolConfig, timeout, timeout, password, database, clientName, isRedisSslEnabled,
null, null, null);
}

public JedisSentinelPool(String masterName, Set<String> sentinels,
final GenericObjectPoolConfig poolConfig, final int timeout, final int soTimeout,
final String password, final int database) {
this(masterName, sentinels, poolConfig, timeout, soTimeout, password, database, null, false,
null, null, null);
}

public JedisSentinelPool(String masterName, Set<String> sentinels,
final GenericObjectPoolConfig poolConfig, final int timeout, final int soTimeout,
final String password, final int database) {
this(masterName, sentinels, poolConfig, timeout, soTimeout, password, database, null);
final String password, final int database, final Boolean isRedisSslEnabled) {
this(masterName, sentinels, poolConfig, timeout, soTimeout, password, database, null, isRedisSslEnabled,
null, null, null);
}

public JedisSentinelPool(String masterName, Set<String> sentinels,
final GenericObjectPoolConfig poolConfig, final int connectionTimeout, final int soTimeout,
final String password, final int database, final String clientName) {
final String password, final int database, final String clientName, final Boolean isRedisSslEnabled,
final SSLSocketFactory sslSocketFactory, final SSLParameters sslParameters, final HostnameVerifier hostnameVerifier) {
this.poolConfig = poolConfig;
this.connectionTimeout = connectionTimeout;
this.soTimeout = soTimeout;
this.password = password;
this.database = database;
this.clientName = clientName;
this.isRedisSslEnabled = isRedisSslEnabled;
this.sslSocketFactory = sslSocketFactory;
this.sslParameters = sslParameters;
this.hostnameVerifier = hostnameVerifier;

HostAndPort master = initSentinels(sentinels, masterName);
initPool(master);
Expand All @@ -116,7 +164,8 @@ private void initPool(HostAndPort master) {
currentHostMaster = master;
if (factory == null) {
factory = new JedisFactory(master.getHost(), master.getPort(), connectionTimeout,
soTimeout, password, database, clientName);
soTimeout, password, database, clientName, isRedisSslEnabled,
sslSocketFactory, sslParameters, hostnameVerifier);
initPool(poolConfig, factory);
} else {
factory.setHostAndPort(currentHostMaster);
Expand Down