Skynet/misc_pterodactyl-panel
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[L6] Update cache methods to use defined times and not ints

Browse source
This commit is contained in:
Dane Everitt 2019-09-04 20:24:46 -07:00
parent 2c0503c593
commit bd8b708c32
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/Admin/NodesController.php
View file

@ -10,6 +10,7 @@
namespace Pterodactyl\Http\Controllers\Admin; namespace Pterodactyl\Http\Controllers\Admin;
use Javascript; use Javascript;
use Cake\Chronos\Chronos;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Pterodactyl\Models\Node; use Pterodactyl\Models\Node;
use Illuminate\Http\Response; use Illuminate\Http\Response;
@ -396,7 +397,7 @@ class NodesController extends Controller
public function setToken(Node $node) public function setToken(Node $node)
{ {
$token = bin2hex(random_bytes(16)); $token = bin2hex(random_bytes(16));
$this->cache->put('Node:Configuration:' . $token, $node->id, 5); $this->cache->put('Node:Configuration:' . $token, $node->id, Chronos::now()->addMinutes(5));
return response()->json(['token' => $token]); return response()->json(['token' => $token]);
} }

3
app/Http/Controllers/Auth/LoginController.php
View file

@ -2,6 +2,7 @@
namespace Pterodactyl\Http\Controllers\Auth; namespace Pterodactyl\Http\Controllers\Auth;
use Cake\Chronos\Chronos;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Auth\AuthManager; use Illuminate\Auth\AuthManager;
@ -100,7 +101,7 @@ class LoginController extends AbstractLoginController
if ($user->use_totp) { if ($user->use_totp) {
$token = Str::random(64); $token = Str::random(64);
$this->cache->put($token, $user->id, 5); $this->cache->put($token, $user->id, Chronos::now()->addMinutes(5));
return JsonResponse::create([ return JsonResponse::create([
'data' => [ 'data' => [

3
app/Services/Helpers/AssetHashService.php
View file

@ -2,6 +2,7 @@
namespace Pterodactyl\Services\Helpers; namespace Pterodactyl\Services\Helpers;
use Cake\Chronos\Chronos;
use Illuminate\Filesystem\FilesystemManager; use Illuminate\Filesystem\FilesystemManager;
use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Cache\Repository as CacheRepository; use Illuminate\Contracts\Cache\Repository as CacheRepository;
@ -134,7 +135,7 @@ class AssetHashService
} }
$contents = json_decode($this->filesystem->get(self::MANIFEST_PATH), true); $contents = json_decode($this->filesystem->get(self::MANIFEST_PATH), true);
$this->cache->put('Core:AssetManifest', $contents, 1440); $this->cache->put('Core:AssetManifest', $contents, Chronos::now()->addMinutes(1440));
return self::$manifest = $contents; return self::$manifest = $contents;
} }

3
app/Services/Helpers/SoftwareVersionService.php
View file

@ -12,6 +12,7 @@ namespace Pterodactyl\Services\Helpers;
use stdClass; use stdClass;
use Exception; use Exception;
use GuzzleHttp\Client; use GuzzleHttp\Client;
use Cake\Chronos\Chronos;
use Illuminate\Contracts\Cache\Repository as CacheRepository; use Illuminate\Contracts\Cache\Repository as CacheRepository;
use Illuminate\Contracts\Config\Repository as ConfigRepository; use Illuminate\Contracts\Config\Repository as ConfigRepository;
use Pterodactyl\Exceptions\Service\Helper\CdnVersionFetchingException; use Pterodactyl\Exceptions\Service\Helper\CdnVersionFetchingException;
@ -118,7 +119,7 @@ class SoftwareVersionService
*/ */
protected function cacheVersionData() protected function cacheVersionData()
{ {
$this->cache->remember(self::VERSION_CACHE_KEY, $this->config->get('pterodactyl.cdn.cache_time'), function () { $this->cache->remember(self::VERSION_CACHE_KEY, Chronos::now()->addMinutes(config('pterodactyl.cdn.cache_time')), function () {
try { try {
$response = $this->client->request('GET', $this->config->get('pterodactyl.cdn.url')); $response = $this->client->request('GET', $this->config->get('pterodactyl.cdn.url'));