From c016b01bf91e201d58d7196c24cab4a95b66f219 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 17 Aug 2017 15:01:50 +0200 Subject: [PATCH] Ensure log message is UTF-8 encoded PHP's json_encode only accept proper UTF-8 strings, loop over all elements to ensure that they are properly UTF-8 compliant or convert them manually. Without this somebody passing an invalid User Agent may make json_encode return false which will get logged as empty newline. Signed-off-by: Lukas Reschke --- lib/private/Log/File.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/private/Log/File.php b/lib/private/Log/File.php index 97ec5012b1..c6677dd528 100644 --- a/lib/private/Log/File.php +++ b/lib/private/Log/File.php @@ -117,7 +117,18 @@ class File { 'userAgent', 'version' ); - $entry = json_encode($entry); + // PHP's json_encode only accept proper UTF-8 strings, loop over all + // elements to ensure that they are properly UTF-8 compliant or convert + // them manually. + foreach($entry as $key => $value) { + if(is_string($value)) { + $testEncode = json_encode($value); + if($testEncode === false) { + $entry[$key] = utf8_encode($value); + } + } + } + $entry = json_encode($entry, JSON_PARTIAL_OUTPUT_ON_ERROR); $handle = @fopen(self::$logFile, 'a'); if ((fileperms(self::$logFile) & 0777) != 0640) { @chmod(self::$logFile, 0640);