Update to Laravel 5.5 (pterodactyl#814)

Author: DaneEveritt

.travis.yml

@@ -4,10 +4,6 @@ php:
   - 7.0
   - 7.1
   - 7.2
-matrix:
-  fast_finish: true
-  allow_failures:
-    - php: 7.2
 sudo: false
 cache:
   directories:

CHANGELOG.md

@@ -15,6 +15,8 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 
 ### Changed
 * Revoking the administrative status for an admin will revoke all authentication tokens currently assigned to their account.
+* Updated core framework to Laravel 5.5. This includes many dependency updates.
+* Certain AWS specific environment keys were changed, this should have minimal impact on users unless you specifically enabled AWS specific features. The renames are: `AWS_KEY -> AWS_ACCESS_KEY_ID`, `AWS_SECRET -> AWS_SECRET_ACCESS_KEY`, `AWS_REGION -> AWS_DEFAULT_REGION`
 
 ### Added
 * Added star indicators to user listing in Admin CP to indicate users who are set as a root admin.

app/Console/Commands/Maintenance/CleanServiceBackupFilesCommand.php

@@ -1,14 +1,8 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Console\Commands\Maintenance;
 
+use SplFileInfo;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;
@@ -17,11 +11,6 @@ class CleanServiceBackupFilesCommand extends Command
 {
     const BACKUP_THRESHOLD_MINUTES = 5;
 
-    /**
-     * @var \Carbon\Carbon
-     */
-    protected $carbon;
-
     /**
      * @var string
      */
@@ -40,14 +29,12 @@ class CleanServiceBackupFilesCommand extends Command
     /**
      * CleanServiceBackupFilesCommand constructor.
      *
-     * @param \Carbon\Carbon                           $carbon
      * @param \Illuminate\Contracts\Filesystem\Factory $filesystem
      */
-    public function __construct(Carbon $carbon, FilesystemFactory $filesystem)
+    public function __construct(FilesystemFactory $filesystem)
     {
         parent::__construct();
 
-        $this->carbon = $carbon;
         $this->disk = $filesystem->disk();
     }
 
@@ -58,11 +45,11 @@ public function handle()
     {
         $files = $this->disk->files('services/.bak');
 
-        collect($files)->each(function ($file) {
-            $lastModified = $this->carbon->timestamp($this->disk->lastModified($file));
-            if ($lastModified->diffInMinutes($this->carbon->now()) > self::BACKUP_THRESHOLD_MINUTES) {
-                $this->disk->delete($file);
-                $this->info(trans('command/messages.maintenance.deleting_service_backup', ['file' => $file]));
+        collect($files)->each(function (SplFileInfo $file) {
+            $lastModified = Carbon::createFromTimestamp($this->disk->lastModified($file->getPath()));
+            if ($lastModified->diffInMinutes(Carbon::now()) > self::BACKUP_THRESHOLD_MINUTES) {
+                $this->disk->delete($file->getPath());
+                $this->info(trans('command/messages.maintenance.deleting_service_backup', ['file' => $file->getFilename()]));
             }
         });
     }

app/Console/Kernel.php

@@ -3,41 +3,17 @@
 namespace Pterodactyl\Console;
 
 use Illuminate\Console\Scheduling\Schedule;
-use Pterodactyl\Console\Commands\InfoCommand;
-use Pterodactyl\Console\Commands\User\MakeUserCommand;
-use Pterodactyl\Console\Commands\User\DeleteUserCommand;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
-use Pterodactyl\Console\Commands\Server\RebuildServerCommand;
-use Pterodactyl\Console\Commands\Location\MakeLocationCommand;
-use Pterodactyl\Console\Commands\User\DisableTwoFactorCommand;
-use Pterodactyl\Console\Commands\Environment\AppSettingsCommand;
-use Pterodactyl\Console\Commands\Location\DeleteLocationCommand;
-use Pterodactyl\Console\Commands\Schedule\ProcessRunnableCommand;
-use Pterodactyl\Console\Commands\Environment\EmailSettingsCommand;
-use Pterodactyl\Console\Commands\Environment\DatabaseSettingsCommand;
-use Pterodactyl\Console\Commands\Maintenance\CleanServiceBackupFilesCommand;
 
 class Kernel extends ConsoleKernel
 {
     /**
-     * The Artisan commands provided by your application.
-     *
-     * @var array
+     * Register the commands for the application.
      */
-    protected $commands = [
-        AppSettingsCommand::class,
-        CleanServiceBackupFilesCommand::class,
-        DatabaseSettingsCommand::class,
-        DeleteLocationCommand::class,
-        DeleteUserCommand::class,
-        DisableTwoFactorCommand::class,
-        EmailSettingsCommand::class,
-        InfoCommand::class,
-        MakeLocationCommand::class,
-        MakeUserCommand::class,
-        ProcessRunnableCommand::class,
-        RebuildServerCommand::class,
-    ];
+    protected function commands()
+    {
+        $this->load(__DIR__ . '/Commands');
+    }
 
     /**
      * Define the application's command schedule.

app/Http/Controllers/Admin/PackController.php

@@ -163,7 +163,7 @@ public function newTemplate()
      */
     public function store(PackFormRequest $request)
     {
-        if ($request->has('from_template')) {
+        if ($request->filled('from_template')) {
             $pack = $this->templateUploadService->handle($request->input('egg_id'), $request->file('file_upload'));
         } else {
             $pack = $this->creationService->handle($request->normalize(), $request->file('file_upload'));

app/Http/Controllers/Admin/ServersController.php

@@ -524,7 +524,7 @@ public function updateBuild(Request $request, Server $server)
      */
     public function delete(Request $request, Server $server)
     {
-        $this->deletionService->withForce($request->has('force_delete'))->handle($server);
+        $this->deletionService->withForce($request->filled('force_delete'))->handle($server);
         $this->alert->success(trans('admin/server.alerts.server_deleted'))->flash();
 
         return redirect()->route('admin.servers');

app/Http/Controllers/Auth/LoginController.php

@@ -107,6 +107,8 @@ public function __construct(
      *
      * @param \Illuminate\Http\Request $request
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response
+     *
+     * @throws \Illuminate\Validation\ValidationException
      */
     public function login(Request $request)
     {
@@ -115,8 +117,7 @@ public function login(Request $request)
 
         if ($this->hasTooManyLoginAttempts($request)) {
             $this->fireLockoutEvent($request);
-
-            return $this->sendLockoutResponse($request);
+            $this->sendLockoutResponse($request);
         }
 
         try {

app/Http/Controllers/Base/SecurityController.php

@@ -1,27 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>
- * Some Modifications (c) 2015 Dylan Seidt <dylan.seidt@gmail.com>.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 
 namespace Pterodactyl\Http\Controllers\Base;
 

app/Http/Kernel.php

@@ -2,10 +2,10 @@
 
 namespace Pterodactyl\Http;
 
-use Fideloper\Proxy\TrustProxies;
 use Illuminate\Auth\Middleware\Authorize;
 use Illuminate\Auth\Middleware\Authenticate;
 use Pterodactyl\Http\Middleware\TrimStrings;
+use Pterodactyl\Http\Middleware\TrustProxies;
 use Illuminate\Session\Middleware\StartSession;
 use Pterodactyl\Http\Middleware\EncryptCookies;
 use Pterodactyl\Http\Middleware\VerifyCsrfToken;
@@ -23,6 +23,7 @@
 use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;
 use Pterodactyl\Http\Middleware\API\AuthenticateIPAccess;
 use Pterodactyl\Http\Middleware\Daemon\DaemonAuthenticate;
+use Illuminate\Foundation\Http\Middleware\ValidatePostSize;
 use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
 use Pterodactyl\Http\Middleware\API\HasPermissionToResource;
 use Pterodactyl\Http\Middleware\Server\AuthenticateAsSubuser;
@@ -31,6 +32,7 @@
 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\DaemonAuthenticate as OldDaemonAuthenticate;
 
 class Kernel extends HttpKernel
@@ -42,9 +44,9 @@ class Kernel extends HttpKernel
      */
     protected $middleware = [
         CheckForMaintenanceMode::class,
-        EncryptCookies::class,
-        AddQueuedCookiesToResponse::class,
+        ValidatePostSize::class,
         TrimStrings::class,
+        ConvertEmptyStringsToNull::class,
         TrustProxies::class,
     ];
 

app/Http/Middleware/TrustProxies.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Pterodactyl\Http\Middleware;
+
+use Illuminate\Http\Request;
+use Fideloper\Proxy\TrustProxies as Middleware;
+
+class TrustProxies extends Middleware
+{
+    /**
+     * The trusted proxies for this application.
+     *
+     * @var array
+     */
+    protected $proxies;
+
+    /**
+     * The current proxy header mappings.
+     *
+     * @var array
+     */
+    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',
+    ];
+}