Merge pull request #41486 from nextcloud/fix/41470/invalid_user_group

Fix invalid users/groups handling in advanced search

Author: Altahrim

core/Controller/UnifiedSearchController.php

@@ -28,6 +28,7 @@
  */
 namespace OC\Core\Controller;
 
+use InvalidArgumentException;
 use OC\Search\SearchComposer;
 use OC\Search\SearchQuery;
 use OCA\Core\ResponseDefinitions;
@@ -111,7 +112,7 @@ public function search(
 
 		try {
 			$filters = $this->composer->buildFilterList($providerId, $this->request->getParams());
-		} catch (UnsupportedFilter $e) {
+		} catch (UnsupportedFilter|InvalidArgumentException $e) {
 			return new DataResponse($e->getMessage(), Http::STATUS_BAD_REQUEST);
 		}
 		return new DataResponse(

lib/private/Search/Filter/GroupFilter.php

@@ -38,10 +38,11 @@ public function __construct(
 		string $value,
 		IGroupManager $groupManager,
 	) {
-		$this->group = $groupManager->get($value);
-		if ($this->group === null) {
+		$group = $groupManager->get($value);
+		if ($group === null) {
 			throw new InvalidArgumentException('Group '.$value.' not found');
 		}
+		$this->group = $group;
 	}
 
 	public function get(): IGroup {

lib/private/Search/Filter/UserFilter.php

@@ -38,10 +38,11 @@ public function __construct(
 		string $value,
 		IUserManager $userManager,
 	) {
-		$this->user = $userManager->get($value);
-		if ($this->user === null) {
+		$user = $userManager->get($value);
+		if ($user === null) {
 			throw new InvalidArgumentException('User '.$value.' not found');
 		}
+		$this->user = $user;
 	}
 
 	public function get(): IUser {