From ae7a0149c286dd128bcbf9f6403f0279e3da57a4 Mon Sep 17 00:00:00 2001 From: Salvatore Martire <4652631+salmart-dev@users.noreply.github.com> Date: Thu, 18 Dec 2025 13:06:05 +0100 Subject: [PATCH 1/2] chore(files_sharing): add debug log when share mount conflict is detected [skip ci] Signed-off-by: Salvatore Martire <4652631+salmart-dev@users.noreply.github.com> --- apps/files_sharing/lib/SharedMount.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/apps/files_sharing/lib/SharedMount.php b/apps/files_sharing/lib/SharedMount.php index 692a6c8979ba6..b2aa82b1c065f 100644 --- a/apps/files_sharing/lib/SharedMount.php +++ b/apps/files_sharing/lib/SharedMount.php @@ -38,6 +38,7 @@ class SharedMount extends MountPoint implements MoveableMount, ISharedMountPoint /** @var IShare[] */ private $groupedShares; + private LoggerInterface $logger; public function __construct( $storage, @@ -52,6 +53,7 @@ public function __construct( ) { $this->superShare = $arguments['superShare']; $this->groupedShares = $arguments['groupedShares']; + $this->logger = \OC::$server->get(LoggerInterface::class); $absMountPoint = '/' . $user->getUID() . '/files/' . trim($this->superShare->getTarget(), '/') . '/'; @@ -102,6 +104,15 @@ private function verifyMountPoint( ); if ($newMountPoint !== $share->getTarget()) { + $absMountPoint = '/' . $this->user->getUID() . '/files/' . trim($this->superShare->getTarget(), '/') . '/'; + $conflictingMount = $mountpoints[$absMountPoint]; + $this->logger->debug('Conflicting mount found for share {id} with target {target}. Conflicting mountpoint {mountpoint} with share id {conflictid}', [ + 'app' => $this->user->getUID(), + 'id' => $share->getId(), + 'target' => $share->getTarget(), + 'mountpoint' => $conflictingMount->getMountPoint(), + 'conflictid' => $conflictingMount instanceof ISharedMountPoint ? $conflictingMount->getShare()->getId() : null, + ]); $this->updateFileTarget($newMountPoint, $share); } From ad48fcc4a5b238bf6aa39fa0f2ce03b861ae487e Mon Sep 17 00:00:00 2001 From: Salvatore Martire <4652631+salmart-dev@users.noreply.github.com> Date: Fri, 19 Dec 2025 14:37:29 +0100 Subject: [PATCH 2/2] chore(files_sharing): log alreadyVerified [skip ci] Signed-off-by: Salvatore Martire <4652631+salmart-dev@users.noreply.github.com> --- apps/files_sharing/lib/SharedMount.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/files_sharing/lib/SharedMount.php b/apps/files_sharing/lib/SharedMount.php index b2aa82b1c065f..911f7011cb705 100644 --- a/apps/files_sharing/lib/SharedMount.php +++ b/apps/files_sharing/lib/SharedMount.php @@ -49,7 +49,7 @@ public function __construct( CappedMemoryCache $folderExistCache, private IEventDispatcher $eventDispatcher, private IUser $user, - bool $alreadyVerified, + private bool $alreadyVerified, ) { $this->superShare = $arguments['superShare']; $this->groupedShares = $arguments['groupedShares']; @@ -112,6 +112,7 @@ private function verifyMountPoint( 'target' => $share->getTarget(), 'mountpoint' => $conflictingMount->getMountPoint(), 'conflictid' => $conflictingMount instanceof ISharedMountPoint ? $conflictingMount->getShare()->getId() : null, + 'verified' => $this->alreadyVerified, ]); $this->updateFileTarget($newMountPoint, $share); }