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

Merge pull request #9694 from nextcloud/backport/9692/stable13 

[stable13] Make sure the log doesn't try to read from PUT if it can't
This commit is contained in:
Morris Jobke 2018-06-01 12:21:26 +02:00 committed by GitHub
parent 5c92da2269 188a41a2be
commit cf4ff7716e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/private/Log.php
View File

@ -293,8 +293,16 @@ class Log implements ILogger {
if(isset($logCondition['shared_secret'])) { if(isset($logCondition['shared_secret'])) {
$request = \OC::$server->getRequest(); $request = \OC::$server->getRequest();
if ($request->getMethod() === 'PUT' &&
strpos($request->getHeader('Content-Type'), 'application/x-www-form-urlencoded') === false &&
strpos($request->getHeader('Content-Type'), 'application/json') === false) {
$logSecretRequest = '';
} else {
$logSecretRequest = $request->getParam('log_secret', '');
}
// if token is found in the request change set the log condition to satisfied // if token is found in the request change set the log condition to satisfied
if($request && hash_equals($logCondition['shared_secret'], $request->getParam('log_secret', ''))) { if ($request && hash_equals($logCondition['shared_secret'], $logSecretRequest)) {
$this->logConditionSatisfied = true; $this->logConditionSatisfied = true;
} }
} }