mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-21 08:17:34 +00:00
Code Issues Projects Releases Wiki Activity

Properly handle errors decoding network item NBT

Browse Source 
since the NBT is now decoded immediately now, any incorrect NBT will cause exceptions to be thrown that we weren't handling, causing server crashes.
This commit is contained in:
Dylan K. Taylor 2021-10-05 19:10:55 +01:00
parent fef8297907
commit 817ab88c70
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/network/mcpe/convert/TypeConverter.php
View File

@ -37,6 +37,7 @@ use pocketmine\item\Durable;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\item\ItemIds;
use pocketmine\nbt\NbtException;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\IntTag;
use pocketmine\network\mcpe\InventoryManager;
@ -183,6 +184,9 @@ class TypeConverter{
);
}
/**
* @throws TypeConversionException
*/
public function netItemStackToCore(ItemStack $itemStack) : Item{
if($itemStack->getId() === 0){
return ItemFactory::getInstance()->get(ItemIds::AIR, 0, 0);
@ -214,12 +218,16 @@ class TypeConverter{
}
}
return ItemFactory::getInstance()->get(
$id,
$meta,
$itemStack->getCount(),
$compound
);
try{
return ItemFactory::getInstance()->get(
$id,
$meta,
$itemStack->getCount(),
$compound
);
}catch(NbtException $e){
throw TypeConversionException::wrap($e, "Bad itemstack NBT data");
}
}
/**
@ -239,15 +247,23 @@ class TypeConverter{
}
/**
* @throws \UnexpectedValueException
* @throws TypeConversionException
*/
public function createInventoryAction(NetworkInventoryAction $action, Player $player, InventoryManager $inventoryManager) : ?InventoryAction{
if($action->oldItem->getItemStack()->equals($action->newItem->getItemStack())){
//filter out useless noise in 1.13
return null;
}
$old = $this->netItemStackToCore($action->oldItem->getItemStack());
$new = $this->netItemStackToCore($action->newItem->getItemStack());
try{
$old = $this->netItemStackToCore($action->oldItem->getItemStack());
}catch(TypeConversionException $e){
throw TypeConversionException::wrap($e, "Inventory action: oldItem");
}
try{
$new = $this->netItemStackToCore($action->newItem->getItemStack());
}catch(TypeConversionException $e){
throw TypeConversionException::wrap($e, "Inventory action: newItem");
}
switch($action->sourceType){
case NetworkInventoryAction::SOURCE_CONTAINER:
if($action->windowId === ContainerIds::UI and $action->inventorySlot > 0){
@ -273,7 +289,7 @@ class TypeConverter{
fn(Inventory $i) => $i instanceof LoomInventory);
}
if($mapped === null){
throw new \UnexpectedValueException("Unmatched UI inventory slot offset $pSlot");
throw new TypeConversionException("Unmatched UI inventory slot offset $pSlot");
}
[$slot, $window] = $mapped;
}else{
@ -284,10 +300,10 @@ class TypeConverter{
return new SlotChangeAction($window, $slot, $old, $new);
}
throw new \UnexpectedValueException("No open container with window ID $action->windowId");
throw new TypeConversionException("No open container with window ID $action->windowId");
case NetworkInventoryAction::SOURCE_WORLD:
if($action->inventorySlot !== NetworkInventoryAction::ACTION_MAGIC_SLOT_DROP_ITEM){
throw new \UnexpectedValueException("Only expecting drop-item world actions from the client!");
throw new TypeConversionException("Only expecting drop-item world actions from the client!");
}
return new DropItemAction($new);
@ -298,7 +314,7 @@ class TypeConverter{
case NetworkInventoryAction::ACTION_MAGIC_SLOT_CREATIVE_CREATE_ITEM:
return new CreateItemAction($old);
default:
throw new \UnexpectedValueException("Unexpected creative action type $action->inventorySlot");
throw new TypeConversionException("Unexpected creative action type $action->inventorySlot");
}
case NetworkInventoryAction::SOURCE_TODO:
@ -310,9 +326,9 @@ class TypeConverter{
}
//TODO: more stuff
throw new \UnexpectedValueException("No open container with window ID $action->windowId");
throw new TypeConversionException("No open container with window ID $action->windowId");
default:
throw new \UnexpectedValueException("Unknown inventory source type $action->sourceType");
throw new TypeConversionException("Unknown inventory source type $action->sourceType");
}
}
}

5
src/network/mcpe/handler/InGamePacketHandler.php
View File

@ -42,6 +42,7 @@ use pocketmine\math\Vector3;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\StringTag;
use pocketmine\network\mcpe\convert\SkinAdapterSingleton;
use pocketmine\network\mcpe\convert\TypeConversionException;
use pocketmine\network\mcpe\convert\TypeConverter;
use pocketmine\network\mcpe\InventoryManager;
use pocketmine\network\mcpe\NetworkSession;
@ -271,8 +272,8 @@ class InGamePacketHandler extends PacketHandler{
if($action !== null){
$actions[] = $action;
}
}catch(\UnexpectedValueException $e){
$this->session->getLogger()->debug("Unhandled inventory action: " . $e->getMessage());
}catch(TypeConversionException $e){
$this->session->getLogger()->debug("Error unpacking inventory action: " . $e->getMessage());
return false;
}
}