fixup! refactor(dav): Replace baseuri manipulation with RootCollection for public shares

Author: provokateurin

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

@@ -13,7 +13,9 @@
 use OCA\DAV\Connector\Sabre\Exception\FileLocked;
 use OCA\DAV\Connector\Sabre\Exception\Forbidden;
 use OCA\DAV\Connector\Sabre\Exception\InvalidPath;
+use OCA\DAV\Storage\PublicShareWrapper;
 use OCP\App\IAppManager;
+use OCP\Constants;
 use OCP\Files\FileInfo;
 use OCP\Files\Folder;
 use OCP\Files\ForbiddenException;
@@ -172,7 +174,19 @@ public function createDirectory($name) {
 	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
 	 */
 	public function getChild($name, $info = null, ?IRequest $request = null, ?IL10N $l10n = null) {
-		if (!$this->info->isReadable()) {
+		$storage = $this->info->getStorage();
+		$allowDirectory = false;
+		if ($storage instanceof PublicShareWrapper) {
+			$share = $storage->getShare();
+			$allowDirectory =
+				// Only allow directories for file drops
+				($share->getPermissions() & Constants::PERMISSION_READ) !== Constants::PERMISSION_READ &&
+				// And only allow it for directories which are a direct child of of the share root
+				$this->info->getId() === $share->getNodeId();
+		}
+
+		// For file drop we need to be allowed to read the directory with the nickname
+		if (!$allowDirectory && !$this->info->isReadable()) {
 			// avoid detecting files through this way
 			throw new NotFound();
 		}
@@ -198,6 +212,11 @@ public function getChild($name, $info = null, ?IRequest $request = null, ?IL10N
 		if ($info->getMimeType() === FileInfo::MIMETYPE_FOLDER) {
 			$node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this->tree, $this->shareManager);
 		} else {
+			// In case reading a directory was allowed but it turns out the node was a not a directory, reject it now.
+			if (!$this->info->isReadable()) {
+				throw new NotFound();
+			}
+
 			$node = new File($this->fileView, $info, $this->shareManager, $request, $l10n);
 		}
 		if ($this->tree) {

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

@@ -688,15 +688,15 @@ private function getMetadataFileAccessRight(Node $node, string $userId): int {
 	 */
 	public function sendFileIdHeader($filePath, ?\Sabre\DAV\INode $node = null) {
 		// 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 Node) {
-			$fileId = $node->getFileId();
-			if (!is_null($fileId)) {
-				$this->server->httpResponse->setHeader('OC-FileId', $fileId);
+		try {
+			$node = $this->server->tree->getNodeForPath($filePath);
+			if ($node instanceof Node) {
+				$fileId = $node->getFileId();
+				if (!is_null($fileId)) {
+					$this->server->httpResponse->setHeader('OC-FileId', $fileId);
+				}
 			}
+		} catch (NotFound) {
 		}
 	}
 }

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

@@ -149,8 +149,8 @@ public function createServer(
 					\OC::$server->getL10NFactory(),
 				);
 
+				// Mount the the share collection at /public.php/dav/shares/<share token>
 				$rootCollection->addChild(new \OCA\DAV\Files\Sharing\RootCollection(
-					$view,
 					$root,
 					$userPrincipalBackend,
 					'principals/shares',

apps/dav/lib/Files/Sharing/FilesDropPlugin.php

@@ -85,7 +85,7 @@ public function beforeMethod(RequestInterface $request, ResponseInterface $respo
 		}
 
 		$newName = \OC_Helper::buildNotExistingFileNameForView('/', $path, $this->view);
-		$url = $request->getBaseUrl() . $newName;
+		$url = $request->getBaseUrl() . 'files/' . $this->share->getToken() . $newName;
 		$request->setUrl($url);
 	}
 

apps/dav/lib/Files/Sharing/RootCollection.php

@@ -1,20 +1,20 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 namespace OCA\DAV\Files\Sharing;
 
-use OC\Files\View;
 use Sabre\DAV\INode;
 use Sabre\DAVACL\AbstractPrincipalCollection;
 use Sabre\DAVACL\PrincipalBackend\BackendInterface;
 
 class RootCollection extends AbstractPrincipalCollection {
 	public function __construct(
-		private View $view,
 		private INode $root,
 		BackendInterface $principalBackend,
 		string $principalPrefix = 'principals',