mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 02:08:21 +00:00
Code Issues Projects Releases Wiki Activity

Split ProcessLoginTask into two tasks: 1) verify, 2) server handshake

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-06-27 18:09:43 +01:00
parent 193a41566d
commit 0e4966dfdf
4 changed files with 135 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/pocketmine/network/mcpe/NetworkSession.php
View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace pocketmine\network\mcpe;
use Mdanter\Ecc\Crypto\Key\PublicKeyInterface;
use pocketmine\entity\effect\EffectInstance;
use pocketmine\entity\Human;
use pocketmine\entity\Living;
@ -522,7 +523,10 @@ class NetworkSession{
}, $reason);
}
public function setAuthenticationStatus(bool $authenticated, bool $authRequired, ?string $error) : bool{
public function setAuthenticationStatus(bool $authenticated, bool $authRequired, ?string $error, PublicKeyInterface $clientPubKey) : void{
if(!$this->connected){
return;
}
if($authenticated and $this->info->getXuid() === ""){
$error = "Expected XUID but none found";
}
@ -530,7 +534,7 @@ class NetworkSession{
if($error !== null){
$this->disconnect($this->server->getLanguage()->translateString("pocketmine.disconnect.invalidSession", [$error]));
return false;
return;
}
$this->authenticated = $authenticated;
@ -538,7 +542,7 @@ class NetworkSession{
if(!$this->authenticated){
if($authRequired){
$this->disconnect("disconnectionScreen.notAuthenticated");
return false;
return;
}
if($this->info->getXuid() !== ""){
@ -547,10 +551,19 @@ class NetworkSession{
}
$this->logger->debug("Xbox Live authenticated: " . ($this->authenticated ? "YES" : "NO"));
return $this->manager->kickDuplicates($this);
if($this->manager->kickDuplicates($this)){
if(NetworkCipher::$ENABLED){
$this->server->getAsyncPool()->submitTask(new PrepareEncryptionTask($this, $clientPubKey));
}else{
$this->onLoginSuccess();
}
}
}
public function enableEncryption(string $encryptionKey, string $handshakeJwt) : void{
if(!$this->connected){
return;
}
$this->sendDataPacket(ServerToClientHandshakePacket::create($handshakeJwt), true); //make sure this gets sent before encryption is enabled
$this->cipher = new NetworkCipher($encryptionKey);