Merge pull request #9695 from nextcloud/backport/9692/stable12

[stable12] Make sure the log doesn't try to read from PUT if it can't

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/private/Log.php b/lib/private/Log.php
index 6da23bfbaee..37ae2d0d067 100644
--- a/lib/private/Log.php
+++ b/lib/private/Log.php
@@ -285,8 +285,16 @@ class Log implements ILogger {
 				if(isset($logCondition['shared_secret'])) {
 					$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($request && hash_equals($logCondition['shared_secret'], $request->getParam('log_secret', ''))) {
+					if ($request && hash_equals($logCondition['shared_secret'], $logSecretRequest)) {
 						$this->logConditionSatisfied = true;
 					}
 				}