Avoid duplicate queries and limit depth by default to 0

Signed-off-by: Julius Härtl <jus@bitgrid.net>

1 files changed, 24 insertions, 27 deletions

diff --git a/lib/DAV/WorkspacePlugin.php b/lib/DAV/WorkspacePlugin.php
index b4019c6f1..2967833f6 100644
--- a/lib/DAV/WorkspacePlugin.php
+++ b/lib/DAV/WorkspacePlugin.php
@@ -84,6 +84,11 @@ class WorkspacePlugin extends ServerPlugin {
 
 
 	public function propFind(PropFind $propFind, INode $node) {
+		if (!in_array(self::WORKSPACE_PROPERTY, $propFind->getRequestedProperties())
+			&& !in_array(self::WORKSPACE_FILE_PROPERTY, $propFind->getRequestedProperties())) {
+			return;
+		}
+
 		if (!$node instanceof Directory && !$node instanceof FilesHome) {
 			return;
 		}
@@ -95,37 +100,29 @@ class WorkspacePlugin extends ServerPlugin {
 			return;
 		}
 
+		$file = null;
+		$owner = $this->userId ?? $node->getFileInfo()->getStorage()->getOwner('');
+		/** @var Folder[] $nodes */
+		$nodes = $this->rootFolder->getUserFolder($owner)->getById($node->getId());
+		if (count($nodes) > 0) {
+			/** @var File $file */
+			try {
+				$file = $this->workspaceService->getFile($nodes[0]);
+			} catch (StorageNotAvailableException $e) {
+				// If a storage is not available we can for the propfind response assume that there is no rich workspace present
+			}
+		}
+
 		// Only return the property for the parent node and ignore it for further in depth nodes
-		$propFind->handle(self::WORKSPACE_PROPERTY, function () use ($node) {
-			$owner = $this->userId ?? $node->getFileInfo()->getStorage()->getOwner('');
-			/** @var Folder[] $nodes */
-			$nodes = $this->rootFolder->getUserFolder($owner)->getById($node->getId());
-			if (count($nodes) > 0) {
-				/** @var File $file */
-				try {
-					$file = $this->workspaceService->getFile($nodes[0]);
-					if ($file instanceof File) {
-						return $file->getContent();
-					}
-				} catch (StorageNotAvailableException $e) {
-					// If a storage is not available we can for the propfind response assume that there is no rich workspace present
-				}
+		$propFind->handle(self::WORKSPACE_PROPERTY, function () use ($file) {
+			if ($file instanceof File) {
+				return $file->getContent();
 			}
 			return '';
 		});
-		$propFind->handle(self::WORKSPACE_FILE_PROPERTY, function () use ($node) {
-			/** @var Folder[] $nodes */
-			$nodes = $this->rootFolder->getUserFolder($this->userId)->getById($node->getId());
-			if (count($nodes) > 0) {
-				/** @var File $file */
-				try {
-					$file = $this->workspaceService->getFile($nodes[0]);
-					if ($file instanceof File) {
-						return $file->getFileInfo()->getId();
-					}
-				} catch (StorageNotAvailableException $e) {
-					// If a storage is not available we can for the propfind response assume that there is no rich workspace present
-				}
+		$propFind->handle(self::WORKSPACE_FILE_PROPERTY, function () use ($file) {
+			if ($file instanceof File) {
+				return $file->getFileInfo()->getId();
 			}
 			return '';
 		});