fix: Correctly filter users when the backend does not implement ISearchKnownUsersBackend

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

Author: come-nc

lib/private/User/Manager.php

@@ -9,6 +9,7 @@
 namespace OC\User;
 
 use OC\Hooks\PublicEmitter;
+use OC\KnownUser\KnownUserService;
 use OC\Memcache\WithLocalCache;
 use OCP\Config\IUserConfig;
 use OCP\DB\QueryBuilder\IQueryBuilder;
@@ -83,6 +84,7 @@ public function __construct(
 		ICacheFactory $cacheFactory,
 		private IEventDispatcher $eventDispatcher,
 		private LoggerInterface $logger,
+		private KnownUserService $knownUserService,
 	) {
 		$this->cache = new WithLocalCache($cacheFactory->createDistributed('user_backend_map'));
 		$this->listen('\OC\User', 'postDelete', function (IUser $user): void {
@@ -374,7 +376,12 @@ public function searchKnownUsersByDisplayName(string $searcher, string $pattern,
 				$backendUsers = $backend->searchKnownUsersByDisplayName($searcher, $pattern, $limit, $offset);
 			} else {
 				// Better than nothing, but filtering after pagination can remove lots of results.
-				$backendUsers = $backend->getDisplayNames($pattern, $limit, $offset);
+				$backendUsers = array_filter(
+					$backend->getDisplayNames($pattern, $limit, $offset),
+					fn (string $uid): bool => $this->knownUserService->isKnownToUser($searcher, $uid),
+					ARRAY_FILTER_USE_KEY,
+				);
+
 			}
 			if (is_array($backendUsers)) {
 				foreach ($backendUsers as $uid => $displayName) {

tests/lib/User/ManagerTest.php

@@ -9,6 +9,7 @@
 namespace Test\User;
 
 use OC\AllConfig;
+use OC\KnownUser\KnownUserService;
 use OC\USER\BACKEND;
 use OC\User\Database;
 use OC\User\Manager;
@@ -34,6 +35,8 @@ class ManagerTest extends TestCase {
 	private ICacheFactory&MockObject $cacheFactory;
 	private ICache&MockObject $cache;
 	private LoggerInterface&MockObject $logger;
+	private KnownUserService&MockObject $knownUserService;
+
 	private IUserManager $manager;
 
 	#[\Override]
@@ -45,11 +48,18 @@ protected function setUp(): void {
 		$this->cacheFactory = $this->createMock(ICacheFactory::class);
 		$this->cache = $this->createMock(ICache::class);
 		$this->logger = $this->createMock(LoggerInterface::class);
+		$this->knownUserService = $this->createMock(KnownUserService::class);
 
 		$this->cacheFactory->method('createDistributed')
 			->willReturn($this->cache);
 
-		$this->manager = new Manager($this->config, $this->cacheFactory, $this->eventDispatcher, $this->logger);
+		$this->manager = new Manager(
+			$this->config,
+			$this->cacheFactory,
+			$this->eventDispatcher,
+			$this->logger,
+			$this->knownUserService,
+		);
 	}
 
 	public function testGetBackends(): void {
@@ -666,7 +676,13 @@ public function testDeleteUser(): void {
 			->method('getAppValue')
 			->willReturnArgument(2);
 
-		$this->manager = new Manager($config, $this->cacheFactory, $this->eventDispatcher, $this->logger);
+		$this->manager = new Manager(
+			$config,
+			$this->cacheFactory,
+			$this->eventDispatcher,
+			$this->logger,
+			$this->knownUserService,
+		);
 		$backend = new \Test\Util\User\Dummy();
 
 		$this->manager->registerBackend($backend);
@@ -688,7 +704,13 @@ public function testGetByEmail(): void {
 			});
 
 		$this->manager = $this->getMockBuilder(Manager::class)
-			->setConstructorArgs([$this->config, $this->cacheFactory, $this->eventDispatcher, $this->logger])
+			->setConstructorArgs([
+				$this->config,
+				$this->cacheFactory,
+				$this->eventDispatcher,
+				$this->logger,
+				$this->knownUserService,
+			])
 			->onlyMethods(['getUserConfig', 'get'])
 			->getMock();
 		$this->manager->method('getUserConfig')->willReturn($userConfig);

tests/lib/User/SessionTest.php

@@ -16,6 +16,7 @@
 use OC\Authentication\Token\IProvider;
 use OC\Authentication\Token\IToken;
 use OC\Authentication\Token\PublicKeyToken;
+use OC\KnownUser\KnownUserService;
 use OC\Security\CSRF\CsrfTokenManager;
 use OC\Session\Memory;
 use OC\User\LoginException;
@@ -183,6 +184,7 @@ public function testLoginValidPasswordEnabled(): void {
 				$this->createMock(ICacheFactory::class),
 				$this->createMock(IEventDispatcher::class),
 				$this->createMock(LoggerInterface::class),
+				$this->createMock(KnownUserService::class),
 			])
 			->getMock();
 
@@ -249,6 +251,7 @@ public function testLoginValidPasswordDisabled(): void {
 				$this->createMock(ICacheFactory::class),
 				$this->createMock(IEventDispatcher::class),
 				$this->createMock(LoggerInterface::class),
+				$this->createMock(KnownUserService::class),
 			])
 			->getMock();
 
@@ -283,6 +286,7 @@ public function testLoginInvalidPassword(): void {
 				$this->createMock(ICacheFactory::class),
 				$this->createMock(IEventDispatcher::class),
 				$this->createMock(LoggerInterface::class),
+				$this->createMock(KnownUserService::class),
 			])
 			->getMock();
 		$backend = $this->createMock(\Test\Util\User\Dummy::class);
@@ -327,6 +331,7 @@ public function testPasswordlessLoginNoLastCheckUpdate(): void {
 				$this->createMock(ICacheFactory::class),
 				$this->createMock(IEventDispatcher::class),
 				$this->createMock(LoggerInterface::class),
+				$this->createMock(KnownUserService::class),
 			])
 			->getMock();
 		$userSession = new Session($manager, $session, $this->timeFactory, $this->tokenProvider, $this->config, $this->random, $this->lockdownManager, $this->logger, $this->dispatcher);
@@ -371,6 +376,7 @@ public function testLoginLastCheckUpdate(): void {
 				$this->createMock(ICacheFactory::class),
 				$this->createMock(IEventDispatcher::class),
 				$this->createMock(LoggerInterface::class),
+				$this->createMock(KnownUserService::class),
 			])
 			->getMock();
 		$userSession = new Session($manager, $session, $this->timeFactory, $this->tokenProvider, $this->config, $this->random, $this->lockdownManager, $this->logger, $this->dispatcher);
@@ -745,6 +751,7 @@ public function testRememberLoginValidToken(): void {
 				$this->createMock(ICacheFactory::class),
 				$this->createMock(IEventDispatcher::class),
 				$this->createMock(LoggerInterface::class),
+				$this->createMock(KnownUserService::class),
 			])
 			->getMock();
 		$userSession = $this->getMockBuilder(Session::class)
@@ -835,6 +842,7 @@ public function testRememberLoginInvalidSessionToken(): void {
 				$this->createMock(ICacheFactory::class),
 				$this->createMock(IEventDispatcher::class),
 				$this->createMock(LoggerInterface::class),
+				$this->createMock(KnownUserService::class),
 			])
 			->getMock();
 		$userSession = $this->getMockBuilder(Session::class)
@@ -900,6 +908,7 @@ public function testRememberLoginInvalidToken(): void {
 				$this->createMock(ICacheFactory::class),
 				$this->createMock(IEventDispatcher::class),
 				$this->createMock(LoggerInterface::class),
+				$this->createMock(KnownUserService::class),
 			])
 			->getMock();
 		$userSession = $this->getMockBuilder(Session::class)
@@ -953,6 +962,7 @@ public function testRememberLoginInvalidUser(): void {
 				$this->createMock(ICacheFactory::class),
 				$this->createMock(IEventDispatcher::class),
 				$this->createMock(LoggerInterface::class),
+				$this->createMock(KnownUserService::class),
 			])
 			->getMock();
 		$userSession = $this->getMockBuilder(Session::class)