Update to Laravel 8

Co-authored-by: Matthew Penner <me@matthewp.io>
2021-01-23 12:09:16 -08:00 · 2021-01-23 12:09:16 -08:00 · a043071e3c
commit a043071e3c
parent 028921b42a
211 changed files with 4394 additions and 2933 deletions
--- a/app/Services/Databases/DatabaseManagementService.php
+++ b/app/Services/Databases/DatabaseManagementService.php
@ -8,7 +8,6 @@ use Pterodactyl\Models\Server;
 use Pterodactyl\Models\Database;
 use Pterodactyl\Helpers\Utilities;
 use Illuminate\Database\ConnectionInterface;
-use Symfony\Component\VarDumper\Cloner\Data;
 use Illuminate\Contracts\Encryption\Encrypter;
 use Pterodactyl\Extensions\DynamicDatabaseConnection;
 use Pterodactyl\Repositories\Eloquent\DatabaseRepository;
--- a/app/Services/Deployment/FindViableNodesService.php
+++ b/app/Services/Deployment/FindViableNodesService.php
@ -2,8 +2,8 @@

 namespace Pterodactyl\Services\Deployment;

-use Webmozart\Assert\Assert;
 use Pterodactyl\Models\Node;
+use Webmozart\Assert\Assert;
 use Pterodactyl\Exceptions\Service\Deployment\NoViableNodeException;

 class FindViableNodesService
--- a/app/Services/Eggs/EggConfigurationService.php
+++ b/app/Services/Eggs/EggConfigurationService.php
@ -108,7 +108,7 @@ class EggConfigurationService
        // Normalize the output of the configuration for the new Wings Daemon to more
        // easily ingest, as well as make things more flexible down the road.
        foreach ($configs as $file => $data) {
-            $append = array_merge((array)$data, ['file' => $file, 'replace' => []]);
+            $append = array_merge((array) $data, ['file' => $file, 'replace' => []]);

            foreach ($this->iterate($data->find, $structure) as $find => $replace) {
                if (is_object($replace)) {
--- a/app/Services/Eggs/Sharing/EggImporterService.php
+++ b/app/Services/Eggs/Sharing/EggImporterService.php
@ -119,7 +119,7 @@ class EggImporterService
        ], true, true);

        collect($parsed->variables)->each(function ($variable) use ($egg) {
-            $this->eggVariableRepository->create(array_merge((array)$variable, [
+            $this->eggVariableRepository->create(array_merge((array) $variable, [
                'egg_id' => $egg->id,
            ]));
        });
--- a/app/Services/Nodes/NodeJWTService.php
+++ b/app/Services/Nodes/NodeJWTService.php
@ -2,13 +2,14 @@

 namespace Pterodactyl\Services\Nodes;

-use DateTimeInterface;
-use Lcobucci\JWT\Builder;
+use DateTimeImmutable;
 use Carbon\CarbonImmutable;
 use Illuminate\Support\Str;
-use Lcobucci\JWT\Signer\Key;
 use Pterodactyl\Models\Node;
+use Lcobucci\JWT\Configuration;
 use Lcobucci\JWT\Signer\Hmac\Sha256;
+use Lcobucci\JWT\Signer\Key\InMemory;
+use Pterodactyl\Extensions\Lcobucci\JWT\Encoding\TimestampDates;

 class NodeJWTService
 {
@ -18,7 +19,7 @@ class NodeJWTService
    private $claims = [];

    /**
-     * @var int|null
+     * @var \DateTimeImmutable|null
     */
    private $expiresAt;

@ -41,12 +42,12 @@ class NodeJWTService
    }

    /**
-     * @param \DateTimeInterface $date
+     * @param \DateTimeImmutable $date
     * @return $this
     */
-    public function setExpiresAt(DateTimeInterface $date)
+    public function setExpiresAt(DateTimeImmutable $date)
    {
-        $this->expiresAt = $date->getTimestamp();
+        $this->expiresAt = $date;

        return $this;
    }
@ -68,24 +69,27 @@ class NodeJWTService
     * @param \Pterodactyl\Models\Node $node
     * @param string|null $identifiedBy
     * @param string $algo
-     * @return \Lcobucci\JWT\Token
+     * @return \Lcobucci\JWT\Token\Plain
     */
    public function handle(Node $node, string $identifiedBy, string $algo = 'md5')
    {
-        $signer = new Sha256;
+        $identifier = hash($algo, $identifiedBy);
+        $config = Configuration::forSymmetricSigner(new Sha256, InMemory::plainText($node->getDecryptedKey()));

-        $builder = (new Builder)->issuedBy(config('app.url'))
+        $builder = $config->builder(new TimestampDates)
+            ->issuedBy(config('app.url'))
            ->permittedFor($node->getConnectionAddress())
-            ->identifiedBy(hash($algo, $identifiedBy), true)
-            ->issuedAt(CarbonImmutable::now()->getTimestamp())
-            ->canOnlyBeUsedAfter(CarbonImmutable::now()->subMinutes(5)->getTimestamp());
+            ->identifiedBy($identifier)
+            ->withHeader('jti', $identifier)
+            ->issuedAt(CarbonImmutable::now())
+            ->canOnlyBeUsedAfter(CarbonImmutable::now()->subMinutes(5));

        if ($this->expiresAt) {
            $builder = $builder->expiresAt($this->expiresAt);
        }

-        if (!empty($this->subject)) {
-            $builder = $builder->relatedTo($this->subject, true);
+        if (! empty($this->subject)) {
+            $builder = $builder->relatedTo($this->subject)->withHeader('sub', $this->subject);
        }

        foreach ($this->claims as $key => $value) {
@ -94,6 +98,6 @@ class NodeJWTService

        return $builder
            ->withClaim('unique_id', Str::random(16))
-            ->getToken($signer, new Key($node->getDecryptedKey()));
+            ->getToken($config->signer(), $config->signingKey());
    }
 }
--- a/app/Services/Nodes/NodeUpdateService.php
+++ b/app/Services/Nodes/NodeUpdateService.php
@ -5,11 +5,9 @@ namespace Pterodactyl\Services\Nodes;
 use Illuminate\Support\Str;
 use Pterodactyl\Models\Node;
 use Illuminate\Support\Facades\Log;
-use GuzzleHttp\Exception\ConnectException;
 use Illuminate\Database\ConnectionInterface;
 use Illuminate\Contracts\Encryption\Encrypter;
 use Pterodactyl\Repositories\Eloquent\NodeRepository;
-use Pterodactyl\Repositories\Daemon\ConfigurationRepository;
 use Pterodactyl\Repositories\Wings\DaemonConfigurationRepository;
 use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
 use Pterodactyl\Exceptions\Service\Node\ConfigurationNotPersistedException;
@ -101,7 +99,7 @@ class NodeUpdateService
                // inject their own response pages, causing this logic to get fucked up.
                //
                // @see https://github.com/pterodactyl/panel/issues/2712
-                return [ $updated, true ];
+                return [$updated, true];
            }

            return [$updated, false];
--- a/app/Services/Servers/BuildModificationService.php
+++ b/app/Services/Servers/BuildModificationService.php
@ -82,7 +82,7 @@ class BuildModificationService

        $updateData = $this->structureService->handle($server);

-        if (!empty($updateData['build'])) {
+        if (! empty($updateData['build'])) {
            $this->daemonServerRepository->setServer($server)->update([
                'build' => $updateData['build'],
            ]);
--- a/app/Services/Servers/ReinstallServerService.php
+++ b/app/Services/Servers/ReinstallServerService.php
@ -4,7 +4,6 @@ namespace Pterodactyl\Services\Servers;

 use Pterodactyl\Models\Server;
 use Illuminate\Database\ConnectionInterface;
-use Pterodactyl\Repositories\Eloquent\ServerRepository;
 use Pterodactyl\Repositories\Wings\DaemonServerRepository;

 class ReinstallServerService
--- a/app/Services/Servers/ServerConfigurationStructureService.php
+++ b/app/Services/Servers/ServerConfigurationStructureService.php
@ -38,7 +38,7 @@ class ServerConfigurationStructureService
        $clone = $server;
        // If any overrides have been set on this call make sure to update them on the
        // cloned instance so that the configuration generated uses them.
-        if (!empty($override)) {
+        if (! empty($override)) {
            $clone = $server->fresh();
            foreach ($override as $key => $value) {
                $clone->setAttribute($key, $value);
@ -95,10 +95,10 @@ class ServerConfigurationStructureService
                'id' => $server->egg->uuid,
                'file_denylist' => [
                    'config.yml',
-                    '**/*.json'
-                ]
+                    '**/*.json',
+                ],
                // 'file_denylist' => explode(PHP_EOL, $server->egg->inherit_file_denylist),
-            ]
+            ],
        ];
    }

@ -124,12 +124,12 @@ class ServerConfigurationStructureService
                })->toArray(),
                'env' => $this->environment->handle($server),
                'oom_disabled' => $server->oom_disabled,
-                'memory' => (int)$server->memory,
-                'swap' => (int)$server->swap,
-                'io' => (int)$server->io,
-                'cpu' => (int)$server->cpu,
+                'memory' => (int) $server->memory,
+                'swap' => (int) $server->swap,
+                'io' => (int) $server->io,
+                'cpu' => (int) $server->cpu,
                'threads' => $server->threads,
-                'disk' => (int)$server->disk,
+                'disk' => (int) $server->disk,
                'image' => $server->image,
            ],
            'service' => [
@ -137,7 +137,7 @@ class ServerConfigurationStructureService
                'skip_scripts' => $server->skip_scripts,
            ],
            'rebuild' => false,
-            'suspended' => (int)$server->suspended,
+            'suspended' => (int) $server->suspended,
        ];
    }
 }
--- a/app/Services/Servers/ServerDeletionService.php
+++ b/app/Services/Servers/ServerDeletionService.php
@ -92,7 +92,7 @@ class ServerDeletionService
                try {
                    $this->databaseManagementService->delete($database);
                } catch (Exception $exception) {
-                    if (!$this->force) {
+                    if (! $this->force) {
                        throw $exception;
                    }

--- a/app/Services/Servers/StartupCommandService.php
+++ b/app/Services/Servers/StartupCommandService.php
@ -20,7 +20,7 @@ class StartupCommandService

        foreach ($server->variables as $variable) {
            $find[] = '{{' . $variable->env_variable . '}}';
-            $replace[] = ($variable->user_viewable && !$hideAllValues) ? ($variable->server_value ?? $variable->default_value) : '[hidden]';
+            $replace[] = ($variable->user_viewable && ! $hideAllValues) ? ($variable->server_value ?? $variable->default_value) : '[hidden]';
        }

        return str_replace($find, $replace, $server->startup);
--- a/app/Services/Servers/StartupModificationService.php
+++ b/app/Services/Servers/StartupModificationService.php
@ -91,7 +91,7 @@ class StartupModificationService
    {
        $eggId = Arr::get($data, 'egg_id');

-        if (is_digit($eggId) && $server->egg_id !== (int)$eggId) {
+        if (is_digit($eggId) && $server->egg_id !== (int) $eggId) {
            /** @var \Pterodactyl\Models\Egg $egg */
            $egg = Egg::query()->findOrFail($data['egg_id']);

--- a/app/Services/Servers/SuspensionService.php
+++ b/app/Services/Servers/SuspensionService.php
@ -6,7 +6,6 @@ use Webmozart\Assert\Assert;
 use Pterodactyl\Models\Server;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Repositories\Wings\DaemonServerRepository;
-use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
 use Pterodactyl\Exceptions\Http\Server\ServerTransferringException;

 class SuspensionService
--- a/app/Services/Servers/VariableValidatorService.php
+++ b/app/Services/Servers/VariableValidatorService.php
@ -68,7 +68,7 @@ class VariableValidatorService
        }

        return Collection::make($variables)->map(function ($item) use ($fields) {
-            return (object)[
+            return (object) [
                'id' => $item->id,
                'key' => $item->env_variable,
                'value' => $fields[$item->env_variable] ?? null,