From 69f4e8b53a4091223d4d71893b52021e2dcc968d Mon Sep 17 00:00:00 2001
From: Gabriel Hollies <gabriel.hollies@appian.com>
Date: Tue, 29 Sep 2020 17:32:38 -0400
Subject: [PATCH] Configure Sentinel Password

* Added new configuration field to allow a different password to be
  used for authenticating against sentinel nodes

Signed-off-by: Gabriel Hollies <gabriel.hollies@appian.com>
---
 .../redisson/config/SentinelServersConfig.java | 18 ++++++++++++++++++
 .../connection/SentinelConnectionManager.java  | 10 +++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/redisson/src/main/java/org/redisson/config/SentinelServersConfig.java b/redisson/src/main/java/org/redisson/config/SentinelServersConfig.java
index 3a8e860cc..04b35b000 100644
--- a/redisson/src/main/java/org/redisson/config/SentinelServersConfig.java
+++ b/redisson/src/main/java/org/redisson/config/SentinelServersConfig.java
@@ -37,6 +37,8 @@ public class SentinelServersConfig extends BaseMasterSlaveServersConfig<Sentinel
 
     private String masterName;
 
+    private String sentinelPassword;
+
     /**
      * Database index used for Redis connection
      */
@@ -60,6 +62,7 @@ public class SentinelServersConfig extends BaseMasterSlaveServersConfig<Sentinel
         setScanInterval(config.getScanInterval());
         setNatMapper(config.getNatMapper());
         setCheckSentinelsList(config.isCheckSentinelsList());
+        setSentinelPassword(config.getSentinelPassword());
     }
 
     /**
@@ -76,6 +79,21 @@ public class SentinelServersConfig extends BaseMasterSlaveServersConfig<Sentinel
         return masterName;
     }
 
+    /**
+     * Password required by the Redis Sentinel servers for authentication.
+     *
+     * @param sentinelPassword of Redis
+     * @return config
+     */
+    public SentinelServersConfig setSentinelPassword(String sentinelPassword) {
+        this.sentinelPassword = sentinelPassword;
+        return this;
+    }
+    public String getSentinelPassword() {
+        return sentinelPassword;
+    }
+
+
     /**
      * Add Redis Sentinel node address in host:port format. Multiple nodes at once could be added.
      *
diff --git a/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java b/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
index 42a261bef..600a96451 100755
--- a/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
+++ b/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
@@ -62,9 +62,10 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
     private final Set<RedisURI> disconnectedSlaves = new HashSet<>();
     private ScheduledFuture<?> monitorFuture;
     private AddressResolver<InetSocketAddress> sentinelResolver;
-    
+
     private final NatMapper natMapper;
 
+    private final String sentinelPassword;
     private boolean usePassword = false;
     private String scheme;
 
@@ -79,6 +80,7 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
         }
 
         this.config = create(cfg);
+        this.sentinelPassword = cfg.getSentinelPassword();
         initTimer(this.config);
 
         this.natMapper = cfg.getNatMapper();
@@ -251,7 +253,13 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
             String sslHostname) {
         RedisClientConfig result = super.createRedisConfig(type, address, timeout, commandTimeout, sslHostname);
         if (type == NodeType.SENTINEL && !usePassword) {
+            result.setUsername(null);
             result.setPassword(null);
+        } else if (type == NodeType.SENTINEL && usePassword) {
+            result.setUsername(null);
+            if (sentinelPassword != null) {
+                result.setPassword(sentinelPassword);
+            }
         }
         return result;
     }