Merge pull request #9692 from nextcloud/bugfix/noid/logsecret_fix_file_put
Make sure the log doesn't try to read from PUT if it can't
This commit is contained in:
commit
f13c2b20b6
|
@ -233,8 +233,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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue