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

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 @@ class DisplayException extends PterodactylException
     {
         parent::__construct($message, $code, $previous);
 
-        if (! is_null($previous)) {
-            Log::{$level}($previous);
-        }
-
         $this->level = $level;
     }
 
@@ -70,8 +68,31 @@ class DisplayException extends PterodactylException
             ]), 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 @@ namespace Pterodactyl\Exceptions;
 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 @@ class Handler extends ExceptionHandler
         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'));
+    }
+}

app/Exceptions/Service/Egg/Variable/BadValidationRuleException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Pterodactyl\Exceptions\Service\Egg\Variable;
+
+use Pterodactyl\Exceptions\DisplayException;
+
+class BadValidationRuleException extends DisplayException
+{
+}