wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #11224 from owncloud/fix_recovery_admin_user

Browse source 
first check if a private key exists, if not it is always a recovery szenario
This commit is contained in:
Lukas Reschke 2014-09-23 10:13:58 +02:00
commit ff6c5331e9
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/files_encryption/hooks/hooks.php
View file

@ -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());