fixup! feat: Add storage wrappert to block download on secure view

Author: juliusknorr

lib/AppConfig.php

@@ -205,10 +205,10 @@ public function useSecureViewAdditionalMimes(): bool {
 	}
 
 	public function getMimeTypes(): array {
-		return array_merge([
+		return array_merge(
 			Capabilities::MIMETYPES,
 			Capabilities::MIMETYPES_MSOFFICE,
-		]);
+		);
 	}
 
 	public function getDomainList(): array {

lib/Controller/WopiController.php

@@ -135,6 +135,9 @@ public function checkFileInfo(string $fileId, string $access_token): JSONRespons
 		$isSmartPickerEnabled = (bool)$wopi->getCanwrite() && !$isPublic && !$wopi->getDirect();
 		$isTaskProcessingEnabled = $isSmartPickerEnabled && $this->taskProcessingManager->isTaskProcessingEnabled();
 
+		$share = $this->getShareForWopiToken($wopi, $file);
+		$shouldUseSecureView = $this->permissionManager->shouldWatermark($file, $wopi->getEditorUid(), $share);
+
 		// If the file is locked manually by a user we want to open it read only for all others
 		$canWriteThroughLock = true;
 		try {
@@ -156,7 +159,7 @@ public function checkFileInfo(string $fileId, string $access_token): JSONRespons
 			'UserExtraInfo' => [],
 			'UserPrivateInfo' => [],
 			'UserCanWrite' => $canWriteThroughLock && (bool)$wopi->getCanwrite(),
-			'UserCanNotWriteRelative' => $isPublic || $this->encryptionManager->isEnabled() || $wopi->getHideDownload() || $wopi->isRemoteToken(),
+			'UserCanNotWriteRelative' => $isPublic || $this->encryptionManager->isEnabled() || $wopi->getHideDownload() || $wopi->isRemoteToken() || $shouldUseSecureView,
 			'PostMessageOrigin' => $wopi->getServerHost(),
 			'LastModifiedTime' => Helper::toISO8601($file->getMTime()),
 			'SupportsRename' => !$isVersion && !$wopi->isRemoteToken(),
@@ -166,11 +169,11 @@ public function checkFileInfo(string $fileId, string $access_token): JSONRespons
 			'EnableShare' => $file->isShareable() && !$isVersion && !$isPublic,
 			'HideUserList' => '',
 			'EnableOwnerTermination' => $wopi->getCanwrite() && !$isPublic,
-			'DisablePrint' => $wopi->getHideDownload(),
-			'DisableExport' => $wopi->getHideDownload(),
-			'DisableCopy' => $wopi->getHideDownload(),
-			'HideExportOption' => $wopi->getHideDownload(),
-			'HidePrintOption' => $wopi->getHideDownload(),
+			'DisablePrint' => $wopi->getHideDownload() || $shouldUseSecureView,
+			'DisableExport' => $wopi->getHideDownload() || $shouldUseSecureView,
+			'DisableCopy' => $wopi->getHideDownload() || $shouldUseSecureView,
+			'HideExportOption' => $wopi->getHideDownload() || $shouldUseSecureView,
+			'HidePrintOption' => $wopi->getHideDownload() || $shouldUseSecureView,
 			'DownloadAsPostMessage' => $wopi->getDirect(),
 			'SupportsLocks' => $this->lockManager->isLockProviderAvailable(),
 			'IsUserLocked' => $this->permissionManager->userIsFeatureLocked($wopi->getEditorUid()),
@@ -223,8 +226,7 @@ public function checkFileInfo(string $fileId, string $access_token): JSONRespons
 			$response['TemplateSource'] = $this->getWopiUrlForTemplate($wopi);
 		}
 
-		$share = $this->getShareForWopiToken($wopi, $file);
-		if ($this->permissionManager->shouldWatermark($file, $wopi->getEditorUid(), $share)) {
+		if ($shouldUseSecureView) {
 			$email = $user !== null && !$isPublic ? $user->getEMailAddress() : '';
 			$currentDateTime = new \DateTime(
 				'now',

lib/Storage/SecureViewWrapper.php

@@ -84,17 +84,17 @@ private function checkFileAccess(string $path): void {
 	}
 
 	private function shouldSecure(string $path, ?IStorage $sourceStorage = null): bool {
-		if ($sourceStorage !== $this) {
+		if ($sourceStorage !== $this && $sourceStorage !== null) {
 			$fp = $sourceStorage->fopen($path, 'r');
 			fclose($fp);
 		}
 
 		$storage = $sourceStorage ?? $this;
 
-		$isSharedStorage = $this->instanceOfStorage(ISharedStorage::class);
+		$isSharedStorage = $storage->instanceOfStorage(ISharedStorage::class);
 		$mountNode = $this->rootFolder->get($storage->getMountPoint());
 		$node = $mountNode instanceof Folder ? $mountNode->get($path) : $mountNode;
-		$share = $isSharedStorage && method_exists($this, 'getShare') ? $this->getShare() : null;
+		$share = $isSharedStorage ? $node->getStorage()->getShare() : null;
 		$userId = $this->userSession->getUser()?->getUID();
 
 		return $this->permissionManager->shouldWatermark($node, $userId, $share);