Added redis auth support

GiansCode · Feb 24, 2021 · a39e18e · a39e18e
1 parent ea033d0
commit a39e18e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>io.alerium.chocolate</groupId>
     <artifactId>parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
 
     <modules>
         <module>velocity</module>

diff --git a/spigot/pom.xml b/spigot/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.alerium.chocolate</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>spigot</artifactId>

diff --git a/velocity/pom.xml b/velocity/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.alerium.chocolate</groupId>
         <artifactId>parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>velocity</artifactId>

diff --git a/velocity/src/main/java/io/alerium/chocolate/velocity/redis/RedisManager.java b/velocity/src/main/java/io/alerium/chocolate/velocity/redis/RedisManager.java
@@ -20,6 +20,7 @@ public class RedisManager {
 
     private PubSubListener psListener;
 
+    private String redisPassword;
     @Getter private String proxyName;
     @Getter private int onlinePlayers;
 
@@ -30,6 +31,7 @@ public class RedisManager {
      */
     public void enable() {
         JsonObject redisConfig = plugin.getConfig().getObject().getAsJsonObject("redis");
+        redisPassword = redisConfig.has("password") ? redisConfig.get("password").getAsString() : null;
         pool = new JedisPool(new JedisPoolConfig(), redisConfig.get("hostname").getAsString(), redisConfig.get("port").getAsInt());
 
         psListener = new PubSubListener(plugin);
@@ -192,7 +194,10 @@ public void unregisterChannel(String... channels) {
     }
 
     private Jedis getConnection() {
-        return pool.getResource();
+        Jedis jedis = pool.getResource();
+        if (redisPassword != null && !redisPassword.isEmpty())
+            jedis.auth(redisPassword);
+        return jedis;
     }
 
 }
diff --git a/velocity/src/main/resources/config.json b/velocity/src/main/resources/config.json
@@ -1,7 +1,8 @@
 {
   "redis": {
     "hostname": "localhost",
-    "port": 6379
+    "port": 6379,
+    "password": ""
   },
 
   "proxyName": "proxy1",