mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-15 18:29:46 +00:00
Code Issues Projects Releases Wiki Activity

ResourcePacksSessionHandler: Prevent clients requesting the same chunk more than once

Browse Source 
Currently this can be used to attack the server by spamming requests for the same chunks forever. This commit prevents that by disconnecting the client if a chunk is requested more than 1 time. It is not necessary to allow more than 1 request per chunk, since RakNet should ensure that these are always delivered correctly.
This commit is contained in:
Dylan K. Taylor 2018-07-21 14:31:34 +01:00
parent d6e61e3e00
commit da876cc8f3
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pocketmine/network/mcpe/handler/ResourcePacksSessionHandler.php
View File

@ -48,6 +48,9 @@ class ResourcePacksSessionHandler extends SessionHandler{
/** @var ResourcePackManager */
private $resourcePackManager;
/** @var bool[][] uuid => [chunk index => hasSent] */
private $downloadedChunks = [];
public function __construct(Player $player, NetworkSession $session, ResourcePackManager $resourcePackManager){
$this->player = $player;
$this->session = $session;
@ -113,6 +116,15 @@ class ResourcePacksSessionHandler extends SessionHandler{
return false;
}
$packId = $pack->getPackId(); //use this because case may be different
if(isset($this->downloadedChunks[$packId][$packet->chunkIndex])){
$this->player->close("", "disconnectionScreen.resourcePack", true);
$this->player->getServer()->getLogger()->debug("Got a duplicate resource pack chunk request for pack " . $packet->packId . " chunk $packet->chunkIndex");
return false;
}
$offset = $packet->chunkIndex * self::PACK_CHUNK_SIZE;
if($offset < 0 or $offset >= $pack->getPackSize()){
$this->player->close("", "disconnectionScreen.resourcePack", true);
@ -121,8 +133,14 @@ class ResourcePacksSessionHandler extends SessionHandler{
return false;
}
if(!isset($this->downloadedChunks[$packId])){
$this->downloadedChunks[$packId] = [$packet->chunkIndex => true];
}else{
$this->downloadedChunks[$packId][$packet->chunkIndex] = true;
}
$pk = new ResourcePackChunkDataPacket();
$pk->packId = $pack->getPackId();
$pk->packId = $packId;
$pk->chunkIndex = $packet->chunkIndex;
$pk->data = $pack->getPackChunk($offset, self::PACK_CHUNK_SIZE);
$pk->progress = $offset;