diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2024-04-18 12:40:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-18 12:40:28 +0200 |
| commit | 5c630fdfc103149db82ab84e2e81d63cb4726263 (patch) | |
| tree | d52fdc5d0e969d13e48a74e9061a4126226b6a5e | |
| parent | 4c4d15681619227d1c5b976a793a7a0b648d92c6 (diff) | |
| parent | c77d5ccfb881bc1fff882c8a8d2cdcb84ee59570 (diff) | |
Merge pull request #2438 from nextcloud/backport/2434/stable28v28.0.5rc1
[stable28] Check download attribute when fetching previews
| -rw-r--r-- | lib/Controller/PreviewController.php | 16 | ||||
| -rw-r--r-- | tests/psalm-baseline.xml | 9 |
2 files changed, 25 insertions, 0 deletions
diff --git a/lib/Controller/PreviewController.php b/lib/Controller/PreviewController.php index 87b7c776..b2083173 100644 --- a/lib/Controller/PreviewController.php +++ b/lib/Controller/PreviewController.php @@ -25,6 +25,7 @@ declare(strict_types=1); namespace OCA\Photos\Controller; +use OCA\Files_Sharing\SharedStorage; use OCA\Photos\Album\AlbumMapper; use OCA\Photos\AppInfo\Application; use OCP\AppFramework\Controller; @@ -90,6 +91,21 @@ class PreviewController extends Controller { } $nodes = $this->userFolder->getById($fileId); + $nodes = array_filter( + $nodes, + function ($node) { + $storage = $node->getStorage(); + if (!$storage->instanceOfStorage(SharedStorage::class)) { + return true; + } + + /** @var SharedStorage $storage */ + $share = $storage->getShare(); + $attributes = $share->getAttributes(); + + return $attributes === null || $attributes->getAttribute('permissions', 'download') !== false; + }, + ); /** @var \OCA\Photos\Album\AlbumInfo[] */ $checkedAlbums = []; diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml index d8c4ea7b..c35e8144 100644 --- a/tests/psalm-baseline.xml +++ b/tests/psalm-baseline.xml @@ -6,11 +6,20 @@ <code>\OCA\GroupFolders\Mount\GroupFolderStorage</code> </UndefinedClass> </file> + <file src="lib/Controller/PreviewController.php"> + <UndefinedDocblockClass occurrences="4"> + <code>OCA\Files_Sharing\SharedStorage</code> + </UndefinedDocblockClass> + <UndefinedClass occurrences="1"> + <code>SharedStorage</code> + </UndefinedClass> + </file> <file src="lib/Controller/PageController.php"> <InvalidArgument occurrences="1"> <code>new SearchQuery(new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'systemtag', $tag->getName()), 0, 0, [], $user)</code> </InvalidArgument> + <UndefinedClass occurrences="12"> <code>$e</code> <code>LoadSidebar</code> |