nitro/G-Earth
1
0
Fork 0
mirror of https://github.com/sirjonasxx/G-Earth.git synced 2024-11-23 08:50:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Validate headerId first in NetworkExtensionsProducer (#125)

Browse Source
This commit is contained in:
Dorving 2022-04-11 04:41:03 +02:00
parent 99b349e9b0
commit 82ae7dc7a9
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/NetworkExtensionsProducer.java
View File

@ -37,6 +37,11 @@ public final class NetworkExtensionsProducer implements ExtensionProducer {
*/ */
private static final int MAX_STRING_SIZE = Character.BYTES * 100; private static final int MAX_STRING_SIZE = Character.BYTES * 100;
/**
* Length is encoded as an {@link Integer} and header id as an {@link Short}.
*/
private static final int LENGTH_AND_ID_SIZE = Integer.BYTES + Short.BYTES;
/** /**
* Represents the maximum number of bytes in the body of an incoming packet. * Represents the maximum number of bytes in the body of an incoming packet.
* <p> * <p>
@ -95,14 +100,18 @@ public final class NetworkExtensionsProducer implements ExtensionProducer {
// listen to incoming data from client // listen to incoming data from client
while (!extensionSocket.isClosed()) { while (!extensionSocket.isClosed()) {
if (dIn.available() < LENGTH_AND_ID_SIZE)
continue;
final int length = dIn.readInt(); final int length = dIn.readInt();
final short headerId = dIn.readShort();
if (headerId == NetworkExtensionInfo.INCOMING_MESSAGES_IDS.EXTENSIONINFO) {
if (length > MAX_PACKET_BODY_SIZE) if (length > MAX_PACKET_BODY_SIZE)
break; break;
final HPacket packet = readPacket(dIn, length); final HPacket packet = readPacket(dIn, length, headerId);
if (packet.headerId() == NetworkExtensionInfo.INCOMING_MESSAGES_IDS.EXTENSIONINFO) {
final NetworkExtension gEarthExtension = new NetworkExtension(packet, extensionSocket); final NetworkExtension gEarthExtension = new NetworkExtension(packet, extensionSocket);
@ -134,15 +143,17 @@ public final class NetworkExtensionsProducer implements ExtensionProducer {
} }
} }
private HPacket readPacket(DataInputStream dIn, int length) throws IOException { private HPacket readPacket(DataInputStream dIn, int length, short id) throws IOException {
final byte[] headerAndBody = new byte[length + 4]; final byte[] headerAndBody = new byte[length + LENGTH_AND_ID_SIZE];
int amountRead = 0; int amountRead = 0;
while (amountRead < length) while (amountRead < length)
amountRead += dIn.read(headerAndBody, 4 + amountRead, Math.min(dIn.available(), length - amountRead)); amountRead += dIn.read(headerAndBody, amountRead + LENGTH_AND_ID_SIZE, Math.min(dIn.available(), length - amountRead));
final HPacket packet = new HPacket(headerAndBody); final HPacket packet = new HPacket(headerAndBody);
packet.fixLength(); packet.fixLength();
packet.replaceShort(4, id); // add header id
return packet; return packet;
} }