mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 01:46:04 +00:00
Code Issues Projects Releases Wiki Activity

Fixed the disaster of packet receive error handling

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-01-16 19:52:41 +00:00
parent ddc2bed63f
commit 23269da1a6
19 changed files with 126 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/pocketmine/network/mcpe/protocol/LoginPacket.php
View File

@ -28,6 +28,7 @@ namespace pocketmine\network\mcpe\protocol;
use Particle\Validator\Validator;
use pocketmine\entity\Skin;
use pocketmine\network\BadPacketException;
use pocketmine\network\mcpe\handler\SessionHandler;
use pocketmine\PlayerInfo;
use pocketmine\utils\BinaryStream;
@ -110,7 +111,7 @@ class LoginPacket extends DataPacket{
foreach($result->getFailures() as $f){
$messages[] = $f->format();
}
throw new \UnexpectedValueException("Failed to validate '$name': " . implode(", ", $messages));
throw new BadPacketException("Failed to validate '$name': " . implode(", ", $messages));
}
}
@ -123,7 +124,7 @@ class LoginPacket extends DataPacket{
$chainData = json_decode($buffer->get($buffer->getLInt()), true);
if(!is_array($chainData)){
throw new \UnexpectedValueException("Failed to decode chainData JSON: " . json_last_error_msg());
throw new BadPacketException("Failed to decode chainData JSON: " . json_last_error_msg());
}
$vd = new Validator();
@ -138,10 +139,10 @@ class LoginPacket extends DataPacket{
$claims = Utils::getJwtClaims($chain);
if(isset($claims["extraData"])){
if(!is_array($claims["extraData"])){
throw new \UnexpectedValueException("'extraData' key should be an array");
throw new BadPacketException("'extraData' key should be an array");
}
if($this->extraData !== null){
throw new \UnexpectedValueException("Found 'extraData' more than once in chainData");
throw new BadPacketException("Found 'extraData' more than once in chainData");
}
$extraV = new Validator();
@ -154,7 +155,7 @@ class LoginPacket extends DataPacket{
}
}
if($this->extraData === null){
throw new \UnexpectedValueException("'extraData' not found in chain data");
throw new BadPacketException("'extraData' not found in chain data");
}
$this->clientDataJwt = $buffer->get($buffer->getLInt());