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

consolidate some JWT handling into one class

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-05-06 21:32:22 +01:00
parent 5d154e43a9
commit ed757c7207
5 changed files with 78 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/network/mcpe/auth/ProcessLoginTask.php
View File

@ -28,6 +28,7 @@ use Mdanter\Ecc\Crypto\Signature\Signature;
use Mdanter\Ecc\Serializer\PublicKey\DerPublicKeySerializer;
use Mdanter\Ecc\Serializer\PublicKey\PemPublicKeySerializer;
use Mdanter\Ecc\Serializer\Signature\DerSignatureSerializer;
use pocketmine\network\mcpe\JwtUtils;
use pocketmine\network\mcpe\protocol\LoginPacket;
use pocketmine\scheduler\AsyncTask;
use function assert;
@ -124,11 +125,11 @@ class ProcessLoginTask extends AsyncTask{
}
//First link, check that it is self-signed
$headers = json_decode(self::b64UrlDecode($headB64), true);
$headers = json_decode(JwtUtils::b64UrlDecode($headB64), true);
$currentPublicKey = $headers["x5u"];
}
$plainSignature = self::b64UrlDecode($sigB64);
$plainSignature = JwtUtils::b64UrlDecode($sigB64);
assert(strlen($plainSignature) === 96);
[$rString, $sString] = str_split($plainSignature, 48);
$sig = new Signature(gmp_init(bin2hex($rString), 16), gmp_init(bin2hex($sString), 16));
@ -149,7 +150,7 @@ class ProcessLoginTask extends AsyncTask{
$this->authenticated = true; //we're signed into xbox live
}
$claims = json_decode(self::b64UrlDecode($payloadB64), true);
$claims = json_decode(JwtUtils::b64UrlDecode($payloadB64), true);
$time = time();
if(isset($claims["nbf"]) and $claims["nbf"] > $time + self::CLOCK_DRIFT_MAX){
@ -163,13 +164,6 @@ class ProcessLoginTask extends AsyncTask{
$currentPublicKey = $claims["identityPublicKey"] ?? null; //if there are further links, the next link should be signed with this
}
private static function b64UrlDecode(string $str) : string{
if(($len = strlen($str) % 4) !== 0){
$str .= str_repeat('=', 4 - $len);
}
return base64_decode(strtr($str, '-_', '+/'), true);
}
public function onCompletion() : void{
/**
* @var \Closure $callback