Revert "add key location to info:file output"

This reverts commit 7bf82fc312.

core/Command/Info/File.php

@@ -5,12 +5,10 @@ declare(strict_types=1);
 namespace OC\Core\Command\Info;
 
 use OC\Files\ObjectStore\ObjectStoreStorage;
-use OC\Files\View;
 use OCA\Files_External\Config\ExternalMountPoint;
 use OCA\GroupFolders\Mount\GroupMountPoint;
 use OCP\Files\Folder;
 use OCP\Files\IHomeStorage;
-use OCP\Files\IRootFolder;
 use OCP\Files\Mount\IMountPoint;
 use OCP\Files\Node;
 use OCP\Files\NotFoundException;
@@ -25,16 +23,13 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class File extends Command {
 	private IL10N $l10n;
-	private View $rootView;
 
 	public function __construct(
 		IFactory $l10nFactory,
 		private FileUtils $fileUtils,
-		private \OC\Encryption\Util $encryptionUtil
 	) {
 		$this->l10n = $l10nFactory->get("core");
 		parent::__construct();
-		$this->rootView = new View();
 	}
 
 	protected function configure(): void {
@@ -59,14 +54,6 @@ class File extends Command {
 		$output->writeln("  mimetype: " . $node->getMimetype());
 		$output->writeln("  modified: " . (string)$this->l10n->l("datetime", $node->getMTime()));
 		$output->writeln("  " . ($node->isEncrypted() ? "encrypted" : "not encrypted"));
-		if ($node->isEncrypted()) {
-			$keyPath = $this->encryptionUtil->getFileKeyDir('', $node->getPath());
-			if ($this->rootView->file_exists($keyPath)) {
-				$output->writeln("    encryption key at: " . $keyPath);
-			} else {
-				$output->writeln("    <error>encryption key not found</error> should be location at: " . $keyPath);
-			}
-		}
 		$output->writeln("  size: " . Util::humanFileSize($node->getSize()));
 		$output->writeln("  etag: " . $node->getEtag());
 		if ($node instanceof Folder) {

lib/private/Encryption/Keys/Storage.php

@@ -98,14 +98,14 @@ class Storage implements IStorage {
 	 */
 	public function getFileKey($path, $keyId, $encryptionModuleId) {
 		$realFile = $this->util->stripPartialFileExtension($path);
-		$keyDir = $this->util->getFileKeyDir($encryptionModuleId, $realFile);
+		$keyDir = $this->getFileKeyDir($encryptionModuleId, $realFile);
 		$key = $this->getKey($keyDir . $keyId)['key'];
 
 		if ($key === '' && $realFile !== $path) {
 			// Check if the part file has keys and use them, if no normal keys
 			// exist. This is required to fix copyBetweenStorage() when we
 			// rename a .part file over storage borders.
-			$keyDir = $this->util->getFileKeyDir($encryptionModuleId, $path);
+			$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
 			$key = $this->getKey($keyDir . $keyId)['key'];
 		}
 
@@ -135,7 +135,7 @@ class Storage implements IStorage {
 	 * @inheritdoc
 	 */
 	public function setFileKey($path, $keyId, $key, $encryptionModuleId) {
-		$keyDir = $this->util->getFileKeyDir($encryptionModuleId, $path);
+		$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
 		return $this->setKey($keyDir . $keyId, [
 			'key' => base64_encode($key),
 		]);
@@ -177,7 +177,7 @@ class Storage implements IStorage {
 	 * @inheritdoc
 	 */
 	public function deleteFileKey($path, $keyId, $encryptionModuleId) {
-		$keyDir = $this->util->getFileKeyDir($encryptionModuleId, $path);
+		$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
 		return !$this->view->file_exists($keyDir . $keyId) || $this->view->unlink($keyDir . $keyId);
 	}
 
@@ -185,7 +185,7 @@ class Storage implements IStorage {
 	 * @inheritdoc
 	 */
 	public function deleteAllFileKeys($path) {
-		$keyDir = $this->util->getFileKeyDir('', $path);
+		$keyDir = $this->getFileKeyDir('', $path);
 		return !$this->view->file_exists($keyDir) || $this->view->deleteAll($keyDir);
 	}
 
@@ -355,6 +355,26 @@ class Storage implements IStorage {
 		return false;
 	}
 
+	/**
+	 * get path to key folder for a given file
+	 *
+	 * @param string $encryptionModuleId
+	 * @param string $path path to the file, relative to data/
+	 * @return string
+	 */
+	private function getFileKeyDir($encryptionModuleId, $path) {
+		[$owner, $filename] = $this->util->getUidAndFilename($path);
+
+		// in case of system wide mount points the keys are stored directly in the data directory
+		if ($this->util->isSystemWideMountPoint($filename, $owner)) {
+			$keyPath = $this->root_dir . '/' . $this->keys_base_dir . $filename . '/';
+		} else {
+			$keyPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $filename . '/';
+		}
+
+		return Filesystem::normalizePath($keyPath . $encryptionModuleId . '/', false);
+	}
+
 	/**
 	 * move keys if a file was renamed
 	 *

lib/private/Encryption/Util.php

@@ -385,25 +385,4 @@ class Util {
 
 		return $result;
 	}
-
-	/**
-	 * get path to key folder for a given file
-	 *
-	 * @param string $encryptionModuleId
-	 * @param string $path path to the file, relative to data/
-	 * @return string
-	 */
-	public function getFileKeyDir(string $encryptionModuleId, string $path): string {
-		[$owner, $filename] = $this->getUidAndFilename($path);
-		$root = $this->getKeyStorageRoot();
-
-		// in case of system-wide mount points the keys are stored directly in the data directory
-		if ($this->isSystemWideMountPoint($filename, $owner)) {
-			$keyPath = $root . '/' . '/files_encryption/keys' . $filename . '/';
-		} else {
-			$keyPath = $root . '/' . $owner . '/files_encryption/keys' . $filename . '/';
-		}
-
-		return Filesystem::normalizePath($keyPath . $encryptionModuleId . '/', false);
-	}
 }