Merge branch 'develop' into feature/api-integration-testing

Author: DaneEveritt

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,8 @@
 <!---
 Please take a little time to submit a good issue. It makes our life easier and the issue will be resolved quicker.
 
+!!! GitHub is NOT the place for difficulties setting up this software. Please use it for bugs and feature requests only. If you have issues setting up the panel or the daemon visit our Discord server: https://pterodactyl.io/discord
+
 If you are submitting a feature request please remove everything in here. Then give a detailed explanation what you want to have implemented and why that would be a good addition.
 
 Please also try to give the issue a good title: It should summarize your issue in a few words and help us see what the issue is about in a glance. Things like "Panel is not working" do not help.

CHANGELOG.md

@@ -3,6 +3,36 @@ This file is a running track of new features and fixes to each version of the pa
 
 This project follows [Semantic Versioning](http://semver.org) guidelines.
 
+## v0.7.7 (Derelict Dermodactylus)
+### Fixed
+* Fixes an issue with the sidebar logo not working correctly in some browsers due to the CSS being assigned.
+
+### Added
+* Added a new client API endpoint for gathering the utilization stats for servers including disk, cpu, and memory. `GET /api/client/servers/<id>/utilization`
+* Added validation to variable validation rules to validate that the validation rules are valid because we heard you like validating your validation.
+
+## v0.7.6 (Derelict Dermodactylus)
+### Fixed
+* Fixes a UI error when attempting to change the default Nest and Egg for an existing server.
+* Correct permissions check in UI to allow subusers with permission to `view-allocations` the ability to actually see the sidebar link.
+* Fixes improper behavior when marking an egg as copying the configuration from another.
+* Debug bar is only checked when the app is set to debug mode in the API session handler, rather than when it is in local mode to match the plugin settings.
+* Added validation to port allocations to prevent allocation of restricted or invalid ports.
+* Fix data integrity exception thrown when attempting to store updated server egg variables.
+* Added missing permissions check on 'SFTP Configuration' page to ensure user has permission to access a server's SFTP server before showing a user credentials.
+
+### Added
+* Added ability for end users to change the name of their server through the UI. This option is only open to the server owner or an admin.
+* Added giant warning message if you attempt to change an encryption key once one has been set.
+
+### Changed
+* Panel now throws proper 504: Gateway Timeout errors on server listing when daemon is offline.
+* Sessions handled through redis now use a seperate database (default `1`) to store session database to avoid logging users out when flushing the cache.
+* File manager UI improved to be clearer with buttons and cleaner on mobile.
+* reCAPTCHA's secret key position swapped with website key in advanced panel settings to be consistent with Google's reCAPTCHA dashboard.
+* Changed DisplayException to handle its own logging correctly and check if the previous exception is marked as one that should not be logged.
+* Changed 'New Folder' modal in file manager to include a trailing slash.
+
 ## v0.7.5 (Derelict Dermodactylus)
 ### Fixed
 * Fixes application API keys being created as a client API key.

Vagrantfile

@@ -1,13 +1,9 @@
 Vagrant.configure("2") do |config|
-    config.vm.box = "ubuntu/xenial64"
+    config.vm.box = "bento/ubuntu-16.04"
 
     config.vm.synced_folder "./", "/var/www/html/pterodactyl",
         owner: "www-data", group: "www-data"
 
-    #config.vm.provision :file, source: ".dev/vagrant/pterdactyl.conf", destination: "/etc/nginx/sites-available/pterodactyl.conf"
-    #config.vm.provision :file, source: ".dev/vagrant/pteroq.service", destination: "/etc/systemd/system/pteroq.service"
-    #config.vm.provision :file, source: ".dev/vagrant/mailhog.service", destination: "/etc/systemd/system/mailhog.service"
-    #config.vm.provision :file, source: ".dev/vagrant/.env", destination: "/var/www/html/pterodactyl/.env"
     config.vm.provision :shell, path: ".dev/vagrant/provision.sh"
 
     config.vm.network :private_network, ip: "192.168.50.2"
@@ -16,6 +12,6 @@ Vagrant.configure("2") do |config|
     config.vm.network :forwarded_port, guest: 3306, host: 53306
 
     # Config for the vagrant-dns plugin (https://github.com/BerlinVagrant/vagrant-dns)
-    config.dns.tld = "app"
-    config.dns.patterns = [/^pterodactyl.app$/]
+    config.dns.tld = "test"
+    config.dns.patterns = [/^pterodactyl.test$/]
 end

app/Console/Commands/Overrides/KeyGenerateCommand.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Pterodactyl\Console\Commands\Overrides;
+
+use Illuminate\Foundation\Console\KeyGenerateCommand as BaseKeyGenerateCommand;
+
+class KeyGenerateCommand extends BaseKeyGenerateCommand
+{
+    /**
+     * Override the default Laravel key generation command to throw a warning to the user
+     * if it appears that they have already generated an application encryption key.
+     */
+    public function handle()
+    {
+        if (! empty(config('app.key')) && $this->input->isInteractive()) {
+            $this->output->warning(trans('command/messages.key.warning'));
+            if (! $this->confirm(trans('command/messages.key.confirm'))) {
+                return;
+            }
+
+            if (! $this->confirm(trans('command/messages.key.final_confirm'))) {
+                return;
+            }
+        }
+
+        parent::handle();
+    }
+}

app/Exceptions/DisplayException.php

@@ -2,9 +2,11 @@
 
 namespace Pterodactyl\Exceptions;
 
-use Log;
+use Exception;
 use Throwable;
+use Psr\Log\LoggerInterface;
 use Illuminate\Http\Response;
+use Illuminate\Container\Container;
 use Prologue\Alerts\AlertsMessageBag;
 
 class DisplayException extends PterodactylException
@@ -31,10 +33,6 @@ public function __construct($message, Throwable $previous = null, $level = self:
     {
         parent::__construct($message, $code, $previous);
 
-        if (! is_null($previous)) {
-            Log::{$level}($previous);
-        }
-
         $this->level = $level;
     }
 
@@ -70,8 +68,31 @@ public function render($request)
             ]), method_exists($this, 'getStatusCode') ? $this->getStatusCode() : Response::HTTP_BAD_REQUEST);
         }
 
-        app()->make(AlertsMessageBag::class)->danger($this->getMessage())->flash();
+        Container::getInstance()->make(AlertsMessageBag::class)->danger($this->getMessage())->flash();
 
         return redirect()->back()->withInput();
     }
+
+    /**
+     * Log the exception to the logs using the defined error level only if the previous
+     * exception is set.
+     *
+     * @return mixed
+     *
+     * @throws \Exception
+     */
+    public function report()
+    {
+        if (! $this->getPrevious() instanceof Exception || ! Handler::isReportable($this->getPrevious())) {
+            return null;
+        }
+
+        try {
+            $logger = Container::getInstance()->make(LoggerInterface::class);
+        } catch (Exception $ex) {
+            throw $this->getPrevious();
+        }
+
+        return $logger->{$this->getErrorLevel()}($this->getPrevious());
+    }
 }

app/Exceptions/Handler.php

@@ -5,6 +5,7 @@
 use Exception;
 use PDOException;
 use Psr\Log\LoggerInterface;
+use Illuminate\Container\Container;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Session\TokenMismatchException;
 use Illuminate\Validation\ValidationException;
@@ -31,7 +32,6 @@ class Handler extends ExceptionHandler
     protected $dontReport = [
         AuthenticationException::class,
         AuthorizationException::class,
-        DisplayException::class,
         HttpException::class,
         ModelNotFoundException::class,
         RecordNotFoundException::class,
@@ -210,6 +210,17 @@ public static function convertToArray(Exception $exception, array $override = []
         return ['errors' => [array_merge($error, $override)]];
     }
 
+    /**
+     * Return an array of exceptions that should not be reported.
+     *
+     * @param \Exception $exception
+     * @return bool
+     */
+    public static function isReportable(Exception $exception): bool
+    {
+        return (new static(Container::getInstance()))->shouldReport($exception);
+    }
+
     /**
      * Convert an authentication exception into an unauthenticated response.
      *

app/Exceptions/Service/Allocation/CidrOutOfRangeException.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Pterodactyl\Exceptions\Service\Allocation;
+
+use Pterodactyl\Exceptions\DisplayException;
+
+class CidrOutOfRangeException extends DisplayException
+{
+    /**
+     * CidrOutOfRangeException constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct(trans('exceptions.allocations.cidr_out_of_range'));
+    }
+}

app/Exceptions/Service/Allocation/InvalidPortMappingException.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Pterodactyl\Exceptions\Service\Allocation;
+
+use Pterodactyl\Exceptions\DisplayException;
+
+class InvalidPortMappingException extends DisplayException
+{
+    /**
+     * InvalidPortMappingException constructor.
+     *
+     * @param mixed $port
+     */
+    public function __construct($port)
+    {
+        parent::__construct(trans('exceptions.allocations.invalid_mapping', ['port' => $port]));
+    }
+}

app/Exceptions/Service/Allocation/PortOutOfRangeException.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Pterodactyl\Exceptions\Service\Allocation;
+
+use Pterodactyl\Exceptions\DisplayException;
+
+class PortOutOfRangeException extends DisplayException
+{
+    /**
+     * PortOutOfRangeException constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct(trans('exceptions.allocations.port_out_of_range'));
+    }
+}

app/Exceptions/Service/Allocation/TooManyPortsInRangeException.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Pterodactyl\Exceptions\Service\Allocation;
+
+use Pterodactyl\Exceptions\DisplayException;
+
+class TooManyPortsInRangeException extends DisplayException
+{
+    /**
+     * TooManyPortsInRangeException constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct(trans('exceptions.allocations.too_many_ports'));
+    }
+}