fix(PublicFolders): Do not allow sharing publicly if disabled in global settings

fixes #1358

Signed-off-by: Marcel Klehr <mklehr@gmx.net>

Author: marcelklehr

lib/Controller/FoldersController.php

@@ -620,6 +620,8 @@ public function createFolderPublicToken(int $folderId): DataResponse {
 			return new DataResponse(['status' => 'error', 'data' => ['Multiple objects returned']], Http::STATUS_INTERNAL_SERVER_ERROR);
 		} catch (DoesNotExistException $e) {
 			return new DataResponse(['status' => 'error', 'data' => ['Not found']], Http::STATUS_BAD_REQUEST);
+		} catch (UnsupportedOperation $e) {
+			return new DataResponse(['status' => 'error', 'data' => ['Unsupported operation']], Http::STATUS_BAD_REQUEST);
 		}
 	}
 

lib/Controller/WebViewController.php

@@ -13,6 +13,7 @@
 use OCA\Bookmarks\Db\FolderMapper;
 use OCA\Bookmarks\Db\PublicFolder;
 use OCA\Bookmarks\Db\PublicFolderMapper;
+use OCA\Bookmarks\Service\SettingsService;
 use OCA\Bookmarks\Service\UserSettingsService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Db\DoesNotExistException;
@@ -22,7 +23,6 @@
 use OCP\AppFramework\Http\NotFoundResponse;
 use OCP\AppFramework\Http\StreamResponse;
 use OCP\AppFramework\Http\Template\PublicTemplateResponse;
-use OCP\IInitialStateService;
 use OCP\IL10N;
 use OCP\IRequest;
 use OCP\IURLGenerator;
@@ -31,22 +31,8 @@
 class WebViewController extends Controller {
 	private ?string $userId;
 
-
 	/**
 	 * WebViewController constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param string|null $userId
-	 * @param IL10N $l
-	 * @param PublicFolderMapper $publicFolderMapper
-	 * @param IUserManager $userManager
-	 * @param FolderMapper $folderMapper
-	 * @param IURLGenerator $urlGenerator
-	 * @param IInitialStateService $initialState
-	 * @param InternalFoldersController $folderController
-	 * @param InternalBookmarkController $bookmarkController
-	 * @param UserSettingsService $userSettingsService
 	 */
 	public function __construct(
 		$appName,
@@ -62,6 +48,7 @@ public function __construct(
 		private \OCA\Bookmarks\Controller\InternalBookmarkController $bookmarkController,
 		private \OCA\Bookmarks\Controller\InternalTagsController $tagsController,
 		private UserSettingsService $userSettingsService,
+		private SettingsService $settings,
 	) {
 		parent::__construct($appName, $request);
 		$this->userId = $userId;
@@ -71,8 +58,6 @@ public function __construct(
 	 * @NoAdminRequired
 	 *
 	 * @NoCSRFRequired
-	 *
-	 * @return AugmentedTemplateResponse
 	 */
 	public function index(): AugmentedTemplateResponse {
 		$res = new AugmentedTemplateResponse($this->appName, 'main', ['url' => $this->urlGenerator]);
@@ -95,6 +80,7 @@ public function index(): AugmentedTemplateResponse {
 		$this->initialState->provideInitialState($this->appName, 'tags', $this->tagsController->fullTags(true)->getData());
 
 		$settings = $this->userSettingsService->toArray();
+		$settings['shareapi_allow_links'] = $this->settings->getLinkSharingAllowed();
 		$this->initialState->provideInitialState($this->appName, 'settings', $settings);
 
 		return $res;

lib/Service/FolderService.php

@@ -55,6 +55,7 @@ public function __construct(
 		private HtmlImporter $htmlImporter,
 		private IEventDispatcher $eventDispatcher,
 		private CirclesService $circlesService,
+		private SettingsService $settings,
 	) {
 	}
 
@@ -261,10 +262,12 @@ public function updateSharedFolderOrFolder(?string $userId, int $folderId, ?stri
 	/**
 	 * @param $folderId
 	 * @return string
-	 * @throws DoesNotExistException
-	 * @throws MultipleObjectsReturnedException
+	 * @throws DoesNotExistException|MultipleObjectsReturnedException|UnsupportedOperation
 	 */
 	public function createFolderPublicToken($folderId): string {
+		if (!$this->settings->getLinkSharingAllowed()) {
+			throw new UnsupportedOperation('Link sharing is not enabled');
+		}
 		$this->folderMapper->find($folderId);
 		try {
 			$publicFolder = $this->publicFolderMapper->findByFolder($folderId);

lib/Service/SettingsService.php

@@ -10,6 +10,7 @@
 namespace OCA\Bookmarks\Service;
 
 use OCP\AppFramework\Services\IAppConfig;
+use OCP\IConfig;
 
 class SettingsService {
 	/** @var array<string,string> */
@@ -26,6 +27,7 @@ class SettingsService {
 
 	public function __construct(
 		private IAppConfig $config,
+		private IConfig $globalConfig,
 	) {
 	}
 
@@ -59,4 +61,8 @@ public function getAll(): array {
 		}
 		return $settings;
 	}
+
+	public function getLinkSharingAllowed(): bool {
+		return $this->globalConfig->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes';
+	}
 }

src/components/SidebarFolder.vue

@@ -41,7 +41,7 @@
 					@option:selected="onAddShare"
 					@search="onParticipantSearch" />
 			</div>
-			<div class="share">
+			<div class="share" v-if="publicLinksAllowed">
 				<LinkIcon :size="20" :class="{'share__avatar': true, active: publicLink }" />
 				<h3 class="share__title">
 					{{ t('bookmarks', 'Share link') }}
@@ -172,6 +172,9 @@ export default {
 		permissions() {
 			return this.$store.getters.getPermissionsForFolder(this.folder.id)
 		},
+		publicLinksAllowed() {
+			return this.$store.state.settings.shareapi_allow_links
+		},
 		isSharable() {
 			if (!this.folder) return
 			return this.isOwner || (!this.isOwner && this.permissions.canShare)

src/store/index.js

@@ -53,6 +53,7 @@ export default {
 			backupPath: '',
 			backupEnabled: '1',
 			hasSeenWhatsnew: '',
+			shareapi_allow_links: true,
 		},
 		bookmarks: [],
 		bookmarksById: {},