MattTheTekie/rverse2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: split parampack parsing from session data

Browse source
This commit is contained in:
Repflez 2023-10-29 12:19:26 -07:00
commit 246f4cc627
1 changed files with 29 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/Helpers/ConsoleAuth.php
View file

@ -67,52 +67,50 @@ class ConsoleAuth
if (empty($sessionId))
return self::AUTH_FAILURE_INVALID_TOKEN;
// Read and parse ParamPack
$paramPack = base64_decode($_SERVER['HTTP_X_NINTENDO_PARAMPACK']);
// Remove the last separator if there's one trailing
if (substr($paramPack, -1) === '\\')
$paramPack = substr($paramPack, 0, -1);
// Unpack the ParamPack from the headers sent by the console
// This only deals with Nintendo style ParamPack
// https://github.com/foxverse/3ds/blob/5e1797cdbaa33103754c4b63e87b4eded38606bf/web/titlesShow.php#L37-L40
$data = explode('\\', $paramPack);
$paramCount = count($data);
for ($i = 1; $i < $paramCount; $i += 2) {
$session[$data[$i]] = $data[$i + 1];
}
// At this point we can check the console from the token
if (intval($session['platform_id']) !== $expectedConsole)
return self::AUTH_FAILURE_WRONG_CONSOLE;
// Set title id and transferable id to hex, just in case we need it
$session['title_id'] = base_convert($session['title_id'], 10, 16);
$session['title_id_string'] = str_pad($session['title_id'], 16, "0", STR_PAD_LEFT);
$session['transferable_id'] = base_convert($session['transferable_id'], 10, 16);
// Get the session data from Redis, otherwise, create it from scratch
$session = Cache::get(self::SESSION_CACHE_NAME . $sessionId, 600);
$persistentSessionData = Cache::get(self::SESSION_CACHE_NAME . $sessionId, 600);
if (!$session) {
$session = [];
$paramPack = base64_decode($_SERVER['HTTP_X_NINTENDO_PARAMPACK']);
if (!$persistentSessionData) {
$persistentSessionData = [];
// Remove the last separator if there's one trailing
if (substr($paramPack, -1) === '\\')
$paramPack = substr($paramPack, 0, -1);
// Set activity feed status
$persistentSessionData['in_activity_feed'] = false;
// Unpack the ParamPack from the headers sent by the console
// This only deals with Nintendo style ParamPack
// https://github.com/foxverse/3ds/blob/5e1797cdbaa33103754c4b63e87b4eded38606bf/web/titlesShow.php#L37-L40
$data = explode('\\', $paramPack);
$paramCount = count($data);
for ($i = 1; $i < $paramCount; $i += 2) {
$session[$data[$i]] = $data[$i + 1];
}
// At this point we can check the console from the token
if (intval($session['platform_id']) !== $expectedConsole)
return self::AUTH_FAILURE_WRONG_CONSOLE;
// Set title id and transferable id to hex, just in case we need it
$session['title_id'] = base_convert($session['title_id'], 10, 16);
$session['title_id_string'] = str_pad($session['title_id'], 16, "0", STR_PAD_LEFT);
$session['transferable_id'] = base_convert($session['transferable_id'], 10, 16);
// Other kinds of session, just in case
$session['in_activity_feed'] = false;
Cache::store(self::SESSION_CACHE_NAME . $sessionId, $session);
Cache::store(self::SESSION_CACHE_NAME . $sessionId, $persistentSessionData);
}
// Set the default timezone based on the session
date_default_timezone_set($session['tz_name']);
// We have to check here as well
if (intval($session['platform_id']) !== $expectedConsole)
return self::AUTH_FAILURE_WRONG_CONSOLE;
// Set the session session for later use
self::$paramPack = $session;
self::$paramPack = array_merge($session, $persistentSessionData);
// Set the console ID variable
self::$consoleId = new stdClass();