mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't check file permissions on every request, handle failures (#9264)

Browse Source 
* Don't check file permissions on every request, handle failures
Improve error page visually

* only print minimal mkdir

* invert file_exists check, whoops

* docblock

* revert accidental changes

* rename variable

* Change database errors to use the new layout

* Add support url to the default layout

* Replaced \n for && in fix for user perms

* fix web output
This commit is contained in:
Tony Murray
2018-10-18 21:08:46 -05:00
committed by GitHub
parent aa14f86c2d
commit 607a567090
13 changed files with 382 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/Exceptions/Handler.php
View File

@@ -2,6 +2,7 @@
namespace App\Exceptions;
use App\Checks;
use Exception;
use Illuminate\Auth\AuthenticationException;
use Illuminate\Database\QueryException;
@@ -36,19 +37,14 @@ class Handler extends ExceptionHandler
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();
}
// handle database exceptions
if ($db_response = $this->dbExceptionToResponse($e)) {
return $db_response;
}
if (in_array($e->getCode(), [1044, 1045, 2002])) {
throw new DatabaseConnectException($message, $e->getCode(), $e);
}
return response('Unhandled MySQL Error [' . $e->getCode() . "] $message");
// check for exceptions relating to not being able to write to the filesystem
if ($fs_response = Checks::filePermissionsException($e)) {
return $fs_response;
}
// show helpful response if debugging, otherwise print generic error so we don't leak information
@@ -74,4 +70,28 @@ class Handler extends ExceptionHandler
return redirect()->guest(route('login'));
}
protected function dbExceptionToResponse(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])) {
// this Exception has it's own render function
throw new DatabaseConnectException($message, $e->getCode(), $e);
}
return response()->view('errors.generic', [
'title' => 'Unhandled MySQL Error [' . $e->getCode() . ']',
'content' => $message
]);
}
return false;
}
}