nextcloud / server

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

Indentation +543 added lines, -543 removed lines

@@ -57,547 +57,547 @@
 
 class FilesPlugin extends ServerPlugin {
 
-	// namespace
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	public const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
-	public const FILEID_PROPERTYNAME = '{http://owncloud.org/ns}id';
-	public const INTERNAL_FILEID_PROPERTYNAME = '{http://owncloud.org/ns}fileid';
-	public const PERMISSIONS_PROPERTYNAME = '{http://owncloud.org/ns}permissions';
-	public const SHARE_PERMISSIONS_PROPERTYNAME = '{http://open-collaboration-services.org/ns}share-permissions';
-	public const OCM_SHARE_PERMISSIONS_PROPERTYNAME = '{http://open-cloud-mesh.org/ns}share-permissions';
-	public const SHARE_ATTRIBUTES_PROPERTYNAME = '{http://nextcloud.org/ns}share-attributes';
-	public const DOWNLOADURL_PROPERTYNAME = '{http://owncloud.org/ns}downloadURL';
-	public const SIZE_PROPERTYNAME = '{http://owncloud.org/ns}size';
-	public const GETETAG_PROPERTYNAME = '{DAV:}getetag';
-	public const LASTMODIFIED_PROPERTYNAME = '{DAV:}lastmodified';
-	public const CREATIONDATE_PROPERTYNAME = '{DAV:}creationdate';
-	public const DISPLAYNAME_PROPERTYNAME = '{DAV:}displayname';
-	public const OWNER_ID_PROPERTYNAME = '{http://owncloud.org/ns}owner-id';
-	public const OWNER_DISPLAY_NAME_PROPERTYNAME = '{http://owncloud.org/ns}owner-display-name';
-	public const CHECKSUMS_PROPERTYNAME = '{http://owncloud.org/ns}checksums';
-	public const DATA_FINGERPRINT_PROPERTYNAME = '{http://owncloud.org/ns}data-fingerprint';
-	public const HAS_PREVIEW_PROPERTYNAME = '{http://nextcloud.org/ns}has-preview';
-	public const MOUNT_TYPE_PROPERTYNAME = '{http://nextcloud.org/ns}mount-type';
-	public const IS_ENCRYPTED_PROPERTYNAME = '{http://nextcloud.org/ns}is-encrypted';
-	public const METADATA_ETAG_PROPERTYNAME = '{http://nextcloud.org/ns}metadata_etag';
-	public const UPLOAD_TIME_PROPERTYNAME = '{http://nextcloud.org/ns}upload_time';
-	public const CREATION_TIME_PROPERTYNAME = '{http://nextcloud.org/ns}creation_time';
-	public const SHARE_NOTE = '{http://nextcloud.org/ns}note';
-	public const SUBFOLDER_COUNT_PROPERTYNAME = '{http://nextcloud.org/ns}contained-folder-count';
-	public const SUBFILE_COUNT_PROPERTYNAME = '{http://nextcloud.org/ns}contained-file-count';
-	public const FILE_METADATA_SIZE = '{http://nextcloud.org/ns}file-metadata-size';
-
-	/** Reference to main server object */
-	private ?Server $server = null;
-	private Tree $tree;
-	private IUserSession $userSession;
-
-	/**
-	 * Whether this is public webdav.
-	 * If true, some returned information will be stripped off.
-	 */
-	private bool $isPublic;
-	private bool $downloadAttachment;
-	private IConfig $config;
-	private IRequest $request;
-	private IPreview $previewManager;
-
-	public function __construct(Tree $tree,
-								IConfig $config,
-								IRequest $request,
-								IPreview $previewManager,
-								IUserSession $userSession,
-								bool $isPublic = false,
-								bool $downloadAttachment = true) {
-		$this->tree = $tree;
-		$this->config = $config;
-		$this->request = $request;
-		$this->userSession = $userSession;
-		$this->isPublic = $isPublic;
-		$this->downloadAttachment = $downloadAttachment;
-		$this->previewManager = $previewManager;
-	}
-
-	/**
-	 * 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.
-	 *
-	 * @return void
-	 */
-	public function initialize(Server $server) {
-		$server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
-		$server->xml->namespaceMap[self::NS_NEXTCLOUD] = 'nc';
-		$server->protectedProperties[] = self::FILEID_PROPERTYNAME;
-		$server->protectedProperties[] = self::INTERNAL_FILEID_PROPERTYNAME;
-		$server->protectedProperties[] = self::PERMISSIONS_PROPERTYNAME;
-		$server->protectedProperties[] = self::SHARE_PERMISSIONS_PROPERTYNAME;
-		$server->protectedProperties[] = self::OCM_SHARE_PERMISSIONS_PROPERTYNAME;
-		$server->protectedProperties[] = self::SHARE_ATTRIBUTES_PROPERTYNAME;
-		$server->protectedProperties[] = self::SIZE_PROPERTYNAME;
-		$server->protectedProperties[] = self::DOWNLOADURL_PROPERTYNAME;
-		$server->protectedProperties[] = self::OWNER_ID_PROPERTYNAME;
-		$server->protectedProperties[] = self::OWNER_DISPLAY_NAME_PROPERTYNAME;
-		$server->protectedProperties[] = self::CHECKSUMS_PROPERTYNAME;
-		$server->protectedProperties[] = self::DATA_FINGERPRINT_PROPERTYNAME;
-		$server->protectedProperties[] = self::HAS_PREVIEW_PROPERTYNAME;
-		$server->protectedProperties[] = self::MOUNT_TYPE_PROPERTYNAME;
-		$server->protectedProperties[] = self::IS_ENCRYPTED_PROPERTYNAME;
-		$server->protectedProperties[] = self::SHARE_NOTE;
-
-		// normally these cannot be changed (RFC4918), but we want them modifiable through PROPPATCH
-		$allowedProperties = ['{DAV:}getetag'];
-		$server->protectedProperties = array_diff($server->protectedProperties, $allowedProperties);
-
-		$this->server = $server;
-		$this->server->on('propFind', [$this, 'handleGetProperties']);
-		$this->server->on('propPatch', [$this, 'handleUpdateProperties']);
-		$this->server->on('afterBind', [$this, 'sendFileIdHeader']);
-		$this->server->on('afterWriteContent', [$this, 'sendFileIdHeader']);
-		$this->server->on('afterMethod:GET', [$this,'httpGet']);
-		$this->server->on('afterMethod:GET', [$this, 'handleDownloadToken']);
-		$this->server->on('afterResponse', function ($request, ResponseInterface $response) {
-			$body = $response->getBody();
-			if (is_resource($body)) {
-				fclose($body);
-			}
-		});
-		$this->server->on('beforeMove', [$this, 'checkMove']);
-	}
-
-	/**
-	 * Plugin that checks if a move can actually be performed.
-	 *
-	 * @param string $source source path
-	 * @param string $destination destination path
-	 * @throws Forbidden
-	 * @throws NotFound
-	 */
-	public function checkMove($source, $destination) {
-		$sourceNode = $this->tree->getNodeForPath($source);
-		if (!$sourceNode instanceof Node) {
-			return;
-		}
-		[$sourceDir,] = \Sabre\Uri\split($source);
-		[$destinationDir,] = \Sabre\Uri\split($destination);
-
-		if ($sourceDir !== $destinationDir) {
-			$sourceNodeFileInfo = $sourceNode->getFileInfo();
-			if ($sourceNodeFileInfo === null) {
-				throw new NotFound($source . ' does not exist');
-			}
-
-			if (!$sourceNodeFileInfo->isDeletable()) {
-				throw new Forbidden($source . " cannot be deleted");
-			}
-		}
-	}
-
-	/**
-	 * This sets a cookie to be able to recognize the start of the download
-	 * the content must not be longer than 32 characters and must only contain
-	 * alphanumeric characters
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 */
-	public function handleDownloadToken(RequestInterface $request, ResponseInterface $response) {
-		$queryParams = $request->getQueryParameters();
-
-		/**
-		 * this sets a cookie to be able to recognize the start of the download
-		 * the content must not be longer than 32 characters and must only contain
-		 * alphanumeric characters
-		 */
-		if (isset($queryParams['downloadStartSecret'])) {
-			$token = $queryParams['downloadStartSecret'];
-			if (!isset($token[32])
-				&& preg_match('!^[a-zA-Z0-9]+$!', $token) === 1) {
-				// FIXME: use $response->setHeader() instead
-				setcookie('ocDownloadStarted', $token, time() + 20, '/');
-			}
-		}
-	}
-
-	/**
-	 * Add headers to file download
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 */
-	public function httpGet(RequestInterface $request, ResponseInterface $response) {
-		// Only handle valid files
-		$node = $this->tree->getNodeForPath($request->getPath());
-		if (!($node instanceof IFile)) {
-			return;
-		}
-
-		// adds a 'Content-Disposition: attachment' header in case no disposition
-		// header has been set before
-		if ($this->downloadAttachment &&
-			$response->getHeader('Content-Disposition') === null) {
-			$filename = $node->getName();
-			if ($this->request->isUserAgent(
-				[
-					Request::USER_AGENT_IE,
-					Request::USER_AGENT_ANDROID_MOBILE_CHROME,
-					Request::USER_AGENT_FREEBOX,
-				])) {
-				$response->addHeader('Content-Disposition', 'attachment; filename="' . rawurlencode($filename) . '"');
-			} else {
-				$response->addHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . rawurlencode($filename)
-													 . '; filename="' . rawurlencode($filename) . '"');
-			}
-		}
-
-		if ($node instanceof \OCA\DAV\Connector\Sabre\File) {
-			//Add OC-Checksum header
-			$checksum = $node->getChecksum();
-			if ($checksum !== null && $checksum !== '') {
-				$response->addHeader('OC-Checksum', $checksum);
-			}
-		}
-		$response->addHeader('X-Accel-Buffering', 'no');
-	}
-
-	/**
-	 * Adds all ownCloud-specific properties
-	 *
-	 * @param PropFind $propFind
-	 * @param \Sabre\DAV\INode $node
-	 * @return void
-	 */
-	public function handleGetProperties(PropFind $propFind, \Sabre\DAV\INode $node) {
-		$httpRequest = $this->server->httpRequest;
-
-		if ($node instanceof \OCA\DAV\Connector\Sabre\Node) {
-			/**
-			 * This was disabled, because it made dir listing throw an exception,
-			 * so users were unable to navigate into folders where one subitem
-			 * is blocked by the files_accesscontrol app, see:
-			 * https://github.com/nextcloud/files_accesscontrol/issues/65
-			 * if (!$node->getFileInfo()->isReadable()) {
-			 *     // avoid detecting files through this means
-			 *     throw new NotFound();
-			 * }
-			 */
-
-			$propFind->handle(self::FILEID_PROPERTYNAME, function () use ($node) {
-				return $node->getFileId();
-			});
-
-			$propFind->handle(self::INTERNAL_FILEID_PROPERTYNAME, function () use ($node) {
-				return $node->getInternalFileId();
-			});
-
-			$propFind->handle(self::PERMISSIONS_PROPERTYNAME, function () use ($node) {
-				$perms = $node->getDavPermissions();
-				if ($this->isPublic) {
-					// remove mount information
-					$perms = str_replace(['S', 'M'], '', $perms);
-				}
-				return $perms;
-			});
-
-			$propFind->handle(self::SHARE_PERMISSIONS_PROPERTYNAME, function () use ($node, $httpRequest) {
-				$user = $this->userSession->getUser();
-				if ($user === null) {
-					return null;
-				}
-				return $node->getSharePermissions(
-					$user->getUID()
-				);
-			});
-
-			$propFind->handle(self::OCM_SHARE_PERMISSIONS_PROPERTYNAME, function () use ($node, $httpRequest): ?string {
-				$user = $this->userSession->getUser();
-				if ($user === null) {
-					return null;
-				}
-				$ncPermissions = $node->getSharePermissions(
-					$user->getUID()
-				);
-				$ocmPermissions = $this->ncPermissions2ocmPermissions($ncPermissions);
-				return json_encode($ocmPermissions, JSON_THROW_ON_ERROR);
-			});
-
-			$propFind->handle(self::SHARE_ATTRIBUTES_PROPERTYNAME, function () use ($node, $httpRequest) {
-				return json_encode($node->getShareAttributes(), JSON_THROW_ON_ERROR);
-			});
-
-			$propFind->handle(self::GETETAG_PROPERTYNAME, function () use ($node): string {
-				return $node->getETag();
-			});
-
-			$propFind->handle(self::OWNER_ID_PROPERTYNAME, function () use ($node): ?string {
-				$owner = $node->getOwner();
-				if (!$owner) {
-					return null;
-				} else {
-					return $owner->getUID();
-				}
-			});
-			$propFind->handle(self::OWNER_DISPLAY_NAME_PROPERTYNAME, function () use ($node): ?string {
-				$owner = $node->getOwner();
-				if (!$owner) {
-					return null;
-				} else {
-					return $owner->getDisplayName();
-				}
-			});
-
-			$propFind->handle(self::HAS_PREVIEW_PROPERTYNAME, function () use ($node) {
-				return json_encode($this->previewManager->isAvailable($node->getFileInfo()), JSON_THROW_ON_ERROR);
-			});
-			$propFind->handle(self::SIZE_PROPERTYNAME, function () use ($node): ?int {
-				return $node->getSize();
-			});
-			$propFind->handle(self::MOUNT_TYPE_PROPERTYNAME, function () use ($node) {
-				return $node->getFileInfo()->getMountPoint()->getMountType();
-			});
-
-			$propFind->handle(self::SHARE_NOTE, function () use ($node, $httpRequest): ?string {
-				$user = $this->userSession->getUser();
-				if ($user === null) {
-					return null;
-				}
-				return $node->getNoteFromShare(
-					$user->getUID()
-				);
-			});
-
-			$propFind->handle(self::DATA_FINGERPRINT_PROPERTYNAME, function () use ($node) {
-				return $this->config->getSystemValue('data-fingerprint', '');
-			});
-			$propFind->handle(self::CREATIONDATE_PROPERTYNAME, function () use ($node) {
-				return (new \DateTimeImmutable())
-					->setTimestamp($node->getFileInfo()->getCreationTime())
-					->format(\DateTimeInterface::ATOM);
-			});
-			$propFind->handle(self::CREATION_TIME_PROPERTYNAME, function () use ($node) {
-				return $node->getFileInfo()->getCreationTime();
-			});
-			/**
-			 * Return file/folder name as displayname. The primary reason to
-			 * implement it this way is to avoid costly fallback to 
-			 * CustomPropertiesBackend (esp. visible when querying all files
-			 * in a folder).
-			 */
-			$propFind->handle(self::DISPLAYNAME_PROPERTYNAME, function () use ($node) {
-				return $node->getName();
-			});
-		}
-
-		if ($node instanceof \OCA\DAV\Connector\Sabre\File) {
-			$propFind->handle(self::DOWNLOADURL_PROPERTYNAME, function () use ($node) {
-				try {
-					$directDownloadUrl = $node->getDirectDownload();
-					if (isset($directDownloadUrl['url'])) {
-						return $directDownloadUrl['url'];
-					}
-				} catch (StorageNotAvailableException $e) {
-					return false;
-				} catch (ForbiddenException $e) {
-					return false;
-				}
-				return false;
-			});
-
-			$propFind->handle(self::CHECKSUMS_PROPERTYNAME, function () use ($node) {
-				$checksum = $node->getChecksum();
-				if ($checksum === null || $checksum === '') {
-					return null;
-				}
-
-				return new ChecksumList($checksum);
-			});
-
-			$propFind->handle(self::UPLOAD_TIME_PROPERTYNAME, function () use ($node) {
-				return $node->getFileInfo()->getUploadTime();
-			});
-
-			if ($this->config->getSystemValueBool('enable_file_metadata', true)) {
-				$propFind->handle(self::FILE_METADATA_SIZE, function () use ($node) {
-					if (!str_starts_with($node->getFileInfo()->getMimetype(), 'image')) {
-						return json_encode((object)[], JSON_THROW_ON_ERROR);
-					}
-
-					if ($node->hasMetadata('size')) {
-						$sizeMetadata = $node->getMetadata('size');
-					} else {
-						// This code path should not be called since we try to preload
-						// the metadata when loading the folder or the search results
-						// in one go
-						$metadataManager = \OC::$server->get(IMetadataManager::class);
-						$sizeMetadata = $metadataManager->fetchMetadataFor('size', [$node->getId()])[$node->getId()];
-
-						// TODO would be nice to display this in the profiler...
-						\OC::$server->get(LoggerInterface::class)->debug('Inefficient fetching of metadata');
-					}
-
-					return json_encode((object)$sizeMetadata->getMetadata(), JSON_THROW_ON_ERROR);
-				});
-			}
-		}
-
-		if ($node instanceof Directory) {
-			$propFind->handle(self::SIZE_PROPERTYNAME, function () use ($node) {
-				return $node->getSize();
-			});
-
-			$propFind->handle(self::IS_ENCRYPTED_PROPERTYNAME, function () use ($node) {
-				return $node->getFileInfo()->isEncrypted() ? '1' : '0';
-			});
-
-			$requestProperties = $propFind->getRequestedProperties();
-
-			// TODO detect dynamically which metadata groups are requested and
-			// preload all of them and not just size
-			if ($this->config->getSystemValueBool('enable_file_metadata', true)
-				&& in_array(self::FILE_METADATA_SIZE, $requestProperties, true)) {
-				// Preloading of the metadata
-				$fileIds = [];
-				foreach ($node->getChildren() as $child) {
-					/** @var \OCP\Files\Node|Node $child */
-					if (str_starts_with($child->getFileInfo()->getMimeType(), 'image/')) {
-						/** @var File $child */
-						$fileIds[] = $child->getFileInfo()->getId();
-					}
-				}
-				/** @var IMetaDataManager $metadataManager */
-				$metadataManager = \OC::$server->get(IMetadataManager::class);
-				$preloadedMetadata = $metadataManager->fetchMetadataFor('size', $fileIds);
-				foreach ($node->getChildren() as $child) {
-					/** @var \OCP\Files\Node|Node $child */
-					if (str_starts_with($child->getFileInfo()->getMimeType(), 'image')) {
-						/** @var File $child */
-						$child->setMetadata('size', $preloadedMetadata[$child->getFileInfo()->getId()]);
-					}
-				}
-			}
-
-			if (in_array(self::SUBFILE_COUNT_PROPERTYNAME, $requestProperties, true)
-				|| in_array(self::SUBFOLDER_COUNT_PROPERTYNAME, $requestProperties, true)) {
-				$nbFiles = 0;
-				$nbFolders = 0;
-				foreach ($node->getChildren() as $child) {
-					if ($child instanceof File) {
-						$nbFiles++;
-					} elseif ($child instanceof Directory) {
-						$nbFolders++;
-					}
-				}
-
-				$propFind->handle(self::SUBFILE_COUNT_PROPERTYNAME, $nbFiles);
-				$propFind->handle(self::SUBFOLDER_COUNT_PROPERTYNAME, $nbFolders);
-			}
-		}
-	}
-
-	/**
-	 * translate Nextcloud permissions to OCM Permissions
-	 *
-	 * @param $ncPermissions
-	 * @return array
-	 */
-	protected function ncPermissions2ocmPermissions($ncPermissions) {
-		$ocmPermissions = [];
-
-		if ($ncPermissions & Constants::PERMISSION_SHARE) {
-			$ocmPermissions[] = 'share';
-		}
-
-		if ($ncPermissions & Constants::PERMISSION_READ) {
-			$ocmPermissions[] = 'read';
-		}
-
-		if (($ncPermissions & Constants::PERMISSION_CREATE) ||
-			($ncPermissions & Constants::PERMISSION_UPDATE)) {
-			$ocmPermissions[] = 'write';
-		}
-
-		return $ocmPermissions;
-	}
-
-	/**
-	 * Update ownCloud-specific properties
-	 *
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 *
-	 * @return void
-	 */
-	public function handleUpdateProperties($path, PropPatch $propPatch) {
-		$node = $this->tree->getNodeForPath($path);
-		if (!($node instanceof \OCA\DAV\Connector\Sabre\Node)) {
-			return;
-		}
-
-		$propPatch->handle(self::LASTMODIFIED_PROPERTYNAME, function ($time) use ($node) {
-			if (empty($time)) {
-				return false;
-			}
-			$node->touch($time);
-			return true;
-		});
-		$propPatch->handle(self::GETETAG_PROPERTYNAME, function ($etag) use ($node) {
-			if (empty($etag)) {
-				return false;
-			}
-			return $node->setEtag($etag) !== -1;
-		});
-		$propPatch->handle(self::CREATIONDATE_PROPERTYNAME, function ($time) use ($node) {
-			if (empty($time)) {
-				return false;
-			}
-			$dateTime = new \DateTimeImmutable($time);
-			$node->setCreationTime($dateTime->getTimestamp());
-			return true;
-		});
-		$propPatch->handle(self::CREATION_TIME_PROPERTYNAME, function ($time) use ($node) {
-			if (empty($time)) {
-				return false;
-			}
-			$node->setCreationTime((int) $time);
-			return true;
-		});
-		/**
-		 * Disable modification of the displayname property for files and
-		 * folders via PROPPATCH. See PROPFIND for more information.
-		 */
-		$propPatch->handle(self::DISPLAYNAME_PROPERTYNAME, function ($displayName) {
-			return 403;
-		});
-	}
-
-	/**
-	 * @param string $filePath
-	 * @param \Sabre\DAV\INode $node
-	 * @throws \Sabre\DAV\Exception\BadRequest
-	 */
-	public function sendFileIdHeader($filePath, \Sabre\DAV\INode $node = null) {
-		// chunked upload handling
-		if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
-			[$path, $name] = \Sabre\Uri\split($filePath);
-			$info = \OC_FileChunking::decodeName($name);
-			if (!empty($info)) {
-				$filePath = $path . '/' . $info['name'];
-			}
-		}
-
-		// we get the node for the given $filePath here because in case of afterCreateFile $node is the parent folder
-		if (!$this->server->tree->nodeExists($filePath)) {
-			return;
-		}
-		$node = $this->server->tree->getNodeForPath($filePath);
-		if ($node instanceof \OCA\DAV\Connector\Sabre\Node) {
-			$fileId = $node->getFileId();
-			if (!is_null($fileId)) {
-				$this->server->httpResponse->setHeader('OC-FileId', $fileId);
-			}
-		}
-	}
+    // namespace
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
+    public const FILEID_PROPERTYNAME = '{http://owncloud.org/ns}id';
+    public const INTERNAL_FILEID_PROPERTYNAME = '{http://owncloud.org/ns}fileid';
+    public const PERMISSIONS_PROPERTYNAME = '{http://owncloud.org/ns}permissions';
+    public const SHARE_PERMISSIONS_PROPERTYNAME = '{http://open-collaboration-services.org/ns}share-permissions';
+    public const OCM_SHARE_PERMISSIONS_PROPERTYNAME = '{http://open-cloud-mesh.org/ns}share-permissions';
+    public const SHARE_ATTRIBUTES_PROPERTYNAME = '{http://nextcloud.org/ns}share-attributes';
+    public const DOWNLOADURL_PROPERTYNAME = '{http://owncloud.org/ns}downloadURL';
+    public const SIZE_PROPERTYNAME = '{http://owncloud.org/ns}size';
+    public const GETETAG_PROPERTYNAME = '{DAV:}getetag';
+    public const LASTMODIFIED_PROPERTYNAME = '{DAV:}lastmodified';
+    public const CREATIONDATE_PROPERTYNAME = '{DAV:}creationdate';
+    public const DISPLAYNAME_PROPERTYNAME = '{DAV:}displayname';
+    public const OWNER_ID_PROPERTYNAME = '{http://owncloud.org/ns}owner-id';
+    public const OWNER_DISPLAY_NAME_PROPERTYNAME = '{http://owncloud.org/ns}owner-display-name';
+    public const CHECKSUMS_PROPERTYNAME = '{http://owncloud.org/ns}checksums';
+    public const DATA_FINGERPRINT_PROPERTYNAME = '{http://owncloud.org/ns}data-fingerprint';
+    public const HAS_PREVIEW_PROPERTYNAME = '{http://nextcloud.org/ns}has-preview';
+    public const MOUNT_TYPE_PROPERTYNAME = '{http://nextcloud.org/ns}mount-type';
+    public const IS_ENCRYPTED_PROPERTYNAME = '{http://nextcloud.org/ns}is-encrypted';
+    public const METADATA_ETAG_PROPERTYNAME = '{http://nextcloud.org/ns}metadata_etag';
+    public const UPLOAD_TIME_PROPERTYNAME = '{http://nextcloud.org/ns}upload_time';
+    public const CREATION_TIME_PROPERTYNAME = '{http://nextcloud.org/ns}creation_time';
+    public const SHARE_NOTE = '{http://nextcloud.org/ns}note';
+    public const SUBFOLDER_COUNT_PROPERTYNAME = '{http://nextcloud.org/ns}contained-folder-count';
+    public const SUBFILE_COUNT_PROPERTYNAME = '{http://nextcloud.org/ns}contained-file-count';
+    public const FILE_METADATA_SIZE = '{http://nextcloud.org/ns}file-metadata-size';
+
+    /** Reference to main server object */
+    private ?Server $server = null;
+    private Tree $tree;
+    private IUserSession $userSession;
+
+    /**
+     * Whether this is public webdav.
+     * If true, some returned information will be stripped off.
+     */
+    private bool $isPublic;
+    private bool $downloadAttachment;
+    private IConfig $config;
+    private IRequest $request;
+    private IPreview $previewManager;
+
+    public function __construct(Tree $tree,
+                                IConfig $config,
+                                IRequest $request,
+                                IPreview $previewManager,
+                                IUserSession $userSession,
+                                bool $isPublic = false,
+                                bool $downloadAttachment = true) {
+        $this->tree = $tree;
+        $this->config = $config;
+        $this->request = $request;
+        $this->userSession = $userSession;
+        $this->isPublic = $isPublic;
+        $this->downloadAttachment = $downloadAttachment;
+        $this->previewManager = $previewManager;
+    }
+
+    /**
+     * 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.
+     *
+     * @return void
+     */
+    public function initialize(Server $server) {
+        $server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
+        $server->xml->namespaceMap[self::NS_NEXTCLOUD] = 'nc';
+        $server->protectedProperties[] = self::FILEID_PROPERTYNAME;
+        $server->protectedProperties[] = self::INTERNAL_FILEID_PROPERTYNAME;
+        $server->protectedProperties[] = self::PERMISSIONS_PROPERTYNAME;
+        $server->protectedProperties[] = self::SHARE_PERMISSIONS_PROPERTYNAME;
+        $server->protectedProperties[] = self::OCM_SHARE_PERMISSIONS_PROPERTYNAME;
+        $server->protectedProperties[] = self::SHARE_ATTRIBUTES_PROPERTYNAME;
+        $server->protectedProperties[] = self::SIZE_PROPERTYNAME;
+        $server->protectedProperties[] = self::DOWNLOADURL_PROPERTYNAME;
+        $server->protectedProperties[] = self::OWNER_ID_PROPERTYNAME;
+        $server->protectedProperties[] = self::OWNER_DISPLAY_NAME_PROPERTYNAME;
+        $server->protectedProperties[] = self::CHECKSUMS_PROPERTYNAME;
+        $server->protectedProperties[] = self::DATA_FINGERPRINT_PROPERTYNAME;
+        $server->protectedProperties[] = self::HAS_PREVIEW_PROPERTYNAME;
+        $server->protectedProperties[] = self::MOUNT_TYPE_PROPERTYNAME;
+        $server->protectedProperties[] = self::IS_ENCRYPTED_PROPERTYNAME;
+        $server->protectedProperties[] = self::SHARE_NOTE;
+
+        // normally these cannot be changed (RFC4918), but we want them modifiable through PROPPATCH
+        $allowedProperties = ['{DAV:}getetag'];
+        $server->protectedProperties = array_diff($server->protectedProperties, $allowedProperties);
+
+        $this->server = $server;
+        $this->server->on('propFind', [$this, 'handleGetProperties']);
+        $this->server->on('propPatch', [$this, 'handleUpdateProperties']);
+        $this->server->on('afterBind', [$this, 'sendFileIdHeader']);
+        $this->server->on('afterWriteContent', [$this, 'sendFileIdHeader']);
+        $this->server->on('afterMethod:GET', [$this,'httpGet']);
+        $this->server->on('afterMethod:GET', [$this, 'handleDownloadToken']);
+        $this->server->on('afterResponse', function ($request, ResponseInterface $response) {
+            $body = $response->getBody();
+            if (is_resource($body)) {
+                fclose($body);
+            }
+        });
+        $this->server->on('beforeMove', [$this, 'checkMove']);
+    }
+
+    /**
+     * Plugin that checks if a move can actually be performed.
+     *
+     * @param string $source source path
+     * @param string $destination destination path
+     * @throws Forbidden
+     * @throws NotFound
+     */
+    public function checkMove($source, $destination) {
+        $sourceNode = $this->tree->getNodeForPath($source);
+        if (!$sourceNode instanceof Node) {
+            return;
+        }
+        [$sourceDir,] = \Sabre\Uri\split($source);
+        [$destinationDir,] = \Sabre\Uri\split($destination);
+
+        if ($sourceDir !== $destinationDir) {
+            $sourceNodeFileInfo = $sourceNode->getFileInfo();
+            if ($sourceNodeFileInfo === null) {
+                throw new NotFound($source . ' does not exist');
+            }
+
+            if (!$sourceNodeFileInfo->isDeletable()) {
+                throw new Forbidden($source . " cannot be deleted");
+            }
+        }
+    }
+
+    /**
+     * This sets a cookie to be able to recognize the start of the download
+     * the content must not be longer than 32 characters and must only contain
+     * alphanumeric characters
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     */
+    public function handleDownloadToken(RequestInterface $request, ResponseInterface $response) {
+        $queryParams = $request->getQueryParameters();
+
+        /**
+         * this sets a cookie to be able to recognize the start of the download
+         * the content must not be longer than 32 characters and must only contain
+         * alphanumeric characters
+         */
+        if (isset($queryParams['downloadStartSecret'])) {
+            $token = $queryParams['downloadStartSecret'];
+            if (!isset($token[32])
+                && preg_match('!^[a-zA-Z0-9]+$!', $token) === 1) {
+                // FIXME: use $response->setHeader() instead
+                setcookie('ocDownloadStarted', $token, time() + 20, '/');
+            }
+        }
+    }
+
+    /**
+     * Add headers to file download
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     */
+    public function httpGet(RequestInterface $request, ResponseInterface $response) {
+        // Only handle valid files
+        $node = $this->tree->getNodeForPath($request->getPath());
+        if (!($node instanceof IFile)) {
+            return;
+        }
+
+        // adds a 'Content-Disposition: attachment' header in case no disposition
+        // header has been set before
+        if ($this->downloadAttachment &&
+            $response->getHeader('Content-Disposition') === null) {
+            $filename = $node->getName();
+            if ($this->request->isUserAgent(
+                [
+                    Request::USER_AGENT_IE,
+                    Request::USER_AGENT_ANDROID_MOBILE_CHROME,
+                    Request::USER_AGENT_FREEBOX,
+                ])) {
+                $response->addHeader('Content-Disposition', 'attachment; filename="' . rawurlencode($filename) . '"');
+            } else {
+                $response->addHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . rawurlencode($filename)
+                                                        . '; filename="' . rawurlencode($filename) . '"');
+            }
+        }
+
+        if ($node instanceof \OCA\DAV\Connector\Sabre\File) {
+            //Add OC-Checksum header
+            $checksum = $node->getChecksum();
+            if ($checksum !== null && $checksum !== '') {
+                $response->addHeader('OC-Checksum', $checksum);
+            }
+        }
+        $response->addHeader('X-Accel-Buffering', 'no');
+    }
+
+    /**
+     * Adds all ownCloud-specific properties
+     *
+     * @param PropFind $propFind
+     * @param \Sabre\DAV\INode $node
+     * @return void
+     */
+    public function handleGetProperties(PropFind $propFind, \Sabre\DAV\INode $node) {
+        $httpRequest = $this->server->httpRequest;
+
+        if ($node instanceof \OCA\DAV\Connector\Sabre\Node) {
+            /**
+             * This was disabled, because it made dir listing throw an exception,
+             * so users were unable to navigate into folders where one subitem
+             * is blocked by the files_accesscontrol app, see:
+             * https://github.com/nextcloud/files_accesscontrol/issues/65
+             * if (!$node->getFileInfo()->isReadable()) {
+             *     // avoid detecting files through this means
+             *     throw new NotFound();
+             * }
+             */
+
+            $propFind->handle(self::FILEID_PROPERTYNAME, function () use ($node) {
+                return $node->getFileId();
+            });
+
+            $propFind->handle(self::INTERNAL_FILEID_PROPERTYNAME, function () use ($node) {
+                return $node->getInternalFileId();
+            });
+
+            $propFind->handle(self::PERMISSIONS_PROPERTYNAME, function () use ($node) {
+                $perms = $node->getDavPermissions();
+                if ($this->isPublic) {
+                    // remove mount information
+                    $perms = str_replace(['S', 'M'], '', $perms);
+                }
+                return $perms;
+            });
+
+            $propFind->handle(self::SHARE_PERMISSIONS_PROPERTYNAME, function () use ($node, $httpRequest) {
+                $user = $this->userSession->getUser();
+                if ($user === null) {
+                    return null;
+                }
+                return $node->getSharePermissions(
+                    $user->getUID()
+                );
+            });
+
+            $propFind->handle(self::OCM_SHARE_PERMISSIONS_PROPERTYNAME, function () use ($node, $httpRequest): ?string {
+                $user = $this->userSession->getUser();
+                if ($user === null) {
+                    return null;
+                }
+                $ncPermissions = $node->getSharePermissions(
+                    $user->getUID()
+                );
+                $ocmPermissions = $this->ncPermissions2ocmPermissions($ncPermissions);
+                return json_encode($ocmPermissions, JSON_THROW_ON_ERROR);
+            });
+
+            $propFind->handle(self::SHARE_ATTRIBUTES_PROPERTYNAME, function () use ($node, $httpRequest) {
+                return json_encode($node->getShareAttributes(), JSON_THROW_ON_ERROR);
+            });
+
+            $propFind->handle(self::GETETAG_PROPERTYNAME, function () use ($node): string {
+                return $node->getETag();
+            });
+
+            $propFind->handle(self::OWNER_ID_PROPERTYNAME, function () use ($node): ?string {
+                $owner = $node->getOwner();
+                if (!$owner) {
+                    return null;
+                } else {
+                    return $owner->getUID();
+                }
+            });
+            $propFind->handle(self::OWNER_DISPLAY_NAME_PROPERTYNAME, function () use ($node): ?string {
+                $owner = $node->getOwner();
+                if (!$owner) {
+                    return null;
+                } else {
+                    return $owner->getDisplayName();
+                }
+            });
+
+            $propFind->handle(self::HAS_PREVIEW_PROPERTYNAME, function () use ($node) {
+                return json_encode($this->previewManager->isAvailable($node->getFileInfo()), JSON_THROW_ON_ERROR);
+            });
+            $propFind->handle(self::SIZE_PROPERTYNAME, function () use ($node): ?int {
+                return $node->getSize();
+            });
+            $propFind->handle(self::MOUNT_TYPE_PROPERTYNAME, function () use ($node) {
+                return $node->getFileInfo()->getMountPoint()->getMountType();
+            });
+
+            $propFind->handle(self::SHARE_NOTE, function () use ($node, $httpRequest): ?string {
+                $user = $this->userSession->getUser();
+                if ($user === null) {
+                    return null;
+                }
+                return $node->getNoteFromShare(
+                    $user->getUID()
+                );
+            });
+
+            $propFind->handle(self::DATA_FINGERPRINT_PROPERTYNAME, function () use ($node) {
+                return $this->config->getSystemValue('data-fingerprint', '');
+            });
+            $propFind->handle(self::CREATIONDATE_PROPERTYNAME, function () use ($node) {
+                return (new \DateTimeImmutable())
+                    ->setTimestamp($node->getFileInfo()->getCreationTime())
+                    ->format(\DateTimeInterface::ATOM);
+            });
+            $propFind->handle(self::CREATION_TIME_PROPERTYNAME, function () use ($node) {
+                return $node->getFileInfo()->getCreationTime();
+            });
+            /**
+             * Return file/folder name as displayname. The primary reason to
+             * implement it this way is to avoid costly fallback to 
+             * CustomPropertiesBackend (esp. visible when querying all files
+             * in a folder).
+             */
+            $propFind->handle(self::DISPLAYNAME_PROPERTYNAME, function () use ($node) {
+                return $node->getName();
+            });
+        }
+
+        if ($node instanceof \OCA\DAV\Connector\Sabre\File) {
+            $propFind->handle(self::DOWNLOADURL_PROPERTYNAME, function () use ($node) {
+                try {
+                    $directDownloadUrl = $node->getDirectDownload();
+                    if (isset($directDownloadUrl['url'])) {
+                        return $directDownloadUrl['url'];
+                    }
+                } catch (StorageNotAvailableException $e) {
+                    return false;
+                } catch (ForbiddenException $e) {
+                    return false;
+                }
+                return false;
+            });
+
+            $propFind->handle(self::CHECKSUMS_PROPERTYNAME, function () use ($node) {
+                $checksum = $node->getChecksum();
+                if ($checksum === null || $checksum === '') {
+                    return null;
+                }
+
+                return new ChecksumList($checksum);
+            });
+
+            $propFind->handle(self::UPLOAD_TIME_PROPERTYNAME, function () use ($node) {
+                return $node->getFileInfo()->getUploadTime();
+            });
+
+            if ($this->config->getSystemValueBool('enable_file_metadata', true)) {
+                $propFind->handle(self::FILE_METADATA_SIZE, function () use ($node) {
+                    if (!str_starts_with($node->getFileInfo()->getMimetype(), 'image')) {
+                        return json_encode((object)[], JSON_THROW_ON_ERROR);
+                    }
+
+                    if ($node->hasMetadata('size')) {
+                        $sizeMetadata = $node->getMetadata('size');
+                    } else {
+                        // This code path should not be called since we try to preload
+                        // the metadata when loading the folder or the search results
+                        // in one go
+                        $metadataManager = \OC::$server->get(IMetadataManager::class);
+                        $sizeMetadata = $metadataManager->fetchMetadataFor('size', [$node->getId()])[$node->getId()];
+
+                        // TODO would be nice to display this in the profiler...
+                        \OC::$server->get(LoggerInterface::class)->debug('Inefficient fetching of metadata');
+                    }
+
+                    return json_encode((object)$sizeMetadata->getMetadata(), JSON_THROW_ON_ERROR);
+                });
+            }
+        }
+
+        if ($node instanceof Directory) {
+            $propFind->handle(self::SIZE_PROPERTYNAME, function () use ($node) {
+                return $node->getSize();
+            });
+
+            $propFind->handle(self::IS_ENCRYPTED_PROPERTYNAME, function () use ($node) {
+                return $node->getFileInfo()->isEncrypted() ? '1' : '0';
+            });
+
+            $requestProperties = $propFind->getRequestedProperties();
+
+            // TODO detect dynamically which metadata groups are requested and
+            // preload all of them and not just size
+            if ($this->config->getSystemValueBool('enable_file_metadata', true)
+                && in_array(self::FILE_METADATA_SIZE, $requestProperties, true)) {
+                // Preloading of the metadata
+                $fileIds = [];
+                foreach ($node->getChildren() as $child) {
+                    /** @var \OCP\Files\Node|Node $child */
+                    if (str_starts_with($child->getFileInfo()->getMimeType(), 'image/')) {
+                        /** @var File $child */
+                        $fileIds[] = $child->getFileInfo()->getId();
+                    }
+                }
+                /** @var IMetaDataManager $metadataManager */
+                $metadataManager = \OC::$server->get(IMetadataManager::class);
+                $preloadedMetadata = $metadataManager->fetchMetadataFor('size', $fileIds);
+                foreach ($node->getChildren() as $child) {
+                    /** @var \OCP\Files\Node|Node $child */
+                    if (str_starts_with($child->getFileInfo()->getMimeType(), 'image')) {
+                        /** @var File $child */
+                        $child->setMetadata('size', $preloadedMetadata[$child->getFileInfo()->getId()]);
+                    }
+                }
+            }
+
+            if (in_array(self::SUBFILE_COUNT_PROPERTYNAME, $requestProperties, true)
+                || in_array(self::SUBFOLDER_COUNT_PROPERTYNAME, $requestProperties, true)) {
+                $nbFiles = 0;
+                $nbFolders = 0;
+                foreach ($node->getChildren() as $child) {
+                    if ($child instanceof File) {
+                        $nbFiles++;
+                    } elseif ($child instanceof Directory) {
+                        $nbFolders++;
+                    }
+                }
+
+                $propFind->handle(self::SUBFILE_COUNT_PROPERTYNAME, $nbFiles);
+                $propFind->handle(self::SUBFOLDER_COUNT_PROPERTYNAME, $nbFolders);
+            }
+        }
+    }
+
+    /**
+     * translate Nextcloud permissions to OCM Permissions
+     *
+     * @param $ncPermissions
+     * @return array
+     */
+    protected function ncPermissions2ocmPermissions($ncPermissions) {
+        $ocmPermissions = [];
+
+        if ($ncPermissions & Constants::PERMISSION_SHARE) {
+            $ocmPermissions[] = 'share';
+        }
+
+        if ($ncPermissions & Constants::PERMISSION_READ) {
+            $ocmPermissions[] = 'read';
+        }
+
+        if (($ncPermissions & Constants::PERMISSION_CREATE) ||
+            ($ncPermissions & Constants::PERMISSION_UPDATE)) {
+            $ocmPermissions[] = 'write';
+        }
+
+        return $ocmPermissions;
+    }
+
+    /**
+     * Update ownCloud-specific properties
+     *
+     * @param string $path
+     * @param PropPatch $propPatch
+     *
+     * @return void
+     */
+    public function handleUpdateProperties($path, PropPatch $propPatch) {
+        $node = $this->tree->getNodeForPath($path);
+        if (!($node instanceof \OCA\DAV\Connector\Sabre\Node)) {
+            return;
+        }
+
+        $propPatch->handle(self::LASTMODIFIED_PROPERTYNAME, function ($time) use ($node) {
+            if (empty($time)) {
+                return false;
+            }
+            $node->touch($time);
+            return true;
+        });
+        $propPatch->handle(self::GETETAG_PROPERTYNAME, function ($etag) use ($node) {
+            if (empty($etag)) {
+                return false;
+            }
+            return $node->setEtag($etag) !== -1;
+        });
+        $propPatch->handle(self::CREATIONDATE_PROPERTYNAME, function ($time) use ($node) {
+            if (empty($time)) {
+                return false;
+            }
+            $dateTime = new \DateTimeImmutable($time);
+            $node->setCreationTime($dateTime->getTimestamp());
+            return true;
+        });
+        $propPatch->handle(self::CREATION_TIME_PROPERTYNAME, function ($time) use ($node) {
+            if (empty($time)) {
+                return false;
+            }
+            $node->setCreationTime((int) $time);
+            return true;
+        });
+        /**
+         * Disable modification of the displayname property for files and
+         * folders via PROPPATCH. See PROPFIND for more information.
+         */
+        $propPatch->handle(self::DISPLAYNAME_PROPERTYNAME, function ($displayName) {
+            return 403;
+        });
+    }
+
+    /**
+     * @param string $filePath
+     * @param \Sabre\DAV\INode $node
+     * @throws \Sabre\DAV\Exception\BadRequest
+     */
+    public function sendFileIdHeader($filePath, \Sabre\DAV\INode $node = null) {
+        // chunked upload handling
+        if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
+            [$path, $name] = \Sabre\Uri\split($filePath);
+            $info = \OC_FileChunking::decodeName($name);
+            if (!empty($info)) {
+                $filePath = $path . '/' . $info['name'];
+            }
+        }
+
+        // we get the node for the given $filePath here because in case of afterCreateFile $node is the parent folder
+        if (!$this->server->tree->nodeExists($filePath)) {
+            return;
+        }
+        $node = $this->server->tree->getNodeForPath($filePath);
+        if ($node instanceof \OCA\DAV\Connector\Sabre\Node) {
+            $fileId = $node->getFileId();
+            if (!is_null($fileId)) {
+                $this->server->httpResponse->setHeader('OC-FileId', $fileId);
+            }
+        }
+    }
 }

Spacing +40 added lines, -40 removed lines

@@ -157,9 +157,9 @@ 
 		$this->server->on('propPatch', [$this, 'handleUpdateProperties']);
 		$this->server->on('afterBind', [$this, 'sendFileIdHeader']);
 		$this->server->on('afterWriteContent', [$this, 'sendFileIdHeader']);
-		$this->server->on('afterMethod:GET', [$this,'httpGet']);
+		$this->server->on('afterMethod:GET', [$this, 'httpGet']);
 		$this->server->on('afterMethod:GET', [$this, 'handleDownloadToken']);
-		$this->server->on('afterResponse', function ($request, ResponseInterface $response) {
+		$this->server->on('afterResponse', function($request, ResponseInterface $response) {
 			$body = $response->getBody();
 			if (is_resource($body)) {
 				fclose($body);
@@ -181,17 +181,17 @@ 
 		if (!$sourceNode instanceof Node) {
 			return;
 		}
-		[$sourceDir,] = \Sabre\Uri\split($source);
-		[$destinationDir,] = \Sabre\Uri\split($destination);
+		[$sourceDir, ] = \Sabre\Uri\split($source);
+		[$destinationDir, ] = \Sabre\Uri\split($destination);
 
 		if ($sourceDir !== $destinationDir) {
 			$sourceNodeFileInfo = $sourceNode->getFileInfo();
 			if ($sourceNodeFileInfo === null) {
-				throw new NotFound($source . ' does not exist');
+				throw new NotFound($source.' does not exist');
 			}
 
 			if (!$sourceNodeFileInfo->isDeletable()) {
-				throw new Forbidden($source . " cannot be deleted");
+				throw new Forbidden($source." cannot be deleted");
 			}
 		}
 	}
@@ -246,10 +246,10 @@ 
 					Request::USER_AGENT_ANDROID_MOBILE_CHROME,
 					Request::USER_AGENT_FREEBOX,
 				])) {
-				$response->addHeader('Content-Disposition', 'attachment; filename="' . rawurlencode($filename) . '"');
+				$response->addHeader('Content-Disposition', 'attachment; filename="'.rawurlencode($filename).'"');
 			} else {
-				$response->addHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . rawurlencode($filename)
-													 . '; filename="' . rawurlencode($filename) . '"');
+				$response->addHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\''.rawurlencode($filename)
+													 . '; filename="'.rawurlencode($filename).'"');
 			}
 		}
 
@@ -285,15 +285,15 @@ 
 			 * }
 			 */
 
-			$propFind->handle(self::FILEID_PROPERTYNAME, function () use ($node) {
+			$propFind->handle(self::FILEID_PROPERTYNAME, function() use ($node) {
 				return $node->getFileId();
 			});
 
-			$propFind->handle(self::INTERNAL_FILEID_PROPERTYNAME, function () use ($node) {
+			$propFind->handle(self::INTERNAL_FILEID_PROPERTYNAME, function() use ($node) {
 				return $node->getInternalFileId();
 			});
 
-			$propFind->handle(self::PERMISSIONS_PROPERTYNAME, function () use ($node) {
+			$propFind->handle(self::PERMISSIONS_PROPERTYNAME, function() use ($node) {
 				$perms = $node->getDavPermissions();
 				if ($this->isPublic) {
 					// remove mount information
@@ -302,7 +302,7 @@ 
 				return $perms;
 			});
 
-			$propFind->handle(self::SHARE_PERMISSIONS_PROPERTYNAME, function () use ($node, $httpRequest) {
+			$propFind->handle(self::SHARE_PERMISSIONS_PROPERTYNAME, function() use ($node, $httpRequest) {
 				$user = $this->userSession->getUser();
 				if ($user === null) {
 					return null;
@@ -312,7 +312,7 @@ 
 				);
 			});
 
-			$propFind->handle(self::OCM_SHARE_PERMISSIONS_PROPERTYNAME, function () use ($node, $httpRequest): ?string {
+			$propFind->handle(self::OCM_SHARE_PERMISSIONS_PROPERTYNAME, function() use ($node, $httpRequest): ?string {
 				$user = $this->userSession->getUser();
 				if ($user === null) {
 					return null;
@@ -324,15 +324,15 @@ 
 				return json_encode($ocmPermissions, JSON_THROW_ON_ERROR);
 			});
 
-			$propFind->handle(self::SHARE_ATTRIBUTES_PROPERTYNAME, function () use ($node, $httpRequest) {
+			$propFind->handle(self::SHARE_ATTRIBUTES_PROPERTYNAME, function() use ($node, $httpRequest) {
 				return json_encode($node->getShareAttributes(), JSON_THROW_ON_ERROR);
 			});
 
-			$propFind->handle(self::GETETAG_PROPERTYNAME, function () use ($node): string {
+			$propFind->handle(self::GETETAG_PROPERTYNAME, function() use ($node): string {
 				return $node->getETag();
 			});
 
-			$propFind->handle(self::OWNER_ID_PROPERTYNAME, function () use ($node): ?string {
+			$propFind->handle(self::OWNER_ID_PROPERTYNAME, function() use ($node): ?string {
 				$owner = $node->getOwner();
 				if (!$owner) {
 					return null;
@@ -340,7 +340,7 @@ 
 					return $owner->getUID();
 				}
 			});
-			$propFind->handle(self::OWNER_DISPLAY_NAME_PROPERTYNAME, function () use ($node): ?string {
+			$propFind->handle(self::OWNER_DISPLAY_NAME_PROPERTYNAME, function() use ($node): ?string {
 				$owner = $node->getOwner();
 				if (!$owner) {
 					return null;
@@ -349,17 +349,17 @@ 
 				}
 			});
 
-			$propFind->handle(self::HAS_PREVIEW_PROPERTYNAME, function () use ($node) {
+			$propFind->handle(self::HAS_PREVIEW_PROPERTYNAME, function() use ($node) {
 				return json_encode($this->previewManager->isAvailable($node->getFileInfo()), JSON_THROW_ON_ERROR);
 			});
-			$propFind->handle(self::SIZE_PROPERTYNAME, function () use ($node): ?int {
+			$propFind->handle(self::SIZE_PROPERTYNAME, function() use ($node): ?int {
 				return $node->getSize();
 			});
-			$propFind->handle(self::MOUNT_TYPE_PROPERTYNAME, function () use ($node) {
+			$propFind->handle(self::MOUNT_TYPE_PROPERTYNAME, function() use ($node) {
 				return $node->getFileInfo()->getMountPoint()->getMountType();
 			});
 
-			$propFind->handle(self::SHARE_NOTE, function () use ($node, $httpRequest): ?string {
+			$propFind->handle(self::SHARE_NOTE, function() use ($node, $httpRequest): ?string {
 				$user = $this->userSession->getUser();
 				if ($user === null) {
 					return null;
@@ -369,15 +369,15 @@ 
 				);
 			});
 
-			$propFind->handle(self::DATA_FINGERPRINT_PROPERTYNAME, function () use ($node) {
+			$propFind->handle(self::DATA_FINGERPRINT_PROPERTYNAME, function() use ($node) {
 				return $this->config->getSystemValue('data-fingerprint', '');
 			});
-			$propFind->handle(self::CREATIONDATE_PROPERTYNAME, function () use ($node) {
+			$propFind->handle(self::CREATIONDATE_PROPERTYNAME, function() use ($node) {
 				return (new \DateTimeImmutable())
 					->setTimestamp($node->getFileInfo()->getCreationTime())
 					->format(\DateTimeInterface::ATOM);
 			});
-			$propFind->handle(self::CREATION_TIME_PROPERTYNAME, function () use ($node) {
+			$propFind->handle(self::CREATION_TIME_PROPERTYNAME, function() use ($node) {
 				return $node->getFileInfo()->getCreationTime();
 			});
 			/**
@@ -386,13 +386,13 @@ 
 			 * CustomPropertiesBackend (esp. visible when querying all files
 			 * in a folder).
 			 */
-			$propFind->handle(self::DISPLAYNAME_PROPERTYNAME, function () use ($node) {
+			$propFind->handle(self::DISPLAYNAME_PROPERTYNAME, function() use ($node) {
 				return $node->getName();
 			});
 		}
 
 		if ($node instanceof \OCA\DAV\Connector\Sabre\File) {
-			$propFind->handle(self::DOWNLOADURL_PROPERTYNAME, function () use ($node) {
+			$propFind->handle(self::DOWNLOADURL_PROPERTYNAME, function() use ($node) {
 				try {
 					$directDownloadUrl = $node->getDirectDownload();
 					if (isset($directDownloadUrl['url'])) {
@@ -406,7 +406,7 @@ 
 				return false;
 			});
 
-			$propFind->handle(self::CHECKSUMS_PROPERTYNAME, function () use ($node) {
+			$propFind->handle(self::CHECKSUMS_PROPERTYNAME, function() use ($node) {
 				$checksum = $node->getChecksum();
 				if ($checksum === null || $checksum === '') {
 					return null;
@@ -415,14 +415,14 @@ 
 				return new ChecksumList($checksum);
 			});
 
-			$propFind->handle(self::UPLOAD_TIME_PROPERTYNAME, function () use ($node) {
+			$propFind->handle(self::UPLOAD_TIME_PROPERTYNAME, function() use ($node) {
 				return $node->getFileInfo()->getUploadTime();
 			});
 
 			if ($this->config->getSystemValueBool('enable_file_metadata', true)) {
-				$propFind->handle(self::FILE_METADATA_SIZE, function () use ($node) {
+				$propFind->handle(self::FILE_METADATA_SIZE, function() use ($node) {
 					if (!str_starts_with($node->getFileInfo()->getMimetype(), 'image')) {
-						return json_encode((object)[], JSON_THROW_ON_ERROR);
+						return json_encode((object) [], JSON_THROW_ON_ERROR);
 					}
 
 					if ($node->hasMetadata('size')) {
@@ -438,17 +438,17 @@ 
 						\OC::$server->get(LoggerInterface::class)->debug('Inefficient fetching of metadata');
 					}
 
-					return json_encode((object)$sizeMetadata->getMetadata(), JSON_THROW_ON_ERROR);
+					return json_encode((object) $sizeMetadata->getMetadata(), JSON_THROW_ON_ERROR);
 				});
 			}
 		}
 
 		if ($node instanceof Directory) {
-			$propFind->handle(self::SIZE_PROPERTYNAME, function () use ($node) {
+			$propFind->handle(self::SIZE_PROPERTYNAME, function() use ($node) {
 				return $node->getSize();
 			});
 
-			$propFind->handle(self::IS_ENCRYPTED_PROPERTYNAME, function () use ($node) {
+			$propFind->handle(self::IS_ENCRYPTED_PROPERTYNAME, function() use ($node) {
 				return $node->getFileInfo()->isEncrypted() ? '1' : '0';
 			});
 
@@ -536,20 +536,20 @@ 
 			return;
 		}
 
-		$propPatch->handle(self::LASTMODIFIED_PROPERTYNAME, function ($time) use ($node) {
+		$propPatch->handle(self::LASTMODIFIED_PROPERTYNAME, function($time) use ($node) {
 			if (empty($time)) {
 				return false;
 			}
 			$node->touch($time);
 			return true;
 		});
-		$propPatch->handle(self::GETETAG_PROPERTYNAME, function ($etag) use ($node) {
+		$propPatch->handle(self::GETETAG_PROPERTYNAME, function($etag) use ($node) {
 			if (empty($etag)) {
 				return false;
 			}
 			return $node->setEtag($etag) !== -1;
 		});
-		$propPatch->handle(self::CREATIONDATE_PROPERTYNAME, function ($time) use ($node) {
+		$propPatch->handle(self::CREATIONDATE_PROPERTYNAME, function($time) use ($node) {
 			if (empty($time)) {
 				return false;
 			}
@@ -557,7 +557,7 @@ 
 			$node->setCreationTime($dateTime->getTimestamp());
 			return true;
 		});
-		$propPatch->handle(self::CREATION_TIME_PROPERTYNAME, function ($time) use ($node) {
+		$propPatch->handle(self::CREATION_TIME_PROPERTYNAME, function($time) use ($node) {
 			if (empty($time)) {
 				return false;
 			}
@@ -568,7 +568,7 @@ 
 		 * Disable modification of the displayname property for files and
 		 * folders via PROPPATCH. See PROPFIND for more information.
 		 */
-		$propPatch->handle(self::DISPLAYNAME_PROPERTYNAME, function ($displayName) {
+		$propPatch->handle(self::DISPLAYNAME_PROPERTYNAME, function($displayName) {
 			return 403;
 		});
 	}
@@ -584,7 +584,7 @@ 
 			[$path, $name] = \Sabre\Uri\split($filePath);
 			$info = \OC_FileChunking::decodeName($name);
 			if (!empty($info)) {
-				$filePath = $path . '/' . $info['name'];
+				$filePath = $path.'/'.$info['name'];
 			}
 		}
 

apps/dav/lib/Comments/CommentsPlugin.php

Indentation +206 added lines, -206 removed lines

@@ -44,210 +44,210 @@
  * Sabre plugin to handle comments:
  */
 class CommentsPlugin extends ServerPlugin {
-	// namespace
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
-
-	public const REPORT_NAME = '{http://owncloud.org/ns}filter-comments';
-	public const REPORT_PARAM_LIMIT = '{http://owncloud.org/ns}limit';
-	public const REPORT_PARAM_OFFSET = '{http://owncloud.org/ns}offset';
-	public const REPORT_PARAM_TIMESTAMP = '{http://owncloud.org/ns}datetime';
-
-	/** @var ICommentsManager  */
-	protected $commentsManager;
-
-	/** @var \Sabre\DAV\Server $server */
-	private $server;
-
-	/** @var  \OCP\IUserSession */
-	protected $userSession;
-
-	/**
-	 * Comments plugin
-	 *
-	 * @param ICommentsManager $commentsManager
-	 * @param IUserSession $userSession
-	 */
-	public function __construct(ICommentsManager $commentsManager, IUserSession $userSession) {
-		$this->commentsManager = $commentsManager;
-		$this->userSession = $userSession;
-	}
-
-	/**
-	 * 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 Server $server
-	 * @return void
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-		if (strpos($this->server->getRequestUri(), 'comments/') !== 0) {
-			return;
-		}
-
-		$this->server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
-
-		$this->server->xml->classMap['DateTime'] = function (Writer $writer, \DateTime $value) {
-			$writer->write(\Sabre\HTTP\toDate($value));
-		};
-
-		$this->server->on('report', [$this, 'onReport']);
-		$this->server->on('method:POST', [$this, 'httpPost']);
-	}
-
-	/**
-	 * POST operation on Comments collections
-	 *
-	 * @param RequestInterface $request request object
-	 * @param ResponseInterface $response response object
-	 * @return null|false
-	 */
-	public function httpPost(RequestInterface $request, ResponseInterface $response) {
-		$path = $request->getPath();
-		$node = $this->server->tree->getNodeForPath($path);
-		if (!$node instanceof EntityCollection) {
-			return null;
-		}
-
-		$data = $request->getBodyAsString();
-		$comment = $this->createComment(
-			$node->getName(),
-			$node->getId(),
-			$data,
-			$request->getHeader('Content-Type')
-		);
-
-		// update read marker for the current user/poster to avoid
-		// having their own comments marked as unread
-		$node->setReadMarker(null);
-
-		$url = rtrim($request->getUrl(), '/') . '/' . urlencode($comment->getId());
-
-		$response->setHeader('Content-Location', $url);
-
-		// created
-		$response->setStatus(201);
-		return false;
-	}
-
-	/**
-	 * Returns a list of reports this plugin supports.
-	 *
-	 * This will be used in the {DAV:}supported-report-set property.
-	 *
-	 * @param string $uri
-	 * @return array
-	 */
-	public function getSupportedReportSet($uri) {
-		return [self::REPORT_NAME];
-	}
-
-	/**
-	 * REPORT operations to look for comments
-	 *
-	 * @param string $reportName
-	 * @param array $report
-	 * @param string $uri
-	 * @return bool
-	 * @throws NotFound
-	 * @throws ReportNotSupported
-	 */
-	public function onReport($reportName, $report, $uri) {
-		$node = $this->server->tree->getNodeForPath($uri);
-		if (!$node instanceof EntityCollection || $reportName !== self::REPORT_NAME) {
-			throw new ReportNotSupported();
-		}
-		$args = ['limit' => 0, 'offset' => 0, 'datetime' => null];
-		$acceptableParameters = [
-			$this::REPORT_PARAM_LIMIT,
-			$this::REPORT_PARAM_OFFSET,
-			$this::REPORT_PARAM_TIMESTAMP
-		];
-		$ns = '{' . $this::NS_OWNCLOUD . '}';
-		foreach ($report as $parameter) {
-			if (!in_array($parameter['name'], $acceptableParameters) || empty($parameter['value'])) {
-				continue;
-			}
-			$args[str_replace($ns, '', $parameter['name'])] = $parameter['value'];
-		}
-
-		if (!is_null($args['datetime'])) {
-			$args['datetime'] = new \DateTime($args['datetime']);
-		}
-
-		$results = $node->findChildren($args['limit'], $args['offset'], $args['datetime']);
-
-		$responses = [];
-		foreach ($results as $node) {
-			$nodePath = $this->server->getRequestUri() . '/' . $node->comment->getId();
-			$resultSet = $this->server->getPropertiesForPath($nodePath, CommentNode::getPropertyNames());
-			if (isset($resultSet[0]) && isset($resultSet[0][200])) {
-				$responses[] = new Response(
-					$this->server->getBaseUri() . $nodePath,
-					[200 => $resultSet[0][200]],
-					200
-				);
-			}
-		}
-
-		$xml = $this->server->xml->write(
-			'{DAV:}multistatus',
-			new MultiStatus($responses)
-		);
-
-		$this->server->httpResponse->setStatus(207);
-		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-		$this->server->httpResponse->setBody($xml);
-
-		return false;
-	}
-
-	/**
-	 * Creates a new comment
-	 *
-	 * @param string $objectType e.g. "files"
-	 * @param string $objectId e.g. the file id
-	 * @param string $data JSON encoded string containing the properties of the tag to create
-	 * @param string $contentType content type of the data
-	 * @return IComment newly created comment
-	 *
-	 * @throws BadRequest if a field was missing
-	 * @throws UnsupportedMediaType if the content type is not supported
-	 */
-	private function createComment($objectType, $objectId, $data, $contentType = 'application/json') {
-		if (explode(';', $contentType)[0] === 'application/json') {
-			$data = json_decode($data, true, 512, JSON_THROW_ON_ERROR);
-		} else {
-			throw new UnsupportedMediaType();
-		}
-
-		$actorType = $data['actorType'];
-		$actorId = null;
-		if ($actorType === 'users') {
-			$user = $this->userSession->getUser();
-			if (!is_null($user)) {
-				$actorId = $user->getUID();
-			}
-		}
-		if (is_null($actorId)) {
-			throw new BadRequest('Invalid actor "' .  $actorType .'"');
-		}
-
-		try {
-			$comment = $this->commentsManager->create($actorType, $actorId, $objectType, $objectId);
-			$comment->setMessage($data['message']);
-			$comment->setVerb($data['verb']);
-			$this->commentsManager->save($comment);
-			return $comment;
-		} catch (\InvalidArgumentException $e) {
-			throw new BadRequest('Invalid input values', 0, $e);
-		} catch (\OCP\Comments\MessageTooLongException $e) {
-			$msg = 'Message exceeds allowed character limit of ';
-			throw new BadRequest($msg . \OCP\Comments\IComment::MAX_MESSAGE_LENGTH, 0,	$e);
-		}
-	}
+    // namespace
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+
+    public const REPORT_NAME = '{http://owncloud.org/ns}filter-comments';
+    public const REPORT_PARAM_LIMIT = '{http://owncloud.org/ns}limit';
+    public const REPORT_PARAM_OFFSET = '{http://owncloud.org/ns}offset';
+    public const REPORT_PARAM_TIMESTAMP = '{http://owncloud.org/ns}datetime';
+
+    /** @var ICommentsManager  */
+    protected $commentsManager;
+
+    /** @var \Sabre\DAV\Server $server */
+    private $server;
+
+    /** @var  \OCP\IUserSession */
+    protected $userSession;
+
+    /**
+     * Comments plugin
+     *
+     * @param ICommentsManager $commentsManager
+     * @param IUserSession $userSession
+     */
+    public function __construct(ICommentsManager $commentsManager, IUserSession $userSession) {
+        $this->commentsManager = $commentsManager;
+        $this->userSession = $userSession;
+    }
+
+    /**
+     * 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 Server $server
+     * @return void
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+        if (strpos($this->server->getRequestUri(), 'comments/') !== 0) {
+            return;
+        }
+
+        $this->server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
+
+        $this->server->xml->classMap['DateTime'] = function (Writer $writer, \DateTime $value) {
+            $writer->write(\Sabre\HTTP\toDate($value));
+        };
+
+        $this->server->on('report', [$this, 'onReport']);
+        $this->server->on('method:POST', [$this, 'httpPost']);
+    }
+
+    /**
+     * POST operation on Comments collections
+     *
+     * @param RequestInterface $request request object
+     * @param ResponseInterface $response response object
+     * @return null|false
+     */
+    public function httpPost(RequestInterface $request, ResponseInterface $response) {
+        $path = $request->getPath();
+        $node = $this->server->tree->getNodeForPath($path);
+        if (!$node instanceof EntityCollection) {
+            return null;
+        }
+
+        $data = $request->getBodyAsString();
+        $comment = $this->createComment(
+            $node->getName(),
+            $node->getId(),
+            $data,
+            $request->getHeader('Content-Type')
+        );
+
+        // update read marker for the current user/poster to avoid
+        // having their own comments marked as unread
+        $node->setReadMarker(null);
+
+        $url = rtrim($request->getUrl(), '/') . '/' . urlencode($comment->getId());
+
+        $response->setHeader('Content-Location', $url);
+
+        // created
+        $response->setStatus(201);
+        return false;
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getSupportedReportSet($uri) {
+        return [self::REPORT_NAME];
+    }
+
+    /**
+     * REPORT operations to look for comments
+     *
+     * @param string $reportName
+     * @param array $report
+     * @param string $uri
+     * @return bool
+     * @throws NotFound
+     * @throws ReportNotSupported
+     */
+    public function onReport($reportName, $report, $uri) {
+        $node = $this->server->tree->getNodeForPath($uri);
+        if (!$node instanceof EntityCollection || $reportName !== self::REPORT_NAME) {
+            throw new ReportNotSupported();
+        }
+        $args = ['limit' => 0, 'offset' => 0, 'datetime' => null];
+        $acceptableParameters = [
+            $this::REPORT_PARAM_LIMIT,
+            $this::REPORT_PARAM_OFFSET,
+            $this::REPORT_PARAM_TIMESTAMP
+        ];
+        $ns = '{' . $this::NS_OWNCLOUD . '}';
+        foreach ($report as $parameter) {
+            if (!in_array($parameter['name'], $acceptableParameters) || empty($parameter['value'])) {
+                continue;
+            }
+            $args[str_replace($ns, '', $parameter['name'])] = $parameter['value'];
+        }
+
+        if (!is_null($args['datetime'])) {
+            $args['datetime'] = new \DateTime($args['datetime']);
+        }
+
+        $results = $node->findChildren($args['limit'], $args['offset'], $args['datetime']);
+
+        $responses = [];
+        foreach ($results as $node) {
+            $nodePath = $this->server->getRequestUri() . '/' . $node->comment->getId();
+            $resultSet = $this->server->getPropertiesForPath($nodePath, CommentNode::getPropertyNames());
+            if (isset($resultSet[0]) && isset($resultSet[0][200])) {
+                $responses[] = new Response(
+                    $this->server->getBaseUri() . $nodePath,
+                    [200 => $resultSet[0][200]],
+                    200
+                );
+            }
+        }
+
+        $xml = $this->server->xml->write(
+            '{DAV:}multistatus',
+            new MultiStatus($responses)
+        );
+
+        $this->server->httpResponse->setStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+        $this->server->httpResponse->setBody($xml);
+
+        return false;
+    }
+
+    /**
+     * Creates a new comment
+     *
+     * @param string $objectType e.g. "files"
+     * @param string $objectId e.g. the file id
+     * @param string $data JSON encoded string containing the properties of the tag to create
+     * @param string $contentType content type of the data
+     * @return IComment newly created comment
+     *
+     * @throws BadRequest if a field was missing
+     * @throws UnsupportedMediaType if the content type is not supported
+     */
+    private function createComment($objectType, $objectId, $data, $contentType = 'application/json') {
+        if (explode(';', $contentType)[0] === 'application/json') {
+            $data = json_decode($data, true, 512, JSON_THROW_ON_ERROR);
+        } else {
+            throw new UnsupportedMediaType();
+        }
+
+        $actorType = $data['actorType'];
+        $actorId = null;
+        if ($actorType === 'users') {
+            $user = $this->userSession->getUser();
+            if (!is_null($user)) {
+                $actorId = $user->getUID();
+            }
+        }
+        if (is_null($actorId)) {
+            throw new BadRequest('Invalid actor "' .  $actorType .'"');
+        }
+
+        try {
+            $comment = $this->commentsManager->create($actorType, $actorId, $objectType, $objectId);
+            $comment->setMessage($data['message']);
+            $comment->setVerb($data['verb']);
+            $this->commentsManager->save($comment);
+            return $comment;
+        } catch (\InvalidArgumentException $e) {
+            throw new BadRequest('Invalid input values', 0, $e);
+        } catch (\OCP\Comments\MessageTooLongException $e) {
+            $msg = 'Message exceeds allowed character limit of ';
+            throw new BadRequest($msg . \OCP\Comments\IComment::MAX_MESSAGE_LENGTH, 0,	$e);
+        }
+    }
 }

apps/dav/lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php

Indentation +409 added lines, -409 removed lines

@@ -42,413 +42,413 @@
 
 class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob {
 
-	/** @var IResourceManager */
-	private $resourceManager;
-
-	/** @var IRoomManager */
-	private $roomManager;
-
-	/** @var IDBConnection */
-	private $dbConnection;
-
-	/** @var CalDavBackend */
-	private $calDavBackend;
-
-	public function __construct(ITimeFactory $time,
-								IResourceManager $resourceManager,
-								IRoomManager $roomManager,
-								IDBConnection $dbConnection,
-								CalDavBackend $calDavBackend) {
-		parent::__construct($time);
-		$this->resourceManager = $resourceManager;
-		$this->roomManager = $roomManager;
-		$this->dbConnection = $dbConnection;
-		$this->calDavBackend = $calDavBackend;
-
-		// Run once an hour
-		$this->setInterval(60 * 60);
-		$this->setTimeSensitivity(self::TIME_SENSITIVE);
-	}
-
-	/**
-	 * @param $argument
-	 */
-	public function run($argument): void {
-		$this->runForBackend(
-			$this->resourceManager,
-			'calendar_resources',
-			'calendar_resources_md',
-			'resource_id',
-			'principals/calendar-resources'
-		);
-		$this->runForBackend(
-			$this->roomManager,
-			'calendar_rooms',
-			'calendar_rooms_md',
-			'room_id',
-			'principals/calendar-rooms'
-		);
-	}
-
-	/**
-	 * Run background-job for one specific backendManager
-	 * either ResourceManager or RoomManager
-	 *
-	 * @param IResourceManager|IRoomManager $backendManager
-	 * @param string $dbTable
-	 * @param string $dbTableMetadata
-	 * @param string $foreignKey
-	 * @param string $principalPrefix
-	 */
-	private function runForBackend($backendManager,
-								   string $dbTable,
-								   string $dbTableMetadata,
-								   string $foreignKey,
-								   string $principalPrefix): void {
-		$backends = $backendManager->getBackends();
-
-		foreach ($backends as $backend) {
-			$backendId = $backend->getBackendIdentifier();
-
-			try {
-				if ($backend instanceof IResourceBackend) {
-					$list = $backend->listAllResources();
-				} else {
-					$list = $backend->listAllRooms();
-				}
-			} catch (BackendTemporarilyUnavailableException $ex) {
-				continue;
-			}
-
-			$cachedList = $this->getAllCachedByBackend($dbTable, $backendId);
-			$newIds = array_diff($list, $cachedList);
-			$deletedIds = array_diff($cachedList, $list);
-			$editedIds = array_intersect($list, $cachedList);
-
-			foreach ($newIds as $newId) {
-				try {
-					if ($backend instanceof IResourceBackend) {
-						$resource = $backend->getResource($newId);
-					} else {
-						$resource = $backend->getRoom($newId);
-					}
-
-					$metadata = [];
-					if ($resource instanceof IMetadataProvider) {
-						$metadata = $this->getAllMetadataOfBackend($resource);
-					}
-				} catch (BackendTemporarilyUnavailableException $ex) {
-					continue;
-				}
-
-				$id = $this->addToCache($dbTable, $backendId, $resource);
-				$this->addMetadataToCache($dbTableMetadata, $foreignKey, $id, $metadata);
-				// we don't create the calendar here, it is created lazily
-				// when an event is actually scheduled with this resource / room
-			}
-
-			foreach ($deletedIds as $deletedId) {
-				$id = $this->getIdForBackendAndResource($dbTable, $backendId, $deletedId);
-				$this->deleteFromCache($dbTable, $id);
-				$this->deleteMetadataFromCache($dbTableMetadata, $foreignKey, $id);
-
-				$principalName = implode('-', [$backendId, $deletedId]);
-				$this->deleteCalendarDataForResource($principalPrefix, $principalName);
-			}
-
-			foreach ($editedIds as $editedId) {
-				$id = $this->getIdForBackendAndResource($dbTable, $backendId, $editedId);
-
-				try {
-					if ($backend instanceof IResourceBackend) {
-						$resource = $backend->getResource($editedId);
-					} else {
-						$resource = $backend->getRoom($editedId);
-					}
-
-					$metadata = [];
-					if ($resource instanceof IMetadataProvider) {
-						$metadata = $this->getAllMetadataOfBackend($resource);
-					}
-				} catch (BackendTemporarilyUnavailableException $ex) {
-					continue;
-				}
-
-				$this->updateCache($dbTable, $id, $resource);
-
-				if ($resource instanceof IMetadataProvider) {
-					$cachedMetadata = $this->getAllMetadataOfCache($dbTableMetadata, $foreignKey, $id);
-					$this->updateMetadataCache($dbTableMetadata, $foreignKey, $id, $metadata, $cachedMetadata);
-				}
-			}
-		}
-	}
-
-	/**
-	 * add entry to cache that exists remotely but not yet in cache
-	 *
-	 * @param string $table
-	 * @param string $backendId
-	 * @param IResource|IRoom $remote
-	 *
-	 * @return int Insert id
-	 */
-	private function addToCache(string $table,
-								string $backendId,
-								$remote): int {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->insert($table)
-			->values([
-				'backend_id' => $query->createNamedParameter($backendId),
-				'resource_id' => $query->createNamedParameter($remote->getId()),
-				'email' => $query->createNamedParameter($remote->getEMail()),
-				'displayname' => $query->createNamedParameter($remote->getDisplayName()),
-				'group_restrictions' => $query->createNamedParameter(
-					$this->serializeGroupRestrictions(
-						$remote->getGroupRestrictions()
-					))
-			])
-			->executeStatement();
-		return $query->getLastInsertId();
-	}
-
-	/**
-	 * @param string $table
-	 * @param string $foreignKey
-	 * @param int $foreignId
-	 * @param array $metadata
-	 */
-	private function addMetadataToCache(string $table,
-										string $foreignKey,
-										int $foreignId,
-										array $metadata): void {
-		foreach ($metadata as $key => $value) {
-			$query = $this->dbConnection->getQueryBuilder();
-			$query->insert($table)
-				->values([
-					$foreignKey => $query->createNamedParameter($foreignId),
-					'key' => $query->createNamedParameter($key),
-					'value' => $query->createNamedParameter($value),
-				])
-				->executeStatement();
-		}
-	}
-
-	/**
-	 * delete entry from cache that does not exist anymore remotely
-	 *
-	 * @param string $table
-	 * @param int $id
-	 */
-	private function deleteFromCache(string $table,
-									 int $id): void {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->delete($table)
-			->where($query->expr()->eq('id', $query->createNamedParameter($id)))
-			->executeStatement();
-	}
-
-	/**
-	 * @param string $table
-	 * @param string $foreignKey
-	 * @param int $id
-	 */
-	private function deleteMetadataFromCache(string $table,
-											 string $foreignKey,
-											 int $id): void {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->delete($table)
-			->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)))
-			->executeStatement();
-	}
-
-	/**
-	 * update an existing entry in cache
-	 *
-	 * @param string $table
-	 * @param int $id
-	 * @param IResource|IRoom $remote
-	 */
-	private function updateCache(string $table,
-								 int $id,
-								 $remote): void {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->update($table)
-			->set('email', $query->createNamedParameter($remote->getEMail()))
-			->set('displayname', $query->createNamedParameter($remote->getDisplayName()))
-			->set('group_restrictions', $query->createNamedParameter(
-				$this->serializeGroupRestrictions(
-					$remote->getGroupRestrictions()
-				)))
-			->where($query->expr()->eq('id', $query->createNamedParameter($id)))
-			->executeStatement();
-	}
-
-	/**
-	 * @param string $dbTable
-	 * @param string $foreignKey
-	 * @param int $id
-	 * @param array $metadata
-	 * @param array $cachedMetadata
-	 */
-	private function updateMetadataCache(string $dbTable,
-										 string $foreignKey,
-										 int $id,
-										 array $metadata,
-										 array $cachedMetadata): void {
-		$newMetadata = array_diff_key($metadata, $cachedMetadata);
-		$deletedMetadata = array_diff_key($cachedMetadata, $metadata);
-
-		foreach ($newMetadata as $key => $value) {
-			$query = $this->dbConnection->getQueryBuilder();
-			$query->insert($dbTable)
-				->values([
-					$foreignKey => $query->createNamedParameter($id),
-					'key' => $query->createNamedParameter($key),
-					'value' => $query->createNamedParameter($value),
-				])
-				->executeStatement();
-		}
-
-		foreach ($deletedMetadata as $key => $value) {
-			$query = $this->dbConnection->getQueryBuilder();
-			$query->delete($dbTable)
-				->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)))
-				->andWhere($query->expr()->eq('key', $query->createNamedParameter($key)))
-				->executeStatement();
-		}
-
-		$existingKeys = array_keys(array_intersect_key($metadata, $cachedMetadata));
-		foreach ($existingKeys as $existingKey) {
-			if ($metadata[$existingKey] !== $cachedMetadata[$existingKey]) {
-				$query = $this->dbConnection->getQueryBuilder();
-				$query->update($dbTable)
-					->set('value', $query->createNamedParameter($metadata[$existingKey]))
-					->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)))
-					->andWhere($query->expr()->eq('key', $query->createNamedParameter($existingKey)))
-					->executeStatement();
-			}
-		}
-	}
-
-	/**
-	 * serialize array of group restrictions to store them in database
-	 *
-	 * @param array $groups
-	 *
-	 * @return string
-	 */
-	private function serializeGroupRestrictions(array $groups): string {
-		return \json_encode($groups, JSON_THROW_ON_ERROR);
-	}
-
-	/**
-	 * Gets all metadata of a backend
-	 *
-	 * @param IResource|IRoom $resource
-	 *
-	 * @return array
-	 */
-	private function getAllMetadataOfBackend($resource): array {
-		if (!($resource instanceof IMetadataProvider)) {
-			return [];
-		}
-
-		$keys = $resource->getAllAvailableMetadataKeys();
-		$metadata = [];
-		foreach ($keys as $key) {
-			$metadata[$key] = $resource->getMetadataForKey($key);
-		}
-
-		return $metadata;
-	}
-
-	/**
-	 * @param string $table
-	 * @param string $foreignKey
-	 * @param int $id
-	 *
-	 * @return array
-	 */
-	private function getAllMetadataOfCache(string $table,
-										   string $foreignKey,
-										   int $id): array {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->select(['key', 'value'])
-			->from($table)
-			->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)));
-		$result = $query->executeQuery();
-		$rows = $result->fetchAll();
-		$result->closeCursor();
-
-		$metadata = [];
-		foreach ($rows as $row) {
-			$metadata[$row['key']] = $row['value'];
-		}
-
-		return $metadata;
-	}
-
-	/**
-	 * Gets all cached rooms / resources by backend
-	 *
-	 * @param $tableName
-	 * @param $backendId
-	 *
-	 * @return array
-	 */
-	private function getAllCachedByBackend(string $tableName,
-										   string $backendId): array {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->select('resource_id')
-			->from($tableName)
-			->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)));
-		$result = $query->executeQuery();
-		$rows = $result->fetchAll();
-		$result->closeCursor();
-
-		return array_map(function ($row): string {
-			return $row['resource_id'];
-		}, $rows);
-	}
-
-	/**
-	 * @param $principalPrefix
-	 * @param $principalUri
-	 */
-	private function deleteCalendarDataForResource(string $principalPrefix,
-												   string $principalUri): void {
-		$calendar = $this->calDavBackend->getCalendarByUri(
-			implode('/', [$principalPrefix, $principalUri]),
-			CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI);
-
-		if ($calendar !== null) {
-			$this->calDavBackend->deleteCalendar(
-				$calendar['id'],
-				true // Because this wasn't deleted by a user
-			);
-		}
-	}
-
-	/**
-	 * @param $table
-	 * @param $backendId
-	 * @param $resourceId
-	 *
-	 * @return int
-	 */
-	private function getIdForBackendAndResource(string $table,
-												string $backendId,
-												string $resourceId): int {
-		$query = $this->dbConnection->getQueryBuilder();
-		$query->select('id')
-			->from($table)
-			->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
-			->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
-		$result = $query->executeQuery();
-
-		$id = (int) $result->fetchOne();
-		$result->closeCursor();
-		return $id;
-	}
+    /** @var IResourceManager */
+    private $resourceManager;
+
+    /** @var IRoomManager */
+    private $roomManager;
+
+    /** @var IDBConnection */
+    private $dbConnection;
+
+    /** @var CalDavBackend */
+    private $calDavBackend;
+
+    public function __construct(ITimeFactory $time,
+                                IResourceManager $resourceManager,
+                                IRoomManager $roomManager,
+                                IDBConnection $dbConnection,
+                                CalDavBackend $calDavBackend) {
+        parent::__construct($time);
+        $this->resourceManager = $resourceManager;
+        $this->roomManager = $roomManager;
+        $this->dbConnection = $dbConnection;
+        $this->calDavBackend = $calDavBackend;
+
+        // Run once an hour
+        $this->setInterval(60 * 60);
+        $this->setTimeSensitivity(self::TIME_SENSITIVE);
+    }
+
+    /**
+     * @param $argument
+     */
+    public function run($argument): void {
+        $this->runForBackend(
+            $this->resourceManager,
+            'calendar_resources',
+            'calendar_resources_md',
+            'resource_id',
+            'principals/calendar-resources'
+        );
+        $this->runForBackend(
+            $this->roomManager,
+            'calendar_rooms',
+            'calendar_rooms_md',
+            'room_id',
+            'principals/calendar-rooms'
+        );
+    }
+
+    /**
+     * Run background-job for one specific backendManager
+     * either ResourceManager or RoomManager
+     *
+     * @param IResourceManager|IRoomManager $backendManager
+     * @param string $dbTable
+     * @param string $dbTableMetadata
+     * @param string $foreignKey
+     * @param string $principalPrefix
+     */
+    private function runForBackend($backendManager,
+                                    string $dbTable,
+                                    string $dbTableMetadata,
+                                    string $foreignKey,
+                                    string $principalPrefix): void {
+        $backends = $backendManager->getBackends();
+
+        foreach ($backends as $backend) {
+            $backendId = $backend->getBackendIdentifier();
+
+            try {
+                if ($backend instanceof IResourceBackend) {
+                    $list = $backend->listAllResources();
+                } else {
+                    $list = $backend->listAllRooms();
+                }
+            } catch (BackendTemporarilyUnavailableException $ex) {
+                continue;
+            }
+
+            $cachedList = $this->getAllCachedByBackend($dbTable, $backendId);
+            $newIds = array_diff($list, $cachedList);
+            $deletedIds = array_diff($cachedList, $list);
+            $editedIds = array_intersect($list, $cachedList);
+
+            foreach ($newIds as $newId) {
+                try {
+                    if ($backend instanceof IResourceBackend) {
+                        $resource = $backend->getResource($newId);
+                    } else {
+                        $resource = $backend->getRoom($newId);
+                    }
+
+                    $metadata = [];
+                    if ($resource instanceof IMetadataProvider) {
+                        $metadata = $this->getAllMetadataOfBackend($resource);
+                    }
+                } catch (BackendTemporarilyUnavailableException $ex) {
+                    continue;
+                }
+
+                $id = $this->addToCache($dbTable, $backendId, $resource);
+                $this->addMetadataToCache($dbTableMetadata, $foreignKey, $id, $metadata);
+                // we don't create the calendar here, it is created lazily
+                // when an event is actually scheduled with this resource / room
+            }
+
+            foreach ($deletedIds as $deletedId) {
+                $id = $this->getIdForBackendAndResource($dbTable, $backendId, $deletedId);
+                $this->deleteFromCache($dbTable, $id);
+                $this->deleteMetadataFromCache($dbTableMetadata, $foreignKey, $id);
+
+                $principalName = implode('-', [$backendId, $deletedId]);
+                $this->deleteCalendarDataForResource($principalPrefix, $principalName);
+            }
+
+            foreach ($editedIds as $editedId) {
+                $id = $this->getIdForBackendAndResource($dbTable, $backendId, $editedId);
+
+                try {
+                    if ($backend instanceof IResourceBackend) {
+                        $resource = $backend->getResource($editedId);
+                    } else {
+                        $resource = $backend->getRoom($editedId);
+                    }
+
+                    $metadata = [];
+                    if ($resource instanceof IMetadataProvider) {
+                        $metadata = $this->getAllMetadataOfBackend($resource);
+                    }
+                } catch (BackendTemporarilyUnavailableException $ex) {
+                    continue;
+                }
+
+                $this->updateCache($dbTable, $id, $resource);
+
+                if ($resource instanceof IMetadataProvider) {
+                    $cachedMetadata = $this->getAllMetadataOfCache($dbTableMetadata, $foreignKey, $id);
+                    $this->updateMetadataCache($dbTableMetadata, $foreignKey, $id, $metadata, $cachedMetadata);
+                }
+            }
+        }
+    }
+
+    /**
+     * add entry to cache that exists remotely but not yet in cache
+     *
+     * @param string $table
+     * @param string $backendId
+     * @param IResource|IRoom $remote
+     *
+     * @return int Insert id
+     */
+    private function addToCache(string $table,
+                                string $backendId,
+                                $remote): int {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->insert($table)
+            ->values([
+                'backend_id' => $query->createNamedParameter($backendId),
+                'resource_id' => $query->createNamedParameter($remote->getId()),
+                'email' => $query->createNamedParameter($remote->getEMail()),
+                'displayname' => $query->createNamedParameter($remote->getDisplayName()),
+                'group_restrictions' => $query->createNamedParameter(
+                    $this->serializeGroupRestrictions(
+                        $remote->getGroupRestrictions()
+                    ))
+            ])
+            ->executeStatement();
+        return $query->getLastInsertId();
+    }
+
+    /**
+     * @param string $table
+     * @param string $foreignKey
+     * @param int $foreignId
+     * @param array $metadata
+     */
+    private function addMetadataToCache(string $table,
+                                        string $foreignKey,
+                                        int $foreignId,
+                                        array $metadata): void {
+        foreach ($metadata as $key => $value) {
+            $query = $this->dbConnection->getQueryBuilder();
+            $query->insert($table)
+                ->values([
+                    $foreignKey => $query->createNamedParameter($foreignId),
+                    'key' => $query->createNamedParameter($key),
+                    'value' => $query->createNamedParameter($value),
+                ])
+                ->executeStatement();
+        }
+    }
+
+    /**
+     * delete entry from cache that does not exist anymore remotely
+     *
+     * @param string $table
+     * @param int $id
+     */
+    private function deleteFromCache(string $table,
+                                        int $id): void {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->delete($table)
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id)))
+            ->executeStatement();
+    }
+
+    /**
+     * @param string $table
+     * @param string $foreignKey
+     * @param int $id
+     */
+    private function deleteMetadataFromCache(string $table,
+                                                string $foreignKey,
+                                                int $id): void {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->delete($table)
+            ->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)))
+            ->executeStatement();
+    }
+
+    /**
+     * update an existing entry in cache
+     *
+     * @param string $table
+     * @param int $id
+     * @param IResource|IRoom $remote
+     */
+    private function updateCache(string $table,
+                                    int $id,
+                                    $remote): void {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->update($table)
+            ->set('email', $query->createNamedParameter($remote->getEMail()))
+            ->set('displayname', $query->createNamedParameter($remote->getDisplayName()))
+            ->set('group_restrictions', $query->createNamedParameter(
+                $this->serializeGroupRestrictions(
+                    $remote->getGroupRestrictions()
+                )))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id)))
+            ->executeStatement();
+    }
+
+    /**
+     * @param string $dbTable
+     * @param string $foreignKey
+     * @param int $id
+     * @param array $metadata
+     * @param array $cachedMetadata
+     */
+    private function updateMetadataCache(string $dbTable,
+                                            string $foreignKey,
+                                            int $id,
+                                            array $metadata,
+                                            array $cachedMetadata): void {
+        $newMetadata = array_diff_key($metadata, $cachedMetadata);
+        $deletedMetadata = array_diff_key($cachedMetadata, $metadata);
+
+        foreach ($newMetadata as $key => $value) {
+            $query = $this->dbConnection->getQueryBuilder();
+            $query->insert($dbTable)
+                ->values([
+                    $foreignKey => $query->createNamedParameter($id),
+                    'key' => $query->createNamedParameter($key),
+                    'value' => $query->createNamedParameter($value),
+                ])
+                ->executeStatement();
+        }
+
+        foreach ($deletedMetadata as $key => $value) {
+            $query = $this->dbConnection->getQueryBuilder();
+            $query->delete($dbTable)
+                ->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)))
+                ->andWhere($query->expr()->eq('key', $query->createNamedParameter($key)))
+                ->executeStatement();
+        }
+
+        $existingKeys = array_keys(array_intersect_key($metadata, $cachedMetadata));
+        foreach ($existingKeys as $existingKey) {
+            if ($metadata[$existingKey] !== $cachedMetadata[$existingKey]) {
+                $query = $this->dbConnection->getQueryBuilder();
+                $query->update($dbTable)
+                    ->set('value', $query->createNamedParameter($metadata[$existingKey]))
+                    ->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)))
+                    ->andWhere($query->expr()->eq('key', $query->createNamedParameter($existingKey)))
+                    ->executeStatement();
+            }
+        }
+    }
+
+    /**
+     * serialize array of group restrictions to store them in database
+     *
+     * @param array $groups
+     *
+     * @return string
+     */
+    private function serializeGroupRestrictions(array $groups): string {
+        return \json_encode($groups, JSON_THROW_ON_ERROR);
+    }
+
+    /**
+     * Gets all metadata of a backend
+     *
+     * @param IResource|IRoom $resource
+     *
+     * @return array
+     */
+    private function getAllMetadataOfBackend($resource): array {
+        if (!($resource instanceof IMetadataProvider)) {
+            return [];
+        }
+
+        $keys = $resource->getAllAvailableMetadataKeys();
+        $metadata = [];
+        foreach ($keys as $key) {
+            $metadata[$key] = $resource->getMetadataForKey($key);
+        }
+
+        return $metadata;
+    }
+
+    /**
+     * @param string $table
+     * @param string $foreignKey
+     * @param int $id
+     *
+     * @return array
+     */
+    private function getAllMetadataOfCache(string $table,
+                                            string $foreignKey,
+                                            int $id): array {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->select(['key', 'value'])
+            ->from($table)
+            ->where($query->expr()->eq($foreignKey, $query->createNamedParameter($id)));
+        $result = $query->executeQuery();
+        $rows = $result->fetchAll();
+        $result->closeCursor();
+
+        $metadata = [];
+        foreach ($rows as $row) {
+            $metadata[$row['key']] = $row['value'];
+        }
+
+        return $metadata;
+    }
+
+    /**
+     * Gets all cached rooms / resources by backend
+     *
+     * @param $tableName
+     * @param $backendId
+     *
+     * @return array
+     */
+    private function getAllCachedByBackend(string $tableName,
+                                            string $backendId): array {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->select('resource_id')
+            ->from($tableName)
+            ->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)));
+        $result = $query->executeQuery();
+        $rows = $result->fetchAll();
+        $result->closeCursor();
+
+        return array_map(function ($row): string {
+            return $row['resource_id'];
+        }, $rows);
+    }
+
+    /**
+     * @param $principalPrefix
+     * @param $principalUri
+     */
+    private function deleteCalendarDataForResource(string $principalPrefix,
+                                                    string $principalUri): void {
+        $calendar = $this->calDavBackend->getCalendarByUri(
+            implode('/', [$principalPrefix, $principalUri]),
+            CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI);
+
+        if ($calendar !== null) {
+            $this->calDavBackend->deleteCalendar(
+                $calendar['id'],
+                true // Because this wasn't deleted by a user
+            );
+        }
+    }
+
+    /**
+     * @param $table
+     * @param $backendId
+     * @param $resourceId
+     *
+     * @return int
+     */
+    private function getIdForBackendAndResource(string $table,
+                                                string $backendId,
+                                                string $resourceId): int {
+        $query = $this->dbConnection->getQueryBuilder();
+        $query->select('id')
+            ->from($table)
+            ->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
+            ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
+        $result = $query->executeQuery();
+
+        $id = (int) $result->fetchOne();
+        $result->closeCursor();
+        return $id;
+    }
 }

apps/dav/lib/BulkUpload/BulkUploadPlugin.php

Indentation +69 added lines, -69 removed lines

@@ -34,83 +34,83 @@
 use OCA\DAV\Connector\Sabre\MtimeSanitizer;
 
 class BulkUploadPlugin extends ServerPlugin {
-	private Folder $userFolder;
-	private LoggerInterface $logger;
+    private Folder $userFolder;
+    private LoggerInterface $logger;
 
-	public function __construct(
-		Folder $userFolder,
-		LoggerInterface $logger
-	) {
-		$this->userFolder = $userFolder;
-		$this->logger = $logger;
-	}
+    public function __construct(
+        Folder $userFolder,
+        LoggerInterface $logger
+    ) {
+        $this->userFolder = $userFolder;
+        $this->logger = $logger;
+    }
 
-	/**
-	 * Register listener on POST requests with the httpPost method.
-	 */
-	public function initialize(Server $server): void {
-		$server->on('method:POST', [$this, 'httpPost'], 10);
-	}
+    /**
+     * Register listener on POST requests with the httpPost method.
+     */
+    public function initialize(Server $server): void {
+        $server->on('method:POST', [$this, 'httpPost'], 10);
+    }
 
-	/**
-	 * Handle POST requests on /dav/bulk
-	 * - parsing is done with a MultipartContentsParser object
-	 * - writing is done with the userFolder service
-	 *
-	 * Will respond with an object containing an ETag for every written files.
-	 */
-	public function httpPost(RequestInterface $request, ResponseInterface $response): bool {
-		// Limit bulk upload to the /dav/bulk endpoint
-		if ($request->getPath() !== "bulk") {
-			return true;
-		}
+    /**
+     * Handle POST requests on /dav/bulk
+     * - parsing is done with a MultipartContentsParser object
+     * - writing is done with the userFolder service
+     *
+     * Will respond with an object containing an ETag for every written files.
+     */
+    public function httpPost(RequestInterface $request, ResponseInterface $response): bool {
+        // Limit bulk upload to the /dav/bulk endpoint
+        if ($request->getPath() !== "bulk") {
+            return true;
+        }
 
-		$multiPartParser = new MultipartRequestParser($request);
-		$writtenFiles = [];
+        $multiPartParser = new MultipartRequestParser($request);
+        $writtenFiles = [];
 
-		while (!$multiPartParser->isAtLastBoundary()) {
-			try {
-				[$headers, $content] = $multiPartParser->parseNextPart();
-			} catch (\Exception $e) {
-				// Return early if an error occurs during parsing.
-				$this->logger->error($e->getMessage());
-				$response->setStatus(Http::STATUS_BAD_REQUEST);
-				$response->setBody(json_encode($writtenFiles, JSON_THROW_ON_ERROR));
-				return false;
-			}
+        while (!$multiPartParser->isAtLastBoundary()) {
+            try {
+                [$headers, $content] = $multiPartParser->parseNextPart();
+            } catch (\Exception $e) {
+                // Return early if an error occurs during parsing.
+                $this->logger->error($e->getMessage());
+                $response->setStatus(Http::STATUS_BAD_REQUEST);
+                $response->setBody(json_encode($writtenFiles, JSON_THROW_ON_ERROR));
+                return false;
+            }
 
-			try {
-				// TODO: Remove 'x-file-mtime' when the desktop client no longer use it.
-				if (isset($headers['x-file-mtime'])) {
-					$mtime = MtimeSanitizer::sanitizeMtime($headers['x-file-mtime']);
-				} elseif (isset($headers['x-oc-mtime'])) {
-					$mtime = MtimeSanitizer::sanitizeMtime($headers['x-oc-mtime']);
-				} else {
-					$mtime = null;
-				}
+            try {
+                // TODO: Remove 'x-file-mtime' when the desktop client no longer use it.
+                if (isset($headers['x-file-mtime'])) {
+                    $mtime = MtimeSanitizer::sanitizeMtime($headers['x-file-mtime']);
+                } elseif (isset($headers['x-oc-mtime'])) {
+                    $mtime = MtimeSanitizer::sanitizeMtime($headers['x-oc-mtime']);
+                } else {
+                    $mtime = null;
+                }
 
-				$node = $this->userFolder->newFile($headers['x-file-path'], $content);
-				$node->touch($mtime);
-				$node = $this->userFolder->getById($node->getId())[0];
+                $node = $this->userFolder->newFile($headers['x-file-path'], $content);
+                $node->touch($mtime);
+                $node = $this->userFolder->getById($node->getId())[0];
 
-				$writtenFiles[$headers['x-file-path']] = [
-					"error" => false,
-					"etag" => $node->getETag(),
-					"fileid" => DavUtil::getDavFileId($node->getId()),
-					"permissions" => DavUtil::getDavPermissions($node),
-				];
-			} catch (\Exception $e) {
-				$this->logger->error($e->getMessage(), ['path' => $headers['x-file-path']]);
-				$writtenFiles[$headers['x-file-path']] = [
-					"error" => true,
-					"message" => $e->getMessage(),
-				];
-			}
-		}
+                $writtenFiles[$headers['x-file-path']] = [
+                    "error" => false,
+                    "etag" => $node->getETag(),
+                    "fileid" => DavUtil::getDavFileId($node->getId()),
+                    "permissions" => DavUtil::getDavPermissions($node),
+                ];
+            } catch (\Exception $e) {
+                $this->logger->error($e->getMessage(), ['path' => $headers['x-file-path']]);
+                $writtenFiles[$headers['x-file-path']] = [
+                    "error" => true,
+                    "message" => $e->getMessage(),
+                ];
+            }
+        }
 
-		$response->setStatus(Http::STATUS_OK);
-		$response->setBody(json_encode($writtenFiles, JSON_THROW_ON_ERROR));
+        $response->setStatus(Http::STATUS_OK);
+        $response->setBody(json_encode($writtenFiles, JSON_THROW_ON_ERROR));
 
-		return false;
-	}
+        return false;
+    }
 }

apps/dav/lib/SystemTag/SystemTagPlugin.php

Indentation +274 added lines, -274 removed lines

@@ -48,278 +48,278 @@
  */
 class SystemTagPlugin extends \Sabre\DAV\ServerPlugin {
 
-	// namespace
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	public const ID_PROPERTYNAME = '{http://owncloud.org/ns}id';
-	public const DISPLAYNAME_PROPERTYNAME = '{http://owncloud.org/ns}display-name';
-	public const USERVISIBLE_PROPERTYNAME = '{http://owncloud.org/ns}user-visible';
-	public const USERASSIGNABLE_PROPERTYNAME = '{http://owncloud.org/ns}user-assignable';
-	public const GROUPS_PROPERTYNAME = '{http://owncloud.org/ns}groups';
-	public const CANASSIGN_PROPERTYNAME = '{http://owncloud.org/ns}can-assign';
-
-	/**
-	 * @var \Sabre\DAV\Server $server
-	 */
-	private $server;
-
-	/**
-	 * @var ISystemTagManager
-	 */
-	protected $tagManager;
-
-	/**
-	 * @var IUserSession
-	 */
-	protected $userSession;
-
-	/**
-	 * @var IGroupManager
-	 */
-	protected $groupManager;
-
-	/**
-	 * @param ISystemTagManager $tagManager tag manager
-	 * @param IGroupManager $groupManager
-	 * @param IUserSession $userSession
-	 */
-	public function __construct(ISystemTagManager $tagManager,
-								IGroupManager $groupManager,
-								IUserSession $userSession) {
-		$this->tagManager = $tagManager;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-	}
-
-	/**
-	 * 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->protectedProperties[] = self::ID_PROPERTYNAME;
-
-		$server->on('propFind', [$this, 'handleGetProperties']);
-		$server->on('propPatch', [$this, 'handleUpdateProperties']);
-		$server->on('method:POST', [$this, 'httpPost']);
-
-		$this->server = $server;
-	}
-
-	/**
-	 * POST operation on system tag collections
-	 *
-	 * @param RequestInterface $request request object
-	 * @param ResponseInterface $response response object
-	 * @return null|false
-	 */
-	public function httpPost(RequestInterface $request, ResponseInterface $response) {
-		$path = $request->getPath();
-
-		// Making sure the node exists
-		$node = $this->server->tree->getNodeForPath($path);
-		if ($node instanceof SystemTagsByIdCollection || $node instanceof SystemTagsObjectMappingCollection) {
-			$data = $request->getBodyAsString();
-
-			$tag = $this->createTag($data, $request->getHeader('Content-Type'));
-
-			if ($node instanceof SystemTagsObjectMappingCollection) {
-				// also add to collection
-				$node->createFile($tag->getId());
-				$url = $request->getBaseUrl() . 'systemtags/';
-			} else {
-				$url = $request->getUrl();
-			}
-
-			if ($url[strlen($url) - 1] !== '/') {
-				$url .= '/';
-			}
-
-			$response->setHeader('Content-Location', $url . $tag->getId());
-
-			// created
-			$response->setStatus(201);
-			return false;
-		}
-	}
-
-	/**
-	 * Creates a new tag
-	 *
-	 * @param string $data JSON encoded string containing the properties of the tag to create
-	 * @param string $contentType content type of the data
-	 * @return ISystemTag newly created system tag
-	 *
-	 * @throws BadRequest if a field was missing
-	 * @throws Conflict if a tag with the same properties already exists
-	 * @throws UnsupportedMediaType if the content type is not supported
-	 */
-	private function createTag($data, $contentType = 'application/json') {
-		if (explode(';', $contentType)[0] === 'application/json') {
-			$data = json_decode($data, true, 512, JSON_THROW_ON_ERROR);
-		} else {
-			throw new UnsupportedMediaType();
-		}
-
-		if (!isset($data['name'])) {
-			throw new BadRequest('Missing "name" attribute');
-		}
-
-		$tagName = $data['name'];
-		$userVisible = true;
-		$userAssignable = true;
-
-		if (isset($data['userVisible'])) {
-			$userVisible = (bool)$data['userVisible'];
-		}
-
-		if (isset($data['userAssignable'])) {
-			$userAssignable = (bool)$data['userAssignable'];
-		}
-
-		$groups = [];
-		if (isset($data['groups'])) {
-			$groups = $data['groups'];
-			if (is_string($groups)) {
-				$groups = explode('|', $groups);
-			}
-		}
-
-		if ($userVisible === false || $userAssignable === false || !empty($groups)) {
-			if (!$this->userSession->isLoggedIn() || !$this->groupManager->isAdmin($this->userSession->getUser()->getUID())) {
-				throw new BadRequest('Not sufficient permissions');
-			}
-		}
-
-		try {
-			$tag = $this->tagManager->createTag($tagName, $userVisible, $userAssignable);
-			if (!empty($groups)) {
-				$this->tagManager->setTagGroups($tag, $groups);
-			}
-			return $tag;
-		} catch (TagAlreadyExistsException $e) {
-			throw new Conflict('Tag already exists', 0, $e);
-		}
-	}
-
-
-	/**
-	 * Retrieves system tag properties
-	 *
-	 * @param PropFind $propFind
-	 * @param \Sabre\DAV\INode $node
-	 */
-	public function handleGetProperties(
-		PropFind $propFind,
-		\Sabre\DAV\INode $node
-	) {
-		if (!($node instanceof SystemTagNode) && !($node instanceof SystemTagMappingNode)) {
-			return;
-		}
-
-		$propFind->handle(self::ID_PROPERTYNAME, function () use ($node) {
-			return $node->getSystemTag()->getId();
-		});
-
-		$propFind->handle(self::DISPLAYNAME_PROPERTYNAME, function () use ($node) {
-			return $node->getSystemTag()->getName();
-		});
-
-		$propFind->handle(self::USERVISIBLE_PROPERTYNAME, function () use ($node) {
-			return $node->getSystemTag()->isUserVisible() ? 'true' : 'false';
-		});
-
-		$propFind->handle(self::USERASSIGNABLE_PROPERTYNAME, function () use ($node) {
-			// this is the tag's inherent property "is user assignable"
-			return $node->getSystemTag()->isUserAssignable() ? 'true' : 'false';
-		});
-
-		$propFind->handle(self::CANASSIGN_PROPERTYNAME, function () use ($node) {
-			// this is the effective permission for the current user
-			return $this->tagManager->canUserAssignTag($node->getSystemTag(), $this->userSession->getUser()) ? 'true' : 'false';
-		});
-
-		$propFind->handle(self::GROUPS_PROPERTYNAME, function () use ($node) {
-			if (!$this->groupManager->isAdmin($this->userSession->getUser()->getUID())) {
-				// property only available for admins
-				throw new Forbidden();
-			}
-			$groups = [];
-			// no need to retrieve groups for namespaces that don't qualify
-			if ($node->getSystemTag()->isUserVisible() && !$node->getSystemTag()->isUserAssignable()) {
-				$groups = $this->tagManager->getTagGroups($node->getSystemTag());
-			}
-			return implode('|', $groups);
-		});
-	}
-
-	/**
-	 * Updates tag attributes
-	 *
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 *
-	 * @return void
-	 */
-	public function handleUpdateProperties($path, PropPatch $propPatch) {
-		$node = $this->server->tree->getNodeForPath($path);
-		if (!($node instanceof SystemTagNode)) {
-			return;
-		}
-
-		$propPatch->handle([
-			self::DISPLAYNAME_PROPERTYNAME,
-			self::USERVISIBLE_PROPERTYNAME,
-			self::USERASSIGNABLE_PROPERTYNAME,
-			self::GROUPS_PROPERTYNAME,
-		], function ($props) use ($node) {
-			$tag = $node->getSystemTag();
-			$name = $tag->getName();
-			$userVisible = $tag->isUserVisible();
-			$userAssignable = $tag->isUserAssignable();
-
-			$updateTag = false;
-
-			if (isset($props[self::DISPLAYNAME_PROPERTYNAME])) {
-				$name = $props[self::DISPLAYNAME_PROPERTYNAME];
-				$updateTag = true;
-			}
-
-			if (isset($props[self::USERVISIBLE_PROPERTYNAME])) {
-				$propValue = $props[self::USERVISIBLE_PROPERTYNAME];
-				$userVisible = ($propValue !== 'false' && $propValue !== '0');
-				$updateTag = true;
-			}
-
-			if (isset($props[self::USERASSIGNABLE_PROPERTYNAME])) {
-				$propValue = $props[self::USERASSIGNABLE_PROPERTYNAME];
-				$userAssignable = ($propValue !== 'false' && $propValue !== '0');
-				$updateTag = true;
-			}
-
-			if (isset($props[self::GROUPS_PROPERTYNAME])) {
-				if (!$this->groupManager->isAdmin($this->userSession->getUser()->getUID())) {
-					// property only available for admins
-					throw new Forbidden();
-				}
-
-				$propValue = $props[self::GROUPS_PROPERTYNAME];
-				$groupIds = explode('|', $propValue);
-				$this->tagManager->setTagGroups($tag, $groupIds);
-			}
-
-			if ($updateTag) {
-				$node->update($name, $userVisible, $userAssignable);
-			}
-
-			return true;
-		});
-	}
+    // namespace
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const ID_PROPERTYNAME = '{http://owncloud.org/ns}id';
+    public const DISPLAYNAME_PROPERTYNAME = '{http://owncloud.org/ns}display-name';
+    public const USERVISIBLE_PROPERTYNAME = '{http://owncloud.org/ns}user-visible';
+    public const USERASSIGNABLE_PROPERTYNAME = '{http://owncloud.org/ns}user-assignable';
+    public const GROUPS_PROPERTYNAME = '{http://owncloud.org/ns}groups';
+    public const CANASSIGN_PROPERTYNAME = '{http://owncloud.org/ns}can-assign';
+
+    /**
+     * @var \Sabre\DAV\Server $server
+     */
+    private $server;
+
+    /**
+     * @var ISystemTagManager
+     */
+    protected $tagManager;
+
+    /**
+     * @var IUserSession
+     */
+    protected $userSession;
+
+    /**
+     * @var IGroupManager
+     */
+    protected $groupManager;
+
+    /**
+     * @param ISystemTagManager $tagManager tag manager
+     * @param IGroupManager $groupManager
+     * @param IUserSession $userSession
+     */
+    public function __construct(ISystemTagManager $tagManager,
+                                IGroupManager $groupManager,
+                                IUserSession $userSession) {
+        $this->tagManager = $tagManager;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+    }
+
+    /**
+     * 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->protectedProperties[] = self::ID_PROPERTYNAME;
+
+        $server->on('propFind', [$this, 'handleGetProperties']);
+        $server->on('propPatch', [$this, 'handleUpdateProperties']);
+        $server->on('method:POST', [$this, 'httpPost']);
+
+        $this->server = $server;
+    }
+
+    /**
+     * POST operation on system tag collections
+     *
+     * @param RequestInterface $request request object
+     * @param ResponseInterface $response response object
+     * @return null|false
+     */
+    public function httpPost(RequestInterface $request, ResponseInterface $response) {
+        $path = $request->getPath();
+
+        // Making sure the node exists
+        $node = $this->server->tree->getNodeForPath($path);
+        if ($node instanceof SystemTagsByIdCollection || $node instanceof SystemTagsObjectMappingCollection) {
+            $data = $request->getBodyAsString();
+
+            $tag = $this->createTag($data, $request->getHeader('Content-Type'));
+
+            if ($node instanceof SystemTagsObjectMappingCollection) {
+                // also add to collection
+                $node->createFile($tag->getId());
+                $url = $request->getBaseUrl() . 'systemtags/';
+            } else {
+                $url = $request->getUrl();
+            }
+
+            if ($url[strlen($url) - 1] !== '/') {
+                $url .= '/';
+            }
+
+            $response->setHeader('Content-Location', $url . $tag->getId());
+
+            // created
+            $response->setStatus(201);
+            return false;
+        }
+    }
+
+    /**
+     * Creates a new tag
+     *
+     * @param string $data JSON encoded string containing the properties of the tag to create
+     * @param string $contentType content type of the data
+     * @return ISystemTag newly created system tag
+     *
+     * @throws BadRequest if a field was missing
+     * @throws Conflict if a tag with the same properties already exists
+     * @throws UnsupportedMediaType if the content type is not supported
+     */
+    private function createTag($data, $contentType = 'application/json') {
+        if (explode(';', $contentType)[0] === 'application/json') {
+            $data = json_decode($data, true, 512, JSON_THROW_ON_ERROR);
+        } else {
+            throw new UnsupportedMediaType();
+        }
+
+        if (!isset($data['name'])) {
+            throw new BadRequest('Missing "name" attribute');
+        }
+
+        $tagName = $data['name'];
+        $userVisible = true;
+        $userAssignable = true;
+
+        if (isset($data['userVisible'])) {
+            $userVisible = (bool)$data['userVisible'];
+        }
+
+        if (isset($data['userAssignable'])) {
+            $userAssignable = (bool)$data['userAssignable'];
+        }
+
+        $groups = [];
+        if (isset($data['groups'])) {
+            $groups = $data['groups'];
+            if (is_string($groups)) {
+                $groups = explode('|', $groups);
+            }
+        }
+
+        if ($userVisible === false || $userAssignable === false || !empty($groups)) {
+            if (!$this->userSession->isLoggedIn() || !$this->groupManager->isAdmin($this->userSession->getUser()->getUID())) {
+                throw new BadRequest('Not sufficient permissions');
+            }
+        }
+
+        try {
+            $tag = $this->tagManager->createTag($tagName, $userVisible, $userAssignable);
+            if (!empty($groups)) {
+                $this->tagManager->setTagGroups($tag, $groups);
+            }
+            return $tag;
+        } catch (TagAlreadyExistsException $e) {
+            throw new Conflict('Tag already exists', 0, $e);
+        }
+    }
+
+
+    /**
+     * Retrieves system tag properties
+     *
+     * @param PropFind $propFind
+     * @param \Sabre\DAV\INode $node
+     */
+    public function handleGetProperties(
+        PropFind $propFind,
+        \Sabre\DAV\INode $node
+    ) {
+        if (!($node instanceof SystemTagNode) && !($node instanceof SystemTagMappingNode)) {
+            return;
+        }
+
+        $propFind->handle(self::ID_PROPERTYNAME, function () use ($node) {
+            return $node->getSystemTag()->getId();
+        });
+
+        $propFind->handle(self::DISPLAYNAME_PROPERTYNAME, function () use ($node) {
+            return $node->getSystemTag()->getName();
+        });
+
+        $propFind->handle(self::USERVISIBLE_PROPERTYNAME, function () use ($node) {
+            return $node->getSystemTag()->isUserVisible() ? 'true' : 'false';
+        });
+
+        $propFind->handle(self::USERASSIGNABLE_PROPERTYNAME, function () use ($node) {
+            // this is the tag's inherent property "is user assignable"
+            return $node->getSystemTag()->isUserAssignable() ? 'true' : 'false';
+        });
+
+        $propFind->handle(self::CANASSIGN_PROPERTYNAME, function () use ($node) {
+            // this is the effective permission for the current user
+            return $this->tagManager->canUserAssignTag($node->getSystemTag(), $this->userSession->getUser()) ? 'true' : 'false';
+        });
+
+        $propFind->handle(self::GROUPS_PROPERTYNAME, function () use ($node) {
+            if (!$this->groupManager->isAdmin($this->userSession->getUser()->getUID())) {
+                // property only available for admins
+                throw new Forbidden();
+            }
+            $groups = [];
+            // no need to retrieve groups for namespaces that don't qualify
+            if ($node->getSystemTag()->isUserVisible() && !$node->getSystemTag()->isUserAssignable()) {
+                $groups = $this->tagManager->getTagGroups($node->getSystemTag());
+            }
+            return implode('|', $groups);
+        });
+    }
+
+    /**
+     * Updates tag attributes
+     *
+     * @param string $path
+     * @param PropPatch $propPatch
+     *
+     * @return void
+     */
+    public function handleUpdateProperties($path, PropPatch $propPatch) {
+        $node = $this->server->tree->getNodeForPath($path);
+        if (!($node instanceof SystemTagNode)) {
+            return;
+        }
+
+        $propPatch->handle([
+            self::DISPLAYNAME_PROPERTYNAME,
+            self::USERVISIBLE_PROPERTYNAME,
+            self::USERASSIGNABLE_PROPERTYNAME,
+            self::GROUPS_PROPERTYNAME,
+        ], function ($props) use ($node) {
+            $tag = $node->getSystemTag();
+            $name = $tag->getName();
+            $userVisible = $tag->isUserVisible();
+            $userAssignable = $tag->isUserAssignable();
+
+            $updateTag = false;
+
+            if (isset($props[self::DISPLAYNAME_PROPERTYNAME])) {
+                $name = $props[self::DISPLAYNAME_PROPERTYNAME];
+                $updateTag = true;
+            }
+
+            if (isset($props[self::USERVISIBLE_PROPERTYNAME])) {
+                $propValue = $props[self::USERVISIBLE_PROPERTYNAME];
+                $userVisible = ($propValue !== 'false' && $propValue !== '0');
+                $updateTag = true;
+            }
+
+            if (isset($props[self::USERASSIGNABLE_PROPERTYNAME])) {
+                $propValue = $props[self::USERASSIGNABLE_PROPERTYNAME];
+                $userAssignable = ($propValue !== 'false' && $propValue !== '0');
+                $updateTag = true;
+            }
+
+            if (isset($props[self::GROUPS_PROPERTYNAME])) {
+                if (!$this->groupManager->isAdmin($this->userSession->getUser()->getUID())) {
+                    // property only available for admins
+                    throw new Forbidden();
+                }
+
+                $propValue = $props[self::GROUPS_PROPERTYNAME];
+                $groupIds = explode('|', $propValue);
+                $this->tagManager->setTagGroups($tag, $groupIds);
+            }
+
+            if ($updateTag) {
+                $node->update($name, $userVisible, $userAssignable);
+            }
+
+            return true;
+        });
+    }
 }

apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php

Indentation +490 added lines, -490 removed lines

@@ -45,494 +45,494 @@
 
 abstract class AbstractPrincipalBackend implements BackendInterface {
 
-	/** @var IDBConnection */
-	private $db;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	private LoggerInterface $logger;
-
-	/** @var ProxyMapper */
-	private $proxyMapper;
-
-	/** @var string */
-	private $principalPrefix;
-
-	/** @var string */
-	private $dbTableName;
-
-	/** @var string */
-	private $dbMetaDataTableName;
-
-	/** @var string */
-	private $dbForeignKeyName;
-
-	/** @var string */
-	private $cuType;
-
-	public function __construct(IDBConnection $dbConnection,
-								IUserSession $userSession,
-								IGroupManager $groupManager,
-								LoggerInterface $logger,
-								ProxyMapper $proxyMapper,
-								string $principalPrefix,
-								string $dbPrefix,
-								string $cuType) {
-		$this->db = $dbConnection;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->logger = $logger;
-		$this->proxyMapper = $proxyMapper;
-		$this->principalPrefix = $principalPrefix;
-		$this->dbTableName = 'calendar_' . $dbPrefix . 's';
-		$this->dbMetaDataTableName = $this->dbTableName . '_md';
-		$this->dbForeignKeyName = $dbPrefix . '_id';
-		$this->cuType = $cuType;
-	}
-
-	use PrincipalProxyTrait;
-
-	/**
-	 * Returns a list of principals based on a prefix.
-	 *
-	 * This prefix will often contain something like 'principals'. You are only
-	 * expected to return principals that are in this base path.
-	 *
-	 * You are expected to return at least a 'uri' for every user, you can
-	 * return any additional properties if you wish so. Common properties are:
-	 *   {DAV:}displayname
-	 *
-	 * @param string $prefixPath
-	 * @return string[]
-	 */
-	public function getPrincipalsByPrefix($prefixPath): array {
-		$principals = [];
-
-		if ($prefixPath === $this->principalPrefix) {
-			$query = $this->db->getQueryBuilder();
-			$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
-				->from($this->dbTableName);
-			$stmt = $query->execute();
-
-			$metaDataQuery = $this->db->getQueryBuilder();
-			$metaDataQuery->select([$this->dbForeignKeyName, 'key', 'value'])
-				->from($this->dbMetaDataTableName);
-			$metaDataStmt = $metaDataQuery->execute();
-			$metaDataRows = $metaDataStmt->fetchAll(\PDO::FETCH_ASSOC);
-
-			$metaDataById = [];
-			foreach ($metaDataRows as $metaDataRow) {
-				if (!isset($metaDataById[$metaDataRow[$this->dbForeignKeyName]])) {
-					$metaDataById[$metaDataRow[$this->dbForeignKeyName]] = [];
-				}
-
-				$metaDataById[$metaDataRow[$this->dbForeignKeyName]][$metaDataRow['key']] =
-					$metaDataRow['value'];
-			}
-
-			while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-				$id = $row['id'];
-
-				if (isset($metaDataById[$id])) {
-					$principals[] = $this->rowToPrincipal($row, $metaDataById[$id]);
-				} else {
-					$principals[] = $this->rowToPrincipal($row);
-				}
-			}
-
-			$stmt->closeCursor();
-		}
-
-		return $principals;
-	}
-
-	/**
-	 * Returns a specific principal, specified by its path.
-	 * The returned structure should be the exact same as from
-	 * getPrincipalsByPrefix.
-	 *
-	 * @param string $prefixPath
-	 *
-	 * @return array
-	 */
-	public function getPrincipalByPath($path) {
-		if (strpos($path, $this->principalPrefix) !== 0) {
-			return null;
-		}
-		[, $name] = \Sabre\Uri\split($path);
-
-		[$backendId, $resourceId] = explode('-',  $name, 2);
-
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
-			->from($this->dbTableName)
-			->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
-			->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
-		$stmt = $query->execute();
-		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-		if (!$row) {
-			return null;
-		}
-
-		$metaDataQuery = $this->db->getQueryBuilder();
-		$metaDataQuery->select(['key', 'value'])
-			->from($this->dbMetaDataTableName)
-			->where($metaDataQuery->expr()->eq($this->dbForeignKeyName, $metaDataQuery->createNamedParameter($row['id'])));
-		$metaDataStmt = $metaDataQuery->execute();
-		$metaDataRows = $metaDataStmt->fetchAll(\PDO::FETCH_ASSOC);
-		$metadata = [];
-
-		foreach ($metaDataRows as $metaDataRow) {
-			$metadata[$metaDataRow['key']] = $metaDataRow['value'];
-		}
-
-		return $this->rowToPrincipal($row, $metadata);
-	}
-
-	/**
-	 * @param int $id
-	 * @return string[]|null
-	 */
-	public function getPrincipalById($id): ?array {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
-			->from($this->dbTableName)
-			->where($query->expr()->eq('id', $query->createNamedParameter($id)));
-		$stmt = $query->execute();
-		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-		if (!$row) {
-			return null;
-		}
-
-		$metaDataQuery = $this->db->getQueryBuilder();
-		$metaDataQuery->select(['key', 'value'])
-			->from($this->dbMetaDataTableName)
-			->where($metaDataQuery->expr()->eq($this->dbForeignKeyName, $metaDataQuery->createNamedParameter($row['id'])));
-		$metaDataStmt = $metaDataQuery->execute();
-		$metaDataRows = $metaDataStmt->fetchAll(\PDO::FETCH_ASSOC);
-		$metadata = [];
-
-		foreach ($metaDataRows as $metaDataRow) {
-			$metadata[$metaDataRow['key']] = $metaDataRow['value'];
-		}
-
-		return $this->rowToPrincipal($row, $metadata);
-	}
-
-	/**
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 * @return int
-	 */
-	public function updatePrincipal($path, PropPatch $propPatch): int {
-		return 0;
-	}
-
-	/**
-	 * @param string $prefixPath
-	 * @param string $test
-	 *
-	 * @return array
-	 */
-	public function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
-		$results = [];
-		if (\count($searchProperties) === 0) {
-			return [];
-		}
-		if ($prefixPath !== $this->principalPrefix) {
-			return [];
-		}
-
-		$user = $this->userSession->getUser();
-		if (!$user) {
-			return [];
-		}
-		$usersGroups = $this->groupManager->getUserGroupIds($user);
-
-		foreach ($searchProperties as $prop => $value) {
-			switch ($prop) {
-				case '{http://sabredav.org/ns}email-address':
-					$query = $this->db->getQueryBuilder();
-					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
-						->from($this->dbTableName)
-						->where($query->expr()->iLike('email', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
-
-					$stmt = $query->execute();
-					$principals = [];
-					while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-						if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
-							continue;
-						}
-						$principals[] = $this->rowToPrincipal($row)['uri'];
-					}
-					$results[] = $principals;
-
-					$stmt->closeCursor();
-					break;
-
-				case '{DAV:}displayname':
-					$query = $this->db->getQueryBuilder();
-					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
-						->from($this->dbTableName)
-						->where($query->expr()->iLike('displayname', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
-
-					$stmt = $query->execute();
-					$principals = [];
-					while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-						if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
-							continue;
-						}
-						$principals[] = $this->rowToPrincipal($row)['uri'];
-					}
-					$results[] = $principals;
-
-					$stmt->closeCursor();
-					break;
-
-				case '{urn:ietf:params:xml:ns:caldav}calendar-user-address-set':
-					// If you add support for more search properties that qualify as a user-address,
-					// please also add them to the array below
-					$results[] = $this->searchPrincipals($this->principalPrefix, [
-						'{http://sabredav.org/ns}email-address' => $value,
-					], 'anyof');
-					break;
-
-				case IRoomMetadata::FEATURES:
-					$results[] = $this->searchPrincipalsByRoomFeature($prop, $value);
-					break;
-
-				case IRoomMetadata::CAPACITY:
-				case IResourceMetadata::VEHICLE_SEATING_CAPACITY:
-					$results[] = $this->searchPrincipalsByCapacity($prop,$value);
-					break;
-
-				default:
-					$results[] = $this->searchPrincipalsByMetadataKey($prop, $value, $usersGroups);
-					break;
-			}
-		}
-
-		// results is an array of arrays, so this is not the first search result
-		// but the results of the first searchProperty
-		if (count($results) === 1) {
-			return $results[0];
-		}
-
-		switch ($test) {
-			case 'anyof':
-				return array_values(array_unique(array_merge(...$results)));
-
-			case 'allof':
-			default:
-				return array_values(array_intersect(...$results));
-		}
-	}
-
-	/**
-	 * @param string $key
-	 * @return IQueryBuilder
-	 */
-	private function getMetadataQuery(string $key): IQueryBuilder {
-		$query = $this->db->getQueryBuilder();
-		$query->select([$this->dbForeignKeyName])
-			->from($this->dbMetaDataTableName)
-			->where($query->expr()->eq('key', $query->createNamedParameter($key)));
-		return $query;
-	}
-
-	/**
-	 * Searches principals based on their metadata keys.
-	 * This allows to search for all principals with a specific key.
-	 * e.g.:
-	 * '{http://nextcloud.com/ns}room-building-address' => 'ABC Street 123, ...'
-	 *
-	 * @param string $key
-	 * @param string $value
-	 * @param string[] $usersGroups
-	 * @return string[]
-	 */
-	private function searchPrincipalsByMetadataKey(string $key, string $value, array $usersGroups = []): array {
-		$query = $this->getMetadataQuery($key);
-		$query->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
-		return $this->getRows($query, $usersGroups);
-	}
-
-	/**
-	 * Searches principals based on room features
-	 * e.g.:
-	 * '{http://nextcloud.com/ns}room-features' => 'TV,PROJECTOR'
-	 *
-	 * @param string $key
-	 * @param string $value
-	 * @param string[] $usersGroups
-	 * @return string[]
-	 */
-	private function searchPrincipalsByRoomFeature(string $key, string $value, array $usersGroups = []): array {
-		$query = $this->getMetadataQuery($key);
-		foreach (explode(',', $value) as $v) {
-			$query->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($v) . '%')));
-		}
-		return $this->getRows($query, $usersGroups);
-	}
-
-	/**
-	 * Searches principals based on room seating capacity or vehicle capacity
-	 * e.g.:
-	 * '{http://nextcloud.com/ns}room-seating-capacity' => '100'
-	 *
-	 * @param string $key
-	 * @param string $value
-	 * @param string[] $usersGroups
-	 * @return string[]
-	 */
-	private function searchPrincipalsByCapacity(string $key, string $value, array $usersGroups = []): array {
-		$query = $this->getMetadataQuery($key);
-		$query->andWhere($query->expr()->gte('value', $query->createNamedParameter($value)));
-		return $this->getRows($query, $usersGroups);
-	}
-
-	/**
-	 * @param IQueryBuilder $query
-	 * @param string[] $usersGroups
-	 * @return string[]
-	 */
-	private function getRows(IQueryBuilder $query, array $usersGroups): array {
-		try {
-			$stmt = $query->executeQuery();
-		} catch (Exception $e) {
-			$this->logger->error("Could not search resources: " . $e->getMessage(), ['exception' => $e]);
-		}
-
-		$rows = [];
-		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-			$principalRow = $this->getPrincipalById($row[$this->dbForeignKeyName]);
-			if (!$principalRow) {
-				continue;
-			}
-
-			$rows[] = $principalRow;
-		}
-
-		$stmt->closeCursor();
-
-		$filteredRows = array_filter($rows, function ($row) use ($usersGroups) {
-			return $this->isAllowedToAccessResource($row, $usersGroups);
-		});
-
-		return array_map(static function ($row): string {
-			return $row['uri'];
-		}, $filteredRows);
-	}
-
-	/**
-	 * @param string $uri
-	 * @param string $principalPrefix
-	 * @return null|string
-	 * @throws Exception
-	 */
-	public function findByUri($uri, $principalPrefix): ?string {
-		$user = $this->userSession->getUser();
-		if (!$user) {
-			return null;
-		}
-		$usersGroups = $this->groupManager->getUserGroupIds($user);
-
-		if (strpos($uri, 'mailto:') === 0) {
-			$email = substr($uri, 7);
-			$query = $this->db->getQueryBuilder();
-			$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
-				->from($this->dbTableName)
-				->where($query->expr()->eq('email', $query->createNamedParameter($email)));
-
-			$stmt = $query->execute();
-			$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-			if (!$row) {
-				return null;
-			}
-			if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
-				return null;
-			}
-
-			return $this->rowToPrincipal($row)['uri'];
-		}
-
-		if (strpos($uri, 'principal:') === 0) {
-			$path = substr($uri, 10);
-			if (strpos($path, $this->principalPrefix) !== 0) {
-				return null;
-			}
-
-			[, $name] = \Sabre\Uri\split($path);
-			[$backendId, $resourceId] = explode('-',  $name, 2);
-
-			$query = $this->db->getQueryBuilder();
-			$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
-				->from($this->dbTableName)
-				->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
-				->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
-			$stmt = $query->execute();
-			$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-			if (!$row) {
-				return null;
-			}
-			if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
-				return null;
-			}
-
-			return $this->rowToPrincipal($row)['uri'];
-		}
-
-		return null;
-	}
-
-	/**
-	 * convert database row to principal
-	 *
-	 * @param string[] $row
-	 * @param string[] $metadata
-	 * @return string[]
-	 */
-	private function rowToPrincipal(array $row, array $metadata = []): array {
-		return array_merge([
-			'uri' => $this->principalPrefix . '/' . $row['backend_id'] . '-' . $row['resource_id'],
-			'{DAV:}displayname' => $row['displayname'],
-			'{http://sabredav.org/ns}email-address' => $row['email'],
-			'{urn:ietf:params:xml:ns:caldav}calendar-user-type' => $this->cuType,
-		], $metadata);
-	}
-
-	/**
-	 * @param array $row
-	 * @param array $userGroups
-	 * @return bool
-	 */
-	private function isAllowedToAccessResource(array $row, array $userGroups): bool {
-		if (!isset($row['group_restrictions']) ||
-			$row['group_restrictions'] === null ||
-			$row['group_restrictions'] === '') {
-			return true;
-		}
-
-		// group restrictions contains something, but not parsable, deny access and log warning
-		$json = json_decode($row['group_restrictions'], null, 512, JSON_THROW_ON_ERROR);
-		if (!\is_array($json)) {
-			$this->logger->info('group_restrictions field could not be parsed for ' . $this->dbTableName . '::' . $row['id'] . ', denying access to resource');
-			return false;
-		}
-
-		// empty array => no group restrictions
-		if (empty($json)) {
-			return true;
-		}
-
-		return !empty(array_intersect($json, $userGroups));
-	}
+    /** @var IDBConnection */
+    private $db;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    private LoggerInterface $logger;
+
+    /** @var ProxyMapper */
+    private $proxyMapper;
+
+    /** @var string */
+    private $principalPrefix;
+
+    /** @var string */
+    private $dbTableName;
+
+    /** @var string */
+    private $dbMetaDataTableName;
+
+    /** @var string */
+    private $dbForeignKeyName;
+
+    /** @var string */
+    private $cuType;
+
+    public function __construct(IDBConnection $dbConnection,
+                                IUserSession $userSession,
+                                IGroupManager $groupManager,
+                                LoggerInterface $logger,
+                                ProxyMapper $proxyMapper,
+                                string $principalPrefix,
+                                string $dbPrefix,
+                                string $cuType) {
+        $this->db = $dbConnection;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->logger = $logger;
+        $this->proxyMapper = $proxyMapper;
+        $this->principalPrefix = $principalPrefix;
+        $this->dbTableName = 'calendar_' . $dbPrefix . 's';
+        $this->dbMetaDataTableName = $this->dbTableName . '_md';
+        $this->dbForeignKeyName = $dbPrefix . '_id';
+        $this->cuType = $cuType;
+    }
+
+    use PrincipalProxyTrait;
+
+    /**
+     * Returns a list of principals based on a prefix.
+     *
+     * This prefix will often contain something like 'principals'. You are only
+     * expected to return principals that are in this base path.
+     *
+     * You are expected to return at least a 'uri' for every user, you can
+     * return any additional properties if you wish so. Common properties are:
+     *   {DAV:}displayname
+     *
+     * @param string $prefixPath
+     * @return string[]
+     */
+    public function getPrincipalsByPrefix($prefixPath): array {
+        $principals = [];
+
+        if ($prefixPath === $this->principalPrefix) {
+            $query = $this->db->getQueryBuilder();
+            $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
+                ->from($this->dbTableName);
+            $stmt = $query->execute();
+
+            $metaDataQuery = $this->db->getQueryBuilder();
+            $metaDataQuery->select([$this->dbForeignKeyName, 'key', 'value'])
+                ->from($this->dbMetaDataTableName);
+            $metaDataStmt = $metaDataQuery->execute();
+            $metaDataRows = $metaDataStmt->fetchAll(\PDO::FETCH_ASSOC);
+
+            $metaDataById = [];
+            foreach ($metaDataRows as $metaDataRow) {
+                if (!isset($metaDataById[$metaDataRow[$this->dbForeignKeyName]])) {
+                    $metaDataById[$metaDataRow[$this->dbForeignKeyName]] = [];
+                }
+
+                $metaDataById[$metaDataRow[$this->dbForeignKeyName]][$metaDataRow['key']] =
+                    $metaDataRow['value'];
+            }
+
+            while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+                $id = $row['id'];
+
+                if (isset($metaDataById[$id])) {
+                    $principals[] = $this->rowToPrincipal($row, $metaDataById[$id]);
+                } else {
+                    $principals[] = $this->rowToPrincipal($row);
+                }
+            }
+
+            $stmt->closeCursor();
+        }
+
+        return $principals;
+    }
+
+    /**
+     * Returns a specific principal, specified by its path.
+     * The returned structure should be the exact same as from
+     * getPrincipalsByPrefix.
+     *
+     * @param string $prefixPath
+     *
+     * @return array
+     */
+    public function getPrincipalByPath($path) {
+        if (strpos($path, $this->principalPrefix) !== 0) {
+            return null;
+        }
+        [, $name] = \Sabre\Uri\split($path);
+
+        [$backendId, $resourceId] = explode('-',  $name, 2);
+
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
+            ->from($this->dbTableName)
+            ->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
+            ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
+        $stmt = $query->execute();
+        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+        if (!$row) {
+            return null;
+        }
+
+        $metaDataQuery = $this->db->getQueryBuilder();
+        $metaDataQuery->select(['key', 'value'])
+            ->from($this->dbMetaDataTableName)
+            ->where($metaDataQuery->expr()->eq($this->dbForeignKeyName, $metaDataQuery->createNamedParameter($row['id'])));
+        $metaDataStmt = $metaDataQuery->execute();
+        $metaDataRows = $metaDataStmt->fetchAll(\PDO::FETCH_ASSOC);
+        $metadata = [];
+
+        foreach ($metaDataRows as $metaDataRow) {
+            $metadata[$metaDataRow['key']] = $metaDataRow['value'];
+        }
+
+        return $this->rowToPrincipal($row, $metadata);
+    }
+
+    /**
+     * @param int $id
+     * @return string[]|null
+     */
+    public function getPrincipalById($id): ?array {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
+            ->from($this->dbTableName)
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id)));
+        $stmt = $query->execute();
+        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+        if (!$row) {
+            return null;
+        }
+
+        $metaDataQuery = $this->db->getQueryBuilder();
+        $metaDataQuery->select(['key', 'value'])
+            ->from($this->dbMetaDataTableName)
+            ->where($metaDataQuery->expr()->eq($this->dbForeignKeyName, $metaDataQuery->createNamedParameter($row['id'])));
+        $metaDataStmt = $metaDataQuery->execute();
+        $metaDataRows = $metaDataStmt->fetchAll(\PDO::FETCH_ASSOC);
+        $metadata = [];
+
+        foreach ($metaDataRows as $metaDataRow) {
+            $metadata[$metaDataRow['key']] = $metaDataRow['value'];
+        }
+
+        return $this->rowToPrincipal($row, $metadata);
+    }
+
+    /**
+     * @param string $path
+     * @param PropPatch $propPatch
+     * @return int
+     */
+    public function updatePrincipal($path, PropPatch $propPatch): int {
+        return 0;
+    }
+
+    /**
+     * @param string $prefixPath
+     * @param string $test
+     *
+     * @return array
+     */
+    public function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
+        $results = [];
+        if (\count($searchProperties) === 0) {
+            return [];
+        }
+        if ($prefixPath !== $this->principalPrefix) {
+            return [];
+        }
+
+        $user = $this->userSession->getUser();
+        if (!$user) {
+            return [];
+        }
+        $usersGroups = $this->groupManager->getUserGroupIds($user);
+
+        foreach ($searchProperties as $prop => $value) {
+            switch ($prop) {
+                case '{http://sabredav.org/ns}email-address':
+                    $query = $this->db->getQueryBuilder();
+                    $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
+                        ->from($this->dbTableName)
+                        ->where($query->expr()->iLike('email', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+
+                    $stmt = $query->execute();
+                    $principals = [];
+                    while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+                        if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
+                            continue;
+                        }
+                        $principals[] = $this->rowToPrincipal($row)['uri'];
+                    }
+                    $results[] = $principals;
+
+                    $stmt->closeCursor();
+                    break;
+
+                case '{DAV:}displayname':
+                    $query = $this->db->getQueryBuilder();
+                    $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
+                        ->from($this->dbTableName)
+                        ->where($query->expr()->iLike('displayname', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+
+                    $stmt = $query->execute();
+                    $principals = [];
+                    while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+                        if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
+                            continue;
+                        }
+                        $principals[] = $this->rowToPrincipal($row)['uri'];
+                    }
+                    $results[] = $principals;
+
+                    $stmt->closeCursor();
+                    break;
+
+                case '{urn:ietf:params:xml:ns:caldav}calendar-user-address-set':
+                    // If you add support for more search properties that qualify as a user-address,
+                    // please also add them to the array below
+                    $results[] = $this->searchPrincipals($this->principalPrefix, [
+                        '{http://sabredav.org/ns}email-address' => $value,
+                    ], 'anyof');
+                    break;
+
+                case IRoomMetadata::FEATURES:
+                    $results[] = $this->searchPrincipalsByRoomFeature($prop, $value);
+                    break;
+
+                case IRoomMetadata::CAPACITY:
+                case IResourceMetadata::VEHICLE_SEATING_CAPACITY:
+                    $results[] = $this->searchPrincipalsByCapacity($prop,$value);
+                    break;
+
+                default:
+                    $results[] = $this->searchPrincipalsByMetadataKey($prop, $value, $usersGroups);
+                    break;
+            }
+        }
+
+        // results is an array of arrays, so this is not the first search result
+        // but the results of the first searchProperty
+        if (count($results) === 1) {
+            return $results[0];
+        }
+
+        switch ($test) {
+            case 'anyof':
+                return array_values(array_unique(array_merge(...$results)));
+
+            case 'allof':
+            default:
+                return array_values(array_intersect(...$results));
+        }
+    }
+
+    /**
+     * @param string $key
+     * @return IQueryBuilder
+     */
+    private function getMetadataQuery(string $key): IQueryBuilder {
+        $query = $this->db->getQueryBuilder();
+        $query->select([$this->dbForeignKeyName])
+            ->from($this->dbMetaDataTableName)
+            ->where($query->expr()->eq('key', $query->createNamedParameter($key)));
+        return $query;
+    }
+
+    /**
+     * Searches principals based on their metadata keys.
+     * This allows to search for all principals with a specific key.
+     * e.g.:
+     * '{http://nextcloud.com/ns}room-building-address' => 'ABC Street 123, ...'
+     *
+     * @param string $key
+     * @param string $value
+     * @param string[] $usersGroups
+     * @return string[]
+     */
+    private function searchPrincipalsByMetadataKey(string $key, string $value, array $usersGroups = []): array {
+        $query = $this->getMetadataQuery($key);
+        $query->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+        return $this->getRows($query, $usersGroups);
+    }
+
+    /**
+     * Searches principals based on room features
+     * e.g.:
+     * '{http://nextcloud.com/ns}room-features' => 'TV,PROJECTOR'
+     *
+     * @param string $key
+     * @param string $value
+     * @param string[] $usersGroups
+     * @return string[]
+     */
+    private function searchPrincipalsByRoomFeature(string $key, string $value, array $usersGroups = []): array {
+        $query = $this->getMetadataQuery($key);
+        foreach (explode(',', $value) as $v) {
+            $query->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($v) . '%')));
+        }
+        return $this->getRows($query, $usersGroups);
+    }
+
+    /**
+     * Searches principals based on room seating capacity or vehicle capacity
+     * e.g.:
+     * '{http://nextcloud.com/ns}room-seating-capacity' => '100'
+     *
+     * @param string $key
+     * @param string $value
+     * @param string[] $usersGroups
+     * @return string[]
+     */
+    private function searchPrincipalsByCapacity(string $key, string $value, array $usersGroups = []): array {
+        $query = $this->getMetadataQuery($key);
+        $query->andWhere($query->expr()->gte('value', $query->createNamedParameter($value)));
+        return $this->getRows($query, $usersGroups);
+    }
+
+    /**
+     * @param IQueryBuilder $query
+     * @param string[] $usersGroups
+     * @return string[]
+     */
+    private function getRows(IQueryBuilder $query, array $usersGroups): array {
+        try {
+            $stmt = $query->executeQuery();
+        } catch (Exception $e) {
+            $this->logger->error("Could not search resources: " . $e->getMessage(), ['exception' => $e]);
+        }
+
+        $rows = [];
+        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+            $principalRow = $this->getPrincipalById($row[$this->dbForeignKeyName]);
+            if (!$principalRow) {
+                continue;
+            }
+
+            $rows[] = $principalRow;
+        }
+
+        $stmt->closeCursor();
+
+        $filteredRows = array_filter($rows, function ($row) use ($usersGroups) {
+            return $this->isAllowedToAccessResource($row, $usersGroups);
+        });
+
+        return array_map(static function ($row): string {
+            return $row['uri'];
+        }, $filteredRows);
+    }
+
+    /**
+     * @param string $uri
+     * @param string $principalPrefix
+     * @return null|string
+     * @throws Exception
+     */
+    public function findByUri($uri, $principalPrefix): ?string {
+        $user = $this->userSession->getUser();
+        if (!$user) {
+            return null;
+        }
+        $usersGroups = $this->groupManager->getUserGroupIds($user);
+
+        if (strpos($uri, 'mailto:') === 0) {
+            $email = substr($uri, 7);
+            $query = $this->db->getQueryBuilder();
+            $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
+                ->from($this->dbTableName)
+                ->where($query->expr()->eq('email', $query->createNamedParameter($email)));
+
+            $stmt = $query->execute();
+            $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+            if (!$row) {
+                return null;
+            }
+            if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
+                return null;
+            }
+
+            return $this->rowToPrincipal($row)['uri'];
+        }
+
+        if (strpos($uri, 'principal:') === 0) {
+            $path = substr($uri, 10);
+            if (strpos($path, $this->principalPrefix) !== 0) {
+                return null;
+            }
+
+            [, $name] = \Sabre\Uri\split($path);
+            [$backendId, $resourceId] = explode('-',  $name, 2);
+
+            $query = $this->db->getQueryBuilder();
+            $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
+                ->from($this->dbTableName)
+                ->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
+                ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
+            $stmt = $query->execute();
+            $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+            if (!$row) {
+                return null;
+            }
+            if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
+                return null;
+            }
+
+            return $this->rowToPrincipal($row)['uri'];
+        }
+
+        return null;
+    }
+
+    /**
+     * convert database row to principal
+     *
+     * @param string[] $row
+     * @param string[] $metadata
+     * @return string[]
+     */
+    private function rowToPrincipal(array $row, array $metadata = []): array {
+        return array_merge([
+            'uri' => $this->principalPrefix . '/' . $row['backend_id'] . '-' . $row['resource_id'],
+            '{DAV:}displayname' => $row['displayname'],
+            '{http://sabredav.org/ns}email-address' => $row['email'],
+            '{urn:ietf:params:xml:ns:caldav}calendar-user-type' => $this->cuType,
+        ], $metadata);
+    }
+
+    /**
+     * @param array $row
+     * @param array $userGroups
+     * @return bool
+     */
+    private function isAllowedToAccessResource(array $row, array $userGroups): bool {
+        if (!isset($row['group_restrictions']) ||
+            $row['group_restrictions'] === null ||
+            $row['group_restrictions'] === '') {
+            return true;
+        }
+
+        // group restrictions contains something, but not parsable, deny access and log warning
+        $json = json_decode($row['group_restrictions'], null, 512, JSON_THROW_ON_ERROR);
+        if (!\is_array($json)) {
+            $this->logger->info('group_restrictions field could not be parsed for ' . $this->dbTableName . '::' . $row['id'] . ', denying access to resource');
+            return false;
+        }
+
+        // empty array => no group restrictions
+        if (empty($json)) {
+            return true;
+        }
+
+        return !empty(array_intersect($json, $userGroups));
+    }
 }

Spacing +15 added lines, -15 removed lines

@@ -88,9 +88,9 @@ 
 		$this->logger = $logger;
 		$this->proxyMapper = $proxyMapper;
 		$this->principalPrefix = $principalPrefix;
-		$this->dbTableName = 'calendar_' . $dbPrefix . 's';
-		$this->dbMetaDataTableName = $this->dbTableName . '_md';
-		$this->dbForeignKeyName = $dbPrefix . '_id';
+		$this->dbTableName = 'calendar_'.$dbPrefix.'s';
+		$this->dbMetaDataTableName = $this->dbTableName.'_md';
+		$this->dbForeignKeyName = $dbPrefix.'_id';
 		$this->cuType = $cuType;
 	}
 
@@ -165,7 +165,7 @@ 
 		}
 		[, $name] = \Sabre\Uri\split($path);
 
-		[$backendId, $resourceId] = explode('-',  $name, 2);
+		[$backendId, $resourceId] = explode('-', $name, 2);
 
 		$query = $this->db->getQueryBuilder();
 		$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
@@ -261,7 +261,7 @@ 
 					$query = $this->db->getQueryBuilder();
 					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
 						->from($this->dbTableName)
-						->where($query->expr()->iLike('email', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+						->where($query->expr()->iLike('email', $query->createNamedParameter('%'.$this->db->escapeLikeParameter($value).'%')));
 
 					$stmt = $query->execute();
 					$principals = [];
@@ -280,7 +280,7 @@ 
 					$query = $this->db->getQueryBuilder();
 					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
 						->from($this->dbTableName)
-						->where($query->expr()->iLike('displayname', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+						->where($query->expr()->iLike('displayname', $query->createNamedParameter('%'.$this->db->escapeLikeParameter($value).'%')));
 
 					$stmt = $query->execute();
 					$principals = [];
@@ -309,7 +309,7 @@ 
 
 				case IRoomMetadata::CAPACITY:
 				case IResourceMetadata::VEHICLE_SEATING_CAPACITY:
-					$results[] = $this->searchPrincipalsByCapacity($prop,$value);
+					$results[] = $this->searchPrincipalsByCapacity($prop, $value);
 					break;
 
 				default:
@@ -359,7 +359,7 @@ 
 	 */
 	private function searchPrincipalsByMetadataKey(string $key, string $value, array $usersGroups = []): array {
 		$query = $this->getMetadataQuery($key);
-		$query->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+		$query->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%'.$this->db->escapeLikeParameter($value).'%')));
 		return $this->getRows($query, $usersGroups);
 	}
 
@@ -376,7 +376,7 @@ 
 	private function searchPrincipalsByRoomFeature(string $key, string $value, array $usersGroups = []): array {
 		$query = $this->getMetadataQuery($key);
 		foreach (explode(',', $value) as $v) {
-			$query->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($v) . '%')));
+			$query->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%'.$this->db->escapeLikeParameter($v).'%')));
 		}
 		return $this->getRows($query, $usersGroups);
 	}
@@ -406,7 +406,7 @@ 
 		try {
 			$stmt = $query->executeQuery();
 		} catch (Exception $e) {
-			$this->logger->error("Could not search resources: " . $e->getMessage(), ['exception' => $e]);
+			$this->logger->error("Could not search resources: ".$e->getMessage(), ['exception' => $e]);
 		}
 
 		$rows = [];
@@ -421,11 +421,11 @@ 
 
 		$stmt->closeCursor();
 
-		$filteredRows = array_filter($rows, function ($row) use ($usersGroups) {
+		$filteredRows = array_filter($rows, function($row) use ($usersGroups) {
 			return $this->isAllowedToAccessResource($row, $usersGroups);
 		});
 
-		return array_map(static function ($row): string {
+		return array_map(static function($row): string {
 			return $row['uri'];
 		}, $filteredRows);
 	}
@@ -470,7 +470,7 @@ 
 			}
 
 			[, $name] = \Sabre\Uri\split($path);
-			[$backendId, $resourceId] = explode('-',  $name, 2);
+			[$backendId, $resourceId] = explode('-', $name, 2);
 
 			$query = $this->db->getQueryBuilder();
 			$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
@@ -502,7 +502,7 @@ 
 	 */
 	private function rowToPrincipal(array $row, array $metadata = []): array {
 		return array_merge([
-			'uri' => $this->principalPrefix . '/' . $row['backend_id'] . '-' . $row['resource_id'],
+			'uri' => $this->principalPrefix.'/'.$row['backend_id'].'-'.$row['resource_id'],
 			'{DAV:}displayname' => $row['displayname'],
 			'{http://sabredav.org/ns}email-address' => $row['email'],
 			'{urn:ietf:params:xml:ns:caldav}calendar-user-type' => $this->cuType,
@@ -524,7 +524,7 @@ 
 		// group restrictions contains something, but not parsable, deny access and log warning
 		$json = json_decode($row['group_restrictions'], null, 512, JSON_THROW_ON_ERROR);
 		if (!\is_array($json)) {
-			$this->logger->info('group_restrictions field could not be parsed for ' . $this->dbTableName . '::' . $row['id'] . ', denying access to resource');
+			$this->logger->info('group_restrictions field could not be parsed for '.$this->dbTableName.'::'.$row['id'].', denying access to resource');
 			return false;
 		}
 

apps/dav/lib/UserMigration/ContactsMigrator.php

Indentation +357 added lines, -357 removed lines

@@ -54,361 +54,361 @@
 
 class ContactsMigrator implements IMigrator, ISizeEstimationMigrator {
 
-	use TMigratorBasicVersionHandling;
-
-	private CardDavBackend $cardDavBackend;
-
-	private IL10N $l10n;
-
-	private SabreDavServer $sabreDavServer;
-
-	private const USERS_URI_ROOT = 'principals/users/';
-
-	private const FILENAME_EXT = 'vcf';
-
-	private const METADATA_EXT = 'json';
-
-	private const MIGRATED_URI_PREFIX = 'migrated-';
-
-	private const PATH_ROOT = Application::APP_ID . '/address_books/';
-
-	public function __construct(
-		CardDavBackend $cardDavBackend,
-		IL10N $l10n
-	) {
-		$this->cardDavBackend = $cardDavBackend;
-		$this->l10n = $l10n;
-
-		$root = new RootCollection();
-		$this->sabreDavServer = new SabreDavServer(new CachingTree($root));
-		$this->sabreDavServer->addPlugin(new CardDAVPlugin());
-	}
-
-	private function getPrincipalUri(IUser $user): string {
-		return ContactsMigrator::USERS_URI_ROOT . $user->getUID();
-	}
-
-	/**
-	 * @return array{name: string, displayName: string, description: ?string, vCards: VCard[]}
-	 *
-	 * @throws InvalidAddressBookException
-	 */
-	private function getAddressBookExportData(IUser $user, array $addressBookInfo, OutputInterface $output): array {
-		$userId = $user->getUID();
-
-		if (!isset($addressBookInfo['uri'])) {
-			throw new InvalidAddressBookException();
-		}
-
-		$uri = $addressBookInfo['uri'];
-
-		$path = CardDAVPlugin::ADDRESSBOOK_ROOT . "/users/$userId/$uri";
-
-		/**
-		 * @see \Sabre\CardDAV\VCFExportPlugin::httpGet() implementation reference
-		 */
-
-		$addressBookDataProp = '{' . CardDAVPlugin::NS_CARDDAV . '}address-data';
-		$addressBookNode = $this->sabreDavServer->tree->getNodeForPath($path);
-		$nodes = $this->sabreDavServer->getPropertiesIteratorForPath($path, [$addressBookDataProp], 1);
-
-		/**
-		 * @see \Sabre\CardDAV\VCFExportPlugin::generateVCF() implementation reference
-		 */
-
-		/** @var VCard[] $vCards */
-		$vCards = [];
-		foreach ($nodes as $node) {
-			if (isset($node[200][$addressBookDataProp])) {
-				$vCard = VObjectReader::read($node[200][$addressBookDataProp]);
-
-				$problems = $vCard->validate();
-				if (!empty($problems)) {
-					$output->writeln('Skipping contact "' . ($vCard->FN ?? 'null') . '" containing invalid contact data');
-					continue;
-				}
-				$vCards[] = $vCard;
-			}
-		}
-
-		if (count($vCards) === 0) {
-			throw new InvalidAddressBookException();
-		}
-
-		return [
-			'name' => $addressBookNode->getName(),
-			'displayName' => $addressBookInfo['{DAV:}displayname'],
-			'description' => $addressBookInfo['{' . CardDAVPlugin::NS_CARDDAV . '}addressbook-description'],
-			'vCards' => $vCards,
-		];
-	}
-
-	/**
-	 * @return array<int, array{name: string, displayName: string, description: ?string, vCards: VCard[]}>
-	 */
-	private function getAddressBookExports(IUser $user, OutputInterface $output): array {
-		$principalUri = $this->getPrincipalUri($user);
-
-		return array_values(array_filter(array_map(
-			function (array $addressBookInfo) use ($user, $output) {
-				try {
-					return $this->getAddressBookExportData($user, $addressBookInfo, $output);
-				} catch (InvalidAddressBookException $e) {
-					// Allow this exception as invalid address books are not to be exported
-					return null;
-				}
-			},
-			$this->cardDavBackend->getAddressBooksForUser($principalUri),
-		)));
-	}
-
-	private function getUniqueAddressBookUri(IUser $user, string $initialAddressBookUri): string {
-		$principalUri = $this->getPrincipalUri($user);
-
-		try {
-			$initialAddressBookUri = substr($initialAddressBookUri, 0, strlen(ContactsMigrator::MIGRATED_URI_PREFIX)) === ContactsMigrator::MIGRATED_URI_PREFIX
-				? $initialAddressBookUri
-				: ContactsMigrator::MIGRATED_URI_PREFIX . $initialAddressBookUri;
-		} catch (StringsException $e) {
-			throw new ContactsMigratorException('Failed to get unique address book URI', 0, $e);
-		}
-
-		$existingAddressBookUris = array_map(
-			fn (array $addressBookInfo): string => $addressBookInfo['uri'],
-			$this->cardDavBackend->getAddressBooksForUser($principalUri),
-		);
-
-		$addressBookUri = $initialAddressBookUri;
-		$acc = 1;
-		while (in_array($addressBookUri, $existingAddressBookUris, true)) {
-			$addressBookUri = $initialAddressBookUri . "-$acc";
-			++$acc;
-		}
-
-		return $addressBookUri;
-	}
-
-	/**
-	 * @param VCard[] $vCards
-	 */
-	private function serializeCards(array $vCards): string {
-		return array_reduce(
-			$vCards,
-			fn (string $addressBookBlob, VCard $vCard) => $addressBookBlob . $vCard->serialize(),
-			'',
-		);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getEstimatedExportSize(IUser $user): int {
-		$addressBookExports = $this->getAddressBookExports($user, new NullOutput());
-		$addressBookCount = count($addressBookExports);
-
-		// 50B for each metadata JSON
-		$size = ($addressBookCount * 50) / 1024;
-
-		$contactsCount = array_sum(array_map(
-			fn (array $data): int => count($data['vCards']),
-			$addressBookExports,
-		));
-
-		// 350B for each contact
-		$size += ($contactsCount * 350) / 1024;
-
-		return (int)ceil($size);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function export(IUser $user, IExportDestination $exportDestination, OutputInterface $output): void {
-		$output->writeln('Exporting contacts into ' . ContactsMigrator::PATH_ROOT . '…');
-
-		$addressBookExports = $this->getAddressBookExports($user, $output);
-
-		if (empty($addressBookExports)) {
-			$output->writeln('No contacts to export…');
-		}
-
-		try {
-			/**
-			 * @var string $name
-			 * @var string $displayName
-			 * @var ?string $description
-			 * @var VCard[] $vCards
-			 */
-			foreach ($addressBookExports as ['name' => $name, 'displayName' => $displayName, 'description' => $description, 'vCards' => $vCards]) {
-				// Set filename to sanitized address book name
-				$basename = preg_replace('/[^a-z0-9-_]/iu', '', $name);
-				$exportPath = ContactsMigrator::PATH_ROOT . $basename . '.' . ContactsMigrator::FILENAME_EXT;
-				$metadataExportPath = ContactsMigrator::PATH_ROOT . $basename . '.' . ContactsMigrator::METADATA_EXT;
-
-				$exportDestination->addFileContents($exportPath, $this->serializeCards($vCards));
-
-				$metadata = array_filter(['displayName' => $displayName, 'description' => $description]);
-				$exportDestination->addFileContents($metadataExportPath, json_encode($metadata, JSON_THROW_ON_ERROR));
-			}
-		} catch (Throwable $e) {
-			throw new CalendarMigratorException('Could not export address book', 0, $e);
-		}
-	}
-
-	private function importContact(int $addressBookId, VCard $vCard, string $filename, OutputInterface $output): void {
-		// Operate on clone to prevent mutation of the original
-		$vCard = clone $vCard;
-		$vCard->PRODID = '-//IDN nextcloud.com//Migrated contact//EN';
-
-		try {
-			$this->cardDavBackend->createCard(
-				$addressBookId,
-				UUIDUtil::getUUID() . '.' . ContactsMigrator::FILENAME_EXT,
-				$vCard->serialize(),
-			);
-		} catch (Throwable $e) {
-			$output->writeln("Error creating contact \"" . ($vCard->FN ?? 'null') . "\" from \"$filename\", skipping…");
-		}
-	}
-
-	/**
-	 * @param array{displayName: string, description?: string} $metadata
-	 * @param VCard[] $vCards
-	 */
-	private function importAddressBook(IUser $user, string $filename, string $initialAddressBookUri, array $metadata, array $vCards, OutputInterface $output): void {
-		$principalUri = $this->getPrincipalUri($user);
-		$addressBookUri = $this->getUniqueAddressBookUri($user, $initialAddressBookUri);
-
-		$addressBookId = $this->cardDavBackend->createAddressBook($principalUri, $addressBookUri, array_filter([
-			'{DAV:}displayname' => $metadata['displayName'],
-			'{' . CardDAVPlugin::NS_CARDDAV . '}addressbook-description' => $metadata['description'] ?? null,
-		]));
-
-		foreach ($vCards as $vCard) {
-			$this->importContact($addressBookId, $vCard, $filename, $output);
-		}
-	}
-
-	/**
-	 * @return array<int, array{addressBook: string, metadata: string}>
-	 */
-	private function getAddressBookImports(array $importFiles): array {
-		$addressBookImports = array_filter(
-			$importFiles,
-			fn (string $filename) => pathinfo($filename, PATHINFO_EXTENSION) === ContactsMigrator::FILENAME_EXT,
-		);
-
-		$metadataImports = array_filter(
-			$importFiles,
-			fn (string $filename) => pathinfo($filename, PATHINFO_EXTENSION) === ContactsMigrator::METADATA_EXT,
-		);
-
-		try {
-			sort($addressBookImports);
-			sort($metadataImports);
-		} catch (ArrayException $e) {
-			throw new ContactsMigratorException('Failed to sort address book files in ' . ContactsMigrator::PATH_ROOT, 0, $e);
-		}
-
-		if (count($addressBookImports) !== count($metadataImports)) {
-			throw new ContactsMigratorException('Each ' . ContactsMigrator::FILENAME_EXT . ' file must have a corresponding ' . ContactsMigrator::METADATA_EXT . ' file');
-		}
-
-		for ($i = 0; $i < count($addressBookImports); ++$i) {
-			if (pathinfo($addressBookImports[$i], PATHINFO_FILENAME) !== pathinfo($metadataImports[$i], PATHINFO_FILENAME)) {
-				throw new ContactsMigratorException('Each ' . ContactsMigrator::FILENAME_EXT . ' file must have a corresponding ' . ContactsMigrator::METADATA_EXT . ' file');
-			}
-		}
-
-		return array_map(
-			fn (string $addressBookFilename, string $metadataFilename) => ['addressBook' => $addressBookFilename, 'metadata' => $metadataFilename],
-			$addressBookImports,
-			$metadataImports,
-		);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @throws ContactsMigratorException
-	 */
-	public function import(IUser $user, IImportSource $importSource, OutputInterface $output): void {
-		if ($importSource->getMigratorVersion($this->getId()) === null) {
-			$output->writeln('No version for ' . static::class . ', skipping import…');
-			return;
-		}
-
-		$output->writeln('Importing contacts from ' . ContactsMigrator::PATH_ROOT . '…');
-
-		$importFiles = $importSource->getFolderListing(ContactsMigrator::PATH_ROOT);
-
-		if (empty($importFiles)) {
-			$output->writeln('No contacts to import…');
-		}
-
-		foreach ($this->getAddressBookImports($importFiles) as ['addressBook' => $addressBookFilename, 'metadata' => $metadataFilename]) {
-			$addressBookImportPath = ContactsMigrator::PATH_ROOT . $addressBookFilename;
-			$metadataImportPath = ContactsMigrator::PATH_ROOT . $metadataFilename;
-
-			$vCardSplitter = new VCardSplitter(
-				$importSource->getFileAsStream($addressBookImportPath),
-				VObjectParser::OPTION_FORGIVING,
-			);
-
-			/** @var VCard[] $vCards */
-			$vCards = [];
-			/** @var ?VCard $vCard */
-			while ($vCard = $vCardSplitter->getNext()) {
-				$problems = $vCard->validate();
-				if (!empty($problems)) {
-					$output->writeln('Skipping contact "' . ($vCard->FN ?? 'null') . '" containing invalid contact data');
-					continue;
-				}
-				$vCards[] = $vCard;
-			}
-
-			$splitFilename = explode('.', $addressBookFilename, 2);
-			if (count($splitFilename) !== 2) {
-				throw new ContactsMigratorException("Invalid filename \"$addressBookFilename\", expected filename of the format \"<address_book_name>." . ContactsMigrator::FILENAME_EXT . '"');
-			}
-			[$initialAddressBookUri, $ext] = $splitFilename;
-
-			/** @var array{displayName: string, description?: string} $metadata */
-			$metadata = json_decode($importSource->getFileContents($metadataImportPath), true, 512, JSON_THROW_ON_ERROR);
-
-			$this->importAddressBook(
-				$user,
-				$addressBookFilename,
-				$initialAddressBookUri,
-				$metadata,
-				$vCards,
-				$output,
-			);
-
-			foreach ($vCards as $vCard) {
-				$vCard->destroy();
-			}
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getId(): string {
-		return 'contacts';
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getDisplayName(): string {
-		return $this->l10n->t('Contacts');
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getDescription(): string {
-		return $this->l10n->t('Contacts and groups');
-	}
+    use TMigratorBasicVersionHandling;
+
+    private CardDavBackend $cardDavBackend;
+
+    private IL10N $l10n;
+
+    private SabreDavServer $sabreDavServer;
+
+    private const USERS_URI_ROOT = 'principals/users/';
+
+    private const FILENAME_EXT = 'vcf';
+
+    private const METADATA_EXT = 'json';
+
+    private const MIGRATED_URI_PREFIX = 'migrated-';
+
+    private const PATH_ROOT = Application::APP_ID . '/address_books/';
+
+    public function __construct(
+        CardDavBackend $cardDavBackend,
+        IL10N $l10n
+    ) {
+        $this->cardDavBackend = $cardDavBackend;
+        $this->l10n = $l10n;
+
+        $root = new RootCollection();
+        $this->sabreDavServer = new SabreDavServer(new CachingTree($root));
+        $this->sabreDavServer->addPlugin(new CardDAVPlugin());
+    }
+
+    private function getPrincipalUri(IUser $user): string {
+        return ContactsMigrator::USERS_URI_ROOT . $user->getUID();
+    }
+
+    /**
+     * @return array{name: string, displayName: string, description: ?string, vCards: VCard[]}
+     *
+     * @throws InvalidAddressBookException
+     */
+    private function getAddressBookExportData(IUser $user, array $addressBookInfo, OutputInterface $output): array {
+        $userId = $user->getUID();
+
+        if (!isset($addressBookInfo['uri'])) {
+            throw new InvalidAddressBookException();
+        }
+
+        $uri = $addressBookInfo['uri'];
+
+        $path = CardDAVPlugin::ADDRESSBOOK_ROOT . "/users/$userId/$uri";
+
+        /**
+         * @see \Sabre\CardDAV\VCFExportPlugin::httpGet() implementation reference
+         */
+
+        $addressBookDataProp = '{' . CardDAVPlugin::NS_CARDDAV . '}address-data';
+        $addressBookNode = $this->sabreDavServer->tree->getNodeForPath($path);
+        $nodes = $this->sabreDavServer->getPropertiesIteratorForPath($path, [$addressBookDataProp], 1);
+
+        /**
+         * @see \Sabre\CardDAV\VCFExportPlugin::generateVCF() implementation reference
+         */
+
+        /** @var VCard[] $vCards */
+        $vCards = [];
+        foreach ($nodes as $node) {
+            if (isset($node[200][$addressBookDataProp])) {
+                $vCard = VObjectReader::read($node[200][$addressBookDataProp]);
+
+                $problems = $vCard->validate();
+                if (!empty($problems)) {
+                    $output->writeln('Skipping contact "' . ($vCard->FN ?? 'null') . '" containing invalid contact data');
+                    continue;
+                }
+                $vCards[] = $vCard;
+            }
+        }
+
+        if (count($vCards) === 0) {
+            throw new InvalidAddressBookException();
+        }
+
+        return [
+            'name' => $addressBookNode->getName(),
+            'displayName' => $addressBookInfo['{DAV:}displayname'],
+            'description' => $addressBookInfo['{' . CardDAVPlugin::NS_CARDDAV . '}addressbook-description'],
+            'vCards' => $vCards,
+        ];
+    }
+
+    /**
+     * @return array<int, array{name: string, displayName: string, description: ?string, vCards: VCard[]}>
+     */
+    private function getAddressBookExports(IUser $user, OutputInterface $output): array {
+        $principalUri = $this->getPrincipalUri($user);
+
+        return array_values(array_filter(array_map(
+            function (array $addressBookInfo) use ($user, $output) {
+                try {
+                    return $this->getAddressBookExportData($user, $addressBookInfo, $output);
+                } catch (InvalidAddressBookException $e) {
+                    // Allow this exception as invalid address books are not to be exported
+                    return null;
+                }
+            },
+            $this->cardDavBackend->getAddressBooksForUser($principalUri),
+        )));
+    }
+
+    private function getUniqueAddressBookUri(IUser $user, string $initialAddressBookUri): string {
+        $principalUri = $this->getPrincipalUri($user);
+
+        try {
+            $initialAddressBookUri = substr($initialAddressBookUri, 0, strlen(ContactsMigrator::MIGRATED_URI_PREFIX)) === ContactsMigrator::MIGRATED_URI_PREFIX
+                ? $initialAddressBookUri
+                : ContactsMigrator::MIGRATED_URI_PREFIX . $initialAddressBookUri;
+        } catch (StringsException $e) {
+            throw new ContactsMigratorException('Failed to get unique address book URI', 0, $e);
+        }
+
+        $existingAddressBookUris = array_map(
+            fn (array $addressBookInfo): string => $addressBookInfo['uri'],
+            $this->cardDavBackend->getAddressBooksForUser($principalUri),
+        );
+
+        $addressBookUri = $initialAddressBookUri;
+        $acc = 1;
+        while (in_array($addressBookUri, $existingAddressBookUris, true)) {
+            $addressBookUri = $initialAddressBookUri . "-$acc";
+            ++$acc;
+        }
+
+        return $addressBookUri;
+    }
+
+    /**
+     * @param VCard[] $vCards
+     */
+    private function serializeCards(array $vCards): string {
+        return array_reduce(
+            $vCards,
+            fn (string $addressBookBlob, VCard $vCard) => $addressBookBlob . $vCard->serialize(),
+            '',
+        );
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getEstimatedExportSize(IUser $user): int {
+        $addressBookExports = $this->getAddressBookExports($user, new NullOutput());
+        $addressBookCount = count($addressBookExports);
+
+        // 50B for each metadata JSON
+        $size = ($addressBookCount * 50) / 1024;
+
+        $contactsCount = array_sum(array_map(
+            fn (array $data): int => count($data['vCards']),
+            $addressBookExports,
+        ));
+
+        // 350B for each contact
+        $size += ($contactsCount * 350) / 1024;
+
+        return (int)ceil($size);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function export(IUser $user, IExportDestination $exportDestination, OutputInterface $output): void {
+        $output->writeln('Exporting contacts into ' . ContactsMigrator::PATH_ROOT . '…');
+
+        $addressBookExports = $this->getAddressBookExports($user, $output);
+
+        if (empty($addressBookExports)) {
+            $output->writeln('No contacts to export…');
+        }
+
+        try {
+            /**
+             * @var string $name
+             * @var string $displayName
+             * @var ?string $description
+             * @var VCard[] $vCards
+             */
+            foreach ($addressBookExports as ['name' => $name, 'displayName' => $displayName, 'description' => $description, 'vCards' => $vCards]) {
+                // Set filename to sanitized address book name
+                $basename = preg_replace('/[^a-z0-9-_]/iu', '', $name);
+                $exportPath = ContactsMigrator::PATH_ROOT . $basename . '.' . ContactsMigrator::FILENAME_EXT;
+                $metadataExportPath = ContactsMigrator::PATH_ROOT . $basename . '.' . ContactsMigrator::METADATA_EXT;
+
+                $exportDestination->addFileContents($exportPath, $this->serializeCards($vCards));
+
+                $metadata = array_filter(['displayName' => $displayName, 'description' => $description]);
+                $exportDestination->addFileContents($metadataExportPath, json_encode($metadata, JSON_THROW_ON_ERROR));
+            }
+        } catch (Throwable $e) {
+            throw new CalendarMigratorException('Could not export address book', 0, $e);
+        }
+    }
+
+    private function importContact(int $addressBookId, VCard $vCard, string $filename, OutputInterface $output): void {
+        // Operate on clone to prevent mutation of the original
+        $vCard = clone $vCard;
+        $vCard->PRODID = '-//IDN nextcloud.com//Migrated contact//EN';
+
+        try {
+            $this->cardDavBackend->createCard(
+                $addressBookId,
+                UUIDUtil::getUUID() . '.' . ContactsMigrator::FILENAME_EXT,
+                $vCard->serialize(),
+            );
+        } catch (Throwable $e) {
+            $output->writeln("Error creating contact \"" . ($vCard->FN ?? 'null') . "\" from \"$filename\", skipping…");
+        }
+    }
+
+    /**
+     * @param array{displayName: string, description?: string} $metadata
+     * @param VCard[] $vCards
+     */
+    private function importAddressBook(IUser $user, string $filename, string $initialAddressBookUri, array $metadata, array $vCards, OutputInterface $output): void {
+        $principalUri = $this->getPrincipalUri($user);
+        $addressBookUri = $this->getUniqueAddressBookUri($user, $initialAddressBookUri);
+
+        $addressBookId = $this->cardDavBackend->createAddressBook($principalUri, $addressBookUri, array_filter([
+            '{DAV:}displayname' => $metadata['displayName'],
+            '{' . CardDAVPlugin::NS_CARDDAV . '}addressbook-description' => $metadata['description'] ?? null,
+        ]));
+
+        foreach ($vCards as $vCard) {
+            $this->importContact($addressBookId, $vCard, $filename, $output);
+        }
+    }
+
+    /**
+     * @return array<int, array{addressBook: string, metadata: string}>
+     */
+    private function getAddressBookImports(array $importFiles): array {
+        $addressBookImports = array_filter(
+            $importFiles,
+            fn (string $filename) => pathinfo($filename, PATHINFO_EXTENSION) === ContactsMigrator::FILENAME_EXT,
+        );
+
+        $metadataImports = array_filter(
+            $importFiles,
+            fn (string $filename) => pathinfo($filename, PATHINFO_EXTENSION) === ContactsMigrator::METADATA_EXT,
+        );
+
+        try {
+            sort($addressBookImports);
+            sort($metadataImports);
+        } catch (ArrayException $e) {
+            throw new ContactsMigratorException('Failed to sort address book files in ' . ContactsMigrator::PATH_ROOT, 0, $e);
+        }
+
+        if (count($addressBookImports) !== count($metadataImports)) {
+            throw new ContactsMigratorException('Each ' . ContactsMigrator::FILENAME_EXT . ' file must have a corresponding ' . ContactsMigrator::METADATA_EXT . ' file');
+        }
+
+        for ($i = 0; $i < count($addressBookImports); ++$i) {
+            if (pathinfo($addressBookImports[$i], PATHINFO_FILENAME) !== pathinfo($metadataImports[$i], PATHINFO_FILENAME)) {
+                throw new ContactsMigratorException('Each ' . ContactsMigrator::FILENAME_EXT . ' file must have a corresponding ' . ContactsMigrator::METADATA_EXT . ' file');
+            }
+        }
+
+        return array_map(
+            fn (string $addressBookFilename, string $metadataFilename) => ['addressBook' => $addressBookFilename, 'metadata' => $metadataFilename],
+            $addressBookImports,
+            $metadataImports,
+        );
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @throws ContactsMigratorException
+     */
+    public function import(IUser $user, IImportSource $importSource, OutputInterface $output): void {
+        if ($importSource->getMigratorVersion($this->getId()) === null) {
+            $output->writeln('No version for ' . static::class . ', skipping import…');
+            return;
+        }
+
+        $output->writeln('Importing contacts from ' . ContactsMigrator::PATH_ROOT . '…');
+
+        $importFiles = $importSource->getFolderListing(ContactsMigrator::PATH_ROOT);
+
+        if (empty($importFiles)) {
+            $output->writeln('No contacts to import…');
+        }
+
+        foreach ($this->getAddressBookImports($importFiles) as ['addressBook' => $addressBookFilename, 'metadata' => $metadataFilename]) {
+            $addressBookImportPath = ContactsMigrator::PATH_ROOT . $addressBookFilename;
+            $metadataImportPath = ContactsMigrator::PATH_ROOT . $metadataFilename;
+
+            $vCardSplitter = new VCardSplitter(
+                $importSource->getFileAsStream($addressBookImportPath),
+                VObjectParser::OPTION_FORGIVING,
+            );
+
+            /** @var VCard[] $vCards */
+            $vCards = [];
+            /** @var ?VCard $vCard */
+            while ($vCard = $vCardSplitter->getNext()) {
+                $problems = $vCard->validate();
+                if (!empty($problems)) {
+                    $output->writeln('Skipping contact "' . ($vCard->FN ?? 'null') . '" containing invalid contact data');
+                    continue;
+                }
+                $vCards[] = $vCard;
+            }
+
+            $splitFilename = explode('.', $addressBookFilename, 2);
+            if (count($splitFilename) !== 2) {
+                throw new ContactsMigratorException("Invalid filename \"$addressBookFilename\", expected filename of the format \"<address_book_name>." . ContactsMigrator::FILENAME_EXT . '"');
+            }
+            [$initialAddressBookUri, $ext] = $splitFilename;
+
+            /** @var array{displayName: string, description?: string} $metadata */
+            $metadata = json_decode($importSource->getFileContents($metadataImportPath), true, 512, JSON_THROW_ON_ERROR);
+
+            $this->importAddressBook(
+                $user,
+                $addressBookFilename,
+                $initialAddressBookUri,
+                $metadata,
+                $vCards,
+                $output,
+            );
+
+            foreach ($vCards as $vCard) {
+                $vCard->destroy();
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getId(): string {
+        return 'contacts';
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDisplayName(): string {
+        return $this->l10n->t('Contacts');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDescription(): string {
+        return $this->l10n->t('Contacts and groups');
+    }
 }