Add SSL connection option for Redis

bukkit/src/main/java/me/william278/husksync/bukkit/config/ConfigLoader.java

@@ -12,6 +12,7 @@ public class ConfigLoader {
         Settings.redisHost = config.getString("redis_settings.host", "localhost");
         Settings.redisPort = config.getInt("redis_settings.port", 6379);
         Settings.redisPassword = config.getString("redis_settings.password", "");
+        Settings.redisSSL = config.getBoolean("redis_settings.use_ssl", false);
 
         Settings.syncInventories = config.getBoolean("synchronisation_settings.inventories", true);
         Settings.syncEnderChests = config.getBoolean("synchronisation_settings.ender_chests", true);

bukkit/src/main/resources/config.yml

@@ -2,6 +2,7 @@ redis_settings:
   host: 'localhost'
   port: 6379
   password: ''
+  use_ssl: false
 synchronisation_settings:
   inventories: true
   ender_chests: true

bungeecord/src/main/java/me/william278/husksync/bungeecord/config/ConfigLoader.java

@@ -42,6 +42,7 @@ public class ConfigLoader {
         Settings.redisHost = config.getString("redis_settings.host", "localhost");
         Settings.redisPort = config.getInt("redis_settings.port", 6379);
         Settings.redisPassword = config.getString("redis_settings.password", "");
+        Settings.redisSSL = config.getBoolean("redis_settings.use_ssl", false);
 
         Settings.dataStorageType = Settings.DataStorageType.valueOf(config.getString("data_storage_settings.database_type", "sqlite").toUpperCase());
         if (Settings.dataStorageType == Settings.DataStorageType.MYSQL) {

common/src/main/java/me/william278/husksync/Settings.java

@@ -21,6 +21,7 @@ public class Settings {
     public static String redisHost;
     public static int redisPort;
     public static String redisPassword;
+    public static boolean redisSSL;
 
     /*
      * Bungee / Proxy server-only settings

common/src/main/java/me/william278/husksync/redis/RedisListener.java

@@ -27,13 +27,15 @@ public abstract class RedisListener {
             jedisPool = new JedisPool(new JedisPoolConfig(),
                     Settings.redisHost,
                     Settings.redisPort,
-                    0);
+                    0,
+                    Settings.redisSSL);
         } else {
             jedisPool = new JedisPool(new JedisPoolConfig(),
                     Settings.redisHost,
                     Settings.redisPort,
                     0,
-                    Settings.redisPassword);
+                    Settings.redisPassword,
+                    Settings.redisSSL);
         }
     }
 

common/src/main/resources/proxy-config.yml

@@ -3,6 +3,7 @@ redis_settings:
   host: 'localhost'
   port: 6379
   password: ''
+  use_ssl: false
 data_storage_settings:
   database_type: 'sqlite'
   mysql_settings:

velocity/src/main/java/me/william278/husksync/velocity/config/ConfigLoader.java

@@ -31,25 +31,24 @@ public class ConfigLoader {
     }
 
     private static String getConfigString(ConfigurationNode rootNode, String defaultValue, String... nodePath) {
-        return !rootNode.getNode((Object[]) nodePath).isVirtual() ? rootNode.getNode((Object[])nodePath).getString() : defaultValue;
+        return !rootNode.getNode((Object[]) nodePath).isVirtual() ? rootNode.getNode((Object[]) nodePath).getString() : defaultValue;
     }
 
     @SuppressWarnings("SameParameterValue")
     private static boolean getConfigBoolean(ConfigurationNode rootNode, boolean defaultValue, String... nodePath) {
-        return !rootNode.getNode((Object[]) nodePath).isVirtual() ? rootNode.getNode((Object[])nodePath).getBoolean() : defaultValue;
+        return !rootNode.getNode((Object[]) nodePath).isVirtual() ? rootNode.getNode((Object[]) nodePath).getBoolean() : defaultValue;
     }
 
     private static int getConfigInt(ConfigurationNode rootNode, int defaultValue, String... nodePath) {
-        return !rootNode.getNode((Object[]) nodePath).isVirtual() ? rootNode.getNode((Object[])nodePath).getInt() : defaultValue;
+        return !rootNode.getNode((Object[]) nodePath).isVirtual() ? rootNode.getNode((Object[]) nodePath).getInt() : defaultValue;
     }
 
     private static long getConfigLong(ConfigurationNode rootNode, long defaultValue, String... nodePath) {
-        return !rootNode.getNode((Object[])nodePath).isVirtual() ? rootNode.getNode((Object[])nodePath).getLong() : defaultValue;
+        return !rootNode.getNode((Object[]) nodePath).isVirtual() ? rootNode.getNode((Object[]) nodePath).getLong() : defaultValue;
     }
 
     public static void loadSettings(ConfigurationNode loadedConfig) throws IllegalArgumentException {
         ConfigurationNode config = copyDefaults(loadedConfig);
-        //ConfigurationNode config = copyDefaults(loadedConfig);
 
         Settings.language = getConfigString(config, "en-gb", "language");
 
@@ -58,6 +57,7 @@ public class ConfigLoader {
         Settings.redisHost = getConfigString(config, "localhost", "redis_settings", "host");
         Settings.redisPort = getConfigInt(config, 6379, "redis_settings", "port");
         Settings.redisPassword = getConfigString(config, "", "redis_settings", "password");
+        Settings.redisSSL = getConfigBoolean(config, false, "redis_settings", "use_ssl");
 
         Settings.dataStorageType = Settings.DataStorageType.valueOf(getConfigString(config, "sqlite", "data_storage_settings", "database_type").toUpperCase());
         if (Settings.dataStorageType == Settings.DataStorageType.MYSQL) {