Skip to content

[stable11] Added additional methods for removal of sensitive info #7673

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
rullzer merged 2 commits into from
Jan 3, 2018
Merged

[stable11] Added additional methods for removal of sensitive info #7673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
268e2a5
Added additional methods for removal of sensitive info
Fiech Oct 26, 2017
5179676
Unit tests for #6977
nickvergessen Oct 27, 2017
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
6 changes: 6 additions & 0 deletions lib/private/Log.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ class Log implements ILogger {
'loginWithPassword',
'updatePrivateKeyPassword',
'validateUserPass',
'loginWithToken',
'\{closure\}',

// TokenProvider
'getToken',
Expand All @@ -90,6 +92,10 @@ class Log implements ILogger {
//LoginController
'tryLogin',
'confirmPassword',

// Encryption
'storeKeyPair',
'setupUser',
];

/**
Expand Down
26 changes: 26 additions & 0 deletions tests/lib/LoggerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,32 @@ public function testDetecttryLogin($user, $password) {
}
}

/**
* @dataProvider userAndPasswordData
*/
public function testDetectclosure($user, $password) {
$a = function($user, $password) {
throw new \Exception('test');
};

try {
$a($user, $password);
} catch (\Exception $e) {
$this->logger->logException($e);
}
$logLines = $this->getLogs();

foreach($logLines as $logLine) {
$log = explode('\n', $logLine);
unset($log[1]); // Remove `testDetectclosure(` because we are not testing this here, but the closure on stack trace 0
$logLine = implode('\n', $log);

$this->assertNotContains($user, $logLine);
$this->assertNotContains($password, $logLine);
$this->assertContains('{closure}(*** sensitive parameters replaced ***)', $logLine);
}
}

public function dataGetLogClass() {
return [
['file', \OC\Log\File::class],
Expand Down