Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 19:15:32 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-3235: Disconnect for payload errors

Browse Source
This commit is contained in:
md_5 2017-05-14 09:25:25 +10:00
parent 2b6c9f40ae
commit fcc5dcce54
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nms-patches/PlayerConnection.patch
View File

@ -1156,7 +1156,7 @@
+ if (packetplayinwindowclick.b() < -1 && packetplayinwindowclick.b() != -999) { + if (packetplayinwindowclick.b() < -1 && packetplayinwindowclick.b() != -999) {
+ return; + return;
+ } + }
+
+ InventoryView inventory = this.player.activeContainer.getBukkitView(); + InventoryView inventory = this.player.activeContainer.getBukkitView();
+ SlotType type = CraftInventoryView.getSlotType(inventory, packetplayinwindowclick.b()); + SlotType type = CraftInventoryView.getSlotType(inventory, packetplayinwindowclick.b());
+ +
@ -1412,7 +1412,7 @@
+ } + }
+ return; + return;
+ } + }
+
+ if (event instanceof CraftItemEvent) { + if (event instanceof CraftItemEvent) {
+ // Need to update the inventory on crafting to + // Need to update the inventory on crafting to
+ // correctly support custom recipes + // correctly support custom recipes
@ -1649,25 +1649,43 @@
} }
} else if ("MC|PickItem".equals(s)) { } else if ("MC|PickItem".equals(s)) {
packetdataserializer = packetplayincustompayload.b(); packetdataserializer = packetplayincustompayload.b();
@@ -1323,9 +2427,31 @@ @@ -1321,11 +2425,49 @@
this.player.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(this.player.inventory.itemInHandIndex));
} catch (Exception exception7) {
PlayerConnection.LOGGER.error("Couldn\'t pick item", exception7); PlayerConnection.LOGGER.error("Couldn\'t pick item", exception7);
+ this.disconnect("Invalid pick item!"); // CraftBukkit
} }
} }
+ // CraftBukkit start + // CraftBukkit start
+ else if (packetplayincustompayload.a().equals("REGISTER")) { + else if (packetplayincustompayload.a().equals("REGISTER")) {
+ try {
+ String channels = packetplayincustompayload.b().toString(com.google.common.base.Charsets.UTF_8); + String channels = packetplayincustompayload.b().toString(com.google.common.base.Charsets.UTF_8);
+ for (String channel : channels.split("\0")) { + for (String channel : channels.split("\0")) {
+ getPlayer().addChannel(channel); + getPlayer().addChannel(channel);
+ } + }
+ } catch (Exception ex) {
+ PlayerConnection.LOGGER.error("Couldn\'t register custom payload", ex);
+ this.disconnect("Invalid payload REGISTER!");
+ }
+ } else if (packetplayincustompayload.a().equals("UNREGISTER")) { + } else if (packetplayincustompayload.a().equals("UNREGISTER")) {
+ try {
+ String channels = packetplayincustompayload.b().toString(com.google.common.base.Charsets.UTF_8); + String channels = packetplayincustompayload.b().toString(com.google.common.base.Charsets.UTF_8);
+ for (String channel : channels.split("\0")) { + for (String channel : channels.split("\0")) {
+ getPlayer().removeChannel(channel); + getPlayer().removeChannel(channel);
+ } + }
+ } catch (Exception ex) {
+ PlayerConnection.LOGGER.error("Couldn\'t unregister custom payload", ex);
+ this.disconnect("Invalid payload UNREGISTER!");
+ }
+ } else { + } else {
+ try {
+ byte[] data = new byte[packetplayincustompayload.b().readableBytes()]; + byte[] data = new byte[packetplayincustompayload.b().readableBytes()];
+ packetplayincustompayload.b().readBytes(data); + packetplayincustompayload.b().readBytes(data);
+ server.getMessenger().dispatchIncomingMessage(player.getBukkitEntity(), packetplayincustompayload.a(), data); + server.getMessenger().dispatchIncomingMessage(player.getBukkitEntity(), packetplayincustompayload.a(), data);
+ } catch (Exception ex) {
+ PlayerConnection.LOGGER.error("Couldn\'t dispatch custom payload", ex);
+ this.disconnect("Invalid custom payload!");
+ }
+ } + }
+ // CraftBukkit end + // CraftBukkit end
} }