diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-05-25 14:52:45 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-05-25 14:52:45 +0200 |
| commit | c5ade48c042fc8d5a2a5e3a3c62854e78711eee1 (patch) | |
| tree | 4dd26063c8f234741e83317e14c8043f4dfeb5e5 | |
| parent | 25e6026fa6f4c696fce13642ab57ff9c4f2f00d6 (diff) | |
| parent | 0f728b4cd1bb42787eb6b41dce48ace4d38b53e2 (diff) | |
| download | nextcloud-server-c5ade48c042fc8d5a2a5e3a3c62854e78711eee1.tar.gz nextcloud-server-c5ade48c042fc8d5a2a5e3a3c62854e78711eee1.zip | |
Merge pull request #24833 from owncloud/fix_24832
don't fail on "bad signature" during login
| -rw-r--r-- | apps/encryption/lib/KeyManager.php | 7 |
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) { |