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

Merge pull request #6169 from nextcloud/check-encoding-log 

Ensure log message is UTF-8 encoded
This commit is contained in:
Lukas Reschke 2017-08-21 10:20:52 +02:00 committed by GitHub
parent 2404c854c4 c016b01bf9
commit 223265b369
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/private/Log/File.php
View File

@ -117,7 +117,18 @@ class File {
'userAgent', 'userAgent',
'version' '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'); $handle = @fopen(self::$logFile, 'a');
if ((fileperms(self::$logFile) & 0777) != 0640) { if ((fileperms(self::$logFile) & 0777) != 0640) {
@chmod(self::$logFile, 0640); @chmod(self::$logFile, 0640);