aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Douma <rullzer@users.noreply.github.com>2016-07-15 09:39:57 +0200
committerGitHub <noreply@github.com>2016-07-15 09:39:57 +0200
commit5bfa95848494d71456954d92749d99b3cb87357c (patch)
treea5909245860374a3e0489ae50d03b4c644c2573f
parent813b58ab947222f983fe25d56781f1f43c840538 (diff)
parent059b7435abee8269fd5ac2948bb5fde138d7e24d (diff)
downloadnextcloud-server-5bfa95848494d71456954d92749d99b3cb87357c.tar.gz
nextcloud-server-5bfa95848494d71456954d92749d99b3cb87357c.zip
Merge pull request #404 from nextcloud/nopasswordlogingallowed_is_not_fatal
PasswordLoginForbidden is not a FATAL exception
-rw-r--r--apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php b/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php
index 38bddef8769..addacec9b03 100644
--- a/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php
@@ -32,6 +32,9 @@ use Sabre\HTTP\Response;
class ExceptionLoggerPlugin extends \Sabre\DAV\ServerPlugin {
protected $nonFatalExceptions = array(
'Sabre\DAV\Exception\NotAuthenticated' => true,
+ // If tokenauth can throw this exception (which is basically as
+ // NotAuthenticated. So not fatal.
+ 'OCA\DAV\Connector\Sabre\Exception\PasswordLoginForbidden' => true,
// the sync client uses this to find out whether files exist,
// so it is not always an error, log it as debug
'Sabre\DAV\Exception\NotFound' => true,