From cc5795ba45a5ca3fe3835f4c12cfab921c23190f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Mon, 1 Dec 2025 09:43:39 +0100 Subject: [PATCH 1/2] fix: Fix orphan shares blocking moving other shares MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- lib/private/Files/View.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index a852f45396332..c924ae1a5c065 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -1886,7 +1886,12 @@ private function targetIsNotShared(string $user, string $targetPath): bool { }, $providers)); foreach ($shares as $share) { - $sharedPath = $share->getNode()->getPath(); + try { + $sharedPath = $share->getNode()->getPath(); + } catch (NotFoundException) { + // node is not found, ignoring + continue; + } if ($targetPath === $sharedPath || str_starts_with($targetPath, $sharedPath . '/')) { $this->logger->debug( 'It is not allowed to move one mount point into a shared folder', From 02f23d566fa3f431d74ff2dce05a677f8b60177a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Tue, 2 Dec 2025 09:33:07 +0100 Subject: [PATCH 2/2] fix: Log missing nodes of shares at debug level MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- lib/private/Files/View.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index c924ae1a5c065..fa7f548164061 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -1888,8 +1888,11 @@ private function targetIsNotShared(string $user, string $targetPath): bool { foreach ($shares as $share) { try { $sharedPath = $share->getNode()->getPath(); - } catch (NotFoundException) { + } catch (NotFoundException $e) { // node is not found, ignoring + $this->logger->debug( + 'Could not find the node linked to a share', + ['app' => 'files', 'exception' => $e]); continue; } if ($targetPath === $sharedPath || str_starts_with($targetPath, $sharedPath . '/')) {