From 761a6979a7c35db5c807b232643ba2506214cfef Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Fri, 30 Jan 2026 15:49:12 +0100 Subject: [PATCH] fix(external-storage): Rtrim trailing slash at the end Otherwise we don't have any matches when $forChildren is false Signed-off-by: Carl Schwan --- apps/files_external/lib/Service/DBConfigService.php | 1 + apps/files_external/tests/Config/ConfigAdapterTest.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/files_external/lib/Service/DBConfigService.php b/apps/files_external/lib/Service/DBConfigService.php index 9e180277ac5fb..fd482ecbef7e5 100644 --- a/apps/files_external/lib/Service/DBConfigService.php +++ b/apps/files_external/lib/Service/DBConfigService.php @@ -120,6 +120,7 @@ private function getSelectQueryBuilder(): IQueryBuilder { */ public function getMountsForUserAndPath(string $userId, array $groupIds, string $path, bool $forChildren): array { $path = str_replace('/' . $userId . '/files', '', $path); + $path = rtrim($path, '/'); $builder = $this->getSelectQueryBuilder(); $builder->where($builder->expr()->orX( $builder->expr()->andX( // global mounts diff --git a/apps/files_external/tests/Config/ConfigAdapterTest.php b/apps/files_external/tests/Config/ConfigAdapterTest.php index ba385435b6016..7a63c55875979 100644 --- a/apps/files_external/tests/Config/ConfigAdapterTest.php +++ b/apps/files_external/tests/Config/ConfigAdapterTest.php @@ -214,7 +214,7 @@ public function testPartialMountpointWithChildren(string $path, int $count): voi public function testPartialMountpointExact(): void { $mountFileInfo = $this->createMock(ICachedMountFileInfo::class); $mountFileInfo->method('getUser')->willReturn($this->user); - $mountFileInfo->method('getMountPoint')->willReturn('/user1/files/subfolder/subfolder'); + $mountFileInfo->method('getMountPoint')->willReturn('/user1/files/subfolder/subfolder/'); $cacheEntry = $this->createMock(ICacheEntry::class); $result = $this->adapter->getMountsForPath('/user1/files/subfolder/subfolder', true, [