Merge pull request #11224 from owncloud/fix_recovery_admin_user

first check if a private key exists, if not it is always a recovery szenario

1 files changed, 4 insertions, 5 deletions

diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index a6b4882083b..8eda8ef0881 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());