Begin adding unit tests for middleware

app/Http/Middleware/Daemon/DaemonAuthenticate.php

@@ -32,19 +32,20 @@ use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
 
 class DaemonAuthenticate
 {
+    /**
+     * @var \Pterodactyl\Contracts\Repository\NodeRepositoryInterface
+     */
+    private $repository;
+
     /**
      * Daemon routes that this middleware should be skipped on.
+     *
      * @var array
      */
     protected $except = [
         'daemon.configuration',
     ];
 
-    /**
-     * @var \Pterodactyl\Contracts\Repository\NodeRepositoryInterface
-     */
-    protected $repository;
-
     /**
      * DaemonAuthenticate constructor.
      *

app/Http/Middleware/Server/AccessingValidServer.php

@@ -6,7 +6,6 @@ use Closure;
 use Illuminate\Http\Request;
 use Pterodactyl\Models\Server;
 use Illuminate\Contracts\Session\Session;
-use Illuminate\Auth\AuthenticationException;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -17,22 +16,17 @@ class AccessingValidServer
     /**
      * @var \Illuminate\Contracts\Config\Repository
      */
-    protected $config;
+    private $config;
 
     /**
      * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
      */
-    protected $repository;
-
-    /**
-     * @var \Pterodactyl\Models\Server
-     */
-    protected $server;
+    private $repository;
 
     /**
      * @var \Illuminate\Contracts\Session\Session
      */
-    protected $session;
+    private $session;
 
     /**
      * AccessingValidServer constructor.
@@ -56,7 +50,7 @@ class AccessingValidServer
      *
      * @param \Illuminate\Http\Request $request
      * @param \Closure                 $next
-     * @return mixed
+     * @return \Illuminate\Http\Response|mixed
      *
      * @throws \Illuminate\Auth\AuthenticationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
@@ -65,10 +59,6 @@ class AccessingValidServer
      */
     public function handle(Request $request, Closure $next)
     {
-        if (! $request->user()) {
-            throw new AuthenticationException;
-        }
-
         $attributes = $request->route()->parameter('server');
         $isApiRequest = $request->expectsJson() || $request->is(...$this->config->get('pterodactyl.json_routes', []));
         $server = $this->repository->getByUuid($attributes instanceof Server ? $attributes->uuid : $attributes);
@@ -89,9 +79,11 @@ class AccessingValidServer
             return response()->view('errors.suspended', [], 403);
         }
 
+        // Servers can have install statuses other than 1 or 0, so don't check
+        // for a bool-type operator here.
         if ($server->installed !== 1) {
             if ($isApiRequest) {
-                throw new AccessDeniedHttpException('Server is completing install process.');
+                throw new AccessDeniedHttpException('Server is not marked as installed.');
             }
 
             return response()->view('errors.installing', [], 403);