Merge pull request #6396 from nextcloud/12-6329

[stable12] Don't log LDAP password when server is not available

lib/private/Log.php

@@ -65,6 +65,7 @@ class Log implements ILogger {
 		'completeLogin',
 		'login',
 		'checkPassword',
+		'checkPasswordNoLogging',
 		'loginWithPassword',
 		'updatePrivateKeyPassword',
 		'validateUserPass',
@@ -82,14 +83,19 @@ class Log implements ILogger {
 		'solveChallenge',
 		'verifyChallenge',
 
-		//ICrypto
+		// ICrypto
 		'calculateHMAC',
 		'encrypt',
 		'decrypt',
 
-		//LoginController
+		// LoginController
 		'tryLogin',
 		'confirmPassword',
+
+		// LDAP
+		'bind',
+		'areCredentialsValid',
+		'invokeLDAPMethod',
 	];
 
 	/**
@@ -97,7 +103,7 @@ class Log implements ILogger {
 	 * @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();