diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-09-22 15:04:55 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-09-22 15:05:03 +0200 |
| commit | 744110905b131998be1dda9f23042572436dfe51 (patch) | |
| tree | 2e4e324bfcbf0d7564ee74b61fc3874693f252e8 /apps | |
| parent | 831d34f084e4c2f6b13303f58e12a9f96eb10a74 (diff) | |
| download | nextcloud-server-744110905b131998be1dda9f23042572436dfe51.tar.gz nextcloud-server-744110905b131998be1dda9f23042572436dfe51.zip | |
first check if a private key exists, if not it is always a recovery szenario
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_encryption/hooks/hooks.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index ccea51f91f7..866d8a9bd51 100644 --- a/apps/files_encryption/hooks/hooks.php +++ b/apps/files_encryption/hooks/hooks.php @@ -191,13 +191,12 @@ class Hooks { if (Crypt::mode() === 'server') {
$view = new \OC\Files\View('/');
+ $session = new \OCA\Encryption\Session($view);
- if ($params['uid'] === \OCP\User::getUser()) {
+ // Get existing decrypted private key
+ $privateKey = $session->getPrivateKey();
- $session = new \OCA\Encryption\Session($view);
-
- // Get existing decrypted private key
- $privateKey = $session->getPrivateKey();
+ if ($params['uid'] === \OCP\User::getUser() && $privateKey) {
// Encrypt private key with new user pwd as passphrase
$encryptedPrivateKey = Crypt::symmetricEncryptFileContent($privateKey, $params['password'], Helper::getCipher());
|