Merge pull request #50031 from nextcloud/backport/50026/stable30

[stable30] fix(logger): Prevent infinite recursion with log.condition => users or matches

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"

lib/private/Log.php

@@ -37,6 +37,7 @@
 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 @@ public function log(int $level, string $message, array $context = []): void {
 	}
 
 	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 @@ public function getLogLevel(array $context, string $message): int {
 
 		// if log condition is satisfied change the required log level to DEBUG
 		if ($this->logConditionSatisfied) {
+			$this->nestingLevel--;
 			return ILogger::DEBUG;
 		}
 
@@ -260,6 +267,7 @@ public function getLogLevel(array $context, string $message): int {
 			 * 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 @@ public function getLogLevel(array $context, string $message): int {
 
 			// 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 @@ public function getLogLevel(array $context, string $message): int {
 				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;
 	}