fix(teamfolder): Fix mimetype detection in teamfolder trashbin and versions

Signed-off-by: Joas Schilling <coding@schilljs.com>

Author: nickvergessen

lib/Operation.php

@@ -12,6 +12,7 @@
 use OC\Files\FileInfo;
 use OC\Files\Node\Folder;
 use OC\Files\View;
+use OCA\GroupFolders\Mount\GroupMountPoint;
 use OCA\WorkflowEngine\Entity\File;
 use OCP\EventDispatcher\Event;
 use OCP\Files\Cache\ICacheEntry;
@@ -62,7 +63,7 @@ public function checkFileAccess(string $path, IMountPoint $mountPoint, bool $isD
 
 		$this->nestingLevel++;
 
-		$filePath = $this->translatePath($storage, $path);
+		$filePath = $this->translatePath($mountPoint, $storage, $path);
 		$ruleMatcher = $this->manager->getRuleMatcher();
 		$ruleMatcher->setFileInfo($storage, $filePath, $isDir);
 		$node = $this->getNode($path, $mountPoint, $cacheEntry);
@@ -119,8 +120,31 @@ protected function isBlockablePath(IMountPoint $mountPoint, string $path): bool
 	/**
 	 * For thumbnails and versions we want to check the tags of the original file
 	 */
-	protected function translatePath(IStorage $storage, string $path): string {
-		if (substr_count($path, '/') < 1) {
+	protected function translatePath(IMountPoint $mountPoint, IStorage $storage, string $path): string {
+		if ($mountPoint instanceof GroupMountPoint) {
+			/**
+			 * Case    | Mount point path                      | Path ($path)
+			 * --------+---------------------------------------+--------------------------------
+			 * Files   | /user/files/$folderName/              | Subfolder/File.txt
+			 * Trash   | /user/files_trashbin/groupfolder/$id/ | Subfolder/File.txt.v{timestamp}
+			 * Version | /user/files_versions/groupfolder/$id/ | Subfolder/File.txt.d{timestamp}
+			 */
+			$mountPath = $mountPoint->getMountPoint();
+			if (substr_count($mountPath, '/') >= 3) {
+				[,, $folder] = explode('/', $mountPath);
+				if ($folder === 'files_versions' && preg_match('/.+\.v\d{10}$/', basename($path))) {
+					// Remove trailing ".v{timestamp}"
+					return substr($path, 0, -12);
+				}
+				if ($folder === 'files_trashbin' && preg_match('/.+\.d\d{10}$/', basename($path))) {
+					// Remove trailing ".d{timestamp}"
+					return substr($path, 0, -12);
+				}
+			}
+			return $path;
+		}
+
+		if (substr_count($path, '/') === 0) {
 			return $path;
 		}
 
@@ -176,6 +200,10 @@ protected function isCreatingSkeletonFiles(): bool {
 				&& isset($step['function']) && $step['function'] === 'tryLogin') {
 				return true;
 			}
+			if (isset($step['class']) && $step['class'] === \OCA\GroupFolders\Trash\TrashBackend::class
+				&& isset($step['function']) && $step['function'] === 'setupTrashFolder') {
+				return true;
+			}
 		}
 
 		return false;

psalm.xml

@@ -31,5 +31,6 @@
 		<file name="tests/stubs/oc_files_cache_wrapper_cachewrapper.php" />
 		<file name="tests/stubs/oc_files_storage_wrapper_wrapper.php" />
 		<file name="tests/stubs/oc_files_storage_wrapper_jail.php" />
+		<file name="tests/stubs/oca_groupfolders.php" />
 	</stubs>
 </psalm>

tests/stubs/oca_groupfolders.php

@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\GroupFolders\Trash {
+	class TrashBackend {
+		public function setupTrashFolder(string $class, string $value, $closure) {
+		}
+	}
+}
+
+namespace OCA\GroupFolders\Mount {
+	abstract class GroupMountPoint implements \OCP\Files\Mount\IMountPoint {
+	}
+}