Upstream
/
Minestom
mirror of https://github.com/Minestom/Minestom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix corruption when receiving multiple compressed packets (#611) 

Signed-off-by: TheMode <themode@outlook.fr>
This commit is contained in:
TheMode 2022-01-29 10:18:23 +01:00 committed by GitHub
parent d45ce9dab4
commit 87d5a33c76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/net/minestom/server/network/player/PlayerSocketConnection.java
View File

@ -99,23 +99,19 @@ public class PlayerSocketConnection extends PlayerConnection {
}
// Read all packets
try {
var result = PacketUtils.readPackets(readBuffer, compressed);
this.cacheBuffer = result.remaining();
for (var packet : result.packets()) {
var id = packet.id();
var payload = packet.payload();
try {
packetProcessor.process(this, id, payload);
} catch (Exception e) {
// Error while reading the packet
MinecraftServer.getExceptionManager().handleException(e);
break;
} finally {
if (payload.position() != payload.limit()) {
LOGGER.warn("WARNING: Packet 0x{} not fully read ({})", Integer.toHexString(id), payload);
}
}
}
this.cacheBuffer = PacketUtils.readPackets(readBuffer, compressed,
(id, payload) -> {
try {
packetProcessor.process(this, id, payload);
} catch (Exception e) {
// Error while reading the packet
MinecraftServer.getExceptionManager().handleException(e);
} finally {
if (payload.position() != payload.limit()) {
LOGGER.warn("WARNING: Packet 0x{} not fully read ({})", Integer.toHexString(id), payload);
}
}
});
} catch (DataFormatException e) {
MinecraftServer.getExceptionManager().handleException(e);
disconnect();

21
src/main/java/net/minestom/server/utils/PacketUtils.java
View File

@ -29,11 +29,10 @@ import org.jetbrains.annotations.Nullable;
import java.nio.BufferUnderflowException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.ConcurrentMap;
import java.util.function.BiConsumer;
import java.util.function.Predicate;
import java.util.zip.DataFormatException;
import java.util.zip.Deflater;
@ -161,8 +160,8 @@ public final class PacketUtils {
}
@ApiStatus.Internal
public static ReadResult readPackets(@NotNull BinaryBuffer readBuffer, boolean compressed) throws DataFormatException {
List<PacketPayload> packets = new ArrayList<>();
public static @Nullable BinaryBuffer readPackets(@NotNull BinaryBuffer readBuffer, boolean compressed,
BiConsumer<Integer, ByteBuffer> payloadConsumer) throws DataFormatException {
BinaryBuffer remaining = null;
while (readBuffer.readableBytes() > 0) {
final var beginMark = readBuffer.mark();
@ -196,7 +195,11 @@ public final class PacketUtils {
// Slice packet
ByteBuffer payload = content.asByteBuffer(content.readerOffset(), decompressedSize);
final int packetId = Utils.readVarInt(payload);
packets.add(new PacketPayload(packetId, payload));
try {
payloadConsumer.accept(packetId, payload);
} catch (Exception e) {
// Empty
}
// Position buffer to read the next packet
readBuffer.readerOffset(readerStart + packetLength);
} catch (BufferUnderflowException e) {
@ -205,13 +208,7 @@ public final class PacketUtils {
break;
}
}
return new ReadResult(packets, remaining);
}
public record ReadResult(List<PacketPayload> packets, BinaryBuffer remaining) {
}
public record PacketPayload(int id, ByteBuffer payload) {
return remaining;
}
public static void writeFramedPacket(@NotNull ByteBuffer buffer,

46
src/test/java/net/minestom/server/network/SocketReadTest.java
View File

@ -1,5 +1,6 @@
package net.minestom.server.network;
import it.unimi.dsi.fastutil.Pair;
import net.minestom.server.network.packet.client.play.ClientPluginMessagePacket;
import net.minestom.server.utils.PacketUtils;
import net.minestom.server.utils.Utils;
@ -9,6 +10,9 @@ import net.minestom.server.utils.binary.PooledBuffers;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import java.util.zip.DataFormatException;
import static org.junit.jupiter.api.Assertions.*;
@ -26,14 +30,15 @@ public class SocketReadTest {
var wrapper = BinaryBuffer.wrap(buffer);
wrapper.reset(0, buffer.position());
var result = PacketUtils.readPackets(wrapper, compressed);
assertNull(result.remaining());
List<Pair<Integer, ByteBuffer>> packets = new ArrayList<>();
var remaining = PacketUtils.readPackets(wrapper, compressed,
(integer, payload) -> packets.add(Pair.of(integer, payload)));
assertNull(remaining);
var packets = result.packets();
assertEquals(1, packets.size());
var rawPacket = packets.get(0);
assertEquals(0x0A, rawPacket.id());
var readPacket = new ClientPluginMessagePacket(new BinaryReader(rawPacket.payload()));
assertEquals(0x0A, rawPacket.left());
var readPacket = new ClientPluginMessagePacket(new BinaryReader(rawPacket.right()));
assertEquals("channel", readPacket.channel());
assertEquals(2000, readPacket.data().length);
}
@ -50,14 +55,15 @@ public class SocketReadTest {
var wrapper = BinaryBuffer.wrap(buffer);
wrapper.reset(0, buffer.position());
var result = PacketUtils.readPackets(wrapper, compressed);
assertNull(result.remaining());
List<Pair<Integer, ByteBuffer>> packets = new ArrayList<>();
var remaining = PacketUtils.readPackets(wrapper, compressed,
(integer, payload) -> packets.add(Pair.of(integer, payload)));
assertNull(remaining);
var packets = result.packets();
assertEquals(2, packets.size());
for (var rawPacket : packets) {
assertEquals(0x0A, rawPacket.id());
var readPacket = new ClientPluginMessagePacket(new BinaryReader(rawPacket.payload()));
assertEquals(0x0A, rawPacket.left());
var readPacket = new ClientPluginMessagePacket(new BinaryReader(rawPacket.right()));
assertEquals("channel", readPacket.channel());
assertEquals(2000, readPacket.data().length);
}
@ -77,16 +83,16 @@ public class SocketReadTest {
var wrapper = BinaryBuffer.wrap(buffer);
wrapper.reset(0, buffer.position());
var result = PacketUtils.readPackets(wrapper, compressed);
var remaining = result.remaining();
List<Pair<Integer, ByteBuffer>> packets = new ArrayList<>();
var remaining = PacketUtils.readPackets(wrapper, compressed,
(integer, payload) -> packets.add(Pair.of(integer, payload)));
assertNotNull(remaining);
assertEquals(Utils.getVarIntSize(200), remaining.readableBytes());
var packets = result.packets();
assertEquals(1, packets.size());
var rawPacket = packets.get(0);
assertEquals(0x0A, rawPacket.id());
var readPacket = new ClientPluginMessagePacket(new BinaryReader(rawPacket.payload()));
assertEquals(0x0A, rawPacket.left());
var readPacket = new ClientPluginMessagePacket(new BinaryReader(rawPacket.right()));
assertEquals("channel", readPacket.channel());
assertEquals(2000, readPacket.data().length);
}
@ -105,16 +111,16 @@ public class SocketReadTest {
var wrapper = BinaryBuffer.wrap(buffer);
wrapper.reset(0, buffer.position());
var result = PacketUtils.readPackets(wrapper, compressed);
var remaining = result.remaining();
List<Pair<Integer, ByteBuffer>> packets = new ArrayList<>();
var remaining = PacketUtils.readPackets(wrapper, compressed,
(integer, payload) -> packets.add(Pair.of(integer, payload)));
assertNotNull(remaining);
assertEquals(1, remaining.readableBytes());
var packets = result.packets();
assertEquals(1, packets.size());
var rawPacket = packets.get(0);
assertEquals(0x0A, rawPacket.id());
var readPacket = new ClientPluginMessagePacket(new BinaryReader(rawPacket.payload()));
assertEquals(0x0A, rawPacket.left());
var readPacket = new ClientPluginMessagePacket(new BinaryReader(rawPacket.right()));
assertEquals("channel", readPacket.channel());
assertEquals(2000, readPacket.data().length);
}