diff --git a/src/Player.php b/src/Player.php index 86bf3317..29e398a4 100755 --- a/src/Player.php +++ b/src/Player.php @@ -223,7 +223,7 @@ class Player{ $this->chatMessagesQueue->data = []; //$this->server->schedule(20 * 60, [$this, "clearQueue"], [], true); - + $this->server->interface->maxACKsAllowed["{$this->ip}:{$this->port}"] = 0; $this->evid[] = $this->server->event("server.close", [$this, "close"]); console("[DEBUG] New Session started with $ip:$port. MTU {$this->MTU}, Client ID {$this->clientID}", true, true, 2); } @@ -2021,6 +2021,10 @@ class Player{ //$this->entity->close(); } } + + public function __destruct(){ //pwease dont leak memory >_< + unset($this->server->interface->maxACKsAllowed["{$this->ip}:{$this->port}"]); + } public function save(){ if($this->entity instanceof Entity){ diff --git a/src/network/MinecraftInterface.php b/src/network/MinecraftInterface.php index 725d99ef..7f4b84f0 100644 --- a/src/network/MinecraftInterface.php +++ b/src/network/MinecraftInterface.php @@ -37,18 +37,43 @@ class MinecraftInterface{ return $this->parsePacket($buf, $source, $port); } + /** + * Stores max ACK packets that the server is allowed to handle. + * + * @var array + */ + public $maxACKsAllowed = []; + private function parsePacket($buffer, $source, $port){ $pid = ord($buffer[0]); if(RakNetInfo::isValid($pid)){ - $packet = RakNetParser::parse($buffer); + $id = "$source:$port"; + $ackCnt = 0; + $acks = $this->maxACKsAllowed[$id] ?? 0; + + $packet = RakNetParser::parse($buffer, $acks, $ackCnt); if($packet !== false){ + if($ackCnt != 0 && isset($this->maxACKsAllowed[$id])){ + $this->maxACKsAllowed[$id] = $acks - $ackCnt; + } $packet->ip = $source; $packet->port = $port; if(EventHandler::callEvent(new PacketReceiveEvent($packet)) === BaseEvent::DENY){ return false; } return $packet; + }else if($ackCnt > 0){ + $CID = PocketMinecraftServer::clientID($source, $port); + $server = ServerAPI::request(); + $c = $server->clients[$CID] ?? false; + if($c !== false){ + $username = $c->iusername == "" ? $id : $c->iusername; + ConsoleAPI::warn("Player '$username' sent too many ACK packets (allowed: {$acks}, attempted {$ackCnt} or more)!"); + $c->close("too many ack packets"); + }else{ + //ConsoleAPI::warn("$id sent too many ACK packets (allowed: {$acks}, attempted {$ackCnt} or more)!"); + } } return false; }elseif($pid === 0xfe and $buffer[1] === "\xfd" and ServerAPI::request()->api->query instanceof QueryHandler){ @@ -75,6 +100,14 @@ class MinecraftInterface{ return 0; }elseif($packet instanceof RakNetPacket){ RakNetCodec::encode($packet); + if($packet->pid() >= RakNetInfo::DATA_PACKET_0 && $packet->pid() <= RakNetInfo::DATA_PACKET_F){ + $id = "{$packet->ip}:{$packet->port}"; + if(isset($this->maxACKsAllowed[$id])){ + ++$this->maxACKsAllowed[$id]; + }else{ + $this->maxACKsAllowed[$id] = 1; + } + } } $write = $this->socket->write($packet->buffer, $packet->ip, $packet->port); $this->bandwidth[1] += $write; diff --git a/src/network/UDPSocket.php b/src/network/UDPSocket.php index 260a1d4b..f53fc9a3 100644 --- a/src/network/UDPSocket.php +++ b/src/network/UDPSocket.php @@ -2,7 +2,10 @@ class UDPSocket{ - public $connected, $sock, $server, $port; + public $connected; + public $sock; + public $server; + public $port; function __construct($server, $port, $listen = false, $serverip = "0.0.0.0"){ $this->server = $server; $this->port = $port; diff --git a/src/network/raknet/RakNetParser.php b/src/network/raknet/RakNetParser.php index 74bc3708..27ec561e 100644 --- a/src/network/raknet/RakNetParser.php +++ b/src/network/raknet/RakNetParser.php @@ -1,7 +1,7 @@ packets = []; + $acks = 0; for($i = 0; $i < $count && isset($buffer[$offset]); ++$i){ ++$offset; if(ord(substr($buffer, $offset - 1, 1)) === 0){ @@ -67,17 +68,29 @@ class RakNetParser{ $start = Utils::readTriad(strrev(substr($buffer, $offset - 3, 3))); $offset += 3; $end = Utils::readTriad(strrev(substr($buffer, $offset - 3, 3))); - if(($end - $start) > 4096){ - $end = $start + 4096; + $acks += ($end - $start)+1; + if($maxACKAllowed >= 0 && ($maxACKAllowed - $acks) < 0){ + $packet = false; + break; } + /*if(($end - $start) > 4096){ //not really needed? + $end = $start + 4096; + }*/ for($c = $start; $c <= $end; ++$c){ $packet->packets[] = $c; } }else{ $offset += 3; + $acks += 1; + if($maxACKAllowed >= 0 && ($maxACKAllowed - $acks) < 0){ + $packet = false; + break; + } $packet->packets[] = Utils::readTriad(strrev(substr($buffer, $offset - 3, 3))); } } + + $ackCnt = $acks; break; default: $packet = false;