remove null bytes from encoded strings

Author: KurtThiemann

build.gradle

@@ -10,7 +10,7 @@ buildscript {
 
 apply plugin: 'foxloader.dev'
 
-version '1.2.0'
+version '1.2.1'
 
 foxloader {
     // forceReload = true

src/server/java/io/thiemann/kurt/query/query/AbstractQueryServer.java

@@ -15,6 +15,7 @@ public abstract class AbstractQueryServer {
 
     public AbstractQueryServer(int port, InetAddress laddr) throws SocketException {
         this.socket = new DatagramSocket(port, laddr);
+        this.socket.setSoTimeout(5000);
         this.thread = new Thread(this::run);
         this.thread.start();
 

src/server/java/io/thiemann/kurt/query/query/packet/ClientBoundBasicStatPacket.java

@@ -31,13 +31,13 @@ protected byte[] serializePayload() {
         ByteBuffer buffer = ByteBuffer.allocate(1024);
         buffer.order(ByteOrder.LITTLE_ENDIAN);
 
-        buffer.put((this.motd + "\0").getBytes(StandardCharsets.UTF_8));
-        buffer.put((this.gameType + "\0").getBytes(StandardCharsets.UTF_8));
-        buffer.put((this.map + "\0").getBytes(StandardCharsets.UTF_8));
-        buffer.put((this.playersOnline + "\0").getBytes(StandardCharsets.UTF_8));
-        buffer.put((this.maxPlayers + "\0").getBytes(StandardCharsets.UTF_8));
+        buffer.put(this.encodeString(this.motd));
+        buffer.put(this.encodeString(this.gameType));
+        buffer.put(this.encodeString(this.map));
+        buffer.put(this.encodeString(Integer.toString(this.playersOnline)));
+        buffer.put(this.encodeString(Integer.toString(this.maxPlayers)));
         buffer.putShort((short) this.port);
-        buffer.put((this.host + "\0").getBytes(StandardCharsets.UTF_8));
+        buffer.put(this.encodeString(this.host));
 
         //only return written length as byte array
         byte[] response = new byte[buffer.position()];

src/server/java/io/thiemann/kurt/query/query/packet/ClientBoundFullStatPacket.java

@@ -34,8 +34,8 @@ public ClientBoundFullStatPacket(int sessionId, String hostName, String gameType
     }
 
     private void putKV(String key, String value, ByteBuffer buffer) {
-        buffer.put((key + "\0").getBytes(StandardCharsets.UTF_8));
-        buffer.put((value + "\0").getBytes(StandardCharsets.UTF_8));
+        buffer.put(this.encodeString(key));
+        buffer.put(this.encodeString(value));
     }
 
     @Override
@@ -58,7 +58,7 @@ protected byte[] serializePayload() {
         buffer.put(new byte[]{0x01, 0x70, 0x6C, 0x61, 0x79, 0x65, 0x72, 0x5F, 0x00, 0x00});
 
         for (String player : this.players) {
-            buffer.put((player + "\0").getBytes(StandardCharsets.UTF_8));
+            buffer.put(this.encodeString(player));
         }
         buffer.put((byte) 0);
 

src/server/java/io/thiemann/kurt/query/query/packet/ClientBoundPacket.java

@@ -2,6 +2,7 @@
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
 
 public abstract class ClientBoundPacket {
     private final PacketType type;
@@ -23,6 +24,10 @@ public int getSessionId() {
 
     protected abstract byte[] serializePayload();
 
+    protected byte[] encodeString(String s) {
+        return (s.replace("\0", "") + "\0").getBytes(StandardCharsets.UTF_8);
+    }
+
     public byte[] serialize() {
         byte[] payload = serializePayload();
         ByteBuffer buffer = ByteBuffer.allocate(5 + payload.length);