From b9493cc12d3753811d1715d055b40ad0e353082f Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 3 Jan 2025 10:04:51 +0100 Subject: fix(logger): Prevent infinite recursion with log.condition => matches 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 --- lib/private/Log.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'lib') diff --git a/lib/private/Log.php b/lib/private/Log.php index 4fce0436707..e2b732473c2 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, @@ -196,6 +197,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, @@ -246,6 +252,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; } @@ -260,6 +267,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; } } @@ -272,6 +280,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; } @@ -285,12 +294,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; } -- cgit v1.2.3