upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 00:32:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

Merge pull request #50026 from nextcloud/bugfix/noid/prevent-infitnite-loop

Browse source 
fix(logger): Prevent infinite recursion with log.condition => users or matches
This commit is contained in:
Joas Schilling 2025-01-03 12:11:17 +01:00 committed by GitHub
commit 0f2b6282c1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 51 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
build/integration/features/log-condition.feature Normal file
View file

@ -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"

12
lib/private/Log.php
View file

@ -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;
}