Skip to content

Commit

Permalink
Merge pull request #6329 from nextcloud/ldap-password
Browse files Browse the repository at this point in the history
Don't log LDAP password when server is not available
  • Loading branch information
MorrisJobke authored Sep 7, 2017
2 parents daf3db8 + b68609d commit 485e22a
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions lib/private/Log.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ class Log implements ILogger {
'completeLogin',
'login',
'checkPassword',
'checkPasswordNoLogging',
'loginWithPassword',
'updatePrivateKeyPassword',
'validateUserPass',
Expand All @@ -82,22 +83,27 @@ class Log implements ILogger {
'solveChallenge',
'verifyChallenge',

//ICrypto
// ICrypto
'calculateHMAC',
'encrypt',
'decrypt',

//LoginController
// LoginController
'tryLogin',
'confirmPassword',

// LDAP
'bind',
'areCredentialsValid',
'invokeLDAPMethod',
];

/**
* @param string $logger The logger that should be used
* @param SystemConfig $config the system config object
* @param null $normalizer
*/
public function __construct($logger=null, SystemConfig $config=null, $normalizer = null) {
public function __construct($logger = null, SystemConfig $config = null, $normalizer = null) {
// FIXME: Add this for backwards compatibility, should be fixed at some point probably
if($config === null) {
$config = \OC::$server->getSystemConfig();
Expand Down

0 comments on commit 485e22a

Please sign in to comment.