Return Http test cases to a passing state

Author: DaneEveritt

.phpunit.result.cache

@@ -30,10 +30,7 @@
 use Pterodactyl\Http\Middleware\Server\AccessingValidServer;
 use Pterodactyl\Http\Middleware\Server\AuthenticateAsSubuser;
 use Pterodactyl\Http\Middleware\Api\Daemon\DaemonAuthenticate;
-use Pterodactyl\Http\Middleware\Server\SubuserBelongsToServer;
 use Pterodactyl\Http\Middleware\RequireTwoFactorAuthentication;
-use Pterodactyl\Http\Middleware\Server\DatabaseBelongsToServer;
-use Pterodactyl\Http\Middleware\Server\ScheduleBelongsToServer;
 use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode;
 use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
 use Pterodactyl\Http\Middleware\Api\Client\SubstituteClientApiBindings;
@@ -113,14 +110,6 @@ class Kernel extends HttpKernel
         'recaptcha' => VerifyReCaptcha::class,
         'node.maintenance' => MaintenanceMiddleware::class,
 
-        // Server specific middleware (used for authenticating access to resources)
-        //
-        // These are only used for individual server authentication, and not global
-        // actions from other resources. They are defined in the route files.
-        'server..database' => DatabaseBelongsToServer::class,
-        'server..subuser' => SubuserBelongsToServer::class,
-        'server..schedule' => ScheduleBelongsToServer::class,
-
         // API Specific Middleware
         'api..key' => AuthenticateKey::class,
     ];

app/Http/Kernel.php

@@ -5,19 +5,24 @@
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Contracts\Encryption\Encrypter;
+use Pterodactyl\Repositories\Eloquent\NodeRepository;
 use Symfony\Component\HttpKernel\Exception\HttpException;
-use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
 use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 
 class DaemonAuthenticate
 {
     /**
-     * @var \Pterodactyl\Contracts\Repository\NodeRepositoryInterface
+     * @var \Pterodactyl\Repositories\Eloquent\NodeRepository
      */
     private $repository;
 
+    /**
+     * @var \Illuminate\Contracts\Encryption\Encrypter
+     */
+    private $encrypter;
+
     /**
      * Daemon routes that this middleware should be skipped on.
      *
@@ -27,18 +32,13 @@ class DaemonAuthenticate
         'daemon.configuration',
     ];
 
-    /**
-     * @var \Illuminate\Contracts\Encryption\Encrypter
-     */
-    private $encrypter;
-
     /**
      * DaemonAuthenticate constructor.
      *
      * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter
-     * @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface $repository
+     * @param \Pterodactyl\Repositories\Eloquent\NodeRepository $repository
      */
-    public function __construct(Encrypter $encrypter, NodeRepositoryInterface $repository)
+    public function __construct(Encrypter $encrypter, NodeRepository $repository)
     {
         $this->repository = $repository;
         $this->encrypter = $encrypter;

app/Http/Middleware/Api/Daemon/DaemonAuthenticate.php

@@ -44,7 +44,7 @@
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.3",
         "barryvdh/laravel-ide-helper": "^2.7",
-        "codedungeon/phpunit-result-printer": "0.25.1",
+        "codedungeon/phpunit-result-printer": "^0.28.0",
         "friendsofphp/php-cs-fixer": "2.16.1",
         "fzaninotto/faker": "^1.9",
         "laravel/dusk": "^6.3",

app/Http/Middleware/Server/DatabaseBelongsToServer.php

@@ -95,7 +95,7 @@
         'disk_overallocate' => 0,
         'upload_size' => 100,
         'daemon_token_id' => Str::random(Node::DAEMON_TOKEN_ID_LENGTH),
-        'daemon_token' => Str::random(Node::DAEMON_TOKEN_LENGTH),
+        'daemon_token' => encrypt(Str::random(Node::DAEMON_TOKEN_LENGTH)),
         'daemonListen' => 8080,
         'daemonSFTP' => 2022,
         'daemonBase' => '/var/lib/pterodactyl/volumes',