nextcloud / server

apps/dav/lib/Connector/Sabre/TagsPlugin.php

Indentation +228 added lines, -228 removed lines

@@ -36,256 +36,256 @@
 
 class TagsPlugin extends \Sabre\DAV\ServerPlugin {
 
-	// namespace
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	public const TAGS_PROPERTYNAME = '{http://owncloud.org/ns}tags';
-	public const FAVORITE_PROPERTYNAME = '{http://owncloud.org/ns}favorite';
-	public const TAG_FAVORITE = '_$!<Favorite>!$_';
+    // namespace
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const TAGS_PROPERTYNAME = '{http://owncloud.org/ns}tags';
+    public const FAVORITE_PROPERTYNAME = '{http://owncloud.org/ns}favorite';
+    public const TAG_FAVORITE = '_$!<Favorite>!$_';
 
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
 
-	/**
-	 * @var ITags
-	 */
-	private $tagger;
+    /**
+     * @var ITags
+     */
+    private $tagger;
 
-	/**
-	 * Array of file id to tags array
-	 * The null value means the cache wasn't initialized.
-	 *
-	 * @var array
-	 */
-	private $cachedTags;
+    /**
+     * Array of file id to tags array
+     * The null value means the cache wasn't initialized.
+     *
+     * @var array
+     */
+    private $cachedTags;
 
-	/**
-	 * @param \Sabre\DAV\Tree $tree tree
-	 * @param ITagManager $tagManager tag manager
-	 */
-	public function __construct(
-		private \Sabre\DAV\Tree $tree,
-		private ITagManager $tagManager,
-		private IEventDispatcher $eventDispatcher,
-		private IUserSession $userSession,
-	) {
-		$this->tagger = null;
-		$this->cachedTags = [];
-	}
+    /**
+     * @param \Sabre\DAV\Tree $tree tree
+     * @param ITagManager $tagManager tag manager
+     */
+    public function __construct(
+        private \Sabre\DAV\Tree $tree,
+        private ITagManager $tagManager,
+        private IEventDispatcher $eventDispatcher,
+        private IUserSession $userSession,
+    ) {
+        $this->tagger = null;
+        $this->cachedTags = [];
+    }
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by \Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
-		$server->xml->elementMap[self::TAGS_PROPERTYNAME] = TagList::class;
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by \Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
+        $server->xml->elementMap[self::TAGS_PROPERTYNAME] = TagList::class;
 
-		$this->server = $server;
-		$this->server->on('propFind', [$this, 'handleGetProperties']);
-		$this->server->on('propPatch', [$this, 'handleUpdateProperties']);
-		$this->server->on('preloadProperties', [$this, 'handlePreloadProperties']);
-	}
+        $this->server = $server;
+        $this->server->on('propFind', [$this, 'handleGetProperties']);
+        $this->server->on('propPatch', [$this, 'handleUpdateProperties']);
+        $this->server->on('preloadProperties', [$this, 'handlePreloadProperties']);
+    }
 
-	/**
-	 * Returns the tagger
-	 *
-	 * @return ITags tagger
-	 */
-	private function getTagger() {
-		if (!$this->tagger) {
-			$this->tagger = $this->tagManager->load('files');
-		}
-		return $this->tagger;
-	}
+    /**
+     * Returns the tagger
+     *
+     * @return ITags tagger
+     */
+    private function getTagger() {
+        if (!$this->tagger) {
+            $this->tagger = $this->tagManager->load('files');
+        }
+        return $this->tagger;
+    }
 
-	/**
-	 * Returns tags and favorites.
-	 *
-	 * @param integer $fileId file id
-	 * @return array list($tags, $favorite) with $tags as tag array
-	 *               and $favorite is a boolean whether the file was favorited
-	 */
-	private function getTagsAndFav($fileId) {
-		$isFav = false;
-		$tags = $this->getTags($fileId);
-		if ($tags) {
-			$favPos = array_search(self::TAG_FAVORITE, $tags);
-			if ($favPos !== false) {
-				$isFav = true;
-				unset($tags[$favPos]);
-			}
-		}
-		return [$tags, $isFav];
-	}
+    /**
+     * Returns tags and favorites.
+     *
+     * @param integer $fileId file id
+     * @return array list($tags, $favorite) with $tags as tag array
+     *               and $favorite is a boolean whether the file was favorited
+     */
+    private function getTagsAndFav($fileId) {
+        $isFav = false;
+        $tags = $this->getTags($fileId);
+        if ($tags) {
+            $favPos = array_search(self::TAG_FAVORITE, $tags);
+            if ($favPos !== false) {
+                $isFav = true;
+                unset($tags[$favPos]);
+            }
+        }
+        return [$tags, $isFav];
+    }
 
-	/**
-	 * Returns tags for the given file id
-	 *
-	 * @param integer $fileId file id
-	 * @return array list of tags for that file
-	 */
-	private function getTags($fileId) {
-		if (isset($this->cachedTags[$fileId])) {
-			return $this->cachedTags[$fileId];
-		} else {
-			$tags = $this->getTagger()->getTagsForObjects([$fileId]);
-			if ($tags !== false) {
-				if (empty($tags)) {
-					return [];
-				}
-				return current($tags);
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns tags for the given file id
+     *
+     * @param integer $fileId file id
+     * @return array list of tags for that file
+     */
+    private function getTags($fileId) {
+        if (isset($this->cachedTags[$fileId])) {
+            return $this->cachedTags[$fileId];
+        } else {
+            $tags = $this->getTagger()->getTagsForObjects([$fileId]);
+            if ($tags !== false) {
+                if (empty($tags)) {
+                    return [];
+                }
+                return current($tags);
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Prefetches tags for a list of file IDs and caches the results
-	 *
-	 * @param array $fileIds List of file IDs to prefetch tags for
-	 * @return void
-	 */
-	private function prefetchTagsForFileIds(array $fileIds) {
-		$tags = $this->getTagger()->getTagsForObjects($fileIds);
-		if ($tags === false) {
-			// the tags API returns false on error...
-			$tags = [];
-		}
+    /**
+     * Prefetches tags for a list of file IDs and caches the results
+     *
+     * @param array $fileIds List of file IDs to prefetch tags for
+     * @return void
+     */
+    private function prefetchTagsForFileIds(array $fileIds) {
+        $tags = $this->getTagger()->getTagsForObjects($fileIds);
+        if ($tags === false) {
+            // the tags API returns false on error...
+            $tags = [];
+        }
 
-		foreach ($fileIds as $fileId) {
-			$this->cachedTags[$fileId] = $tags[$fileId] ?? [];
-		}
-	}
+        foreach ($fileIds as $fileId) {
+            $this->cachedTags[$fileId] = $tags[$fileId] ?? [];
+        }
+    }
 
-	/**
-	 * Updates the tags of the given file id
-	 *
-	 * @param int $fileId
-	 * @param array $tags array of tag strings
-	 */
-	private function updateTags($fileId, $tags) {
-		$tagger = $this->getTagger();
-		$currentTags = $this->getTags($fileId);
+    /**
+     * Updates the tags of the given file id
+     *
+     * @param int $fileId
+     * @param array $tags array of tag strings
+     */
+    private function updateTags($fileId, $tags) {
+        $tagger = $this->getTagger();
+        $currentTags = $this->getTags($fileId);
 
-		$newTags = array_diff($tags, $currentTags);
-		foreach ($newTags as $tag) {
-			if ($tag === self::TAG_FAVORITE) {
-				continue;
-			}
-			$tagger->tagAs($fileId, $tag);
-		}
-		$deletedTags = array_diff($currentTags, $tags);
-		foreach ($deletedTags as $tag) {
-			if ($tag === self::TAG_FAVORITE) {
-				continue;
-			}
-			$tagger->unTag($fileId, $tag);
-		}
-	}
+        $newTags = array_diff($tags, $currentTags);
+        foreach ($newTags as $tag) {
+            if ($tag === self::TAG_FAVORITE) {
+                continue;
+            }
+            $tagger->tagAs($fileId, $tag);
+        }
+        $deletedTags = array_diff($currentTags, $tags);
+        foreach ($deletedTags as $tag) {
+            if ($tag === self::TAG_FAVORITE) {
+                continue;
+            }
+            $tagger->unTag($fileId, $tag);
+        }
+    }
 
-	/**
-	 * Adds tags and favorites properties to the response,
-	 * if requested.
-	 *
-	 * @param PropFind $propFind
-	 * @param \Sabre\DAV\INode $node
-	 * @return void
-	 */
-	public function handleGetProperties(
-		PropFind $propFind,
-		\Sabre\DAV\INode $node,
-	) {
-		if (!($node instanceof Node)) {
-			return;
-		}
+    /**
+     * Adds tags and favorites properties to the response,
+     * if requested.
+     *
+     * @param PropFind $propFind
+     * @param \Sabre\DAV\INode $node
+     * @return void
+     */
+    public function handleGetProperties(
+        PropFind $propFind,
+        \Sabre\DAV\INode $node,
+    ) {
+        if (!($node instanceof Node)) {
+            return;
+        }
 
-		// need prefetch ?
-		if ($node instanceof Directory
-			&& $propFind->getDepth() !== 0
-			&& (!is_null($propFind->getStatus(self::TAGS_PROPERTYNAME))
-			|| !is_null($propFind->getStatus(self::FAVORITE_PROPERTYNAME))
-			)) {
-			// note: pre-fetching only supported for depth <= 1
-			$folderContent = $node->getChildren();
-			$fileIds = [(int)$node->getId()];
-			foreach ($folderContent as $info) {
-				$fileIds[] = (int)$info->getId();
-			}
-			$this->prefetchTagsForFileIds($fileIds);
-		}
+        // need prefetch ?
+        if ($node instanceof Directory
+            && $propFind->getDepth() !== 0
+            && (!is_null($propFind->getStatus(self::TAGS_PROPERTYNAME))
+            || !is_null($propFind->getStatus(self::FAVORITE_PROPERTYNAME))
+            )) {
+            // note: pre-fetching only supported for depth <= 1
+            $folderContent = $node->getChildren();
+            $fileIds = [(int)$node->getId()];
+            foreach ($folderContent as $info) {
+                $fileIds[] = (int)$info->getId();
+            }
+            $this->prefetchTagsForFileIds($fileIds);
+        }
 
-		$isFav = null;
+        $isFav = null;
 
-		$propFind->handle(self::TAGS_PROPERTYNAME, function () use (&$isFav, $node) {
-			[$tags, $isFav] = $this->getTagsAndFav($node->getId());
-			return new TagList($tags);
-		});
+        $propFind->handle(self::TAGS_PROPERTYNAME, function () use (&$isFav, $node) {
+            [$tags, $isFav] = $this->getTagsAndFav($node->getId());
+            return new TagList($tags);
+        });
 
-		$propFind->handle(self::FAVORITE_PROPERTYNAME, function () use ($isFav, $node) {
-			if (is_null($isFav)) {
-				[, $isFav] = $this->getTagsAndFav($node->getId());
-			}
-			if ($isFav) {
-				return 1;
-			} else {
-				return 0;
-			}
-		});
-	}
+        $propFind->handle(self::FAVORITE_PROPERTYNAME, function () use ($isFav, $node) {
+            if (is_null($isFav)) {
+                [, $isFav] = $this->getTagsAndFav($node->getId());
+            }
+            if ($isFav) {
+                return 1;
+            } else {
+                return 0;
+            }
+        });
+    }
 
-	/**
-	 * Updates tags and favorites properties, if applicable.
-	 *
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 *
-	 * @return void
-	 */
-	public function handleUpdateProperties($path, PropPatch $propPatch) {
-		$node = $this->tree->getNodeForPath($path);
-		if (!($node instanceof Node)) {
-			return;
-		}
+    /**
+     * Updates tags and favorites properties, if applicable.
+     *
+     * @param string $path
+     * @param PropPatch $propPatch
+     *
+     * @return void
+     */
+    public function handleUpdateProperties($path, PropPatch $propPatch) {
+        $node = $this->tree->getNodeForPath($path);
+        if (!($node instanceof Node)) {
+            return;
+        }
 
-		$propPatch->handle(self::TAGS_PROPERTYNAME, function ($tagList) use ($node) {
-			$this->updateTags($node->getId(), $tagList->getTags());
-			return true;
-		});
+        $propPatch->handle(self::TAGS_PROPERTYNAME, function ($tagList) use ($node) {
+            $this->updateTags($node->getId(), $tagList->getTags());
+            return true;
+        });
 
-		$propPatch->handle(self::FAVORITE_PROPERTYNAME, function ($favState) use ($node, $path) {
-			if ((int)$favState === 1 || $favState === 'true') {
-				$this->getTagger()->tagAs($node->getId(), self::TAG_FAVORITE);
-			} else {
-				$this->getTagger()->unTag($node->getId(), self::TAG_FAVORITE);
-			}
+        $propPatch->handle(self::FAVORITE_PROPERTYNAME, function ($favState) use ($node, $path) {
+            if ((int)$favState === 1 || $favState === 'true') {
+                $this->getTagger()->tagAs($node->getId(), self::TAG_FAVORITE);
+            } else {
+                $this->getTagger()->unTag($node->getId(), self::TAG_FAVORITE);
+            }
 
-			if (is_null($favState)) {
-				// confirm deletion
-				return 204;
-			}
+            if (is_null($favState)) {
+                // confirm deletion
+                return 204;
+            }
 
-			return 200;
-		});
-	}
+            return 200;
+        });
+    }
 
-	public function handlePreloadProperties(array $nodes, array $requestProperties): void {
-		if (
-			!in_array(self::FAVORITE_PROPERTYNAME, $requestProperties, true) &&
-			!in_array(self::TAGS_PROPERTYNAME, $requestProperties, true)
-		) {
-			return;
-		}
-		$this->prefetchTagsForFileIds(array_map(fn ($node) => $node->getId(), $nodes));
-	}
+    public function handlePreloadProperties(array $nodes, array $requestProperties): void {
+        if (
+            !in_array(self::FAVORITE_PROPERTYNAME, $requestProperties, true) &&
+            !in_array(self::TAGS_PROPERTYNAME, $requestProperties, true)
+        ) {
+            return;
+        }
+        $this->prefetchTagsForFileIds(array_map(fn ($node) => $node->getId(), $nodes));
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -218,21 +218,21 @@ 
 			)) {
 			// note: pre-fetching only supported for depth <= 1
 			$folderContent = $node->getChildren();
-			$fileIds = [(int)$node->getId()];
+			$fileIds = [(int) $node->getId()];
 			foreach ($folderContent as $info) {
-				$fileIds[] = (int)$info->getId();
+				$fileIds[] = (int) $info->getId();
 			}
 			$this->prefetchTagsForFileIds($fileIds);
 		}
 
 		$isFav = null;
 
-		$propFind->handle(self::TAGS_PROPERTYNAME, function () use (&$isFav, $node) {
+		$propFind->handle(self::TAGS_PROPERTYNAME, function() use (&$isFav, $node) {
 			[$tags, $isFav] = $this->getTagsAndFav($node->getId());
 			return new TagList($tags);
 		});
 
-		$propFind->handle(self::FAVORITE_PROPERTYNAME, function () use ($isFav, $node) {
+		$propFind->handle(self::FAVORITE_PROPERTYNAME, function() use ($isFav, $node) {
 			if (is_null($isFav)) {
 				[, $isFav] = $this->getTagsAndFav($node->getId());
 			}
@@ -258,13 +258,13 @@ 
 			return;
 		}
 
-		$propPatch->handle(self::TAGS_PROPERTYNAME, function ($tagList) use ($node) {
+		$propPatch->handle(self::TAGS_PROPERTYNAME, function($tagList) use ($node) {
 			$this->updateTags($node->getId(), $tagList->getTags());
 			return true;
 		});
 
-		$propPatch->handle(self::FAVORITE_PROPERTYNAME, function ($favState) use ($node, $path) {
-			if ((int)$favState === 1 || $favState === 'true') {
+		$propPatch->handle(self::FAVORITE_PROPERTYNAME, function($favState) use ($node, $path) {
+			if ((int) $favState === 1 || $favState === 'true') {
 				$this->getTagger()->tagAs($node->getId(), self::TAG_FAVORITE);
 			} else {
 				$this->getTagger()->unTag($node->getId(), self::TAG_FAVORITE);

apps/dav/lib/Server.php

Indentation +326 added lines, -326 removed lines

@@ -100,331 +100,331 @@
 use SearchDAV\DAV\SearchPlugin;
 
 class Server {
-	public Connector\Sabre\Server $server;
-	private IProfiler $profiler;
-
-	public function __construct(
-		private IRequest $request,
-		private string $baseUri,
-	) {
-		$this->profiler = \OCP\Server::get(IProfiler::class);
-		if ($this->profiler->isEnabled()) {
-			/** @var IEventLogger $eventLogger */
-			$eventLogger = \OCP\Server::get(IEventLogger::class);
-			$eventLogger->start('runtime', 'DAV Runtime');
-		}
-
-		$logger = \OCP\Server::get(LoggerInterface::class);
-		$eventDispatcher = \OCP\Server::get(IEventDispatcher::class);
-
-		$root = new RootCollection();
-		$this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
-
-		// Add maintenance plugin
-		$this->server->addPlugin(new MaintenancePlugin(\OCP\Server::get(IConfig::class), \OC::$server->getL10N('dav')));
-
-		$this->server->addPlugin(new AppleQuirksPlugin());
-
-		// Backends
-		$authBackend = new Auth(
-			\OCP\Server::get(ISession::class),
-			\OCP\Server::get(IUserSession::class),
-			\OCP\Server::get(IRequest::class),
-			\OCP\Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
-			\OCP\Server::get(IThrottler::class)
-		);
-
-		// Set URL explicitly due to reverse-proxy situations
-		$this->server->httpRequest->setUrl($this->request->getRequestUri());
-		$this->server->setBaseUri($this->baseUri);
-
-		$this->server->addPlugin(new ProfilerPlugin($this->request));
-		$this->server->addPlugin(new BlockLegacyClientPlugin(
-			\OCP\Server::get(IConfig::class),
-			\OCP\Server::get(ThemingDefaults::class),
-		));
-		$this->server->addPlugin(new AnonymousOptionsPlugin());
-		$authPlugin = new Plugin();
-		$authPlugin->addBackend(new PublicAuth());
-		$this->server->addPlugin($authPlugin);
-
-		// allow setup of additional auth backends
-		$event = new SabrePluginEvent($this->server);
-		$eventDispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
-
-		$newAuthEvent = new SabrePluginAuthInitEvent($this->server);
-		$eventDispatcher->dispatchTyped($newAuthEvent);
-
-		$bearerAuthBackend = new BearerAuth(
-			\OCP\Server::get(IUserSession::class),
-			\OCP\Server::get(ISession::class),
-			\OCP\Server::get(IRequest::class),
-			\OCP\Server::get(IConfig::class),
-		);
-		$authPlugin->addBackend($bearerAuthBackend);
-		// because we are throwing exceptions this plugin has to be the last one
-		$authPlugin->addBackend($authBackend);
-
-		// debugging
-		if (\OCP\Server::get(IConfig::class)->getSystemValue('debug', false)) {
-			$this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
-		} else {
-			$this->server->addPlugin(new DummyGetResponsePlugin());
-		}
-
-		$this->server->addPlugin(new ExceptionLoggerPlugin('webdav', $logger));
-		$this->server->addPlugin(new LockPlugin());
-		$this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
-
-		// acl
-		$acl = new DavAclPlugin();
-		$acl->principalCollectionSet = [
-			'principals/users',
-			'principals/groups',
-			'principals/calendar-resources',
-			'principals/calendar-rooms',
-		];
-		$this->server->addPlugin($acl);
-
-		// calendar plugins
-		if ($this->requestIsForSubtree(['calendars', 'public-calendars', 'system-calendars', 'principals'])) {
-			$this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OCP\Server::get(IRequest::class), \OCP\Server::get(IConfig::class)));
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
-			$this->server->addPlugin(new ICSExportPlugin(\OCP\Server::get(IConfig::class), $logger));
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(\OCP\Server::get(IConfig::class), \OCP\Server::get(LoggerInterface::class), \OCP\Server::get(DefaultCalendarValidator::class)));
-
-			$this->server->addPlugin(\OCP\Server::get(\OCA\DAV\CalDAV\Trashbin\Plugin::class));
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\WebcalCaching\Plugin($this->request));
-			if (\OCP\Server::get(IConfig::class)->getAppValue('dav', 'allow_calendar_link_subscriptions', 'yes') === 'yes') {
-				$this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
-			}
-
-			$this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
-			$this->server->addPlugin(new PublishPlugin(
-				\OCP\Server::get(IConfig::class),
-				\OCP\Server::get(IURLGenerator::class)
-			));
-
-			$this->server->addPlugin(\OCP\Server::get(RateLimitingPlugin::class));
-			$this->server->addPlugin(\OCP\Server::get(CalDavValidatePlugin::class));
-		}
-
-		// addressbook plugins
-		if ($this->requestIsForSubtree(['addressbooks', 'principals'])) {
-			$this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OCP\Server::get(IRequest::class), \OCP\Server::get(IConfig::class)));
-			$this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
-			$this->server->addPlugin(new VCFExportPlugin());
-			$this->server->addPlugin(new MultiGetExportPlugin());
-			$this->server->addPlugin(new HasPhotoPlugin());
-			$this->server->addPlugin(new ImageExportPlugin(\OCP\Server::get(PhotoCache::class)));
-
-			$this->server->addPlugin(\OCP\Server::get(CardDavRateLimitingPlugin::class));
-			$this->server->addPlugin(\OCP\Server::get(CardDavValidatePlugin::class));
-		}
-
-		// system tags plugins
-		$this->server->addPlugin(\OCP\Server::get(SystemTagPlugin::class));
-
-		// comments plugin
-		$this->server->addPlugin(new CommentsPlugin(
-			\OCP\Server::get(ICommentsManager::class),
-			\OCP\Server::get(IUserSession::class)
-		));
-
-		$this->server->addPlugin(new CopyEtagHeaderPlugin());
-		$this->server->addPlugin(new RequestIdHeaderPlugin(\OCP\Server::get(IRequest::class)));
-		$this->server->addPlugin(new UploadAutoMkcolPlugin());
-		$this->server->addPlugin(new ChunkingV2Plugin(\OCP\Server::get(ICacheFactory::class)));
-		$this->server->addPlugin(new ChunkingPlugin());
-		$this->server->addPlugin(new ZipFolderPlugin(
-			$this->server->tree,
-			$logger,
-			$eventDispatcher,
-		));
-		$this->server->addPlugin(\OCP\Server::get(PaginatePlugin::class));
-
-		// allow setup of additional plugins
-		$eventDispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
-		$typedEvent = new SabrePluginAddEvent($this->server);
-		$eventDispatcher->dispatchTyped($typedEvent);
-
-		// Some WebDAV clients do require Class 2 WebDAV support (locking), since
-		// we do not provide locking we emulate it using a fake locking plugin.
-		if ($this->request->isUserAgent([
-			'/WebDAVFS/',
-			'/OneNote/',
-			'/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
-		])) {
-			$this->server->addPlugin(new FakeLockerPlugin());
-		}
-
-		if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
-			$this->server->addPlugin(new BrowserErrorPagePlugin());
-		}
-
-		$lazySearchBackend = new LazySearchBackend();
-		$this->server->addPlugin(new SearchPlugin($lazySearchBackend));
-
-		// wait with registering these until auth is handled and the filesystem is setup
-		$this->server->on('beforeMethod:*', function () use ($root, $lazySearchBackend, $logger): void {
-			// Allow view-only plugin for webdav requests
-			$this->server->addPlugin(new ViewOnlyPlugin(
-				\OC::$server->getUserFolder(),
-			));
-
-			// custom properties plugin must be the last one
-			$userSession = \OCP\Server::get(IUserSession::class);
-			$user = $userSession->getUser();
-			if ($user !== null) {
-				$view = Filesystem::getView();
-				$config = \OCP\Server::get(IConfig::class);
-				$this->server->addPlugin(
-					new FilesPlugin(
-						$this->server->tree,
-						$config,
-						$this->request,
-						\OCP\Server::get(IPreview::class),
-						\OCP\Server::get(IUserSession::class),
-						\OCP\Server::get(IFilenameValidator::class),
-						\OCP\Server::get(IAccountManager::class),
-						false,
-						$config->getSystemValueBool('debug', false) === false,
-					)
-				);
-				$this->server->addPlugin(new ChecksumUpdatePlugin());
-
-				$this->server->addPlugin(
-					new \Sabre\DAV\PropertyStorage\Plugin(
-						new CustomPropertiesBackend(
-							$this->server,
-							$this->server->tree,
-							\OCP\Server::get(IDBConnection::class),
-							\OCP\Server::get(IUserSession::class)->getUser(),
-							\OCP\Server::get(DefaultCalendarValidator::class),
-						)
-					)
-				);
-				if ($view !== null) {
-					$this->server->addPlugin(
-						new QuotaPlugin($view));
-				}
-				$this->server->addPlugin(
-					new TagsPlugin(
-						$this->server->tree, \OCP\Server::get(ITagManager::class), \OCP\Server::get(IEventDispatcher::class), \OCP\Server::get(IUserSession::class)
-					)
-				);
-
-				// TODO: switch to LazyUserFolder
-				$userFolder = \OC::$server->getUserFolder();
-				$shareManager = \OCP\Server::get(\OCP\Share\IManager::class);
-				$this->server->addPlugin(new SharesPlugin(
-					$this->server->tree,
-					$userSession,
-					$userFolder,
-					$shareManager,
-				));
-				$this->server->addPlugin(new CommentPropertiesPlugin(
-					\OCP\Server::get(ICommentsManager::class),
-					$userSession
-				));
-				if (\OCP\Server::get(IConfig::class)->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') {
-					$this->server->addPlugin(new IMipPlugin(
-						\OCP\Server::get(IAppConfig::class),
-						\OCP\Server::get(IMailer::class),
-						\OCP\Server::get(LoggerInterface::class),
-						\OCP\Server::get(ITimeFactory::class),
-						\OCP\Server::get(Defaults::class),
-						$userSession,
-						\OCP\Server::get(IMipService::class),
-						\OCP\Server::get(EventComparisonService::class),
-						\OCP\Server::get(\OCP\Mail\Provider\IManager::class)
-					));
-				}
-				$this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
-				if ($view !== null) {
-					$this->server->addPlugin(new FilesReportPlugin(
-						$this->server->tree,
-						$view,
-						\OCP\Server::get(ISystemTagManager::class),
-						\OCP\Server::get(ISystemTagObjectMapper::class),
-						\OCP\Server::get(ITagManager::class),
-						$userSession,
-						\OCP\Server::get(IGroupManager::class),
-						$userFolder,
-						\OCP\Server::get(IAppManager::class)
-					));
-					$lazySearchBackend->setBackend(new FileSearchBackend(
-						$this->server,
-						$this->server->tree,
-						$user,
-						\OCP\Server::get(IRootFolder::class),
-						$shareManager,
-						$view,
-						\OCP\Server::get(IFilesMetadataManager::class)
-					));
-					$this->server->addPlugin(
-						new BulkUploadPlugin(
-							$userFolder,
-							$logger
-						)
-					);
-				}
-				$this->server->addPlugin(new EnablePlugin(
-					\OCP\Server::get(IConfig::class),
-					\OCP\Server::get(BirthdayService::class),
-					$user
-				));
-				$this->server->addPlugin(new AppleProvisioningPlugin(
-					\OCP\Server::get(IUserSession::class),
-					\OCP\Server::get(IURLGenerator::class),
-					\OCP\Server::get(ThemingDefaults::class),
-					\OCP\Server::get(IRequest::class),
-					\OC::$server->getL10N('dav'),
-					function () {
-						return UUIDUtil::getUUID();
-					}
-				));
-			}
-
-			// register plugins from apps
-			$pluginManager = new PluginManager(
-				\OC::$server,
-				\OCP\Server::get(IAppManager::class)
-			);
-			foreach ($pluginManager->getAppPlugins() as $appPlugin) {
-				$this->server->addPlugin($appPlugin);
-			}
-			foreach ($pluginManager->getAppCollections() as $appCollection) {
-				$root->addChild($appCollection);
-			}
-		});
-
-		$this->server->addPlugin(
-			new PropfindCompressionPlugin()
-		);
-	}
-
-	public function exec() {
-		/** @var IEventLogger $eventLogger */
-		$eventLogger = \OCP\Server::get(IEventLogger::class);
-		$eventLogger->start('dav_server_exec', '');
-		$this->server->start();
-		$eventLogger->end('dav_server_exec');
-		if ($this->profiler->isEnabled()) {
-			$eventLogger->end('runtime');
-			$profile = $this->profiler->collect(\OCP\Server::get(IRequest::class), new Response());
-			$this->profiler->saveProfile($profile);
-		}
-	}
-
-	private function requestIsForSubtree(array $subTrees): bool {
-		foreach ($subTrees as $subTree) {
-			$subTree = trim($subTree, ' /');
-			if (str_starts_with($this->server->getRequestUri(), $subTree . '/')) {
-				return true;
-			}
-		}
-		return false;
-	}
+    public Connector\Sabre\Server $server;
+    private IProfiler $profiler;
+
+    public function __construct(
+        private IRequest $request,
+        private string $baseUri,
+    ) {
+        $this->profiler = \OCP\Server::get(IProfiler::class);
+        if ($this->profiler->isEnabled()) {
+            /** @var IEventLogger $eventLogger */
+            $eventLogger = \OCP\Server::get(IEventLogger::class);
+            $eventLogger->start('runtime', 'DAV Runtime');
+        }
+
+        $logger = \OCP\Server::get(LoggerInterface::class);
+        $eventDispatcher = \OCP\Server::get(IEventDispatcher::class);
+
+        $root = new RootCollection();
+        $this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
+
+        // Add maintenance plugin
+        $this->server->addPlugin(new MaintenancePlugin(\OCP\Server::get(IConfig::class), \OC::$server->getL10N('dav')));
+
+        $this->server->addPlugin(new AppleQuirksPlugin());
+
+        // Backends
+        $authBackend = new Auth(
+            \OCP\Server::get(ISession::class),
+            \OCP\Server::get(IUserSession::class),
+            \OCP\Server::get(IRequest::class),
+            \OCP\Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
+            \OCP\Server::get(IThrottler::class)
+        );
+
+        // Set URL explicitly due to reverse-proxy situations
+        $this->server->httpRequest->setUrl($this->request->getRequestUri());
+        $this->server->setBaseUri($this->baseUri);
+
+        $this->server->addPlugin(new ProfilerPlugin($this->request));
+        $this->server->addPlugin(new BlockLegacyClientPlugin(
+            \OCP\Server::get(IConfig::class),
+            \OCP\Server::get(ThemingDefaults::class),
+        ));
+        $this->server->addPlugin(new AnonymousOptionsPlugin());
+        $authPlugin = new Plugin();
+        $authPlugin->addBackend(new PublicAuth());
+        $this->server->addPlugin($authPlugin);
+
+        // allow setup of additional auth backends
+        $event = new SabrePluginEvent($this->server);
+        $eventDispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
+
+        $newAuthEvent = new SabrePluginAuthInitEvent($this->server);
+        $eventDispatcher->dispatchTyped($newAuthEvent);
+
+        $bearerAuthBackend = new BearerAuth(
+            \OCP\Server::get(IUserSession::class),
+            \OCP\Server::get(ISession::class),
+            \OCP\Server::get(IRequest::class),
+            \OCP\Server::get(IConfig::class),
+        );
+        $authPlugin->addBackend($bearerAuthBackend);
+        // because we are throwing exceptions this plugin has to be the last one
+        $authPlugin->addBackend($authBackend);
+
+        // debugging
+        if (\OCP\Server::get(IConfig::class)->getSystemValue('debug', false)) {
+            $this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
+        } else {
+            $this->server->addPlugin(new DummyGetResponsePlugin());
+        }
+
+        $this->server->addPlugin(new ExceptionLoggerPlugin('webdav', $logger));
+        $this->server->addPlugin(new LockPlugin());
+        $this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
+
+        // acl
+        $acl = new DavAclPlugin();
+        $acl->principalCollectionSet = [
+            'principals/users',
+            'principals/groups',
+            'principals/calendar-resources',
+            'principals/calendar-rooms',
+        ];
+        $this->server->addPlugin($acl);
+
+        // calendar plugins
+        if ($this->requestIsForSubtree(['calendars', 'public-calendars', 'system-calendars', 'principals'])) {
+            $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OCP\Server::get(IRequest::class), \OCP\Server::get(IConfig::class)));
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
+            $this->server->addPlugin(new ICSExportPlugin(\OCP\Server::get(IConfig::class), $logger));
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(\OCP\Server::get(IConfig::class), \OCP\Server::get(LoggerInterface::class), \OCP\Server::get(DefaultCalendarValidator::class)));
+
+            $this->server->addPlugin(\OCP\Server::get(\OCA\DAV\CalDAV\Trashbin\Plugin::class));
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\WebcalCaching\Plugin($this->request));
+            if (\OCP\Server::get(IConfig::class)->getAppValue('dav', 'allow_calendar_link_subscriptions', 'yes') === 'yes') {
+                $this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
+            }
+
+            $this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
+            $this->server->addPlugin(new PublishPlugin(
+                \OCP\Server::get(IConfig::class),
+                \OCP\Server::get(IURLGenerator::class)
+            ));
+
+            $this->server->addPlugin(\OCP\Server::get(RateLimitingPlugin::class));
+            $this->server->addPlugin(\OCP\Server::get(CalDavValidatePlugin::class));
+        }
+
+        // addressbook plugins
+        if ($this->requestIsForSubtree(['addressbooks', 'principals'])) {
+            $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OCP\Server::get(IRequest::class), \OCP\Server::get(IConfig::class)));
+            $this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
+            $this->server->addPlugin(new VCFExportPlugin());
+            $this->server->addPlugin(new MultiGetExportPlugin());
+            $this->server->addPlugin(new HasPhotoPlugin());
+            $this->server->addPlugin(new ImageExportPlugin(\OCP\Server::get(PhotoCache::class)));
+
+            $this->server->addPlugin(\OCP\Server::get(CardDavRateLimitingPlugin::class));
+            $this->server->addPlugin(\OCP\Server::get(CardDavValidatePlugin::class));
+        }
+
+        // system tags plugins
+        $this->server->addPlugin(\OCP\Server::get(SystemTagPlugin::class));
+
+        // comments plugin
+        $this->server->addPlugin(new CommentsPlugin(
+            \OCP\Server::get(ICommentsManager::class),
+            \OCP\Server::get(IUserSession::class)
+        ));
+
+        $this->server->addPlugin(new CopyEtagHeaderPlugin());
+        $this->server->addPlugin(new RequestIdHeaderPlugin(\OCP\Server::get(IRequest::class)));
+        $this->server->addPlugin(new UploadAutoMkcolPlugin());
+        $this->server->addPlugin(new ChunkingV2Plugin(\OCP\Server::get(ICacheFactory::class)));
+        $this->server->addPlugin(new ChunkingPlugin());
+        $this->server->addPlugin(new ZipFolderPlugin(
+            $this->server->tree,
+            $logger,
+            $eventDispatcher,
+        ));
+        $this->server->addPlugin(\OCP\Server::get(PaginatePlugin::class));
+
+        // allow setup of additional plugins
+        $eventDispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
+        $typedEvent = new SabrePluginAddEvent($this->server);
+        $eventDispatcher->dispatchTyped($typedEvent);
+
+        // Some WebDAV clients do require Class 2 WebDAV support (locking), since
+        // we do not provide locking we emulate it using a fake locking plugin.
+        if ($this->request->isUserAgent([
+            '/WebDAVFS/',
+            '/OneNote/',
+            '/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
+        ])) {
+            $this->server->addPlugin(new FakeLockerPlugin());
+        }
+
+        if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
+            $this->server->addPlugin(new BrowserErrorPagePlugin());
+        }
+
+        $lazySearchBackend = new LazySearchBackend();
+        $this->server->addPlugin(new SearchPlugin($lazySearchBackend));
+
+        // wait with registering these until auth is handled and the filesystem is setup
+        $this->server->on('beforeMethod:*', function () use ($root, $lazySearchBackend, $logger): void {
+            // Allow view-only plugin for webdav requests
+            $this->server->addPlugin(new ViewOnlyPlugin(
+                \OC::$server->getUserFolder(),
+            ));
+
+            // custom properties plugin must be the last one
+            $userSession = \OCP\Server::get(IUserSession::class);
+            $user = $userSession->getUser();
+            if ($user !== null) {
+                $view = Filesystem::getView();
+                $config = \OCP\Server::get(IConfig::class);
+                $this->server->addPlugin(
+                    new FilesPlugin(
+                        $this->server->tree,
+                        $config,
+                        $this->request,
+                        \OCP\Server::get(IPreview::class),
+                        \OCP\Server::get(IUserSession::class),
+                        \OCP\Server::get(IFilenameValidator::class),
+                        \OCP\Server::get(IAccountManager::class),
+                        false,
+                        $config->getSystemValueBool('debug', false) === false,
+                    )
+                );
+                $this->server->addPlugin(new ChecksumUpdatePlugin());
+
+                $this->server->addPlugin(
+                    new \Sabre\DAV\PropertyStorage\Plugin(
+                        new CustomPropertiesBackend(
+                            $this->server,
+                            $this->server->tree,
+                            \OCP\Server::get(IDBConnection::class),
+                            \OCP\Server::get(IUserSession::class)->getUser(),
+                            \OCP\Server::get(DefaultCalendarValidator::class),
+                        )
+                    )
+                );
+                if ($view !== null) {
+                    $this->server->addPlugin(
+                        new QuotaPlugin($view));
+                }
+                $this->server->addPlugin(
+                    new TagsPlugin(
+                        $this->server->tree, \OCP\Server::get(ITagManager::class), \OCP\Server::get(IEventDispatcher::class), \OCP\Server::get(IUserSession::class)
+                    )
+                );
+
+                // TODO: switch to LazyUserFolder
+                $userFolder = \OC::$server->getUserFolder();
+                $shareManager = \OCP\Server::get(\OCP\Share\IManager::class);
+                $this->server->addPlugin(new SharesPlugin(
+                    $this->server->tree,
+                    $userSession,
+                    $userFolder,
+                    $shareManager,
+                ));
+                $this->server->addPlugin(new CommentPropertiesPlugin(
+                    \OCP\Server::get(ICommentsManager::class),
+                    $userSession
+                ));
+                if (\OCP\Server::get(IConfig::class)->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') {
+                    $this->server->addPlugin(new IMipPlugin(
+                        \OCP\Server::get(IAppConfig::class),
+                        \OCP\Server::get(IMailer::class),
+                        \OCP\Server::get(LoggerInterface::class),
+                        \OCP\Server::get(ITimeFactory::class),
+                        \OCP\Server::get(Defaults::class),
+                        $userSession,
+                        \OCP\Server::get(IMipService::class),
+                        \OCP\Server::get(EventComparisonService::class),
+                        \OCP\Server::get(\OCP\Mail\Provider\IManager::class)
+                    ));
+                }
+                $this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
+                if ($view !== null) {
+                    $this->server->addPlugin(new FilesReportPlugin(
+                        $this->server->tree,
+                        $view,
+                        \OCP\Server::get(ISystemTagManager::class),
+                        \OCP\Server::get(ISystemTagObjectMapper::class),
+                        \OCP\Server::get(ITagManager::class),
+                        $userSession,
+                        \OCP\Server::get(IGroupManager::class),
+                        $userFolder,
+                        \OCP\Server::get(IAppManager::class)
+                    ));
+                    $lazySearchBackend->setBackend(new FileSearchBackend(
+                        $this->server,
+                        $this->server->tree,
+                        $user,
+                        \OCP\Server::get(IRootFolder::class),
+                        $shareManager,
+                        $view,
+                        \OCP\Server::get(IFilesMetadataManager::class)
+                    ));
+                    $this->server->addPlugin(
+                        new BulkUploadPlugin(
+                            $userFolder,
+                            $logger
+                        )
+                    );
+                }
+                $this->server->addPlugin(new EnablePlugin(
+                    \OCP\Server::get(IConfig::class),
+                    \OCP\Server::get(BirthdayService::class),
+                    $user
+                ));
+                $this->server->addPlugin(new AppleProvisioningPlugin(
+                    \OCP\Server::get(IUserSession::class),
+                    \OCP\Server::get(IURLGenerator::class),
+                    \OCP\Server::get(ThemingDefaults::class),
+                    \OCP\Server::get(IRequest::class),
+                    \OC::$server->getL10N('dav'),
+                    function () {
+                        return UUIDUtil::getUUID();
+                    }
+                ));
+            }
+
+            // register plugins from apps
+            $pluginManager = new PluginManager(
+                \OC::$server,
+                \OCP\Server::get(IAppManager::class)
+            );
+            foreach ($pluginManager->getAppPlugins() as $appPlugin) {
+                $this->server->addPlugin($appPlugin);
+            }
+            foreach ($pluginManager->getAppCollections() as $appCollection) {
+                $root->addChild($appCollection);
+            }
+        });
+
+        $this->server->addPlugin(
+            new PropfindCompressionPlugin()
+        );
+    }
+
+    public function exec() {
+        /** @var IEventLogger $eventLogger */
+        $eventLogger = \OCP\Server::get(IEventLogger::class);
+        $eventLogger->start('dav_server_exec', '');
+        $this->server->start();
+        $eventLogger->end('dav_server_exec');
+        if ($this->profiler->isEnabled()) {
+            $eventLogger->end('runtime');
+            $profile = $this->profiler->collect(\OCP\Server::get(IRequest::class), new Response());
+            $this->profiler->saveProfile($profile);
+        }
+    }
+
+    private function requestIsForSubtree(array $subTrees): bool {
+        foreach ($subTrees as $subTree) {
+            $subTree = trim($subTree, ' /');
+            if (str_starts_with($this->server->getRequestUri(), $subTree . '/')) {
+                return true;
+            }
+        }
+        return false;
+    }
 
 }

apps/dav/lib/Files/FileSearchBackend.php

Indentation +499 added lines, -499 removed lines

@@ -42,503 +42,503 @@
 use SearchDAV\Query\Query;
 
 class FileSearchBackend implements ISearchBackend {
-	public const OPERATOR_LIMIT = 100;
-
-	public function __construct(
-		private Server $server,
-		private CachingTree $tree,
-		private IUser $user,
-		private IRootFolder $rootFolder,
-		private IManager $shareManager,
-		private View $view,
-		private IFilesMetadataManager $filesMetadataManager,
-	) {
-	}
-
-	/**
-	 * Search endpoint will be remote.php/dav
-	 */
-	public function getArbiterPath(): string {
-		return '';
-	}
-
-	public function isValidScope(string $href, $depth, ?string $path): bool {
-		// only allow scopes inside the dav server
-		if (is_null($path)) {
-			return false;
-		}
-
-		try {
-			$node = $this->tree->getNodeForPath($path);
-			return $node instanceof Directory;
-		} catch (NotFound $e) {
-			return false;
-		}
-	}
-
-	public function getPropertyDefinitionsForScope(string $href, ?string $path): array {
-		// all valid scopes support the same schema
-
-		//todo dynamically load all propfind properties that are supported
-		$props = [
-			// queryable properties
-			new SearchPropertyDefinition('{DAV:}displayname', true, true, true),
-			new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true),
-			new SearchPropertyDefinition('{DAV:}getlastmodified', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME),
-			new SearchPropertyDefinition(FilesPlugin::SIZE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
-			new SearchPropertyDefinition(TagsPlugin::FAVORITE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_BOOLEAN),
-			new SearchPropertyDefinition(FilesPlugin::INTERNAL_FILEID_PROPERTYNAME, true, true, false, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
-			new SearchPropertyDefinition(FilesPlugin::OWNER_ID_PROPERTYNAME, true, true, false),
-
-			// select only properties
-			new SearchPropertyDefinition('{DAV:}resourcetype', true, false, false),
-			new SearchPropertyDefinition('{DAV:}getcontentlength', true, false, false),
-			new SearchPropertyDefinition(FilesPlugin::CHECKSUMS_PROPERTYNAME, true, false, false),
-			new SearchPropertyDefinition(FilesPlugin::PERMISSIONS_PROPERTYNAME, true, false, false),
-			new SearchPropertyDefinition(FilesPlugin::GETETAG_PROPERTYNAME, true, false, false),
-			new SearchPropertyDefinition(FilesPlugin::OWNER_DISPLAY_NAME_PROPERTYNAME, true, false, false),
-			new SearchPropertyDefinition(FilesPlugin::DATA_FINGERPRINT_PROPERTYNAME, true, false, false),
-			new SearchPropertyDefinition(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, true, false, false, SearchPropertyDefinition::DATATYPE_BOOLEAN),
-			new SearchPropertyDefinition(FilesPlugin::FILEID_PROPERTYNAME, true, false, false, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
-		];
-
-		return array_merge($props, $this->getPropertyDefinitionsForMetadata());
-	}
-
-
-	private function getPropertyDefinitionsForMetadata(): array {
-		$metadataProps = [];
-		$metadata = $this->filesMetadataManager->getKnownMetadata();
-		$indexes = $metadata->getIndexes();
-		foreach ($metadata->getKeys() as $key) {
-			$isIndex = in_array($key, $indexes);
-			$type = match ($metadata->getType($key)) {
-				IMetadataValueWrapper::TYPE_INT => SearchPropertyDefinition::DATATYPE_INTEGER,
-				IMetadataValueWrapper::TYPE_FLOAT => SearchPropertyDefinition::DATATYPE_DECIMAL,
-				IMetadataValueWrapper::TYPE_BOOL => SearchPropertyDefinition::DATATYPE_BOOLEAN,
-				default => SearchPropertyDefinition::DATATYPE_STRING
-			};
-			$metadataProps[] = new SearchPropertyDefinition(
-				FilesPlugin::FILE_METADATA_PREFIX . $key,
-				true,
-				$isIndex,
-				$isIndex,
-				$type
-			);
-		}
-
-		return $metadataProps;
-	}
-
-	/**
-	 * @param INode[] $nodes
-	 * @param string[] $requestProperties
-	 */
-	public function preloadPropertyFor(array $nodes, array $requestProperties): void {
-		$this->server->emit('preloadProperties', [$nodes, $requestProperties]);
-	}
-
-	private function getFolderForPath(?string $path = null): Folder {
-		if ($path === null) {
-			throw new \InvalidArgumentException('Using uri\'s as scope is not supported, please use a path relative to the search arbiter instead');
-		}
-
-		$node = $this->tree->getNodeForPath($path);
-
-		if (!$node instanceof Directory) {
-			throw new \InvalidArgumentException('Search is only supported on directories');
-		}
-
-		$fileInfo = $node->getFileInfo();
-
-		/** @var Folder */
-		return $this->rootFolder->get($fileInfo->getPath());
-	}
-
-	/**
-	 * @param Query $search
-	 * @return SearchResult[]
-	 */
-	public function search(Query $search): array {
-		switch (count($search->from)) {
-			case 0:
-				throw new \InvalidArgumentException('You need to specify a scope for the search.');
-				break;
-			case 1:
-				$scope = $search->from[0];
-				$folder = $this->getFolderForPath($scope->path);
-				$query = $this->transformQuery($search);
-				$results = $folder->search($query);
-				break;
-			default:
-				$scopes = [];
-				foreach ($search->from as $scope) {
-					$folder = $this->getFolderForPath($scope->path);
-					$folderStorage = $folder->getStorage();
-					if ($folderStorage->instanceOfStorage(Jail::class)) {
-						/** @var Jail $folderStorage */
-						$internalPath = $folderStorage->getUnjailedPath($folder->getInternalPath());
-					} else {
-						$internalPath = $folder->getInternalPath();
-					}
-
-					$scopes[] = new SearchBinaryOperator(
-						ISearchBinaryOperator::OPERATOR_AND,
-						[
-							new SearchComparison(
-								ISearchComparison::COMPARE_EQUAL,
-								'storage',
-								$folderStorage->getCache()->getNumericStorageId(),
-								''
-							),
-							new SearchComparison(
-								ISearchComparison::COMPARE_LIKE,
-								'path',
-								$internalPath . '/%',
-								''
-							),
-						]
-					);
-				}
-
-				$scopeOperators = new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_OR, $scopes);
-				$query = $this->transformQuery($search, $scopeOperators);
-				$userFolder = $this->rootFolder->getUserFolder($this->user->getUID());
-				$results = $userFolder->search($query);
-		}
-
-		/** @var SearchResult[] $nodes */
-		$nodes = array_map(function (Node $node) {
-			if ($node instanceof Folder) {
-				$davNode = new Directory($this->view, $node, $this->tree, $this->shareManager);
-			} else {
-				$davNode = new File($this->view, $node, $this->shareManager);
-			}
-			$path = $this->getHrefForNode($node);
-			$this->tree->cacheNode($davNode, $path);
-			return new SearchResult($davNode, $path);
-		}, $results);
-
-		if (!$query->limitToHome()) {
-			// Sort again, since the result from multiple storages is appended and not sorted
-			usort($nodes, function (SearchResult $a, SearchResult $b) use ($search) {
-				return $this->sort($a, $b, $search->orderBy);
-			});
-		}
-
-		// If a limit is provided use only return that number of files
-		if ($search->limit->maxResults !== 0) {
-			$nodes = \array_slice($nodes, 0, $search->limit->maxResults);
-		}
-
-		return $nodes;
-	}
-
-	private function sort(SearchResult $a, SearchResult $b, array $orders) {
-		/** @var Order $order */
-		foreach ($orders as $order) {
-			$v1 = $this->getSearchResultProperty($a, $order->property);
-			$v2 = $this->getSearchResultProperty($b, $order->property);
-
-
-			if ($v1 === null && $v2 === null) {
-				continue;
-			}
-			if ($v1 === null) {
-				return $order->order === Order::ASC ? 1 : -1;
-			}
-			if ($v2 === null) {
-				return $order->order === Order::ASC ? -1 : 1;
-			}
-
-			$s = $this->compareProperties($v1, $v2, $order);
-			if ($s === 0) {
-				continue;
-			}
-
-			if ($order->order === Order::DESC) {
-				$s = -$s;
-			}
-			return $s;
-		}
-
-		return 0;
-	}
-
-	private function compareProperties($a, $b, Order $order) {
-		switch ($order->property->dataType) {
-			case SearchPropertyDefinition::DATATYPE_STRING:
-				return strcmp($a, $b);
-			case SearchPropertyDefinition::DATATYPE_BOOLEAN:
-				if ($a === $b) {
-					return 0;
-				}
-				if ($a === false) {
-					return -1;
-				}
-				return 1;
-			default:
-				if ($a === $b) {
-					return 0;
-				}
-				if ($a < $b) {
-					return -1;
-				}
-				return 1;
-		}
-	}
-
-	private function getSearchResultProperty(SearchResult $result, SearchPropertyDefinition $property) {
-		/** @var \OCA\DAV\Connector\Sabre\Node $node */
-		$node = $result->node;
-
-		switch ($property->name) {
-			case '{DAV:}displayname':
-				return $node->getName();
-			case '{DAV:}getlastmodified':
-				return $node->getLastModified();
-			case FilesPlugin::SIZE_PROPERTYNAME:
-				return $node->getSize();
-			case FilesPlugin::INTERNAL_FILEID_PROPERTYNAME:
-				return $node->getInternalFileId();
-			default:
-				return null;
-		}
-	}
-
-	/**
-	 * @param Node $node
-	 * @return string
-	 */
-	private function getHrefForNode(Node $node) {
-		$base = '/files/' . $this->user->getUID();
-		return $base . $this->view->getRelativePath($node->getPath());
-	}
-
-	/**
-	 * @param Query $query
-	 *
-	 * @return ISearchQuery
-	 */
-	private function transformQuery(Query $query, ?SearchBinaryOperator $scopeOperators = null): ISearchQuery {
-		$orders = array_map(function (Order $order): ISearchOrder {
-			$direction = $order->order === Order::ASC ? ISearchOrder::DIRECTION_ASCENDING : ISearchOrder::DIRECTION_DESCENDING;
-			if (str_starts_with($order->property->name, FilesPlugin::FILE_METADATA_PREFIX)) {
-				return new SearchOrder($direction, substr($order->property->name, strlen(FilesPlugin::FILE_METADATA_PREFIX)), IMetadataQuery::EXTRA);
-			} else {
-				return new SearchOrder($direction, $this->mapPropertyNameToColumn($order->property));
-			}
-		}, $query->orderBy);
-
-		$limit = $query->limit;
-		$offset = $limit->firstResult;
-
-		$limitHome = false;
-		$ownerProp = $this->extractWhereValue($query->where, FilesPlugin::OWNER_ID_PROPERTYNAME, Operator::OPERATION_EQUAL);
-		if ($ownerProp !== null) {
-			if ($ownerProp === $this->user->getUID()) {
-				$limitHome = true;
-			} else {
-				throw new \InvalidArgumentException("Invalid search value for '{http://owncloud.org/ns}owner-id', only the current user id is allowed");
-			}
-		}
-
-		$operatorCount = $this->countSearchOperators($query->where);
-		if ($operatorCount > self::OPERATOR_LIMIT) {
-			throw new \InvalidArgumentException('Invalid search query, maximum operator limit of ' . self::OPERATOR_LIMIT . ' exceeded, got ' . $operatorCount . ' operators');
-		}
-
-		/** @var SearchBinaryOperator|SearchComparison */
-		$queryOperators = $this->transformSearchOperation($query->where);
-		if ($scopeOperators === null) {
-			$operators = $queryOperators;
-		} else {
-			$operators = new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_AND, [$queryOperators, $scopeOperators]);
-		}
-
-		return new SearchQuery(
-			$operators,
-			(int)$limit->maxResults,
-			$offset,
-			$orders,
-			$this->user,
-			$limitHome
-		);
-	}
-
-	private function countSearchOperators(Operator $operator): int {
-		switch ($operator->type) {
-			case Operator::OPERATION_AND:
-			case Operator::OPERATION_OR:
-			case Operator::OPERATION_NOT:
-				/** @var Operator[] $arguments */
-				$arguments = $operator->arguments;
-				return array_sum(array_map([$this, 'countSearchOperators'], $arguments));
-			case Operator::OPERATION_EQUAL:
-			case Operator::OPERATION_GREATER_OR_EQUAL_THAN:
-			case Operator::OPERATION_GREATER_THAN:
-			case Operator::OPERATION_LESS_OR_EQUAL_THAN:
-			case Operator::OPERATION_LESS_THAN:
-			case Operator::OPERATION_IS_LIKE:
-			case Operator::OPERATION_IS_COLLECTION:
-			default:
-				return 1;
-		}
-	}
-
-	/**
-	 * @param Operator $operator
-	 * @return ISearchOperator
-	 */
-	private function transformSearchOperation(Operator $operator) {
-		[, $trimmedType] = explode('}', $operator->type);
-		switch ($operator->type) {
-			case Operator::OPERATION_AND:
-			case Operator::OPERATION_OR:
-			case Operator::OPERATION_NOT:
-				$arguments = array_map([$this, 'transformSearchOperation'], $operator->arguments);
-				return new SearchBinaryOperator($trimmedType, $arguments);
-			case Operator::OPERATION_EQUAL:
-			case Operator::OPERATION_GREATER_OR_EQUAL_THAN:
-			case Operator::OPERATION_GREATER_THAN:
-			case Operator::OPERATION_LESS_OR_EQUAL_THAN:
-			case Operator::OPERATION_LESS_THAN:
-			case Operator::OPERATION_IS_LIKE:
-				if (count($operator->arguments) !== 2) {
-					throw new \InvalidArgumentException('Invalid number of arguments for ' . $trimmedType . ' operation');
-				}
-				if (!($operator->arguments[1] instanceof Literal)) {
-					throw new \InvalidArgumentException('Invalid argument 2 for ' . $trimmedType . ' operation, expected literal');
-				}
-				$value = $operator->arguments[1]->value;
-				// no break
-			case Operator::OPERATION_IS_DEFINED:
-				if (!($operator->arguments[0] instanceof SearchPropertyDefinition)) {
-					throw new \InvalidArgumentException('Invalid argument 1 for ' . $trimmedType . ' operation, expected property');
-				}
-				$property = $operator->arguments[0];
-
-				if (str_starts_with($property->name, FilesPlugin::FILE_METADATA_PREFIX)) {
-					$field = substr($property->name, strlen(FilesPlugin::FILE_METADATA_PREFIX));
-					$extra = IMetadataQuery::EXTRA;
-				} else {
-					$field = $this->mapPropertyNameToColumn($property);
-				}
-
-				try {
-					$castedValue = $this->castValue($property, $value ?? '');
-				} catch (\Error $e) {
-					throw new \InvalidArgumentException('Invalid property value for ' . $property->name, previous: $e);
-				}
-
-				return new SearchComparison(
-					$trimmedType,
-					$field,
-					$castedValue,
-					$extra ?? ''
-				);
-
-			case Operator::OPERATION_IS_COLLECTION:
-				return new SearchComparison('eq', 'mimetype', ICacheEntry::DIRECTORY_MIMETYPE);
-			default:
-				throw new \InvalidArgumentException('Unsupported operation ' . $trimmedType . ' (' . $operator->type . ')');
-		}
-	}
-
-	/**
-	 * @param SearchPropertyDefinition $property
-	 * @return string
-	 */
-	private function mapPropertyNameToColumn(SearchPropertyDefinition $property) {
-		switch ($property->name) {
-			case '{DAV:}displayname':
-				return 'name';
-			case '{DAV:}getcontenttype':
-				return 'mimetype';
-			case '{DAV:}getlastmodified':
-				return 'mtime';
-			case FilesPlugin::SIZE_PROPERTYNAME:
-				return 'size';
-			case TagsPlugin::FAVORITE_PROPERTYNAME:
-				return 'favorite';
-			case TagsPlugin::TAGS_PROPERTYNAME:
-				return 'tagname';
-			case FilesPlugin::INTERNAL_FILEID_PROPERTYNAME:
-				return 'fileid';
-			default:
-				throw new \InvalidArgumentException('Unsupported property for search or order: ' . $property->name);
-		}
-	}
-
-	private function castValue(SearchPropertyDefinition $property, $value) {
-		if ($value === '') {
-			return '';
-		}
-
-		switch ($property->dataType) {
-			case SearchPropertyDefinition::DATATYPE_BOOLEAN:
-				return $value === 'yes';
-			case SearchPropertyDefinition::DATATYPE_DECIMAL:
-			case SearchPropertyDefinition::DATATYPE_INTEGER:
-			case SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER:
-				return 0 + $value;
-			case SearchPropertyDefinition::DATATYPE_DATETIME:
-				if (is_numeric($value)) {
-					return max(0, 0 + $value);
-				}
-				$date = \DateTime::createFromFormat(\DateTimeInterface::ATOM, (string)$value);
-				return ($date instanceof \DateTime && $date->getTimestamp() !== false) ? $date->getTimestamp() : 0;
-			default:
-				return $value;
-		}
-	}
-
-	/**
-	 * Get a specific property from the were clause
-	 */
-	private function extractWhereValue(Operator &$operator, string $propertyName, string $comparison, bool $acceptableLocation = true): ?string {
-		switch ($operator->type) {
-			case Operator::OPERATION_AND:
-			case Operator::OPERATION_OR:
-			case Operator::OPERATION_NOT:
-				foreach ($operator->arguments as &$argument) {
-					$value = $this->extractWhereValue($argument, $propertyName, $comparison, $acceptableLocation && $operator->type === Operator::OPERATION_AND);
-					if ($value !== null) {
-						return $value;
-					}
-				}
-				return null;
-			case Operator::OPERATION_EQUAL:
-			case Operator::OPERATION_GREATER_OR_EQUAL_THAN:
-			case Operator::OPERATION_GREATER_THAN:
-			case Operator::OPERATION_LESS_OR_EQUAL_THAN:
-			case Operator::OPERATION_LESS_THAN:
-			case Operator::OPERATION_IS_LIKE:
-				if ($operator->arguments[0]->name === $propertyName) {
-					if ($operator->type === $comparison) {
-						if ($acceptableLocation) {
-							if ($operator->arguments[1] instanceof Literal) {
-								$value = $operator->arguments[1]->value;
-
-								// to remove the comparison from the query, we replace it with an empty AND
-								$operator = new Operator(Operator::OPERATION_AND);
-
-								return $value;
-							} else {
-								throw new \InvalidArgumentException("searching by '$propertyName' is only allowed with a literal value");
-							}
-						} else {
-							throw new \InvalidArgumentException("searching by '$propertyName' is not allowed inside a '{DAV:}or' or '{DAV:}not'");
-						}
-					} else {
-						throw new \InvalidArgumentException("searching by '$propertyName' is only allowed inside a '$comparison'");
-					}
-				} else {
-					return null;
-				}
-				// no break
-			default:
-				return null;
-		}
-	}
+    public const OPERATOR_LIMIT = 100;
+
+    public function __construct(
+        private Server $server,
+        private CachingTree $tree,
+        private IUser $user,
+        private IRootFolder $rootFolder,
+        private IManager $shareManager,
+        private View $view,
+        private IFilesMetadataManager $filesMetadataManager,
+    ) {
+    }
+
+    /**
+     * Search endpoint will be remote.php/dav
+     */
+    public function getArbiterPath(): string {
+        return '';
+    }
+
+    public function isValidScope(string $href, $depth, ?string $path): bool {
+        // only allow scopes inside the dav server
+        if (is_null($path)) {
+            return false;
+        }
+
+        try {
+            $node = $this->tree->getNodeForPath($path);
+            return $node instanceof Directory;
+        } catch (NotFound $e) {
+            return false;
+        }
+    }
+
+    public function getPropertyDefinitionsForScope(string $href, ?string $path): array {
+        // all valid scopes support the same schema
+
+        //todo dynamically load all propfind properties that are supported
+        $props = [
+            // queryable properties
+            new SearchPropertyDefinition('{DAV:}displayname', true, true, true),
+            new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true),
+            new SearchPropertyDefinition('{DAV:}getlastmodified', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME),
+            new SearchPropertyDefinition(FilesPlugin::SIZE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
+            new SearchPropertyDefinition(TagsPlugin::FAVORITE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_BOOLEAN),
+            new SearchPropertyDefinition(FilesPlugin::INTERNAL_FILEID_PROPERTYNAME, true, true, false, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
+            new SearchPropertyDefinition(FilesPlugin::OWNER_ID_PROPERTYNAME, true, true, false),
+
+            // select only properties
+            new SearchPropertyDefinition('{DAV:}resourcetype', true, false, false),
+            new SearchPropertyDefinition('{DAV:}getcontentlength', true, false, false),
+            new SearchPropertyDefinition(FilesPlugin::CHECKSUMS_PROPERTYNAME, true, false, false),
+            new SearchPropertyDefinition(FilesPlugin::PERMISSIONS_PROPERTYNAME, true, false, false),
+            new SearchPropertyDefinition(FilesPlugin::GETETAG_PROPERTYNAME, true, false, false),
+            new SearchPropertyDefinition(FilesPlugin::OWNER_DISPLAY_NAME_PROPERTYNAME, true, false, false),
+            new SearchPropertyDefinition(FilesPlugin::DATA_FINGERPRINT_PROPERTYNAME, true, false, false),
+            new SearchPropertyDefinition(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, true, false, false, SearchPropertyDefinition::DATATYPE_BOOLEAN),
+            new SearchPropertyDefinition(FilesPlugin::FILEID_PROPERTYNAME, true, false, false, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
+        ];
+
+        return array_merge($props, $this->getPropertyDefinitionsForMetadata());
+    }
+
+
+    private function getPropertyDefinitionsForMetadata(): array {
+        $metadataProps = [];
+        $metadata = $this->filesMetadataManager->getKnownMetadata();
+        $indexes = $metadata->getIndexes();
+        foreach ($metadata->getKeys() as $key) {
+            $isIndex = in_array($key, $indexes);
+            $type = match ($metadata->getType($key)) {
+                IMetadataValueWrapper::TYPE_INT => SearchPropertyDefinition::DATATYPE_INTEGER,
+                IMetadataValueWrapper::TYPE_FLOAT => SearchPropertyDefinition::DATATYPE_DECIMAL,
+                IMetadataValueWrapper::TYPE_BOOL => SearchPropertyDefinition::DATATYPE_BOOLEAN,
+                default => SearchPropertyDefinition::DATATYPE_STRING
+            };
+            $metadataProps[] = new SearchPropertyDefinition(
+                FilesPlugin::FILE_METADATA_PREFIX . $key,
+                true,
+                $isIndex,
+                $isIndex,
+                $type
+            );
+        }
+
+        return $metadataProps;
+    }
+
+    /**
+     * @param INode[] $nodes
+     * @param string[] $requestProperties
+     */
+    public function preloadPropertyFor(array $nodes, array $requestProperties): void {
+        $this->server->emit('preloadProperties', [$nodes, $requestProperties]);
+    }
+
+    private function getFolderForPath(?string $path = null): Folder {
+        if ($path === null) {
+            throw new \InvalidArgumentException('Using uri\'s as scope is not supported, please use a path relative to the search arbiter instead');
+        }
+
+        $node = $this->tree->getNodeForPath($path);
+
+        if (!$node instanceof Directory) {
+            throw new \InvalidArgumentException('Search is only supported on directories');
+        }
+
+        $fileInfo = $node->getFileInfo();
+
+        /** @var Folder */
+        return $this->rootFolder->get($fileInfo->getPath());
+    }
+
+    /**
+     * @param Query $search
+     * @return SearchResult[]
+     */
+    public function search(Query $search): array {
+        switch (count($search->from)) {
+            case 0:
+                throw new \InvalidArgumentException('You need to specify a scope for the search.');
+                break;
+            case 1:
+                $scope = $search->from[0];
+                $folder = $this->getFolderForPath($scope->path);
+                $query = $this->transformQuery($search);
+                $results = $folder->search($query);
+                break;
+            default:
+                $scopes = [];
+                foreach ($search->from as $scope) {
+                    $folder = $this->getFolderForPath($scope->path);
+                    $folderStorage = $folder->getStorage();
+                    if ($folderStorage->instanceOfStorage(Jail::class)) {
+                        /** @var Jail $folderStorage */
+                        $internalPath = $folderStorage->getUnjailedPath($folder->getInternalPath());
+                    } else {
+                        $internalPath = $folder->getInternalPath();
+                    }
+
+                    $scopes[] = new SearchBinaryOperator(
+                        ISearchBinaryOperator::OPERATOR_AND,
+                        [
+                            new SearchComparison(
+                                ISearchComparison::COMPARE_EQUAL,
+                                'storage',
+                                $folderStorage->getCache()->getNumericStorageId(),
+                                ''
+                            ),
+                            new SearchComparison(
+                                ISearchComparison::COMPARE_LIKE,
+                                'path',
+                                $internalPath . '/%',
+                                ''
+                            ),
+                        ]
+                    );
+                }
+
+                $scopeOperators = new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_OR, $scopes);
+                $query = $this->transformQuery($search, $scopeOperators);
+                $userFolder = $this->rootFolder->getUserFolder($this->user->getUID());
+                $results = $userFolder->search($query);
+        }
+
+        /** @var SearchResult[] $nodes */
+        $nodes = array_map(function (Node $node) {
+            if ($node instanceof Folder) {
+                $davNode = new Directory($this->view, $node, $this->tree, $this->shareManager);
+            } else {
+                $davNode = new File($this->view, $node, $this->shareManager);
+            }
+            $path = $this->getHrefForNode($node);
+            $this->tree->cacheNode($davNode, $path);
+            return new SearchResult($davNode, $path);
+        }, $results);
+
+        if (!$query->limitToHome()) {
+            // Sort again, since the result from multiple storages is appended and not sorted
+            usort($nodes, function (SearchResult $a, SearchResult $b) use ($search) {
+                return $this->sort($a, $b, $search->orderBy);
+            });
+        }
+
+        // If a limit is provided use only return that number of files
+        if ($search->limit->maxResults !== 0) {
+            $nodes = \array_slice($nodes, 0, $search->limit->maxResults);
+        }
+
+        return $nodes;
+    }
+
+    private function sort(SearchResult $a, SearchResult $b, array $orders) {
+        /** @var Order $order */
+        foreach ($orders as $order) {
+            $v1 = $this->getSearchResultProperty($a, $order->property);
+            $v2 = $this->getSearchResultProperty($b, $order->property);
+
+
+            if ($v1 === null && $v2 === null) {
+                continue;
+            }
+            if ($v1 === null) {
+                return $order->order === Order::ASC ? 1 : -1;
+            }
+            if ($v2 === null) {
+                return $order->order === Order::ASC ? -1 : 1;
+            }
+
+            $s = $this->compareProperties($v1, $v2, $order);
+            if ($s === 0) {
+                continue;
+            }
+
+            if ($order->order === Order::DESC) {
+                $s = -$s;
+            }
+            return $s;
+        }
+
+        return 0;
+    }
+
+    private function compareProperties($a, $b, Order $order) {
+        switch ($order->property->dataType) {
+            case SearchPropertyDefinition::DATATYPE_STRING:
+                return strcmp($a, $b);
+            case SearchPropertyDefinition::DATATYPE_BOOLEAN:
+                if ($a === $b) {
+                    return 0;
+                }
+                if ($a === false) {
+                    return -1;
+                }
+                return 1;
+            default:
+                if ($a === $b) {
+                    return 0;
+                }
+                if ($a < $b) {
+                    return -1;
+                }
+                return 1;
+        }
+    }
+
+    private function getSearchResultProperty(SearchResult $result, SearchPropertyDefinition $property) {
+        /** @var \OCA\DAV\Connector\Sabre\Node $node */
+        $node = $result->node;
+
+        switch ($property->name) {
+            case '{DAV:}displayname':
+                return $node->getName();
+            case '{DAV:}getlastmodified':
+                return $node->getLastModified();
+            case FilesPlugin::SIZE_PROPERTYNAME:
+                return $node->getSize();
+            case FilesPlugin::INTERNAL_FILEID_PROPERTYNAME:
+                return $node->getInternalFileId();
+            default:
+                return null;
+        }
+    }
+
+    /**
+     * @param Node $node
+     * @return string
+     */
+    private function getHrefForNode(Node $node) {
+        $base = '/files/' . $this->user->getUID();
+        return $base . $this->view->getRelativePath($node->getPath());
+    }
+
+    /**
+     * @param Query $query
+     *
+     * @return ISearchQuery
+     */
+    private function transformQuery(Query $query, ?SearchBinaryOperator $scopeOperators = null): ISearchQuery {
+        $orders = array_map(function (Order $order): ISearchOrder {
+            $direction = $order->order === Order::ASC ? ISearchOrder::DIRECTION_ASCENDING : ISearchOrder::DIRECTION_DESCENDING;
+            if (str_starts_with($order->property->name, FilesPlugin::FILE_METADATA_PREFIX)) {
+                return new SearchOrder($direction, substr($order->property->name, strlen(FilesPlugin::FILE_METADATA_PREFIX)), IMetadataQuery::EXTRA);
+            } else {
+                return new SearchOrder($direction, $this->mapPropertyNameToColumn($order->property));
+            }
+        }, $query->orderBy);
+
+        $limit = $query->limit;
+        $offset = $limit->firstResult;
+
+        $limitHome = false;
+        $ownerProp = $this->extractWhereValue($query->where, FilesPlugin::OWNER_ID_PROPERTYNAME, Operator::OPERATION_EQUAL);
+        if ($ownerProp !== null) {
+            if ($ownerProp === $this->user->getUID()) {
+                $limitHome = true;
+            } else {
+                throw new \InvalidArgumentException("Invalid search value for '{http://owncloud.org/ns}owner-id', only the current user id is allowed");
+            }
+        }
+
+        $operatorCount = $this->countSearchOperators($query->where);
+        if ($operatorCount > self::OPERATOR_LIMIT) {
+            throw new \InvalidArgumentException('Invalid search query, maximum operator limit of ' . self::OPERATOR_LIMIT . ' exceeded, got ' . $operatorCount . ' operators');
+        }
+
+        /** @var SearchBinaryOperator|SearchComparison */
+        $queryOperators = $this->transformSearchOperation($query->where);
+        if ($scopeOperators === null) {
+            $operators = $queryOperators;
+        } else {
+            $operators = new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_AND, [$queryOperators, $scopeOperators]);
+        }
+
+        return new SearchQuery(
+            $operators,
+            (int)$limit->maxResults,
+            $offset,
+            $orders,
+            $this->user,
+            $limitHome
+        );
+    }
+
+    private function countSearchOperators(Operator $operator): int {
+        switch ($operator->type) {
+            case Operator::OPERATION_AND:
+            case Operator::OPERATION_OR:
+            case Operator::OPERATION_NOT:
+                /** @var Operator[] $arguments */
+                $arguments = $operator->arguments;
+                return array_sum(array_map([$this, 'countSearchOperators'], $arguments));
+            case Operator::OPERATION_EQUAL:
+            case Operator::OPERATION_GREATER_OR_EQUAL_THAN:
+            case Operator::OPERATION_GREATER_THAN:
+            case Operator::OPERATION_LESS_OR_EQUAL_THAN:
+            case Operator::OPERATION_LESS_THAN:
+            case Operator::OPERATION_IS_LIKE:
+            case Operator::OPERATION_IS_COLLECTION:
+            default:
+                return 1;
+        }
+    }
+
+    /**
+     * @param Operator $operator
+     * @return ISearchOperator
+     */
+    private function transformSearchOperation(Operator $operator) {
+        [, $trimmedType] = explode('}', $operator->type);
+        switch ($operator->type) {
+            case Operator::OPERATION_AND:
+            case Operator::OPERATION_OR:
+            case Operator::OPERATION_NOT:
+                $arguments = array_map([$this, 'transformSearchOperation'], $operator->arguments);
+                return new SearchBinaryOperator($trimmedType, $arguments);
+            case Operator::OPERATION_EQUAL:
+            case Operator::OPERATION_GREATER_OR_EQUAL_THAN:
+            case Operator::OPERATION_GREATER_THAN:
+            case Operator::OPERATION_LESS_OR_EQUAL_THAN:
+            case Operator::OPERATION_LESS_THAN:
+            case Operator::OPERATION_IS_LIKE:
+                if (count($operator->arguments) !== 2) {
+                    throw new \InvalidArgumentException('Invalid number of arguments for ' . $trimmedType . ' operation');
+                }
+                if (!($operator->arguments[1] instanceof Literal)) {
+                    throw new \InvalidArgumentException('Invalid argument 2 for ' . $trimmedType . ' operation, expected literal');
+                }
+                $value = $operator->arguments[1]->value;
+                // no break
+            case Operator::OPERATION_IS_DEFINED:
+                if (!($operator->arguments[0] instanceof SearchPropertyDefinition)) {
+                    throw new \InvalidArgumentException('Invalid argument 1 for ' . $trimmedType . ' operation, expected property');
+                }
+                $property = $operator->arguments[0];
+
+                if (str_starts_with($property->name, FilesPlugin::FILE_METADATA_PREFIX)) {
+                    $field = substr($property->name, strlen(FilesPlugin::FILE_METADATA_PREFIX));
+                    $extra = IMetadataQuery::EXTRA;
+                } else {
+                    $field = $this->mapPropertyNameToColumn($property);
+                }
+
+                try {
+                    $castedValue = $this->castValue($property, $value ?? '');
+                } catch (\Error $e) {
+                    throw new \InvalidArgumentException('Invalid property value for ' . $property->name, previous: $e);
+                }
+
+                return new SearchComparison(
+                    $trimmedType,
+                    $field,
+                    $castedValue,
+                    $extra ?? ''
+                );
+
+            case Operator::OPERATION_IS_COLLECTION:
+                return new SearchComparison('eq', 'mimetype', ICacheEntry::DIRECTORY_MIMETYPE);
+            default:
+                throw new \InvalidArgumentException('Unsupported operation ' . $trimmedType . ' (' . $operator->type . ')');
+        }
+    }
+
+    /**
+     * @param SearchPropertyDefinition $property
+     * @return string
+     */
+    private function mapPropertyNameToColumn(SearchPropertyDefinition $property) {
+        switch ($property->name) {
+            case '{DAV:}displayname':
+                return 'name';
+            case '{DAV:}getcontenttype':
+                return 'mimetype';
+            case '{DAV:}getlastmodified':
+                return 'mtime';
+            case FilesPlugin::SIZE_PROPERTYNAME:
+                return 'size';
+            case TagsPlugin::FAVORITE_PROPERTYNAME:
+                return 'favorite';
+            case TagsPlugin::TAGS_PROPERTYNAME:
+                return 'tagname';
+            case FilesPlugin::INTERNAL_FILEID_PROPERTYNAME:
+                return 'fileid';
+            default:
+                throw new \InvalidArgumentException('Unsupported property for search or order: ' . $property->name);
+        }
+    }
+
+    private function castValue(SearchPropertyDefinition $property, $value) {
+        if ($value === '') {
+            return '';
+        }
+
+        switch ($property->dataType) {
+            case SearchPropertyDefinition::DATATYPE_BOOLEAN:
+                return $value === 'yes';
+            case SearchPropertyDefinition::DATATYPE_DECIMAL:
+            case SearchPropertyDefinition::DATATYPE_INTEGER:
+            case SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER:
+                return 0 + $value;
+            case SearchPropertyDefinition::DATATYPE_DATETIME:
+                if (is_numeric($value)) {
+                    return max(0, 0 + $value);
+                }
+                $date = \DateTime::createFromFormat(\DateTimeInterface::ATOM, (string)$value);
+                return ($date instanceof \DateTime && $date->getTimestamp() !== false) ? $date->getTimestamp() : 0;
+            default:
+                return $value;
+        }
+    }
+
+    /**
+     * Get a specific property from the were clause
+     */
+    private function extractWhereValue(Operator &$operator, string $propertyName, string $comparison, bool $acceptableLocation = true): ?string {
+        switch ($operator->type) {
+            case Operator::OPERATION_AND:
+            case Operator::OPERATION_OR:
+            case Operator::OPERATION_NOT:
+                foreach ($operator->arguments as &$argument) {
+                    $value = $this->extractWhereValue($argument, $propertyName, $comparison, $acceptableLocation && $operator->type === Operator::OPERATION_AND);
+                    if ($value !== null) {
+                        return $value;
+                    }
+                }
+                return null;
+            case Operator::OPERATION_EQUAL:
+            case Operator::OPERATION_GREATER_OR_EQUAL_THAN:
+            case Operator::OPERATION_GREATER_THAN:
+            case Operator::OPERATION_LESS_OR_EQUAL_THAN:
+            case Operator::OPERATION_LESS_THAN:
+            case Operator::OPERATION_IS_LIKE:
+                if ($operator->arguments[0]->name === $propertyName) {
+                    if ($operator->type === $comparison) {
+                        if ($acceptableLocation) {
+                            if ($operator->arguments[1] instanceof Literal) {
+                                $value = $operator->arguments[1]->value;
+
+                                // to remove the comparison from the query, we replace it with an empty AND
+                                $operator = new Operator(Operator::OPERATION_AND);
+
+                                return $value;
+                            } else {
+                                throw new \InvalidArgumentException("searching by '$propertyName' is only allowed with a literal value");
+                            }
+                        } else {
+                            throw new \InvalidArgumentException("searching by '$propertyName' is not allowed inside a '{DAV:}or' or '{DAV:}not'");
+                        }
+                    } else {
+                        throw new \InvalidArgumentException("searching by '$propertyName' is only allowed inside a '$comparison'");
+                    }
+                } else {
+                    return null;
+                }
+                // no break
+            default:
+                return null;
+        }
+    }
 }

apps/dav/tests/unit/Files/FileSearchBackendTest.php

Indentation +382 added lines, -382 removed lines

@@ -36,386 +36,386 @@
 use Test\TestCase;
 
 class FileSearchBackendTest extends TestCase {
-	private ObjectTree&MockObject $tree;
-	private Server&MockObject $server;
-	private IUser&MockObject $user;
-	private IRootFolder&MockObject $rootFolder;
-	private IManager&MockObject $shareManager;
-	private View&MockObject $view;
-	private Folder&MockObject $searchFolder;
-	private Directory&MockObject $davFolder;
-	private FileSearchBackend $search;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->user = $this->createMock(IUser::class);
-		$this->user->expects($this->any())
-			->method('getUID')
-			->willReturn('test');
-
-		$this->tree = $this->createMock(ObjectTree::class);
-		$this->server = $this->createMock(Server::class);
-		$this->view = $this->createMock(View::class);
-		$this->rootFolder = $this->createMock(IRootFolder::class);
-		$this->shareManager = $this->createMock(IManager::class);
-		$this->searchFolder = $this->createMock(Folder::class);
-		$fileInfo = $this->createMock(FileInfo::class);
-		$this->davFolder = $this->createMock(Directory::class);
-
-		$this->view->expects($this->any())
-			->method('getRoot')
-			->willReturn('');
-
-		$this->view->expects($this->any())
-			->method('getRelativePath')
-			->willReturnArgument(0);
-
-		$this->davFolder->expects($this->any())
-			->method('getFileInfo')
-			->willReturn($fileInfo);
-
-		$this->rootFolder->expects($this->any())
-			->method('get')
-			->willReturn($this->searchFolder);
-
-		$filesMetadataManager = $this->createMock(IFilesMetadataManager::class);
-
-		$this->search = new FileSearchBackend($this->server, $this->tree, $this->user, $this->rootFolder, $this->shareManager, $this->view, $filesMetadataManager);
-	}
-
-	public function testSearchFilename(): void {
-		$this->tree->expects($this->any())
-			->method('getNodeForPath')
-			->willReturn($this->davFolder);
-
-		$this->searchFolder->expects($this->once())
-			->method('search')
-			->with(new SearchQuery(
-				new SearchComparison(
-					ISearchComparison::COMPARE_EQUAL,
-					'name',
-					'foo'
-				),
-				0,
-				0,
-				[],
-				$this->user
-			))
-			->willReturn([
-				new \OC\Files\Node\Folder($this->rootFolder, $this->view, '/test/path'),
-			]);
-
-		$query = $this->getBasicQuery(Operator::OPERATION_EQUAL, '{DAV:}displayname', 'foo');
-		$result = $this->search->search($query);
-
-		$this->assertCount(1, $result);
-		$this->assertEquals('/files/test/test/path', $result[0]->href);
-	}
-
-	public function testSearchMimetype(): void {
-		$this->tree->expects($this->any())
-			->method('getNodeForPath')
-			->willReturn($this->davFolder);
-
-		$this->searchFolder->expects($this->once())
-			->method('search')
-			->with(new SearchQuery(
-				new SearchComparison(
-					ISearchComparison::COMPARE_EQUAL,
-					'mimetype',
-					'foo'
-				),
-				0,
-				0,
-				[],
-				$this->user
-			))
-			->willReturn([
-				new \OC\Files\Node\Folder($this->rootFolder, $this->view, '/test/path'),
-			]);
-
-		$query = $this->getBasicQuery(Operator::OPERATION_EQUAL, '{DAV:}getcontenttype', 'foo');
-		$result = $this->search->search($query);
-
-		$this->assertCount(1, $result);
-		$this->assertEquals('/files/test/test/path', $result[0]->href);
-	}
-
-	public function testSearchSize(): void {
-		$this->tree->expects($this->any())
-			->method('getNodeForPath')
-			->willReturn($this->davFolder);
-
-		$this->searchFolder->expects($this->once())
-			->method('search')
-			->with(new SearchQuery(
-				new SearchComparison(
-					ISearchComparison::COMPARE_GREATER_THAN,
-					'size',
-					10
-				),
-				0,
-				0,
-				[],
-				$this->user
-			))
-			->willReturn([
-				new \OC\Files\Node\Folder($this->rootFolder, $this->view, '/test/path'),
-			]);
-
-		$query = $this->getBasicQuery(Operator::OPERATION_GREATER_THAN, FilesPlugin::SIZE_PROPERTYNAME, 10);
-		$result = $this->search->search($query);
-
-		$this->assertCount(1, $result);
-		$this->assertEquals('/files/test/test/path', $result[0]->href);
-	}
-
-	public function testSearchMtime(): void {
-		$this->tree->expects($this->any())
-			->method('getNodeForPath')
-			->willReturn($this->davFolder);
-
-		$this->searchFolder->expects($this->once())
-			->method('search')
-			->with(new SearchQuery(
-				new SearchComparison(
-					ISearchComparison::COMPARE_GREATER_THAN,
-					'mtime',
-					10
-				),
-				0,
-				0,
-				[],
-				$this->user
-			))
-			->willReturn([
-				new \OC\Files\Node\Folder($this->rootFolder, $this->view, '/test/path'),
-			]);
-
-		$query = $this->getBasicQuery(Operator::OPERATION_GREATER_THAN, '{DAV:}getlastmodified', 10);
-		$result = $this->search->search($query);
-
-		$this->assertCount(1, $result);
-		$this->assertEquals('/files/test/test/path', $result[0]->href);
-	}
-
-	public function testSearchIsCollection(): void {
-		$this->tree->expects($this->any())
-			->method('getNodeForPath')
-			->willReturn($this->davFolder);
-
-		$this->searchFolder->expects($this->once())
-			->method('search')
-			->with(new SearchQuery(
-				new SearchComparison(
-					ISearchComparison::COMPARE_EQUAL,
-					'mimetype',
-					FileInfo::MIMETYPE_FOLDER
-				),
-				0,
-				0,
-				[],
-				$this->user
-			))
-			->willReturn([
-				new \OC\Files\Node\Folder($this->rootFolder, $this->view, '/test/path'),
-			]);
-
-		$query = $this->getBasicQuery(Operator::OPERATION_IS_COLLECTION, 'yes');
-		$result = $this->search->search($query);
-
-		$this->assertCount(1, $result);
-		$this->assertEquals('/files/test/test/path', $result[0]->href);
-	}
-
-
-	public function testSearchInvalidProp(): void {
-		$this->expectException(\InvalidArgumentException::class);
-
-		$this->tree->expects($this->any())
-			->method('getNodeForPath')
-			->willReturn($this->davFolder);
-
-		$this->searchFolder->expects($this->never())
-			->method('search');
-
-		$query = $this->getBasicQuery(Operator::OPERATION_EQUAL, '{DAV:}getetag', 'foo');
-		$this->search->search($query);
-	}
-
-	private function getBasicQuery(string $type, string $property, int|string|null $value = null) {
-		$scope = new Scope('/', 'infinite');
-		$scope->path = '/';
-		$from = [$scope];
-		$orderBy = [];
-		$select = [];
-		if (is_null($value)) {
-			$where = new Operator(
-				$type,
-				[new Literal($property)]
-			);
-		} else {
-			$where = new Operator(
-				$type,
-				[new SearchPropertyDefinition($property, true, true, true), new Literal($value)]
-			);
-		}
-		$limit = new Limit();
-
-		return new Query($select, $from, $where, $orderBy, $limit);
-	}
-
-
-	public function testSearchNonFolder(): void {
-		$this->expectException(\InvalidArgumentException::class);
-
-		$davNode = $this->createMock(File::class);
-
-		$this->tree->expects($this->any())
-			->method('getNodeForPath')
-			->willReturn($davNode);
-
-		$query = $this->getBasicQuery(Operator::OPERATION_EQUAL, '{DAV:}displayname', 'foo');
-		$this->search->search($query);
-	}
-
-	public function testSearchLimitOwnerBasic(): void {
-		$this->tree->expects($this->any())
-			->method('getNodeForPath')
-			->willReturn($this->davFolder);
-
-		/** @var ISearchQuery|null $receivedQuery */
-		$receivedQuery = null;
-		$this->searchFolder
-			->method('search')
-			->willReturnCallback(function ($query) use (&$receivedQuery) {
-				$receivedQuery = $query;
-				return [
-					new \OC\Files\Node\Folder($this->rootFolder, $this->view, '/test/path'),
-				];
-			});
-
-		$query = $this->getBasicQuery(Operator::OPERATION_EQUAL, FilesPlugin::OWNER_ID_PROPERTYNAME, $this->user->getUID());
-		$this->search->search($query);
-
-		$this->assertNotNull($receivedQuery);
-		$this->assertTrue($receivedQuery->limitToHome());
-
-		/** @var ISearchBinaryOperator $operator */
-		$operator = $receivedQuery->getSearchOperation();
-		$this->assertInstanceOf(ISearchBinaryOperator::class, $operator);
-		$this->assertEquals(ISearchBinaryOperator::OPERATOR_AND, $operator->getType());
-		$this->assertEmpty($operator->getArguments());
-	}
-
-	public function testSearchLimitOwnerNested(): void {
-		$this->tree->expects($this->any())
-			->method('getNodeForPath')
-			->willReturn($this->davFolder);
-
-		/** @var ISearchQuery|null $receivedQuery */
-		$receivedQuery = null;
-		$this->searchFolder
-			->method('search')
-			->willReturnCallback(function ($query) use (&$receivedQuery) {
-				$receivedQuery = $query;
-				return [
-					new \OC\Files\Node\Folder($this->rootFolder, $this->view, '/test/path'),
-				];
-			});
-
-		$query = $this->getBasicQuery(Operator::OPERATION_EQUAL, FilesPlugin::OWNER_ID_PROPERTYNAME, $this->user->getUID());
-		$query->where = new Operator(
-			Operator::OPERATION_AND,
-			[
-				new Operator(
-					Operator::OPERATION_EQUAL,
-					[new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), new Literal('image/png')]
-				),
-				new Operator(
-					Operator::OPERATION_EQUAL,
-					[new SearchPropertyDefinition(FilesPlugin::OWNER_ID_PROPERTYNAME, true, true, true), new Literal($this->user->getUID())]
-				),
-			]
-		);
-		$this->search->search($query);
-
-		$this->assertNotNull($receivedQuery);
-		$this->assertTrue($receivedQuery->limitToHome());
-
-		/** @var ISearchBinaryOperator $operator */
-		$operator = $receivedQuery->getSearchOperation();
-		$this->assertInstanceOf(ISearchBinaryOperator::class, $operator);
-		$this->assertEquals(ISearchBinaryOperator::OPERATOR_AND, $operator->getType());
-		$this->assertCount(2, $operator->getArguments());
-
-		/** @var ISearchBinaryOperator $operator */
-		$operator = $operator->getArguments()[1];
-		$this->assertInstanceOf(ISearchBinaryOperator::class, $operator);
-		$this->assertEquals(ISearchBinaryOperator::OPERATOR_AND, $operator->getType());
-		$this->assertEmpty($operator->getArguments());
-	}
-
-	public function testSearchOperatorLimit(): void {
-		$this->tree->expects($this->any())
-			->method('getNodeForPath')
-			->willReturn($this->davFolder);
-
-		$innerOperator = new Operator(
-			Operator::OPERATION_EQUAL,
-			[new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), new Literal('image/png')]
-		);
-		// 5 child operators
-		$level1Operator = new Operator(
-			Operator::OPERATION_AND,
-			[
-				$innerOperator,
-				$innerOperator,
-				$innerOperator,
-				$innerOperator,
-				$innerOperator,
-			]
-		);
-		// 5^2 = 25 child operators
-		$level2Operator = new Operator(
-			Operator::OPERATION_AND,
-			[
-				$level1Operator,
-				$level1Operator,
-				$level1Operator,
-				$level1Operator,
-				$level1Operator,
-			]
-		);
-		// 5^3 = 125 child operators
-		$level3Operator = new Operator(
-			Operator::OPERATION_AND,
-			[
-				$level2Operator,
-				$level2Operator,
-				$level2Operator,
-				$level2Operator,
-				$level2Operator,
-			]
-		);
-
-		$query = $this->getBasicQuery(Operator::OPERATION_EQUAL, FilesPlugin::OWNER_ID_PROPERTYNAME, $this->user->getUID());
-		$query->where = $level3Operator;
-		$this->expectException(\InvalidArgumentException::class);
-		$this->search->search($query);
-	}
-
-	public function testPreloadPropertyFor(): void {
-		$node1 = $this->createMock(File::class);
-		$node2 = $this->createMock(Directory::class);
-		$nodes = [$node1, $node2];
-		$requestProperties = ['{DAV:}getcontenttype', '{DAV:}getlastmodified'];
-
-		$this->server->expects($this->once())
-			->method('emit')
-			->with('preloadProperties', [$nodes, $requestProperties]);
-
-		$this->search->preloadPropertyFor($nodes, $requestProperties);
-	}
+    private ObjectTree&MockObject $tree;
+    private Server&MockObject $server;
+    private IUser&MockObject $user;
+    private IRootFolder&MockObject $rootFolder;
+    private IManager&MockObject $shareManager;
+    private View&MockObject $view;
+    private Folder&MockObject $searchFolder;
+    private Directory&MockObject $davFolder;
+    private FileSearchBackend $search;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->user = $this->createMock(IUser::class);
+        $this->user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('test');
+
+        $this->tree = $this->createMock(ObjectTree::class);
+        $this->server = $this->createMock(Server::class);
+        $this->view = $this->createMock(View::class);
+        $this->rootFolder = $this->createMock(IRootFolder::class);
+        $this->shareManager = $this->createMock(IManager::class);
+        $this->searchFolder = $this->createMock(Folder::class);
+        $fileInfo = $this->createMock(FileInfo::class);
+        $this->davFolder = $this->createMock(Directory::class);
+
+        $this->view->expects($this->any())
+            ->method('getRoot')
+            ->willReturn('');
+
+        $this->view->expects($this->any())
+            ->method('getRelativePath')
+            ->willReturnArgument(0);
+
+        $this->davFolder->expects($this->any())
+            ->method('getFileInfo')
+            ->willReturn($fileInfo);
+
+        $this->rootFolder->expects($this->any())
+            ->method('get')
+            ->willReturn($this->searchFolder);
+
+        $filesMetadataManager = $this->createMock(IFilesMetadataManager::class);
+
+        $this->search = new FileSearchBackend($this->server, $this->tree, $this->user, $this->rootFolder, $this->shareManager, $this->view, $filesMetadataManager);
+    }
+
+    public function testSearchFilename(): void {
+        $this->tree->expects($this->any())
+            ->method('getNodeForPath')
+            ->willReturn($this->davFolder);
+
+        $this->searchFolder->expects($this->once())
+            ->method('search')
+            ->with(new SearchQuery(
+                new SearchComparison(
+                    ISearchComparison::COMPARE_EQUAL,
+                    'name',
+                    'foo'
+                ),
+                0,
+                0,
+                [],
+                $this->user
+            ))
+            ->willReturn([
+                new \OC\Files\Node\Folder($this->rootFolder, $this->view, '/test/path'),
+            ]);
+
+        $query = $this->getBasicQuery(Operator::OPERATION_EQUAL, '{DAV:}displayname', 'foo');
+        $result = $this->search->search($query);
+
+        $this->assertCount(1, $result);
+        $this->assertEquals('/files/test/test/path', $result[0]->href);
+    }
+
+    public function testSearchMimetype(): void {
+        $this->tree->expects($this->any())
+            ->method('getNodeForPath')
+            ->willReturn($this->davFolder);
+
+        $this->searchFolder->expects($this->once())
+            ->method('search')
+            ->with(new SearchQuery(
+                new SearchComparison(
+                    ISearchComparison::COMPARE_EQUAL,
+                    'mimetype',
+                    'foo'
+                ),
+                0,
+                0,
+                [],
+                $this->user
+            ))
+            ->willReturn([
+                new \OC\Files\Node\Folder($this->rootFolder, $this->view, '/test/path'),
+            ]);
+
+        $query = $this->getBasicQuery(Operator::OPERATION_EQUAL, '{DAV:}getcontenttype', 'foo');
+        $result = $this->search->search($query);
+
+        $this->assertCount(1, $result);
+        $this->assertEquals('/files/test/test/path', $result[0]->href);
+    }
+
+    public function testSearchSize(): void {
+        $this->tree->expects($this->any())
+            ->method('getNodeForPath')
+            ->willReturn($this->davFolder);
+
+        $this->searchFolder->expects($this->once())
+            ->method('search')
+            ->with(new SearchQuery(
+                new SearchComparison(
+                    ISearchComparison::COMPARE_GREATER_THAN,
+                    'size',
+                    10
+                ),
+                0,
+                0,
+                [],
+                $this->user
+            ))
+            ->willReturn([
+                new \OC\Files\Node\Folder($this->rootFolder, $this->view, '/test/path'),
+            ]);
+
+        $query = $this->getBasicQuery(Operator::OPERATION_GREATER_THAN, FilesPlugin::SIZE_PROPERTYNAME, 10);
+        $result = $this->search->search($query);
+
+        $this->assertCount(1, $result);
+        $this->assertEquals('/files/test/test/path', $result[0]->href);
+    }
+
+    public function testSearchMtime(): void {
+        $this->tree->expects($this->any())
+            ->method('getNodeForPath')
+            ->willReturn($this->davFolder);
+
+        $this->searchFolder->expects($this->once())
+            ->method('search')
+            ->with(new SearchQuery(
+                new SearchComparison(
+                    ISearchComparison::COMPARE_GREATER_THAN,
+                    'mtime',
+                    10
+                ),
+                0,
+                0,
+                [],
+                $this->user
+            ))
+            ->willReturn([
+                new \OC\Files\Node\Folder($this->rootFolder, $this->view, '/test/path'),
+            ]);
+
+        $query = $this->getBasicQuery(Operator::OPERATION_GREATER_THAN, '{DAV:}getlastmodified', 10);
+        $result = $this->search->search($query);
+
+        $this->assertCount(1, $result);
+        $this->assertEquals('/files/test/test/path', $result[0]->href);
+    }
+
+    public function testSearchIsCollection(): void {
+        $this->tree->expects($this->any())
+            ->method('getNodeForPath')
+            ->willReturn($this->davFolder);
+
+        $this->searchFolder->expects($this->once())
+            ->method('search')
+            ->with(new SearchQuery(
+                new SearchComparison(
+                    ISearchComparison::COMPARE_EQUAL,
+                    'mimetype',
+                    FileInfo::MIMETYPE_FOLDER
+                ),
+                0,
+                0,
+                [],
+                $this->user
+            ))
+            ->willReturn([
+                new \OC\Files\Node\Folder($this->rootFolder, $this->view, '/test/path'),
+            ]);
+
+        $query = $this->getBasicQuery(Operator::OPERATION_IS_COLLECTION, 'yes');
+        $result = $this->search->search($query);
+
+        $this->assertCount(1, $result);
+        $this->assertEquals('/files/test/test/path', $result[0]->href);
+    }
+
+
+    public function testSearchInvalidProp(): void {
+        $this->expectException(\InvalidArgumentException::class);
+
+        $this->tree->expects($this->any())
+            ->method('getNodeForPath')
+            ->willReturn($this->davFolder);
+
+        $this->searchFolder->expects($this->never())
+            ->method('search');
+
+        $query = $this->getBasicQuery(Operator::OPERATION_EQUAL, '{DAV:}getetag', 'foo');
+        $this->search->search($query);
+    }
+
+    private function getBasicQuery(string $type, string $property, int|string|null $value = null) {
+        $scope = new Scope('/', 'infinite');
+        $scope->path = '/';
+        $from = [$scope];
+        $orderBy = [];
+        $select = [];
+        if (is_null($value)) {
+            $where = new Operator(
+                $type,
+                [new Literal($property)]
+            );
+        } else {
+            $where = new Operator(
+                $type,
+                [new SearchPropertyDefinition($property, true, true, true), new Literal($value)]
+            );
+        }
+        $limit = new Limit();
+
+        return new Query($select, $from, $where, $orderBy, $limit);
+    }
+
+
+    public function testSearchNonFolder(): void {
+        $this->expectException(\InvalidArgumentException::class);
+
+        $davNode = $this->createMock(File::class);
+
+        $this->tree->expects($this->any())
+            ->method('getNodeForPath')
+            ->willReturn($davNode);
+
+        $query = $this->getBasicQuery(Operator::OPERATION_EQUAL, '{DAV:}displayname', 'foo');
+        $this->search->search($query);
+    }
+
+    public function testSearchLimitOwnerBasic(): void {
+        $this->tree->expects($this->any())
+            ->method('getNodeForPath')
+            ->willReturn($this->davFolder);
+
+        /** @var ISearchQuery|null $receivedQuery */
+        $receivedQuery = null;
+        $this->searchFolder
+            ->method('search')
+            ->willReturnCallback(function ($query) use (&$receivedQuery) {
+                $receivedQuery = $query;
+                return [
+                    new \OC\Files\Node\Folder($this->rootFolder, $this->view, '/test/path'),
+                ];
+            });
+
+        $query = $this->getBasicQuery(Operator::OPERATION_EQUAL, FilesPlugin::OWNER_ID_PROPERTYNAME, $this->user->getUID());
+        $this->search->search($query);
+
+        $this->assertNotNull($receivedQuery);
+        $this->assertTrue($receivedQuery->limitToHome());
+
+        /** @var ISearchBinaryOperator $operator */
+        $operator = $receivedQuery->getSearchOperation();
+        $this->assertInstanceOf(ISearchBinaryOperator::class, $operator);
+        $this->assertEquals(ISearchBinaryOperator::OPERATOR_AND, $operator->getType());
+        $this->assertEmpty($operator->getArguments());
+    }
+
+    public function testSearchLimitOwnerNested(): void {
+        $this->tree->expects($this->any())
+            ->method('getNodeForPath')
+            ->willReturn($this->davFolder);
+
+        /** @var ISearchQuery|null $receivedQuery */
+        $receivedQuery = null;
+        $this->searchFolder
+            ->method('search')
+            ->willReturnCallback(function ($query) use (&$receivedQuery) {
+                $receivedQuery = $query;
+                return [
+                    new \OC\Files\Node\Folder($this->rootFolder, $this->view, '/test/path'),
+                ];
+            });
+
+        $query = $this->getBasicQuery(Operator::OPERATION_EQUAL, FilesPlugin::OWNER_ID_PROPERTYNAME, $this->user->getUID());
+        $query->where = new Operator(
+            Operator::OPERATION_AND,
+            [
+                new Operator(
+                    Operator::OPERATION_EQUAL,
+                    [new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), new Literal('image/png')]
+                ),
+                new Operator(
+                    Operator::OPERATION_EQUAL,
+                    [new SearchPropertyDefinition(FilesPlugin::OWNER_ID_PROPERTYNAME, true, true, true), new Literal($this->user->getUID())]
+                ),
+            ]
+        );
+        $this->search->search($query);
+
+        $this->assertNotNull($receivedQuery);
+        $this->assertTrue($receivedQuery->limitToHome());
+
+        /** @var ISearchBinaryOperator $operator */
+        $operator = $receivedQuery->getSearchOperation();
+        $this->assertInstanceOf(ISearchBinaryOperator::class, $operator);
+        $this->assertEquals(ISearchBinaryOperator::OPERATOR_AND, $operator->getType());
+        $this->assertCount(2, $operator->getArguments());
+
+        /** @var ISearchBinaryOperator $operator */
+        $operator = $operator->getArguments()[1];
+        $this->assertInstanceOf(ISearchBinaryOperator::class, $operator);
+        $this->assertEquals(ISearchBinaryOperator::OPERATOR_AND, $operator->getType());
+        $this->assertEmpty($operator->getArguments());
+    }
+
+    public function testSearchOperatorLimit(): void {
+        $this->tree->expects($this->any())
+            ->method('getNodeForPath')
+            ->willReturn($this->davFolder);
+
+        $innerOperator = new Operator(
+            Operator::OPERATION_EQUAL,
+            [new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), new Literal('image/png')]
+        );
+        // 5 child operators
+        $level1Operator = new Operator(
+            Operator::OPERATION_AND,
+            [
+                $innerOperator,
+                $innerOperator,
+                $innerOperator,
+                $innerOperator,
+                $innerOperator,
+            ]
+        );
+        // 5^2 = 25 child operators
+        $level2Operator = new Operator(
+            Operator::OPERATION_AND,
+            [
+                $level1Operator,
+                $level1Operator,
+                $level1Operator,
+                $level1Operator,
+                $level1Operator,
+            ]
+        );
+        // 5^3 = 125 child operators
+        $level3Operator = new Operator(
+            Operator::OPERATION_AND,
+            [
+                $level2Operator,
+                $level2Operator,
+                $level2Operator,
+                $level2Operator,
+                $level2Operator,
+            ]
+        );
+
+        $query = $this->getBasicQuery(Operator::OPERATION_EQUAL, FilesPlugin::OWNER_ID_PROPERTYNAME, $this->user->getUID());
+        $query->where = $level3Operator;
+        $this->expectException(\InvalidArgumentException::class);
+        $this->search->search($query);
+    }
+
+    public function testPreloadPropertyFor(): void {
+        $node1 = $this->createMock(File::class);
+        $node2 = $this->createMock(Directory::class);
+        $nodes = [$node1, $node2];
+        $requestProperties = ['{DAV:}getcontenttype', '{DAV:}getlastmodified'];
+
+        $this->server->expects($this->once())
+            ->method('emit')
+            ->with('preloadProperties', [$nodes, $requestProperties]);
+
+        $this->search->preloadPropertyFor($nodes, $requestProperties);
+    }
 }