Merge pull request #16502 from nextcloud/bugfix/16474

Check the if we can actually access the storage cache for recent files

Author: MorrisJobke

lib/private/Files/Node/Folder.php

@@ -442,8 +442,13 @@ private function recentParse($result, $mountMap, $mimetypeLoader) {
 		}, $result));
 
 		return array_values(array_filter($files, function (Node $node) {
+			$cacheEntry = $node->getMountPoint()->getStorage()->getCache()->get($node->getId());
+			if (!$cacheEntry) {
+				return false;
+			}
 			$relative = $this->getRelativePath($node->getPath());
-			return $relative !== null && $relative !== '/';
+			return $relative !== null && $relative !== '/'
+				&& ($cacheEntry->getPermissions() & \OCP\Constants::PERMISSION_READ) === \OCP\Constants::PERMISSION_READ;
 		}));
 	}
 

tests/lib/Files/Node/FolderTest.php

@@ -810,13 +810,15 @@ public function testRecent() {
 			'storage_mtime' => $baseTime,
 			'mtime' => $baseTime,
 			'mimetype' => 'text/plain',
-			'size' => 3
+			'size' => 3,
+			'permissions' => \OCP\Constants::PERMISSION_ALL
 		]);
 		$id2 = $cache->put('bar/foo/old.txt', [
 			'storage_mtime' => $baseTime - 100,
 			'mtime' => $baseTime - 100,
 			'mimetype' => 'text/plain',
-			'size' => 3
+			'size' => 3,
+			'permissions' => \OCP\Constants::PERMISSION_READ
 		]);
 		$cache->put('bar/asd/outside.txt', [
 			'storage_mtime' => $baseTime,
@@ -828,7 +830,8 @@ public function testRecent() {
 			'storage_mtime' => $baseTime - 600,
 			'mtime' => $baseTime - 600,
 			'mimetype' => 'text/plain',
-			'size' => 3
+			'size' => 3,
+			'permissions' => \OCP\Constants::PERMISSION_ALL
 		]);
 
 		$node = new \OC\Files\Node\Folder($root, $view, $folderPath, $folderInfo);
@@ -871,21 +874,24 @@ public function testRecentFolder() {
 			'storage_mtime' => $baseTime,
 			'mtime' => $baseTime,
 			'mimetype' => \OCP\Files\FileInfo::MIMETYPE_FOLDER,
-			'size' => 3
+			'size' => 3,
+			'permissions' => 0
 		]);
 		$id2 = $cache->put('bar/foo/folder/bar.txt', [
 			'storage_mtime' => $baseTime,
 			'mtime' => $baseTime,
 			'mimetype' => 'text/plain',
 			'size' => 3,
-			'parent' => $id1
+			'parent' => $id1,
+			'permissions' => \OCP\Constants::PERMISSION_ALL
 		]);
 		$id3 = $cache->put('bar/foo/folder/asd.txt', [
 			'storage_mtime' => $baseTime - 100,
 			'mtime' => $baseTime - 100,
 			'mimetype' => 'text/plain',
 			'size' => 3,
-			'parent' => $id1
+			'parent' => $id1,
+			'permissions' => \OCP\Constants::PERMISSION_ALL
 		]);
 
 		$node = new \OC\Files\Node\Folder($root, $view, $folderPath, $folderInfo);
@@ -934,7 +940,8 @@ public function testRecentJail() {
 			'storage_mtime' => $baseTime,
 			'mtime' => $baseTime,
 			'mimetype' => 'text/plain',
-			'size' => 3
+			'size' => 3,
+			'permissions' => \OCP\Constants::PERMISSION_ALL
 		]);
 		$cache->put('outside.txt', [
 			'storage_mtime' => $baseTime - 100,