summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-07-08 14:13:16 +0200
committerMorris Jobke <hey@morrisjobke.de>2016-07-08 14:13:16 +0200
commit390a9962970b9283663d8a84d5da4929aa5921e8 (patch)
tree43bb730016d88956dac6c317b07b125398858050 /lib
parent48f9e4ed03f3148d62919a95496ee43164d3e707 (diff)
downloadnextcloud-server-390a9962970b9283663d8a84d5da4929aa5921e8.tar.gz
nextcloud-server-390a9962970b9283663d8a84d5da4929aa5921e8.zip
Sanitize more config options and stack traces
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Log.php1
-rw-r--r--lib/private/SystemConfig.php6
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/private/Log.php b/lib/private/Log.php
index 49223521916..b759021ad1f 100644
--- a/lib/private/Log.php
+++ b/lib/private/Log.php
@@ -64,6 +64,7 @@ class Log implements ILogger {
// Session/User
'login',
'checkPassword',
+ 'loginWithPassword',
'updatePrivateKeyPassword',
'validateUserPass',
diff --git a/lib/private/SystemConfig.php b/lib/private/SystemConfig.php
index d773e601256..4d9882c9538 100644
--- a/lib/private/SystemConfig.php
+++ b/lib/private/SystemConfig.php
@@ -55,6 +55,12 @@ class SystemConfig {
'objectstore' => [
'arguments' => [
'password' => true,
+ 'options' => [
+ 'credentials' => [
+ 'key' => true,
+ 'secret' => true,
+ ]
+ ]
],
],
];