Merge pull request #4133 from nextcloud/fix/skip-disable-download-30

[stable30] Fix asset download checks
nextcloud · Oct 17, 2024 · 38838eb · 38838eb
2 parents 62dc748 + 89eee2f
commit 38838eb
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/lib/Controller/AssetsController.php b/lib/Controller/AssetsController.php
@@ -6,6 +6,7 @@
 
 namespace OCA\Richdocuments\Controller;
 
+use OCA\Files_Sharing\SharedStorage;
 use OCA\Richdocuments\Controller\Attribute\RestrictToWopiServer;
 use OCA\Richdocuments\Db\AssetMapper;
 use OCA\Richdocuments\Service\UserScopeService;
@@ -18,6 +19,7 @@
 use OCP\Files\File;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
 use OCP\IRequest;
 use OCP\IURLGenerator;
 
@@ -56,8 +58,24 @@ public function create($path) {
 
 		try {
 			$node = $userFolder->get($path);
+
+			if (!($node instanceof File)) {
+				return new JSONResponse([], Http::STATUS_NOT_FOUND);
+			}
+
+			$storage = $node->getStorage();
+			if ($storage->instanceOfStorage(SharedStorage::class)) {
+				/** @var SharedStorage $storage */
+				$share = $storage->getShare();
+				$attributes = $share->getAttributes();
+				if ($attributes !== null && $attributes->getAttribute('permissions', 'download') === false) {
+					throw new NotPermittedException();
+				}
+			}
 		} catch (NotFoundException $e) {
 			return new JSONResponse([], Http::STATUS_NOT_FOUND);
+		} catch (NotPermittedException $e) {
+			return new JSONResponse([], Http::STATUS_FORBIDDEN);
 		}
 
 		$asset = $this->assetMapper->newAsset($this->userId, $node->getId());

diff --git a/src/view/FilesAppIntegration.js b/src/view/FilesAppIntegration.js
@@ -166,6 +166,11 @@ export default {
 
 		getFilePickerBuilder(t('richdocuments', 'Insert image from {name}', { name: OC.theme.name }))
 			.setMimeTypeFilter(['image/png', 'image/gif', 'image/jpeg', 'image/svg'])
+			.setFilter((node) => {
+				const downloadShareAttribute = JSON.parse(node.attributes['share-attributes']).find((shareAttribute) => shareAttribute.key === 'download')
+				const downloadPermissions = downloadShareAttribute !== undefined ? (downloadShareAttribute.enabled || downloadShareAttribute.value) : true
+				return (node.permissions & OC.PERMISSION_READ) && downloadPermissions
+			})
 			.addButton({
 				label: t('richdocuments', 'Insert image'),
 				callback: (files) => {