From b68609d0cf248ed42c9fe14706131da06b51d496 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 1 Sep 2017 10:31:11 +0200
Subject: [PATCH] Don't log LDAP password when server is not available
Signed-off-by: Joas Schilling <coding@schilljs.com>
---
lib/private/Log.php | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/lib/private/Log.php b/lib/private/Log.php
index 0d291218096..d93b29414e6 100644
--- a/lib/private/Log.php
+++ b/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();
--
GitLab