Merge branch 'develop' of https://github.com/stanjg/panel into feature/user-specific-language

app/Http/Middleware/Api/Application/AuthenticateApplicationUser.php

@@ -10,7 +10,7 @@ class AuthenticateApplicationUser
 {
     /**
      * Authenticate that the currently authenticated user is an administrator
-     * and should be allowed to proceede through the application API.
+     * and should be allowed to proceed through the application API.
      *
      * @param \Illuminate\Http\Request $request
      * @param \Closure                 $next

app/Http/Middleware/MaintenanceMiddleware.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Pterodactyl\Http\Middleware;
+
+use Closure;
+use Illuminate\Contracts\Routing\ResponseFactory;
+
+class MaintenanceMiddleware
+{
+    /**
+     * @var \Illuminate\Contracts\Routing\ResponseFactory
+     */
+    private $response;
+
+    /**
+     * MaintenanceMiddleware constructor.
+     *
+     * @param \Illuminate\Contracts\Routing\ResponseFactory $response
+     */
+    public function __construct(ResponseFactory $response)
+    {
+        $this->response = $response;
+    }
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        /** @var \Pterodactyl\Models\Server $server */
+        $server = $request->attributes->get('server');
+        $node = $server->getRelation('node');
+
+        if ($node->maintenance_mode) {
+            return $this->response->view('errors.maintenance');
+        }
+
+        return $next($request);
+    }
+}

app/Http/Middleware/RequireTwoFactorAuthentication.php

@@ -25,7 +25,7 @@ class RequireTwoFactorAuthentication
     private $alert;
 
     /**
-     * The names of routes that should be accessable without 2FA enabled.
+     * The names of routes that should be accessible without 2FA enabled.
      *
      * @var array
      */

app/Http/Middleware/Server/AuthenticateAsSubuser.php

@@ -33,7 +33,7 @@ class AuthenticateAsSubuser
     }
 
     /**
-     * Determine if a subuser has permissions to access a server, if so set thier access token.
+     * Determine if a subuser has permissions to access a server, if so set their access token.
      *
      * @param \Illuminate\Http\Request $request
      * @param \Closure                 $next

app/Http/Middleware/TrustProxies.php

@@ -15,15 +15,9 @@ class TrustProxies extends Middleware
     protected $proxies;
 
     /**
-     * The current proxy header mappings.
+     * The headers that should be used to detect proxies.
      *
-     * @var array
+     * @var int
      */
-    protected $headers = [
-        Request::HEADER_FORWARDED => 'FORWARDED',
-        Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
-        Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
-        Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
-        Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
-    ];
+    protected $headers = Request::HEADER_X_FORWARDED_ALL;
 }