clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-21 10:28:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve error handling (#9111)

Browse Source 
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`
This commit is contained in:
Tony Murray 2018-09-02 17:49:02 -05:00 committed by Neil Lathwood
parent a1e2222191
commit 6c5a4f0531
1 changed files with 25 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
app/Exceptions/Handler.php
View File

@ -24,53 +24,39 @@ class Handler extends ExceptionHandler
\Illuminate\Validation\ValidationException::class,
];
/**
* Report or log an exception.
*
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
*
* @param \Exception $exception
* @return void
*/
public function report(Exception $exception)
{
parent::report($exception);
}
/**
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Exception $exception
* @return \Illuminate\Http\Response
*/
public function render($request, Exception $exception)
{
if ($exception 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 = $exception->getMessage();
} else {
$message = $exception->getPrevious()->getMessage();
}
if (in_array($exception->getCode(), [1044, 1045, 2002])) {
throw new DatabaseConnectException($message, $exception->getCode(), $exception);
}
return response('Unhandled MySQL Error [' . $exception->getCode() . "] $message");
}
// emulate Laravel 5.5 renderable exceptions
if (method_exists($exception, 'render')) {
return $exception->render($request);
}
if (config('app.debug')) {
return parent::render($request, $exception);
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");
}
return view('errors.generic')->with('exception', $exception);
// 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]);
}
/**
@ -82,7 +68,7 @@ class Handler extends ExceptionHandler
*/
protected function unauthenticated($request, AuthenticationException $exception)
{
if ($request->expectsJson()) {
if ($request->expectsJson() || $request->is('api/*')) {
return response()->json(['error' => 'Unauthenticated.'], 401);
}