1 files changed, 34 insertions, 96 deletions

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 {