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

ResourcePackManager: validate pack UUIDs

Browse Source 
fixes CrashArchive ##12248760
This commit is contained in:
Dylan K. Taylor 2025-02-23 19:45:38 +00:00
parent 77be5f8e25
commit 3050af0bc0
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/resourcepacks/ResourcePackManager.php
View File

@ -26,6 +26,7 @@ namespace pocketmine\resourcepacks;
use pocketmine\utils\Config; use pocketmine\utils\Config;
use pocketmine\utils\Filesystem; use pocketmine\utils\Filesystem;
use pocketmine\utils\Utils; use pocketmine\utils\Utils;
use Ramsey\Uuid\Uuid;
use Symfony\Component\Filesystem\Path; use Symfony\Component\Filesystem\Path;
use function array_keys; use function array_keys;
use function copy; use function copy;
@ -103,9 +104,14 @@ class ResourcePackManager{
try{ try{
$newPack = $this->loadPackFromPath(Path::join($this->path, $pack)); $newPack = $this->loadPackFromPath(Path::join($this->path, $pack));
$this->resourcePacks[] = $newPack;
$index = strtolower($newPack->getPackId()); $index = strtolower($newPack->getPackId());
if(!Uuid::isValid($index)){
//TODO: we should use Uuid in ResourcePack interface directly but that would break BC
//for now we need to validate this here to make sure it doesn't cause crashes later on
throw new ResourcePackException("Invalid UUID ($index)");
}
$this->uuidList[$index] = $newPack; $this->uuidList[$index] = $newPack;
$this->resourcePacks[] = $newPack;
$keyPath = Path::join($this->path, $pack . ".key"); $keyPath = Path::join($this->path, $pack . ".key");
if(file_exists($keyPath)){ if(file_exists($keyPath)){
@ -190,6 +196,11 @@ class ResourcePackManager{
$resourcePacks = []; $resourcePacks = [];
foreach($resourceStack as $pack){ foreach($resourceStack as $pack){
$uuid = strtolower($pack->getPackId()); $uuid = strtolower($pack->getPackId());
if(!Uuid::isValid($uuid)){
//TODO: we should use Uuid in ResourcePack interface directly but that would break BC
//for now we need to validate this here to make sure it doesn't cause crashes later on
throw new \InvalidArgumentException("Invalid resource pack UUID ($uuid)");
}
if(isset($uuidList[$uuid])){ if(isset($uuidList[$uuid])){
throw new \InvalidArgumentException("Cannot load two resource pack with the same UUID ($uuid)"); throw new \InvalidArgumentException("Cannot load two resource pack with the same UUID ($uuid)");
} }