aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2016-05-25 11:39:44 +0200
committerBjörn Schießle <schiessle@owncloud.com>2016-05-25 11:39:44 +0200
commit0f728b4cd1bb42787eb6b41dce48ace4d38b53e2 (patch)
tree4dd26063c8f234741e83317e14c8043f4dfeb5e5
parent25e6026fa6f4c696fce13642ab57ff9c4f2f00d6 (diff)
downloadnextcloud-server-0f728b4cd1bb42787eb6b41dce48ace4d38b53e2.tar.gz
nextcloud-server-0f728b4cd1bb42787eb6b41dce48ace4d38b53e2.zip
don't fail on "bad signature" during login. Most likely this happens because
the login password changed at the user back-end (e.g ldap). Such failures will be handled after login correctly by allowing the user to adjust the passwords
-rw-r--r--apps/encryption/lib/KeyManager.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php
index 4f22c3def63..a9ba8d9dbaa 100644
--- a/apps/encryption/lib/KeyManager.php
+++ b/apps/encryption/lib/KeyManager.php
@@ -360,6 +360,13 @@ class KeyManager {
return false;
} catch (DecryptionFailedException $e) {
return false;
+ } catch (\Exception $e) {
+ $this->log->warning(
+ 'Could not decrypt the private key from user "' . $uid . '"" during login. ' .
+ 'Assume password change on the user back-end. Error message: '
+ . $e->getMessage()
+ );
+ return false;
}
if ($privateKey) {