Merge pull request #1153 from nextcloud/bugfix/noid/share-error

Avoid throwing on other share types than user
nextcloud · Nov 10, 2023 · f282151 · f282151
2 parents a6aaf32 + 1b9e787
commit f282151
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 16 deletions.
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -37,7 +37,11 @@ public function register(IRegistrationContext $context): void {
 			);
 		} else {
 			// FIXME: Remove once Nextcloud 28 is the minimum supported version
-			\OCP\Server::get(IEventDispatcher::class)->addListener('OCP\Share::preShare', function (GenericEvent $event) {
+			\OCP\Server::get(IEventDispatcher::class)->addListener('OCP\Share::preShare', function ($event) {
+				if (!$event instanceof GenericEvent) {
+					return;
+				}
+
 				/** @var IShare $share */
 				$share = $event->getSubject();
 

diff --git a/lib/AppInfo/BeforeShareCreatedListener.php b/lib/AppInfo/BeforeShareCreatedListener.php
@@ -11,14 +11,16 @@
 use OCP\Files\File;
 use OCP\Share\Events\BeforeShareCreatedEvent;
 use OCP\Share\IShare;
+use Psr\Log\LoggerInterface;
 
 class BeforeShareCreatedListener implements IEventListener {
 	private SettingsService $settings;
 	private NoteUtil $noteUtil;
 
-	public function __construct(SettingsService $settings, NoteUtil $noteUtil) {
+	public function __construct(SettingsService $settings, NoteUtil $noteUtil, LoggerInterface $logger) {
 		$this->settings = $settings;
 		$this->noteUtil = $noteUtil;
+		$this->logger = $logger;
 	}
 
 	public function handle(Event $event): void {
@@ -31,22 +33,33 @@ public function handle(Event $event): void {
 
 	public function overwriteShareTarget(IShare $share): void {
 		$itemType = $share->getNode() instanceof File ? 'file' : 'folder';
-		$fileSourcePath = $share->getNode()->getPath();
-		$itemTarget = $share->getTarget();
-		$uidOwner = $share->getSharedBy();
-		$ownerPath = $this->noteUtil->getRoot()->getUserFolder($uidOwner)->getPath();
-		$ownerNotesPath = $ownerPath . '/' . $this->settings->get($uidOwner, 'notesPath');
-
-		$receiver = $share->getSharedWith();
-		$receiverPath = $this->noteUtil->getRoot()->getUserFolder($receiver)->getPath();
-		$receiverNotesInternalPath = $this->settings->get($receiver, 'notesPath');
-		$receiverNotesPath = $receiverPath . '/' . $receiverNotesInternalPath;
-		$this->noteUtil->getOrCreateFolder($receiverNotesPath);
-
-		if ($itemType !== 'file' || strpos($fileSourcePath, $ownerNotesPath) !== 0) {
+
+		if ($share->getShareType() !== IShare::TYPE_USER) {
 			return;
 		}
 
-		$share->setTarget('/' . $receiverNotesInternalPath . $itemTarget);
+		try {
+			$fileSourcePath = $share->getNode()->getPath();
+			$itemTarget = $share->getTarget();
+			$uidOwner = $share->getSharedBy();
+			$ownerPath = $this->noteUtil->getRoot()->getUserFolder($uidOwner)->getPath();
+			$ownerNotesPath = $ownerPath . '/' . $this->settings->get($uidOwner, 'notesPath');
+
+			$receiver = $share->getSharedWith();
+			$receiverPath = $this->noteUtil->getRoot()->getUserFolder($receiver)->getPath();
+			$receiverNotesInternalPath = $this->settings->get($receiver, 'notesPath');
+			$receiverNotesPath = $receiverPath . '/' . $receiverNotesInternalPath;
+			$this->noteUtil->getOrCreateFolder($receiverNotesPath);
+
+			if ($itemType !== 'file' || strpos($fileSourcePath, $ownerNotesPath) !== 0) {
+				return;
+			}
+
+			$share->setTarget('/' . $receiverNotesInternalPath . $itemTarget);
+		} catch (\Throwable $e) {
+			$this->logger->error('Failed to overwrite share target for notes', [
+				'exception' => $e,
+			]);
+		}
 	}
 }