aboutsummaryrefslogtreecommitdiffstats
path: root/apps/encryption/lib/Recovery.php
diff options
context:
space:
mode:
Diffstat (limited to 'apps/encryption/lib/Recovery.php')
-rw-r--r--apps/encryption/lib/Recovery.php117
1 files changed, 34 insertions, 83 deletions
diff --git a/apps/encryption/lib/Recovery.php b/apps/encryption/lib/Recovery.php
index f4336ec7c4e..38e78f5e822 100644
--- a/apps/encryption/lib/Recovery.php
+++ b/apps/encryption/lib/Recovery.php
@@ -1,28 +1,9 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\Encryption;
@@ -35,32 +16,10 @@ use OCP\IUserSession;
use OCP\PreConditionNotMetException;
class Recovery {
-
-
/**
* @var null|IUser
*/
protected $user;
- /**
- * @var Crypt
- */
- protected $crypt;
- /**
- * @var KeyManager
- */
- private $keyManager;
- /**
- * @var IConfig
- */
- private $config;
- /**
- * @var View
- */
- private $view;
- /**
- * @var IFile
- */
- private $file;
/**
* @param IUserSession $userSession
@@ -70,18 +29,15 @@ class Recovery {
* @param IFile $file
* @param View $view
*/
- public function __construct(IUserSession $userSession,
- Crypt $crypt,
- KeyManager $keyManager,
- IConfig $config,
- IFile $file,
- View $view) {
+ public function __construct(
+ IUserSession $userSession,
+ protected Crypt $crypt,
+ private KeyManager $keyManager,
+ private IConfig $config,
+ private IFile $file,
+ private View $view,
+ ) {
$this->user = ($userSession->isLoggedIn()) ? $userSession->getUser() : null;
- $this->crypt = $crypt;
- $this->keyManager = $keyManager;
- $this->config = $config;
- $this->view = $view;
- $this->file = $file;
}
/**
@@ -102,7 +58,7 @@ class Recovery {
}
if ($keyManager->checkRecoveryPassword($password)) {
- $appConfig->setAppValue('encryption', 'recoveryAdminEnabled', 1);
+ $appConfig->setAppValue('encryption', 'recoveryAdminEnabled', '1');
return true;
}
@@ -140,7 +96,7 @@ class Recovery {
if ($keyManager->checkRecoveryPassword($recoveryPassword)) {
// Set recoveryAdmin as disabled
- $this->config->setAppValue('encryption', 'recoveryAdminEnabled', 0);
+ $this->config->setAppValue('encryption', 'recoveryAdminEnabled', '0');
return true;
}
return false;
@@ -169,7 +125,7 @@ class Recovery {
* @return bool
*/
public function isRecoveryKeyEnabled() {
- $enabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled', 0);
+ $enabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled', '0');
return ($enabled === '1');
}
@@ -199,16 +155,15 @@ class Recovery {
/**
* add recovery key to all encrypted files
- * @param string $path
*/
- private function addRecoveryKeys($path) {
+ private function addRecoveryKeys(string $path): void {
$dirContent = $this->view->getDirectoryContent($path);
foreach ($dirContent as $item) {
$filePath = $item->getPath();
if ($item['type'] === 'dir') {
$this->addRecoveryKeys($filePath . '/');
} else {
- $fileKey = $this->keyManager->getFileKey($filePath, $this->user->getUID());
+ $fileKey = $this->keyManager->getFileKey($filePath, $this->user->getUID(), null);
if (!empty($fileKey)) {
$accessList = $this->file->getAccessList($filePath);
$publicKeys = [];
@@ -218,8 +173,11 @@ class Recovery {
$publicKeys = $this->keyManager->addSystemKeys($accessList, $publicKeys, $this->user->getUID());
- $encryptedKeyfiles = $this->crypt->multiKeyEncrypt($fileKey, $publicKeys);
- $this->keyManager->setAllFileKeys($filePath, $encryptedKeyfiles);
+ $shareKeys = $this->crypt->multiKeyEncrypt($fileKey, $publicKeys);
+ $this->keyManager->deleteLegacyFileKey($filePath);
+ foreach ($shareKeys as $uid => $keyFile) {
+ $this->keyManager->setShareKey($filePath, $uid, $keyFile);
+ }
}
}
}
@@ -227,9 +185,8 @@ class Recovery {
/**
* remove recovery key to all encrypted files
- * @param string $path
*/
- private function removeRecoveryKeys($path) {
+ private function removeRecoveryKeys(string $path): void {
$dirContent = $this->view->getDirectoryContent($path);
foreach ($dirContent as $item) {
$filePath = $item->getPath();
@@ -243,11 +200,8 @@ class Recovery {
/**
* recover users files with the recovery key
- *
- * @param string $recoveryPassword
- * @param string $user
*/
- public function recoverUsersFiles($recoveryPassword, $user) {
+ public function recoverUsersFiles(string $recoveryPassword, string $user): void {
$encryptedKey = $this->keyManager->getSystemPrivateKey($this->keyManager->getRecoveryKeyId());
$privateKey = $this->crypt->decryptPrivateKey($encryptedKey, $recoveryPassword);
@@ -258,12 +212,8 @@ class Recovery {
/**
* recover users files
- *
- * @param string $path
- * @param string $privateKey
- * @param string $uid
*/
- private function recoverAllFiles($path, $privateKey, $uid) {
+ private function recoverAllFiles(string $path, string $privateKey, string $uid): void {
$dirContent = $this->view->getDirectoryContent($path);
foreach ($dirContent as $item) {
@@ -279,19 +229,17 @@ class Recovery {
/**
* recover file
- *
- * @param string $path
- * @param string $privateKey
- * @param string $uid
*/
- private function recoverFile($path, $privateKey, $uid) {
+ private function recoverFile(string $path, string $privateKey, string $uid): void {
$encryptedFileKey = $this->keyManager->getEncryptedFileKey($path);
$shareKey = $this->keyManager->getShareKey($path, $this->keyManager->getRecoveryKeyId());
if ($encryptedFileKey && $shareKey && $privateKey) {
- $fileKey = $this->crypt->multiKeyDecrypt($encryptedFileKey,
+ $fileKey = $this->crypt->multiKeyDecryptLegacy($encryptedFileKey,
$shareKey,
$privateKey);
+ } elseif ($shareKey && $privateKey) {
+ $fileKey = $this->crypt->multiKeyDecrypt($shareKey, $privateKey);
}
if (!empty($fileKey)) {
@@ -303,8 +251,11 @@ class Recovery {
$publicKeys = $this->keyManager->addSystemKeys($accessList, $publicKeys, $uid);
- $encryptedKeyfiles = $this->crypt->multiKeyEncrypt($fileKey, $publicKeys);
- $this->keyManager->setAllFileKeys($path, $encryptedKeyfiles);
+ $shareKeys = $this->crypt->multiKeyEncrypt($fileKey, $publicKeys);
+ $this->keyManager->deleteLegacyFileKey($path);
+ foreach ($shareKeys as $uid => $keyFile) {
+ $this->keyManager->setShareKey($path, $uid, $keyFile);
+ }
}
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-15 00:44:17 +0000