chat message signing

fix Player List Packet serialization issues

Author: MrKinau

src/main/java/systems/kinau/fishingbot/bot/Player.java

@@ -17,12 +17,14 @@
 import systems.kinau.fishingbot.network.protocol.ProtocolConstants;
 import systems.kinau.fishingbot.network.protocol.play.*;
 import systems.kinau.fishingbot.network.protocol.play.PacketOutEntityAction.EntityAction;
+import systems.kinau.fishingbot.network.utils.CryptManager;
 import systems.kinau.fishingbot.utils.ItemUtils;
 import systems.kinau.fishingbot.utils.LocationUtils;
 import systems.kinau.fishingbot.utils.StringUtils;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
@@ -48,6 +50,7 @@ public class Player implements Listener {
     @Getter @Setter private Slot heldItem;
     @Getter @Setter private Inventory inventory;
     @Getter         private final Map<Integer, Inventory> openedInventories = new HashMap<>();
+    @Getter @Setter private Optional<CryptManager.MessageSignature> lastUsedSignature = Optional.empty();
 
     @Getter @Setter private UUID uuid;
 

src/main/java/systems/kinau/fishingbot/network/protocol/play/PacketInChatPlayer.java

@@ -18,6 +18,7 @@
 import systems.kinau.fishingbot.event.play.ChatEvent;
 import systems.kinau.fishingbot.network.protocol.NetworkHandler;
 import systems.kinau.fishingbot.network.protocol.Packet;
+import systems.kinau.fishingbot.network.protocol.ProtocolConstants;
 import systems.kinau.fishingbot.network.utils.ByteArrayDataInputWrapper;
 import systems.kinau.fishingbot.utils.TextComponent;
 
@@ -37,21 +38,25 @@ public void write(ByteArrayDataOutput out, int protocolId) {
 
     @Override
     public void read(ByteArrayDataInputWrapper in, NetworkHandler networkHandler, int length, int protocolId) {
-        this.text = readString(in);
-        try {
-            JSONObject object = (JSONObject) PARSER.parse(text);
+        if (protocolId >= ProtocolConstants.MINECRAFT_1_19) {
 
+        } else {
+            this.text = readString(in);
             try {
-                this.text = TextComponent.toPlainText(object);
+                JSONObject object = (JSONObject) PARSER.parse(text);
+
+                try {
+                    this.text = TextComponent.toPlainText(object);
+                } catch (Exception ignored) {
+                    //Ignored
+                }
+
+                //TODO: Handle this correctly. This packet represents the normal chat packet up to 1.18.2 and the vanilla server player chat packet in 1.19 and higher
+
+                FishingBot.getInstance().getCurrentBot().getEventManager().callEvent(new ChatEvent(getText(), getSender()));
             } catch (Exception ignored) {
                 //Ignored
             }
-
-            //TODO: Handle this correctly. This packet represents the normal chat packet up to 1.18.2 and the vanilla server player chat packet in 1.19 and higher
-
-            FishingBot.getInstance().getCurrentBot().getEventManager().callEvent(new ChatEvent(getText(), getSender()));
-        } catch (Exception ignored) {
-            //Ignored
         }
     }
 }

src/main/java/systems/kinau/fishingbot/network/protocol/play/PacketInPlayerListItem.java

@@ -12,6 +12,7 @@
 import systems.kinau.fishingbot.event.play.UpdatePlayerListEvent;
 import systems.kinau.fishingbot.network.protocol.NetworkHandler;
 import systems.kinau.fishingbot.network.protocol.Packet;
+import systems.kinau.fishingbot.network.protocol.ProtocolConstants;
 import systems.kinau.fishingbot.network.utils.ByteArrayDataInputWrapper;
 
 import java.io.IOException;
@@ -49,6 +50,15 @@ public void read(ByteArrayDataInputWrapper in, NetworkHandler networkHandler, in
                 int ping = readVarInt(in);
                 if (in.readBoolean()) // has display name
                     readString(in); // display name
+                if (protocolId >= ProtocolConstants.MINECRAFT_1_19) {
+                    if (in.readBoolean()) {
+                        in.readLong(); // expiration
+                        int size = readVarInt(in); // pubkey length
+                        in.readFully(new byte[size]); // pubkey
+                        size = readVarInt(in); // sig length
+                        in.readFully(new byte[size]); // sig
+                    }
+                }
                 if (uuid.equals(FishingBot.getInstance().getCurrentBot().getPlayer().getUuid()))
                     FishingBot.getInstance().getCurrentBot().getEventManager().callEvent(new PingChangeEvent(ping));
             } else if (action == 1) {

src/main/java/systems/kinau/fishingbot/network/protocol/play/PacketOutChatCommand.java

@@ -10,6 +10,7 @@
 import lombok.Getter;
 import systems.kinau.fishingbot.network.protocol.NetworkHandler;
 import systems.kinau.fishingbot.network.protocol.Packet;
+import systems.kinau.fishingbot.network.protocol.ProtocolConstants;
 import systems.kinau.fishingbot.network.utils.ByteArrayDataInputWrapper;
 
 @AllArgsConstructor
@@ -22,11 +23,16 @@ public class PacketOutChatCommand extends Packet {
     public void write(ByteArrayDataOutput out, int protocolId) {
         writeString(getCommand(), out);
         // this is most likely very illegal, but it seems like the server does not care about the signature
+        // UPDATE: It's not working in a signed context (only no argument commands work)
 
         out.writeLong(System.currentTimeMillis());  // timestamp
         out.writeLong(System.currentTimeMillis());  // arg sig salt
         writeVarInt(0, out);                  // arg sig map
         out.writeBoolean(false);                 // signed preview
+        if (protocolId >= ProtocolConstants.MINECRAFT_1_19_1) {
+            writeVarInt(0, out);              // acknowledgements lastSeen (LastSeenMessageList.write(buf))
+            out.writeBoolean(false);             // acknowledgements lastReceived (Optional<LastSeenMessageList.Entry>)
+        }
     }
 
     @Override

src/main/java/systems/kinau/fishingbot/network/protocol/play/PacketOutChatMessage.java

@@ -16,6 +16,7 @@
 import systems.kinau.fishingbot.network.utils.ByteArrayDataInputWrapper;
 import systems.kinau.fishingbot.network.utils.CryptManager;
 
+import java.util.Optional;
 import java.util.UUID;
 
 @AllArgsConstructor
@@ -50,6 +51,8 @@ public void write(ByteArrayDataOutput out, int protocolId) {
                 writeVarInt(signature.getSignature().length, out);
                 out.write(signature.getSignature());
                 out.writeBoolean(false);
+
+                FishingBot.getInstance().getCurrentBot().getPlayer().setLastUsedSignature(Optional.of(signature));
             }
 
             if (protocolId >= ProtocolConstants.MINECRAFT_1_19_1) {

src/main/java/systems/kinau/fishingbot/network/utils/CryptManager.java

@@ -35,6 +35,7 @@
 import java.security.spec.X509EncodedKeySpec;
 import java.time.Instant;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Random;
 import java.util.UUID;
 import java.util.function.Consumer;
@@ -221,6 +222,7 @@ public static MessageSignature signChatMessage(AuthData.ProfileKeys keys, UUID s
             HashingOutputStream hashingOutputStream = new HashingOutputStream(Hashing.sha256(), new OutputStream() {
                 @Override
                 public void write(int b) throws IOException {
+                    // empty
                 }
             });
 
@@ -238,6 +240,9 @@ public void write(int b) throws IOException {
             byte[] messageBody = hashingOutputStream.hash().asBytes();
             return new MessageSignature(sign(keys, signature -> {
                 try {
+                    Optional<MessageSignature> prevSignature = FishingBot.getInstance().getCurrentBot().getPlayer().getLastUsedSignature();
+                    if (prevSignature.isPresent())
+                        signature.update(prevSignature.get().getSignature());
                     signature.update(messageHeader);
                     signature.update(messageBody);
                 } catch (SignatureException e) {