salty

Author: nellieldev

bukkit/dependency-reduced-pom.xml

@@ -35,6 +35,7 @@
 import net.outfluencer.convey.common.protocol.pipe.PacketHandler;
 import net.outfluencer.convey.common.protocol.pipe.Varint21FrameDecoder;
 import net.outfluencer.convey.common.protocol.pipe.Varint21LengthFieldPrepender;
+import net.outfluencer.convey.common.utils.AESGCMUtils;
 import net.outfluencer.convey.common.utils.AESUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -80,7 +81,7 @@ public class ConveyBukkit extends Convey {
     @Getter
     private SecretKey secretKey;
     @Getter
-    private AESUtils aesUtils;
+    private AESGCMUtils aesUtils;
     private EventLoopGroup eventLoopGroup = new NioEventLoopGroup();
     @Getter
     @Setter
@@ -136,7 +137,7 @@ public void onEnable() {
             return;
         }
 
-        this.aesUtils = new AESUtils(secretKey);
+        this.aesUtils = new AESGCMUtils(secretKey);
         this.reloadMessages();
 
         Bukkit.getPluginManager().registerEvents(new PlayerLoginListener(this), this.plugin);

bukkit/src/main/java/net/outfluencer/convey/bukkit/ConveyBukkit.java

@@ -19,6 +19,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
@@ -123,7 +124,7 @@ public void sendCookie(AbstractCookie cookie) {
         DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream);
         cookie.write(dataOutputStream);
         byte[] encrypted = this.convey.getAesUtils().encrypt(byteArrayOutputStream.toByteArray());
-        this.player.storeCookie(NamespacedKey.fromString(cookie.getCookieName()), encrypted);
+        this.player.storeCookie(NamespacedKey.fromString(cookie.getCookieName()), Arrays.copyOf(encrypted, encrypted.length));
     }
 
     @Override

bukkit/src/main/java/net/outfluencer/convey/bukkit/impl/BukkitConveyPlayer.java

@@ -105,7 +105,9 @@ public void onLogin(PlayerLoginEvent event) {
                 AtomicInteger amt = new AtomicInteger(verifyCookie.getClientCookies().size());
                 List<FriendlyCookie> cookies = new CopyOnWriteArrayList<>();
                 for (String clientCookie : verifyCookie.getClientCookies()) {
+                    System.out.println(clientCookie);
                     player.retrieveCookie(NamespacedKey.fromString(clientCookie)).thenAccept(cookieData -> {
+                        System.out.println("GOT " + clientCookie);
                         try {
                             cookieData = this.convey.getAesUtils().decrypt(cookieData);
                             InternalCookie internalCookie = new InternalCookie();

bukkit/src/main/java/net/outfluencer/convey/bukkit/listeners/PlayerLoginListener.java

@@ -15,7 +15,7 @@
 import net.outfluencer.convey.bukkit.ConveyBukkit;
 import net.outfluencer.convey.bukkit.impl.BukkitConveyPlayer;
 import net.outfluencer.convey.bukkit.impl.ServerImplBukkit;
-import net.outfluencer.convey.common.utils.AESUtils;
+import net.outfluencer.convey.common.utils.AESGCMUtils;
 import org.bukkit.entity.Player;
 
 import java.io.ByteArrayOutputStream;
@@ -85,7 +85,7 @@ public class KickCatcher {
     @SneakyThrows
     public static void applyKickCatcher(BukkitConveyPlayer player) {
         ConveyBukkit convey = player.getConvey();
-        AESUtils aesUtils = convey.getAesUtils();
+        AESGCMUtils aesUtils = convey.getAesUtils();
         Player bukkitPlayer = player.getPlayer();
         UUID uuid = bukkitPlayer.getUniqueId();
         Object entityPlayer = getHandleMethod.invoke(bukkitPlayer);
@@ -155,7 +155,7 @@ public void close(ChannelHandlerContext ctx, ChannelPromise promise) throws Exce
     }
 
     @SneakyThrows
-    public static byte[] parseCookie(AESUtils utils, AbstractCookie cookie) {
+    public static byte[] parseCookie(AESGCMUtils utils, AbstractCookie cookie) {
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
         DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream);
         cookie.write(dataOutputStream);

bukkit/src/main/java/net/outfluencer/convey/bukkit/utils/KickCatcher.java

@@ -0,0 +1,56 @@
+package net.outfluencer.convey.common.utils;
+
+import lombok.SneakyThrows;
+
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.GCMParameterSpec;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.security.SecureRandom;
+import java.util.Arrays;
+
+public class AESGCMUtils {
+
+    private final static int GCM_IV_LENGTH = 12;
+
+    @SneakyThrows
+    public byte[] decrypt(byte[] data) {
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        cipher.init(Cipher.DECRYPT_MODE, this.key, new GCMParameterSpec(128, data, 0, AESGCMUtils.GCM_IV_LENGTH));
+        return cipher.doFinal(data, AESGCMUtils.GCM_IV_LENGTH, data.length - AESGCMUtils.GCM_IV_LENGTH);
+    }
+
+    public byte[] encrypt(byte[] data) {
+        return this.encrypt(this.generateIv(), data);
+    }
+
+    @SneakyThrows
+    public byte[] encrypt(byte[] iv, byte[] data) {
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        cipher.init(Cipher.ENCRYPT_MODE, this.key, new GCMParameterSpec(128, iv));
+        byte[] encrypted = cipher.doFinal(data);
+        ByteBuffer buffer = ByteBuffer.allocate(iv.length + encrypted.length);
+        buffer.put(iv);
+        buffer.put(encrypted);
+
+        return buffer.array();
+    }
+
+    private final SecretKey key;
+    private final SecureRandom random;
+
+    @SneakyThrows
+    public AESGCMUtils(SecretKey key) {
+        this.key = key;
+        this.random = new SecureRandom();
+    }
+
+    public byte[] generateIv() {
+        final byte[] iv = new byte[AESGCMUtils.GCM_IV_LENGTH];
+        this.random.nextBytes(iv);
+        return iv;
+    }
+
+}