aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2025-01-03 10:04:51 +0100
committerJoas Schilling <coding@schilljs.com>2025-01-03 10:04:51 +0100
commit63f3309993772d40fd2da1b2d8f5040c5586e967 (patch)
treebd3d7cba41a772aed9d1808f5c8486f97ae75647
parent9e18d3402c1ab63266413eda9cedc0e43cb6fa5a (diff)
downloadnextcloud-server-bugfix/noid/prevent-infitnite-loop.tar.gz
nextcloud-server-bugfix/noid/prevent-infitnite-loop.zip
fix(logger): Prevent infinite recursion with log.condition => matchesbugfix/noid/prevent-infitnite-loop
When we need to check the log condition for a user matches, there is a risk that something on the way checks the log level and would result in an infinite loop. So we simply check if it's a nested call and use the default warning level in that case. Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r--build/integration/features/log-condition.feature39
-rw-r--r--lib/private/Log.php12
2 files changed, 51 insertions, 0 deletions
diff --git a/build/integration/features/log-condition.feature b/build/integration/features/log-condition.feature
new file mode 100644
index 00000000000..4059db1ebf3
--- /dev/null
+++ b/build/integration/features/log-condition.feature
@@ -0,0 +1,39 @@
+# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: AGPL-3.0-or-later
+Feature: log-condition
+
+ Background:
+ Given invoking occ with "config:system:set log.condition matches 0 users 0 --value admin"
+ Then the command was successful
+
+ Scenario: Accessing /status.php with log.condition
+ When requesting "/status.php" with "GET"
+ Then the HTTP status code should be "200"
+
+ Scenario: Accessing /index.php with log.condition
+ When requesting "/index.php" with "GET"
+ Then the HTTP status code should be "200"
+
+ Scenario: Accessing /remote.php/webdav with log.condition
+ When requesting "/remote.php/webdav" with "GET"
+ Then the HTTP status code should be "401"
+
+ Scenario: Accessing /remote.php/dav with log.condition
+ When requesting "/remote.php/dav" with "GET"
+ Then the HTTP status code should be "401"
+
+ Scenario: Accessing /ocs/v1.php with log.condition
+ When requesting "/ocs/v1.php" with "GET"
+ Then the HTTP status code should be "200"
+
+ Scenario: Accessing /ocs/v2.php with log.condition
+ When requesting "/ocs/v2.php" with "GET"
+ Then the HTTP status code should be "404"
+
+ Scenario: Accessing /public.php/webdav with log.condition
+ When requesting "/public.php/webdav" with "GET"
+ Then the HTTP status code should be "401"
+
+ Scenario: Accessing /public.php/dav with log.condition
+ When requesting "/public.php/dav" with "GET"
+ Then the HTTP status code should be "503"
diff --git a/lib/private/Log.php b/lib/private/Log.php
index 98de9bfa858..55e41134692 100644
--- a/lib/private/Log.php
+++ b/lib/private/Log.php
@@ -37,6 +37,7 @@ use function strtr;
class Log implements ILogger, IDataLogger {
private ?bool $logConditionSatisfied = null;
private ?IEventDispatcher $eventDispatcher = null;
+ private int $nestingLevel = 0;
public function __construct(
private IWriter $logger,
@@ -192,6 +193,11 @@ class Log implements ILogger, IDataLogger {
}
public function getLogLevel(array $context, string $message): int {
+ if ($this->nestingLevel > 1) {
+ return ILogger::WARN;
+ }
+
+ $this->nestingLevel++;
/**
* @psalm-var array{
* shared_secret?: string,
@@ -242,6 +248,7 @@ class Log implements ILogger, IDataLogger {
// if log condition is satisfied change the required log level to DEBUG
if ($this->logConditionSatisfied) {
+ $this->nestingLevel--;
return ILogger::DEBUG;
}
@@ -256,6 +263,7 @@ class Log implements ILogger, IDataLogger {
* once this is met -> change the required log level to debug
*/
if (in_array($context['app'], $logCondition['apps'] ?? [], true)) {
+ $this->nestingLevel--;
return ILogger::DEBUG;
}
}
@@ -268,6 +276,7 @@ class Log implements ILogger, IDataLogger {
// Invalid configuration, warn the user and fall back to default level of WARN
error_log('Nextcloud configuration: "loglevel" is not a valid integer');
+ $this->nestingLevel--;
return ILogger::WARN;
}
@@ -281,12 +290,15 @@ class Log implements ILogger, IDataLogger {
if (!isset($option['apps']) && !isset($option['loglevel']) && !isset($option['message'])) {
/* Only user and/or secret are listed as conditions, we can cache the result for the rest of the request */
$this->logConditionSatisfied = true;
+ $this->nestingLevel--;
return ILogger::DEBUG;
}
+ $this->nestingLevel--;
return $option['loglevel'] ?? ILogger::DEBUG;
}
}
+ $this->nestingLevel--;
return ILogger::WARN;
}