mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24874 from nextcloud/enh/exception_logging 

Avoid huge exception argument logging
This commit is contained in:
Roeland Jago Douma 2020-12-29 11:38:27 +01:00 committed by GitHub
parent 35aa34a1fd 179de95f81
commit c9fcf5f6b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Log.php
View File

@ -314,7 +314,7 @@ class Log implements ILogger, IDataLogger {
$app = $context['app'] ?? 'no app in context'; $app = $context['app'] ?? 'no app in context';
$level = $context['level'] ?? ILogger::ERROR; $level = $context['level'] ?? ILogger::ERROR;
$serializer = new ExceptionSerializer(); $serializer = new ExceptionSerializer($this->config);
$data = $serializer->serializeException($exception); $data = $serializer->serializeException($exception);
$data['CustomMessage'] = $context['message'] ?? '--'; $data['CustomMessage'] = $context['message'] ?? '--';

26
lib/private/Log/ExceptionSerializer.php
View File

@ -33,6 +33,7 @@ use OC\Core\Controller\SetupController;
use OC\HintException; use OC\HintException;
use OC\Security\IdentityProof\Key; use OC\Security\IdentityProof\Key;
use OC\Setup; use OC\Setup;
use OC\SystemConfig;
class ExceptionSerializer { class ExceptionSerializer {
public const methodsWithSensitiveParameters = [ public const methodsWithSensitiveParameters = [
@ -92,6 +93,13 @@ class ExceptionSerializer {
'imagecreatefromstring', 'imagecreatefromstring',
]; ];
/** @var SystemConfig */
private $systemConfig;
public function __construct(SystemConfig $systemConfig) {
$this->systemConfig = $systemConfig;
}
public const methodsWithSensitiveParametersByClass = [ public const methodsWithSensitiveParametersByClass = [
SetupController::class => [ SetupController::class => [
'run', 'run',
@ -163,11 +171,21 @@ class ExceptionSerializer {
$data = get_object_vars($arg); $data = get_object_vars($arg);
$data['__class__'] = get_class($arg); $data['__class__'] = get_class($arg);
return array_map([$this, 'encodeArg'], $data); return array_map([$this, 'encodeArg'], $data);
} elseif (is_array($arg)) {
return array_map([$this, 'encodeArg'], $arg);
} else {
return $arg;
} }
if (is_array($arg)) {
// Only log the first 5 elements of an array unless we are on debug
if ((int)$this->systemConfig->getValue('loglevel', 2) !== 0) {
$elemCount = count($arg);
if ($elemCount > 5) {
$arg = array_slice($arg, 0, 5);
$arg[] = 'And ' . ($elemCount - 5) . ' more entries, set log level to debug to see all entries';
}
}
return array_map([$this, 'encodeArg'], $arg);
}
return $arg;
} }
public function serializeException(\Throwable $exception) { public function serializeException(\Throwable $exception) {