Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Always show errors from HTTP exceptions correctly to the user; closes #2439

Browse source
This commit is contained in:
Dane Everitt 2020-10-03 11:18:14 -07:00
parent f31a6d3967
commit 1616cf1318
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Exceptions/Handler.php
View file

@ -17,6 +17,7 @@ use Illuminate\Database\Eloquent\ModelNotFoundException;
use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\HttpKernel\Exception\HttpException;
use Pterodactyl\Exceptions\Repository\RecordNotFoundException; use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
class Handler extends ExceptionHandler class Handler extends ExceptionHandler
{ {
@ -217,7 +218,9 @@ class Handler extends ExceptionHandler
'status' => method_exists($exception, 'getStatusCode') 'status' => method_exists($exception, 'getStatusCode')
? strval($exception->getStatusCode()) ? strval($exception->getStatusCode())
: ($exception instanceof ValidationException ? '422' : '500'), : ($exception instanceof ValidationException ? '422' : '500'),
'detail' => 'An error was encountered while processing this request.', 'detail' => $exception instanceof HttpExceptionInterface
? $exception->getMessage()
: 'An unexpected error was ecnountered while processing this request, please try again.',
]; ];
if ($exception instanceof ModelNotFoundException || $exception->getPrevious() instanceof ModelNotFoundException) { if ($exception instanceof ModelNotFoundException || $exception->getPrevious() instanceof ModelNotFoundException) {