From 009eee3fcaf4de12be615a77eeee931316e9f3fe Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Sat, 22 Mar 2014 18:29:15 +0100 Subject: [PATCH] Created a validateAndSend method to validate packets against the access rights prior to sending them. --- mcp/mobius/opis/events/OpisServerTickHandler.java | 4 ++-- mcp/mobius/opis/network/OpisPacketHandler.java | 11 +++++++++-- .../opis/network/server/Packet250Metadata.java | 14 ++++++++++++++ .../opis/network/server/Packet_DataList.java | 7 +++++-- .../opis/network/server/Packet_DataValue.java | 9 ++++++--- 5 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 mcp/mobius/opis/network/server/Packet250Metadata.java diff --git a/mcp/mobius/opis/events/OpisServerTickHandler.java b/mcp/mobius/opis/events/OpisServerTickHandler.java index 0a22221..bfe79ea 100644 --- a/mcp/mobius/opis/events/OpisServerTickHandler.java +++ b/mcp/mobius/opis/events/OpisServerTickHandler.java @@ -143,7 +143,7 @@ public class OpisServerTickHandler implements ITickHandler { ArrayList amountEntities = EntityManager.getCumulativeEntities(filtered); // Here we send a full update to the player - PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST_AMOUNT_ENTITIES, amountEntities), player); + OpisPacketHandler.validateAndSend(Packet_DataList.create(DataReq.LIST_AMOUNT_ENTITIES, amountEntities), player); } for (Player player : PlayerTracker.instance().playersOpis) @@ -169,7 +169,7 @@ public class OpisServerTickHandler implements ITickHandler { PacketDispatcher.sendPacketToPlayer( Packet_LoadedChunks.create(ChunkManager.getLoadedChunks(PlayerTracker.instance().playerDimension.get(player))), player); if (PlayerTracker.instance().playerOverlayStatus.get(player) == OverlayStatus.MEANTIME){ ArrayList timingChunks = ChunkManager.getTopChunks(100); - PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST_TIMING_CHUNK, timingChunks), player); + OpisPacketHandler.validateAndSend(Packet_DataList.create(DataReq.LIST_TIMING_CHUNK, timingChunks), player); } } } diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index 7fccf52..2e11430 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -8,6 +8,7 @@ import java.util.ArrayList; import mapwriter.Mw; import mcp.mobius.opis.modOpis; import mcp.mobius.opis.data.client.DataCache; +import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk; import mcp.mobius.opis.data.holders.basetypes.SerialDouble; import mcp.mobius.opis.data.holders.basetypes.SerialInt; @@ -25,6 +26,7 @@ import mcp.mobius.opis.network.client.Packet_ReqChunks; import mcp.mobius.opis.network.client.Packet_ReqData; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.DataReq; +import mcp.mobius.opis.network.server.Packet250Metadata; import mcp.mobius.opis.network.server.Packet_Chunks; import mcp.mobius.opis.network.server.Packet_ClientCommand; import mcp.mobius.opis.network.server.Packet_DataList; @@ -264,9 +266,14 @@ public class OpisPacketHandler implements IPacketHandler { } } - public static void sendPacketToAllSwing(Packet250CustomPayload packet){ - for (Player player : PlayerTracker.instance().playersSwing) + public static void validateAndSend(Packet250Metadata packet, Player player){ + if (packet.dataReq.canPlayerUseCommand(player)) PacketDispatcher.sendPacketToPlayer(packet, player); } + + public static void sendPacketToAllSwing(Packet250Metadata packet){ + for (Player player : PlayerTracker.instance().playersSwing) + OpisPacketHandler.validateAndSend(packet, player); + } } diff --git a/mcp/mobius/opis/network/server/Packet250Metadata.java b/mcp/mobius/opis/network/server/Packet250Metadata.java new file mode 100644 index 0000000..b759d36 --- /dev/null +++ b/mcp/mobius/opis/network/server/Packet250Metadata.java @@ -0,0 +1,14 @@ +package mcp.mobius.opis.network.server; + +import java.util.ArrayList; + +import mcp.mobius.opis.data.holders.ISerializable; +import mcp.mobius.opis.network.enums.DataReq; +import net.minecraft.network.packet.Packet250CustomPayload; + +public class Packet250Metadata extends Packet250CustomPayload { + + public DataReq dataReq; + public ISerializable dataValue; + public ArrayList dataList; +} diff --git a/mcp/mobius/opis/network/server/Packet_DataList.java b/mcp/mobius/opis/network/server/Packet_DataList.java index ed4aeb7..34ea63a 100644 --- a/mcp/mobius/opis/network/server/Packet_DataList.java +++ b/mcp/mobius/opis/network/server/Packet_DataList.java @@ -42,8 +42,8 @@ public class Packet_DataList { } catch (IOException e){} } - public static Packet250CustomPayload create(DataReq dataReq, ArrayList stats){ - Packet250CustomPayload packet = new Packet250CustomPayload(); + public static Packet250Metadata create(DataReq dataReq, ArrayList stats){ + Packet250Metadata packet = new Packet250Metadata(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream ostream = new DataOutputStream(bos); @@ -59,6 +59,9 @@ public class Packet_DataList { data.writeToStream(ostream); }catch(IOException e){} + packet.dataReq = dataReq; + packet.dataList = stats; + packet.channel = "Opis"; packet.data = bos.toByteArray(); packet.length = bos.size(); diff --git a/mcp/mobius/opis/network/server/Packet_DataValue.java b/mcp/mobius/opis/network/server/Packet_DataValue.java index 25ddfcb..1bda89c 100644 --- a/mcp/mobius/opis/network/server/Packet_DataValue.java +++ b/mcp/mobius/opis/network/server/Packet_DataValue.java @@ -32,10 +32,10 @@ public class Packet_DataValue { } catch (IOException e){} } - public static Packet250CustomPayload create(DataReq dataReq, ISerializable data){ - Packet250CustomPayload packet = new Packet250CustomPayload(); + public static Packet250Metadata create(DataReq dataReq, ISerializable data){ + Packet250Metadata packet = new Packet250Metadata(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); - DataOutputStream ostream = new DataOutputStream(bos); + DataOutputStream ostream = new DataOutputStream(bos); try{ ostream.writeByte(Packets.DATA_VALUE_GENERAL); @@ -45,6 +45,9 @@ public class Packet_DataValue { }catch(IOException e){} + packet.dataReq = dataReq; + packet.dataValue = data; + packet.channel = "Opis"; packet.data = bos.toByteArray(); packet.length = bos.size();