mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
6c5a4f0531
Handle exceptions more correctly. Before we could bypass some important logic if APP_DEBUG was set to false. DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926`
78 lines
2.6 KiB
PHP
78 lines
2.6 KiB
PHP
<?php
|
|
|
|
namespace App\Exceptions;
|
|
|
|
use Exception;
|
|
use Illuminate\Auth\AuthenticationException;
|
|
use Illuminate\Database\QueryException;
|
|
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
|
|
use LibreNMS\Exceptions\DatabaseConnectException;
|
|
|
|
class Handler extends ExceptionHandler
|
|
{
|
|
/**
|
|
* A list of the exception types that should not be reported.
|
|
*
|
|
* @var array
|
|
*/
|
|
protected $dontReport = [
|
|
\Illuminate\Auth\AuthenticationException::class,
|
|
\Illuminate\Auth\Access\AuthorizationException::class,
|
|
\Symfony\Component\HttpKernel\Exception\HttpException::class,
|
|
\Illuminate\Database\Eloquent\ModelNotFoundException::class,
|
|
\Illuminate\Session\TokenMismatchException::class,
|
|
\Illuminate\Validation\ValidationException::class,
|
|
];
|
|
|
|
public function render($request, Exception $exception)
|
|
{
|
|
// emulate Laravel 5.5 renderable exceptions
|
|
if (method_exists($exception, 'render')) {
|
|
return $exception->render($request);
|
|
}
|
|
|
|
return parent::render($request, $exception);
|
|
}
|
|
|
|
protected function convertExceptionToResponse(Exception $e)
|
|
{
|
|
if ($e instanceof QueryException) {
|
|
// connect exception, convert to our standard connection exception
|
|
if (config('app.debug')) {
|
|
// get message form PDO exception, it doesn't contain the query
|
|
$message = $e->getMessage();
|
|
} else {
|
|
$message = $e->getPrevious()->getMessage();
|
|
}
|
|
|
|
if (in_array($e->getCode(), [1044, 1045, 2002])) {
|
|
throw new DatabaseConnectException($message, $e->getCode(), $e);
|
|
}
|
|
return response('Unhandled MySQL Error [' . $e->getCode() . "] $message");
|
|
}
|
|
|
|
// show helpful response if debugging, otherwise print generic error so we don't leak information
|
|
if (config('app.debug')) {
|
|
return parent::convertExceptionToResponse($e);
|
|
}
|
|
|
|
return response()->view('errors.generic', ['exception' => $e]);
|
|
}
|
|
|
|
/**
|
|
* Convert an authentication exception into an unauthenticated response.
|
|
*
|
|
* @param \Illuminate\Http\Request $request
|
|
* @param \Illuminate\Auth\AuthenticationException $exception
|
|
* @return \Illuminate\Http\Response
|
|
*/
|
|
protected function unauthenticated($request, AuthenticationException $exception)
|
|
{
|
|
if ($request->expectsJson() || $request->is('api/*')) {
|
|
return response()->json(['error' => 'Unauthenticated.'], 401);
|
|
}
|
|
|
|
return redirect()->guest(route('login'));
|
|
}
|
|
}
|