diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-25 20:04:01 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-25 20:04:01 +0200 |
| commit | 0aaece7de7584f9f6ae1144ef05abc5a32d95403 (patch) | |
| tree | d3085263c460837f0c06003ac260125e10228eab /lib | |
| parent | 8f2a14c5d6956fbc6d316211d68f7d87d7349c55 (diff) | |
| parent | db8e7ce8b95c882c876f932296f25ec08883a1d3 (diff) | |
| download | nextcloud-server-0aaece7de7584f9f6ae1144ef05abc5a32d95403.tar.gz nextcloud-server-0aaece7de7584f9f6ae1144ef05abc5a32d95403.zip | |
Merge pull request #19346 from owncloud/drop-passwords-from-exception-log
Remove passwords from logged exception stack traces
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/log.php | 21 | ||||
| -rw-r--r-- | lib/public/ilogger.php | 10 | ||||
| -rw-r--r-- | lib/public/util.php | 11 |
3 files changed, 33 insertions, 9 deletions
diff --git a/lib/private/log.php b/lib/private/log.php index 3c8149bc1d0..4a0a34b7113 100644 --- a/lib/private/log.php +++ b/lib/private/log.php @@ -254,4 +254,25 @@ class Log implements ILogger { call_user_func(array($logger, 'write'), $app, $message, $level); } } + + /** + * Logs an exception very detailed + * + * @param \Exception $exception + * @param array $context + * @return void + * @since 8.2.0 + */ + public function logException(\Exception $exception, array $context = array()) { + $exception = array( + 'Exception' => get_class($exception), + 'Message' => $exception->getMessage(), + 'Code' => $exception->getCode(), + 'Trace' => $exception->getTraceAsString(), + 'File' => $exception->getFile(), + 'Line' => $exception->getLine(), + ); + $exception['Trace'] = preg_replace('!(login|checkPassword)\(.*\)!', '$1(*** username and password replaced ***)', $exception['Trace']); + $this->error('Exception: ' . json_encode($exception), $context); + } } diff --git a/lib/public/ilogger.php b/lib/public/ilogger.php index 43b1ef70e5b..27a5d63dfdb 100644 --- a/lib/public/ilogger.php +++ b/lib/public/ilogger.php @@ -122,4 +122,14 @@ interface ILogger { * @since 7.0.0 */ public function log($level, $message, array $context = array()); + + /** + * Logs an exception very detailed + * + * @param \Exception $exception + * @param array $context + * @return void + * @since 8.2.0 + */ + public function logException(\Exception $exception, array $context = array()); } diff --git a/lib/public/util.php b/lib/public/util.php index c32668b14a8..652df5192cf 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -158,17 +158,10 @@ class Util { * @param \Exception $ex exception to log * @param int $level log level, defaults to \OCP\Util::FATAL * @since ....0.0 - parameter $level was added in 7.0.0 + * @deprecated 8.2.0 use logException of \OCP\ILogger */ public static function logException( $app, \Exception $ex, $level = \OCP\Util::FATAL ) { - $exception = array( - 'Exception' => get_class($ex), - 'Message' => $ex->getMessage(), - 'Code' => $ex->getCode(), - 'Trace' => $ex->getTraceAsString(), - 'File' => $ex->getFile(), - 'Line' => $ex->getLine(), - ); - \OCP\Util::writeLog($app, 'Exception: ' . json_encode($exception), $level); + \OC::$server->getLogger()->logException($ex, ['app' => $app]); } /** |