Skip to content

[stable24] Fix logger overwriting vars in some circumstances #32904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 3 commits into from
Jun 17, 2022
Merged

[stable24] Fix logger overwriting vars in some circumstances #32904

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc2a881
add serializer test
blizzz Jun 15, 2022
ed4fcf2
fix overwriting original vars when logging
blizzz Jun 16, 2022
6b8d6de
make placeholder a const for reuse
blizzz Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix overwriting original vars when logging 
Signed-off-by: Arthur Schiwon <[email protected]>
  • Loading branch information
@blizzz @backportbot-nextcloud
blizzz authored and backportbot-nextcloud[bot] committed Jun 16, 2022
commit ed4fcf2d17c60a8c3c8da9758063a95326df86a8
6 changes: 4 additions & 2 deletions lib/private/Log/ExceptionSerializer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,14 +208,16 @@ private function filterTrace(array $trace) {
}

private function removeValuesFromArgs($args, $values) {
foreach ($args as &$arg) {
$workArgs = [];
foreach ($args as $arg) {
if (in_array($arg, $values, true)) {
$arg = '*** sensitive parameter replaced ***';
} elseif (is_array($arg)) {
$arg = $this->removeValuesFromArgs($arg, $values);
}
$workArgs[] = $arg;
}
return $args;
return $workArgs;
}

private function encodeTrace($trace) {
Expand Down
3 changes: 2 additions & 1 deletion tests/lib/Log/ExceptionSerializerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ public function testSerializer() {
$secret = ['Secret'];
$this->emit([&$secret]);
} catch (\Exception $e) {
$this->serializer->serializeException($e);
$serializedData = $this->serializer->serializeException($e);
$this->assertSame(['Secret'], $secret);
$this->assertSame('*** sensitive parameters replaced ***', $serializedData['Trace'][0]['args'][0]);
}
}
}