summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-09-07 09:25:56 +0200
committerGitHub <noreply@github.com>2017-09-07 09:25:56 +0200
commit485e22acde461d1142dc2fca1a75068179a8523e (patch)
treee749839f69020a97f578e1ea388cb2aedf24bbce /lib/private
parentdaf3db8de673d566e0c37492861e5ffe4090fd8d (diff)
parentb68609d0cf248ed42c9fe14706131da06b51d496 (diff)
downloadnextcloud-server-485e22acde461d1142dc2fca1a75068179a8523e.tar.gz
nextcloud-server-485e22acde461d1142dc2fca1a75068179a8523e.zip
Merge pull request #6329 from nextcloud/ldap-password
Don't log LDAP password when server is not available
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/Log.php12
1 files 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();