aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/Encryption
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/Encryption')
-rw-r--r--lib/private/Encryption/EncryptionEventListener.php93
-rw-r--r--lib/private/Encryption/EncryptionWrapper.php10
-rw-r--r--lib/private/Encryption/HookManager.php75
-rw-r--r--lib/private/Encryption/Update.php130
-rw-r--r--lib/private/Encryption/Util.php2
5 files changed, 128 insertions, 182 deletions
diff --git a/lib/private/Encryption/EncryptionEventListener.php b/lib/private/Encryption/EncryptionEventListener.php
new file mode 100644
index 00000000000..59ac0dea932
--- /dev/null
+++ b/lib/private/Encryption/EncryptionEventListener.php
@@ -0,0 +1,93 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+namespace OC\Encryption;
+
+use OC\Files\SetupManager;
+use OC\Files\View;
+use OCA\Files_Trashbin\Events\NodeRestoredEvent;
+use OCP\Encryption\IFile;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventDispatcher;
+use OCP\EventDispatcher\IEventListener;
+use OCP\Files\Events\Node\NodeRenamedEvent;
+use OCP\IUser;
+use OCP\IUserSession;
+use OCP\Share\Events\ShareCreatedEvent;
+use OCP\Share\Events\ShareDeletedEvent;
+use Psr\Log\LoggerInterface;
+
+/** @template-implements IEventListener<NodeRenamedEvent|ShareCreatedEvent|ShareDeletedEvent|NodeRestoredEvent> */
+class EncryptionEventListener implements IEventListener {
+ private ?Update $updater = null;
+
+ public function __construct(
+ private IUserSession $userSession,
+ private SetupManager $setupManager,
+ private Manager $encryptionManager,
+ ) {
+ }
+
+ public static function register(IEventDispatcher $dispatcher): void {
+ $dispatcher->addServiceListener(NodeRenamedEvent::class, static::class);
+ $dispatcher->addServiceListener(ShareCreatedEvent::class, static::class);
+ $dispatcher->addServiceListener(ShareDeletedEvent::class, static::class);
+ $dispatcher->addServiceListener(NodeRestoredEvent::class, static::class);
+ }
+
+ public function handle(Event $event): void {
+ if (!$this->encryptionManager->isEnabled()) {
+ return;
+ }
+ if ($event instanceof NodeRenamedEvent) {
+ $this->getUpdate()->postRename($event->getSource(), $event->getTarget());
+ } elseif ($event instanceof ShareCreatedEvent) {
+ $this->getUpdate()->postShared($event->getShare()->getNode());
+ } elseif ($event instanceof ShareDeletedEvent) {
+ // In case the unsharing happens in a background job, we don't have
+ // a session and we load instead the user from the UserManager
+ $owner = $event->getShare()->getNode()->getOwner();
+ $this->getUpdate($owner)->postUnshared($event->getShare()->getNode());
+ } elseif ($event instanceof NodeRestoredEvent) {
+ $this->getUpdate()->postRestore($event->getTarget());
+ }
+ }
+
+ private function getUpdate(?IUser $owner = null): Update {
+ if (is_null($this->updater)) {
+ $user = $this->userSession->getUser();
+ if (!$user && ($owner !== null)) {
+ $user = $owner;
+ }
+ if (!$user) {
+ throw new \Exception('Inconsistent data, File unshared, but owner not found. Should not happen');
+ }
+
+ $uid = $user->getUID();
+
+ if (!$this->setupManager->isSetupComplete($user)) {
+ $this->setupManager->setupForUser($user);
+ }
+
+ $this->updater = new Update(
+ new Util(
+ new View(),
+ \OC::$server->getUserManager(),
+ \OC::$server->getGroupManager(),
+ \OC::$server->getConfig()),
+ \OC::$server->getEncryptionManager(),
+ \OC::$server->get(IFile::class),
+ \OC::$server->get(LoggerInterface::class),
+ $uid
+ );
+ }
+
+ return $this->updater;
+ }
+}
diff --git a/lib/private/Encryption/EncryptionWrapper.php b/lib/private/Encryption/EncryptionWrapper.php
index 7f355b603d6..b9db9616538 100644
--- a/lib/private/Encryption/EncryptionWrapper.php
+++ b/lib/private/Encryption/EncryptionWrapper.php
@@ -75,15 +75,6 @@ class EncryptionWrapper {
\OC::$server->getGroupManager(),
\OC::$server->getConfig()
);
- $update = new Update(
- new View(),
- $util,
- Filesystem::getMountManager(),
- $this->manager,
- $fileHelper,
- $this->logger,
- $uid
- );
return new Encryption(
$parameters,
$this->manager,
@@ -92,7 +83,6 @@ class EncryptionWrapper {
$fileHelper,
$uid,
$keyStorage,
- $update,
$mountManager,
$this->arrayCache
);
diff --git a/lib/private/Encryption/HookManager.php b/lib/private/Encryption/HookManager.php
deleted file mode 100644
index 39e7edabb95..00000000000
--- a/lib/private/Encryption/HookManager.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
- * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-namespace OC\Encryption;
-
-use OC\Files\Filesystem;
-use OC\Files\SetupManager;
-use OC\Files\View;
-use OCP\Encryption\IFile;
-use Psr\Log\LoggerInterface;
-
-class HookManager {
- private static ?Update $updater = null;
-
- public static function postShared($params): void {
- self::getUpdate()->postShared($params);
- }
- public static function postUnshared($params): void {
- // In case the unsharing happens in a background job, we don't have
- // a session and we load instead the user from the UserManager
- $path = Filesystem::getPath($params['fileSource']);
- $owner = Filesystem::getOwner($path);
- self::getUpdate($owner)->postUnshared($params);
- }
-
- public static function postRename($params): void {
- self::getUpdate()->postRename($params);
- }
-
- public static function postRestore($params): void {
- self::getUpdate()->postRestore($params);
- }
-
- private static function getUpdate(?string $owner = null): Update {
- if (is_null(self::$updater)) {
- $user = \OC::$server->getUserSession()->getUser();
- if (!$user && $owner) {
- $user = \OC::$server->getUserManager()->get($owner);
- }
- if (!$user) {
- throw new \Exception('Inconsistent data, File unshared, but owner not found. Should not happen');
- }
-
- $uid = '';
- if ($user) {
- $uid = $user->getUID();
- }
-
- $setupManager = \OC::$server->get(SetupManager::class);
- if (!$setupManager->isSetupComplete($user)) {
- $setupManager->setupForUser($user);
- }
-
- self::$updater = new Update(
- new View(),
- new Util(
- new View(),
- \OC::$server->getUserManager(),
- \OC::$server->getGroupManager(),
- \OC::$server->getConfig()),
- Filesystem::getMountManager(),
- \OC::$server->getEncryptionManager(),
- \OC::$server->get(IFile::class),
- \OC::$server->get(LoggerInterface::class),
- $uid
- );
- }
-
- return self::$updater;
- }
-}
diff --git a/lib/private/Encryption/Update.php b/lib/private/Encryption/Update.php
index 0b27d63c19a..293a1ce653c 100644
--- a/lib/private/Encryption/Update.php
+++ b/lib/private/Encryption/Update.php
@@ -1,146 +1,85 @@
<?php
+declare(strict_types=1);
+
/**
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-only
*/
+
namespace OC\Encryption;
use InvalidArgumentException;
-use OC\Files\Filesystem;
-use OC\Files\Mount;
use OC\Files\View;
use OCP\Encryption\Exceptions\GenericEncryptionException;
+use OCP\Files\File as OCPFile;
+use OCP\Files\Folder;
+use OCP\Files\NotFoundException;
use Psr\Log\LoggerInterface;
/**
* update encrypted files, e.g. because a file was shared
*/
class Update {
- /** @var View */
- protected $view;
-
- /** @var Util */
- protected $util;
-
- /** @var \OC\Files\Mount\Manager */
- protected $mountManager;
-
- /** @var Manager */
- protected $encryptionManager;
-
- /** @var string */
- protected $uid;
-
- /** @var File */
- protected $file;
-
- /** @var LoggerInterface */
- protected $logger;
-
- /**
- * @param string $uid
- */
public function __construct(
- View $view,
- Util $util,
- Mount\Manager $mountManager,
- Manager $encryptionManager,
- File $file,
- LoggerInterface $logger,
- $uid,
+ protected Util $util,
+ protected Manager $encryptionManager,
+ protected File $file,
+ protected LoggerInterface $logger,
+ protected string $uid,
) {
- $this->view = $view;
- $this->util = $util;
- $this->mountManager = $mountManager;
- $this->encryptionManager = $encryptionManager;
- $this->file = $file;
- $this->logger = $logger;
- $this->uid = $uid;
}
/**
* hook after file was shared
- *
- * @param array $params
*/
- public function postShared($params) {
- if ($this->encryptionManager->isEnabled()) {
- if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
- $path = Filesystem::getPath($params['fileSource']);
- [$owner, $ownerPath] = $this->getOwnerPath($path);
- $absPath = '/' . $owner . '/files/' . $ownerPath;
- $this->update($absPath);
- }
- }
+ public function postShared(OCPFile|Folder $node): void {
+ $this->update($node);
}
/**
* hook after file was unshared
- *
- * @param array $params
*/
- public function postUnshared($params) {
- if ($this->encryptionManager->isEnabled()) {
- if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
- $path = Filesystem::getPath($params['fileSource']);
- [$owner, $ownerPath] = $this->getOwnerPath($path);
- $absPath = '/' . $owner . '/files/' . $ownerPath;
- $this->update($absPath);
- }
- }
+ public function postUnshared(OCPFile|Folder $node): void {
+ $this->update($node);
}
/**
* inform encryption module that a file was restored from the trash bin,
* e.g. to update the encryption keys
- *
- * @param array $params
*/
- public function postRestore($params) {
- if ($this->encryptionManager->isEnabled()) {
- $path = Filesystem::normalizePath('/' . $this->uid . '/files/' . $params['filePath']);
- $this->update($path);
- }
+ public function postRestore(OCPFile|Folder $node): void {
+ $this->update($node);
}
/**
* inform encryption module that a file was renamed,
* e.g. to update the encryption keys
- *
- * @param array $params
*/
- public function postRename($params) {
- $source = $params['oldpath'];
- $target = $params['newpath'];
- if (
- $this->encryptionManager->isEnabled() &&
- dirname($source) !== dirname($target)
- ) {
- [$owner, $ownerPath] = $this->getOwnerPath($target);
- $absPath = '/' . $owner . '/files/' . $ownerPath;
- $this->update($absPath);
+ public function postRename(OCPFile|Folder $source, OCPFile|Folder $target): void {
+ if (dirname($source->getPath()) !== dirname($target->getPath())) {
+ $this->update($target);
}
}
/**
- * get owner and path relative to data/<owner>/files
+ * get owner and path relative to data/
*
- * @param string $path path to file for current user
- * @return array ['owner' => $owner, 'path' => $path]
* @throws \InvalidArgumentException
*/
- protected function getOwnerPath($path) {
- $info = Filesystem::getFileInfo($path);
- $owner = Filesystem::getOwner($path);
+ protected function getOwnerPath(OCPFile|Folder $node): string {
+ $owner = $node->getOwner()?->getUID();
+ if ($owner === null) {
+ throw new InvalidArgumentException('No owner found for ' . $node->getId());
+ }
$view = new View('/' . $owner . '/files');
- $path = $view->getPath($info->getId());
- if ($path === null) {
- throw new InvalidArgumentException('No file found for ' . $info->getId());
+ try {
+ $path = $view->getPath($node->getId());
+ } catch (NotFoundException $e) {
+ throw new InvalidArgumentException('No file found for ' . $node->getId(), previous:$e);
}
-
- return [$owner, $path];
+ return '/' . $owner . '/files/' . $path;
}
/**
@@ -149,7 +88,7 @@ class Update {
* @param string $path relative to data/
* @throws Exceptions\ModuleDoesNotExistsException
*/
- public function update($path) {
+ public function update(OCPFile|Folder $node): void {
$encryptionModule = $this->encryptionManager->getEncryptionModule();
// if the encryption module doesn't encrypt the files on a per-user basis
@@ -158,15 +97,14 @@ class Update {
return;
}
+ $path = $this->getOwnerPath($node);
// if a folder was shared, get a list of all (sub-)folders
- if ($this->view->is_dir($path)) {
+ if ($node instanceof Folder) {
$allFiles = $this->util->getAllFiles($path);
} else {
$allFiles = [$path];
}
-
-
foreach ($allFiles as $file) {
$usersSharing = $this->file->getAccessList($file);
try {
diff --git a/lib/private/Encryption/Util.php b/lib/private/Encryption/Util.php
index 1fb08b15696..0566ab9a760 100644
--- a/lib/private/Encryption/Util.php
+++ b/lib/private/Encryption/Util.php
@@ -304,7 +304,7 @@ class Util {
// detect user specific folders
if ($this->userManager->userExists($root[1])
- && in_array($root[2], $this->excludedPaths)) {
+ && in_array($root[2] ?? '', $this->excludedPaths)) {
return true;
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-15 03:20:37 +0000