Fix ssl connections on PooledConnections

useSSL in configloader wasn't passing it to the ConnectionProvider

README.md

@@ -47,11 +47,11 @@ SpigotMC resource page: [click](https://www.spigotmc.org/resources/redisbungee.8
 |     7.x.x     | ✔  |
 
 
-## Implementing RedisBungee in your plugin: [![RedisBungee Build](https://github.com/proxiodev/RedisBungee/actions/workflows/maven.yml/badge.svg)](https://github.com/Limework/RedisBungee/actions/workflows/maven.yml) [![](https://jitpack.io/v/limework/redisbungee.svg)](https://jitpack.io/#limework/redisbungee)
+## Implementing RedisBungee in your plugin: [![RedisBungee Build](https://github.com/proxiodev/RedisBungee/actions/workflows/maven.yml/badge.svg)](https://github.com/Limework/RedisBungee/actions/workflows/maven.yml) [![](https://jitpack.io/v/ProxioDev/redisbungee.svg)](https://jitpack.io/#ProxioDev/redisbungee)
 
 RedisBungee is distributed as a [maven](https://maven.apache.org) project.
 
-By using jitpack [![](https://jitpack.io/v/limework/redisbungee.svg)](https://jitpack.io/#limework/redisbungee)
+By using jitpack [![](https://jitpack.io/v/ProxioDev/redisbungee.svg)](https://jitpack.io/#ProxioDev/redisbungee)
 
 ## Setup jitpack repository
 ```xml
@@ -66,7 +66,7 @@ By using jitpack [![](https://jitpack.io/v/limework/redisbungee.svg)](https://ji
 add this in your project dependencies 
 ```xml
 	<dependency>
-	    <groupId>com.github.limework.redisbungee</groupId>
+	    <groupId>com.github.proxiodev.redisbungee</groupId>
 	    <artifactId>RedisBungee-Bungee</artifactId>
 	    <version>VERSION</version>
 	    <scope>provided</scope>
@@ -86,7 +86,7 @@ depends: [ RedisBungee ]
 ## [Velocity](https://github.com/PaperMC/Velocity)
 ```xml
 	<dependency>
-	    <groupId>com.github.limework.redisbungee</groupId>
+	    <groupId>com.github.proxiodev.redisbungee</groupId>
 	    <artifactId>RedisBungee-Velocity</artifactId>
 	    <version>VERSION</version>
 	    <scope>provided</scope>

RedisBungee-API/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>RedisBungee</artifactId>
         <groupId>com.imaginarycode.minecraft</groupId>
-        <version>0.8.0-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/config/ConfigLoader.java

@@ -39,11 +39,6 @@ public interface ConfigLoader {
         loadConfig(plugin, dataFolder.toPath());
     }
 
-    // There currently a problem with the SSL/TLS connections
-    // looking into the Jedis source code you can pass some form of
-    // Domain Validation, SSL factory from javax packages
-    // todo: create Domain valdiation
-    // todo: add new config options for ssl certs locations
     default void loadConfig(RedisBungeePlugin<?> plugin, Path dataFolder) throws IOException {
         Path configFile = createConfigFile(dataFolder);
         final YAMLConfigurationLoader yamlConfigurationFileLoader = YAMLConfigurationLoader.builder().setPath(configFile).build();
@@ -126,7 +121,7 @@ public interface ConfigLoader {
             GenericObjectPoolConfig<Connection> poolConfig = new GenericObjectPoolConfig<>();
             poolConfig.setMaxTotal(maxConnections);
             poolConfig.setBlockWhenExhausted(true);
-            summoner = new JedisPooledSummoner(new PooledConnectionProvider(new ConnectionFactory(new HostAndPort(redisServer, redisPort), DefaultJedisClientConfig.builder().timeoutMillis(5000).password(redisPassword).build()), poolConfig), jedisPool);
+            summoner = new JedisPooledSummoner(new PooledConnectionProvider(new ConnectionFactory(new HostAndPort(redisServer, redisPort), DefaultJedisClientConfig.builder().timeoutMillis(5000).ssl(useSSL).password(redisPassword).build()), poolConfig), jedisPool);
             redisBungeeMode = RedisBungeeMode.SINGLE;
         }
         plugin.logInfo("Successfully connected to Redis.");

RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/api/util/player/PlayerUtils.java

@@ -3,6 +3,12 @@ package com.imaginarycode.minecraft.redisbungee.api.util.player;
 import com.imaginarycode.minecraft.redisbungee.AbstractRedisBungeeAPI;
 import redis.clients.jedis.UnifiedJedis;
 
+import java.net.InetAddress;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import static com.imaginarycode.minecraft.redisbungee.api.util.payload.PayloadUtils.playerJoinPayload;
 import static com.imaginarycode.minecraft.redisbungee.api.util.payload.PayloadUtils.playerQuitPayload;
 
 public class PlayerUtils {
@@ -17,5 +23,22 @@ public class PlayerUtils {
         }
     }
 
+    public static void createPlayer(UUID uuid, UnifiedJedis unifiedJedis, String currentServer, InetAddress hostname, boolean fireEvent) {
+        if (currentServer != null) {
+            unifiedJedis.hset("player:" + uuid, "server", currentServer);
+        }
+        Map<String, String> playerData = new HashMap<>(4);
+        playerData.put("online", "0");
+        playerData.put("ip", hostname.getHostName());
+        playerData.put("proxy", AbstractRedisBungeeAPI.getAbstractRedisBungeeAPI().getProxyId());
+
+        unifiedJedis.sadd("proxy:" + AbstractRedisBungeeAPI.getAbstractRedisBungeeAPI().getProxyId() + ":usersOnline", uuid.toString());
+        unifiedJedis.hmset("player:" + uuid, playerData);
+
+        if (fireEvent) {
+            playerJoinPayload(uuid, unifiedJedis, hostname);
+        }
+    }
+
 
 }

RedisBungee-API/src/main/resources/config.yml

@@ -32,15 +32,15 @@ redis-password: ""
 # inefficient plugins or a lot of players.
 max-redis-connections: 10
 
-# since redis can support ssl by version 6 you can use ssl in redis bungee too!
+# since redis can support ssl by version 6 you can use ssl / tls in redis bungee too!
 # but there is more configuration needed to work see https://github.com/ProxioDev/RedisBungee/issues/18
-# in cluster mode using ssl without password is ignored due fact is not supported in Jedis lib
+# Keep note that SSL/TLS connections will decrease redis performance so use it when needed.
 useSSL: false
 
 # An identifier for this BungeeCord / Velocity instance. Will randomly generate if leaving it blank.
 proxy-id: "test-1"
 
-# In version 0.8.0 Internally now uses JedisPooled instead of Jedis, JedisPool.
+# since version 0.8.0 Internally now uses JedisPooled instead of Jedis, JedisPool.
 # which will break compatibility with old plugins that uses RedisBungee JedisPool
 # so to mitigate this issue, we will instruct RedisBungee to init an JedisPool for compatibility reasons.
 # enabled by default

RedisBungee-Bungee/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>RedisBungee</artifactId>
         <groupId>com.imaginarycode.minecraft</groupId>
-        <version>0.8.0-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/BungeePlayerUtils.java

@@ -10,37 +10,19 @@
 
 package com.imaginarycode.minecraft.redisbungee;
 
+import com.imaginarycode.minecraft.redisbungee.api.util.player.PlayerUtils;
 import net.md_5.bungee.api.connection.PendingConnection;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import redis.clients.jedis.UnifiedJedis;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static com.imaginarycode.minecraft.redisbungee.api.util.payload.PayloadUtils.playerJoinPayload;
-
 public class BungeePlayerUtils {
 
-    public static void createPlayer(ProxiedPlayer player, UnifiedJedis unifiedJedis, boolean fireEvent) {
-        createPlayer(player.getPendingConnection(), unifiedJedis, fireEvent);
-        if (player.getServer() != null)
-            unifiedJedis.hset("player:" + player.getUniqueId().toString(), "server", player.getServer().getInfo().getName());
+    public static void createBungeePlayer(ProxiedPlayer player, UnifiedJedis unifiedJedis, boolean fireEvent) {
+        String serverName = null;
+        if (player.getServer() != null) {
+           serverName = player.getServer().getInfo().getName();
         }
-
-    public static void createPlayer(PendingConnection connection, UnifiedJedis unifiedJedis, boolean fireEvent) {
-        Map<String, String> playerData = new HashMap<>(4);
-        playerData.put("online", "0");
-        playerData.put("ip", connection.getAddress().getAddress().getHostAddress());
-        playerData.put("proxy", RedisBungeeAPI.getRedisBungeeApi().getProxyId());
-
-        unifiedJedis.sadd("proxy:" + RedisBungeeAPI.getRedisBungeeApi().getProxyId() + ":usersOnline", connection.getUniqueId().toString());
-        unifiedJedis.hmset("player:" + connection.getUniqueId().toString(), playerData);
-
-        if (fireEvent) {
-            playerJoinPayload(connection.getUniqueId(), unifiedJedis, connection.getAddress().getAddress());
+        PendingConnection pendingConnection = player.getPendingConnection();
+        PlayerUtils.createPlayer(player.getUniqueId(), unifiedJedis, serverName, pendingConnection.getAddress().getAddress(), fireEvent);
     }
-    }
-
-
 
 }

RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java

@@ -243,7 +243,7 @@ public class RedisBungee extends Plugin implements RedisBungeePlugin<ProxiedPlay
                 if (proxiedPlayer == null)
                     return; // We'll deal with it later.
 
-                BungeePlayerUtils.createPlayer(proxiedPlayer, unifiedJedis, false);
+                BungeePlayerUtils.createBungeePlayer(proxiedPlayer, unifiedJedis, false);
             }
         };
 

RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeBungeeListener.java

@@ -94,7 +94,7 @@ public class RedisBungeeBungeeListener extends AbstractRedisBungeeListener<Login
             @Override
             public Void unifiedJedisTask(UnifiedJedis unifiedJedis) {
                 plugin.getUuidTranslator().persistInfo(event.getPlayer().getName(), event.getPlayer().getUniqueId(), unifiedJedis);
-                BungeePlayerUtils.createPlayer(event.getPlayer(), unifiedJedis, true);
+                BungeePlayerUtils.createBungeePlayer(event.getPlayer(), unifiedJedis, true);
                 return null;
             }
         });

RedisBungee-Velocity/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>RedisBungee</artifactId>
         <groupId>com.imaginarycode.minecraft</groupId>
-        <version>0.8.0-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityListener.java

@@ -97,7 +97,7 @@ public class RedisBungeeVelocityListener extends AbstractRedisBungeeListener<Log
             @Override
             public Void unifiedJedisTask(UnifiedJedis unifiedJedis) {
                 plugin.getUuidTranslator().persistInfo(event.getPlayer().getUsername(), event.getPlayer().getUniqueId(), unifiedJedis);
-                VelocityPlayerUtils.createPlayer(event.getPlayer(), unifiedJedis, true);
+                VelocityPlayerUtils.createVelocityPlayer(event.getPlayer(), unifiedJedis, true);
                 return null;
             }
         });

RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeVelocityPlugin.java

@@ -259,7 +259,7 @@ public class RedisBungeeVelocityPlugin implements RedisBungeePlugin<Player>, Con
                 Player playerProxied = getProxy().getPlayer(UUID.fromString(player)).orElse(null);
                 if (playerProxied == null)
                     return; // We'll deal with it later.
-                VelocityPlayerUtils.createPlayer(playerProxied, unifiedJedis, false);
+                VelocityPlayerUtils.createVelocityPlayer(playerProxied, unifiedJedis, false);
             }
         };
         integrityCheck = getProxy().getScheduler().buildTask(this, integrityCheckTask::execute).repeat(30, TimeUnit.SECONDS).schedule();

RedisBungee-Velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/VelocityPlayerUtils.java

@@ -10,31 +10,22 @@
 
 package com.imaginarycode.minecraft.redisbungee;
 
+import com.imaginarycode.minecraft.redisbungee.api.util.player.PlayerUtils;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ServerConnection;
 import redis.clients.jedis.UnifiedJedis;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Optional;
 
-import static com.imaginarycode.minecraft.redisbungee.api.util.payload.PayloadUtils.playerJoinPayload;
-
 public class VelocityPlayerUtils {
-    protected static void createPlayer(Player player, UnifiedJedis unifiedJedis, boolean fireEvent) {
-        Optional<ServerConnection> server = player.getCurrentServer();
-        server.ifPresent(serverConnection -> unifiedJedis.hset("player:" + player.getUniqueId().toString(), "server", serverConnection.getServerInfo().getName()));
-
-        Map<String, String> playerData = new HashMap<>(4);
-        playerData.put("online", "0");
-        playerData.put("ip", player.getRemoteAddress().getHostName());
-        playerData.put("proxy", AbstractRedisBungeeAPI.getAbstractRedisBungeeAPI().getProxyId());
-
-        unifiedJedis.sadd("proxy:" + AbstractRedisBungeeAPI.getAbstractRedisBungeeAPI().getProxyId() + ":usersOnline", player.getUniqueId().toString());
-        unifiedJedis.hmset("player:" + player.getUniqueId().toString(), playerData);
-
-        if (fireEvent) {
-            playerJoinPayload(player.getUniqueId(), unifiedJedis, player.getRemoteAddress().getAddress());
+    protected static void createVelocityPlayer(Player player, UnifiedJedis unifiedJedis, boolean fireEvent) {
+        Optional<ServerConnection> optionalServerConnection = player.getCurrentServer();
+        String serverName = null;
+        if (optionalServerConnection.isPresent()) {
+            serverName = optionalServerConnection.get().getServerInfo().getName();
         }
+        PlayerUtils.createPlayer(player.getUniqueId(), unifiedJedis, serverName, player.getRemoteAddress().getAddress(), fireEvent);
     }
+
+
 }

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.imaginarycode.minecraft</groupId>
     <artifactId>RedisBungee</artifactId>
     <packaging>pom</packaging>
-    <version>0.8.0-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>