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

Renamed BadPacketException -> PacketHandlingException

Browse Source 
this better describes the intent, instead of just vaguely describing a packet as 'bad'.
This commit is contained in:
Dylan K. Taylor
2021-03-30 01:15:28 +01:00
parent 25998720ce
commit b7a6c9dc17
7 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/network/mcpe/handler/LoginPacketHandler.php
View File

@ -26,7 +26,6 @@ namespace pocketmine\network\mcpe\handler;
use Mdanter\Ecc\Crypto\Key\PublicKeyInterface;
use pocketmine\entity\InvalidSkinException;
use pocketmine\event\player\PlayerPreLoginEvent;
use pocketmine\network\BadPacketException;
use pocketmine\network\mcpe\auth\ProcessLoginTask;
use pocketmine\network\mcpe\convert\SkinAdapterSingleton;
use pocketmine\network\mcpe\JwtException;
@ -39,6 +38,7 @@ use pocketmine\network\mcpe\protocol\types\login\AuthenticationData;
use pocketmine\network\mcpe\protocol\types\login\ClientData;
use pocketmine\network\mcpe\protocol\types\login\ClientDataToSkinDataHelper;
use pocketmine\network\mcpe\protocol\types\login\JwtChain;
use pocketmine\network\PacketHandlingException;
use pocketmine\player\Player;
use pocketmine\player\PlayerInfo;
use pocketmine\player\XboxLivePlayerInfo;
@ -113,7 +113,7 @@ class LoginPacketHandler extends PacketHandler{
}
if(!Uuid::isValid($extraData->identity)){
throw new BadPacketException("Invalid login UUID");
throw new PacketHandlingException("Invalid login UUID");
}
$uuid = Uuid::fromString($extraData->identity);
if($extraData->XUID !== ""){
@ -164,7 +164,7 @@ class LoginPacketHandler extends PacketHandler{
}
/**
* @throws BadPacketException
* @throws PacketHandlingException
*/
protected function fetchAuthData(JwtChain $chain) : AuthenticationData{
/** @var AuthenticationData|null $extraData */
@ -174,15 +174,15 @@ class LoginPacketHandler extends PacketHandler{
try{
[, $claims, ] = JwtUtils::parse($jwt);
}catch(JwtException $e){
throw BadPacketException::wrap($e);
throw PacketHandlingException::wrap($e);
}
if(isset($claims["extraData"])){
if($extraData !== null){
throw new BadPacketException("Found 'extraData' more than once in chainData");
throw new PacketHandlingException("Found 'extraData' more than once in chainData");
}
if(!is_array($claims["extraData"])){
throw new BadPacketException("'extraData' key should be an array");
throw new PacketHandlingException("'extraData' key should be an array");
}
$mapper = new \JsonMapper;
$mapper->bEnforceMapType = false; //TODO: we don't really need this as an array, but right now we don't have enough models
@ -192,24 +192,24 @@ class LoginPacketHandler extends PacketHandler{
/** @var AuthenticationData $extraData */
$extraData = $mapper->map($claims["extraData"], new AuthenticationData);
}catch(\JsonMapper_Exception $e){
throw BadPacketException::wrap($e);
throw PacketHandlingException::wrap($e);
}
}
}
if($extraData === null){
throw new BadPacketException("'extraData' not found in chain data");
throw new PacketHandlingException("'extraData' not found in chain data");
}
return $extraData;
}
/**
* @throws BadPacketException
* @throws PacketHandlingException
*/
protected function parseClientData(string $clientDataJwt) : ClientData{
try{
[, $clientDataClaims, ] = JwtUtils::parse($clientDataJwt);
}catch(JwtException $e){
throw BadPacketException::wrap($e);
throw PacketHandlingException::wrap($e);
}
$mapper = new \JsonMapper;
@ -219,7 +219,7 @@ class LoginPacketHandler extends PacketHandler{
try{
$clientData = $mapper->map($clientDataClaims, new ClientData);
}catch(\JsonMapper_Exception $e){
throw BadPacketException::wrap($e);
throw PacketHandlingException::wrap($e);
}
return $clientData;
}