Upstream Seldaek/monolog state of the touched files before 466b18ff51

This commit is contained in:
upstream committed 2026-09-04 08:38:50 +02:00
1 parent 78b679dd92
commit fb5cc5f9ee
2 files changed
+2 -41

No files matched your search

+2 -25
View File
@@ -203,9 +203,8 @@ final class RedactingFormatter implements WrappingFormatterInterface
if (\is_array($data)) {
foreach ($data as $key => $value) {
if (\is_string($key) && \in_array(strtolower($key), $this->sensitiveKeys, true)) {
// the value is masked in the record, but a nested array's leaves can still
// leak elsewhere (e.g. json-encoded by PsrLogMessageProcessor)
$this->collectSensitiveValue($value, $secrets, $depth + 1);
// no need to recurse, the whole value is masked in the record anyway
$this->addSecret($value, $secrets);
continue;
}
@@ -240,28 +239,6 @@ final class RedactingFormatter implements WrappingFormatterInterface
}
}
/**
* Collects every string leaf nested inside a value under a sensitive key.
*
* @param list<string> $secrets
*/
private function collectSensitiveValue(mixed $value, array &$secrets, int $depth): void
{
if ($depth > self::MAX_DEPTH) {
return;
}
if (\is_array($value)) {
foreach ($value as $item) {
$this->collectSensitiveValue($item, $secrets, $depth + 1);
}
return;
}
$this->addSecret($value, $secrets);
}
/**
* Reflects the properties of an object matching a #[SensitiveParameter] constructor parameter
*