mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-23 11:26:37 +00:00
Code Issues Projects Releases Wiki Activity

SkinAdapter::fromSkinData() may now throw InvalidSkinException

Browse Source 
fixes a rogue TODO in LegacySkinAdapter and invalid skins maybe showing up as Steve instead of getting kicked off the server
This commit is contained in:
Dylan K. Taylor 2020-06-17 21:44:22 +01:00
parent 1c13ba5656
commit 77c71e22b2
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pocketmine/Player.php
View File

@ -33,6 +33,7 @@ use pocketmine\entity\Effect;
use pocketmine\entity\EffectInstance; use pocketmine\entity\EffectInstance;
use pocketmine\entity\Entity; use pocketmine\entity\Entity;
use pocketmine\entity\Human; use pocketmine\entity\Human;
use pocketmine\entity\InvalidSkinException;
use pocketmine\entity\object\ItemEntity; use pocketmine\entity\object\ItemEntity;
use pocketmine\entity\projectile\Arrow; use pocketmine\entity\projectile\Arrow;
use pocketmine\entity\Skin; use pocketmine\entity\Skin;
@ -1957,9 +1958,11 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
true true
); );
$skin = SkinAdapterSingleton::get()->fromSkinData($skinData); try{
$skin = SkinAdapterSingleton::get()->fromSkinData($skinData);
if(!$skin->isValid()){ $skin->validate();
}catch(InvalidSkinException $e){
$this->server->getLogger()->debug("$this->username: Invalid skin: " . $e->getMessage());
$this->close("", "disconnectionScreen.invalidSkin"); $this->close("", "disconnectionScreen.invalidSkin");
return true; return true;

4
src/pocketmine/network/mcpe/protocol/types/LegacySkinAdapter.php
View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace pocketmine\network\mcpe\protocol\types; namespace pocketmine\network\mcpe\protocol\types;
use pocketmine\entity\InvalidSkinException;
use pocketmine\entity\Skin; use pocketmine\entity\Skin;
use function is_string; use function is_string;
@ -56,12 +57,11 @@ class LegacySkinAdapter implements SkinAdapter{
$capeData = $data->isPersonaCapeOnClassic() ? "" : $data->getCapeImage()->getData(); $capeData = $data->isPersonaCapeOnClassic() ? "" : $data->getCapeImage()->getData();
$geometryName = "";
$resourcePatch = json_decode($data->getResourcePatch(), true); $resourcePatch = json_decode($data->getResourcePatch(), true);
if(isset($resourcePatch["geometry"]["default"]) && is_string($resourcePatch["geometry"]["default"])){ if(isset($resourcePatch["geometry"]["default"]) && is_string($resourcePatch["geometry"]["default"])){
$geometryName = $resourcePatch["geometry"]["default"]; $geometryName = $resourcePatch["geometry"]["default"];
}else{ }else{
//TODO: Kick for invalid skin throw new InvalidSkinException("Missing geometry name field");
} }
return new Skin($data->getSkinId(), $data->getSkinImage()->getData(), $capeData, $geometryName, $data->getGeometryData()); return new Skin($data->getSkinId(), $data->getSkinImage()->getData(), $capeData, $geometryName, $data->getGeometryData());

2
src/pocketmine/network/mcpe/protocol/types/SkinAdapter.php
View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace pocketmine\network\mcpe\protocol\types; namespace pocketmine\network\mcpe\protocol\types;
use pocketmine\entity\InvalidSkinException;
use pocketmine\entity\Skin; use pocketmine\entity\Skin;
/** /**
@ -37,6 +38,7 @@ interface SkinAdapter{
/** /**
* Allows you to convert skin data to a skin entity. * Allows you to convert skin data to a skin entity.
* @throws InvalidSkinException
*/ */
public function fromSkinData(SkinData $data) : Skin; public function fromSkinData(SkinData $data) : Skin;
} }