nextcloud / server

apps/dav/appinfo/v1/publicwebdav.php

Indentation +62 added lines, -62 removed lines

@@ -40,10 +40,10 @@ 
 
 // Backends
 $authBackend = new LegacyPublicAuth(
-	Server::get(IRequest::class),
-	Server::get(\OCP\Share\IManager::class),
-	Server::get(ISession::class),
-	Server::get(IThrottler::class)
+    Server::get(IRequest::class),
+    Server::get(\OCP\Share\IManager::class),
+    Server::get(ISession::class),
+    Server::get(IThrottler::class)
 );
 $authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
 
@@ -51,16 +51,16 @@ 
 $eventDispatcher = Server::get(IEventDispatcher::class);
 
 $serverFactory = new ServerFactory(
-	Server::get(IConfig::class),
-	Server::get(LoggerInterface::class),
-	Server::get(IDBConnection::class),
-	Server::get(IUserSession::class),
-	Server::get(IMountManager::class),
-	Server::get(ITagManager::class),
-	Server::get(IRequest::class),
-	Server::get(IPreview::class),
-	$eventDispatcher,
-	\OC::$server->getL10N('dav')
+    Server::get(IConfig::class),
+    Server::get(LoggerInterface::class),
+    Server::get(IDBConnection::class),
+    Server::get(IUserSession::class),
+    Server::get(IMountManager::class),
+    Server::get(ITagManager::class),
+    Server::get(IRequest::class),
+    Server::get(IPreview::class),
+    $eventDispatcher,
+    \OC::$server->getL10N('dav')
 );
 
 $requestUri = Server::get(IRequest::class)->getRequestUri();
@@ -69,54 +69,54 @@ 
 $filesDropPlugin = new FilesDropPlugin();
 
 $server = $serverFactory->createServer(
-	true,
-	$baseuri,
-	$requestUri,
-	$authPlugin,
-	function (\Sabre\DAV\Server $server) use (
-		$authBackend,
-		$linkCheckPlugin,
-		$filesDropPlugin
-	) {
-		$isAjax = in_array('XMLHttpRequest', explode(',', $_SERVER['HTTP_X_REQUESTED_WITH'] ?? ''));
-		/** @var FederatedShareProvider $shareProvider */
-		$federatedShareProvider = Server::get(FederatedShareProvider::class);
-		if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && !$isAjax) {
-			// this is what is thrown when trying to access a non-existing share
-			throw new \Sabre\DAV\Exception\NotAuthenticated();
-		}
-
-		$share = $authBackend->getShare();
-		$owner = $share->getShareOwner();
-		$isReadable = $share->getPermissions() & Constants::PERMISSION_READ;
-		$fileId = $share->getNodeId();
-
-		// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
-		$previousLog = Filesystem::logWarningWhenAddingStorageWrapper(false);
-		Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
-			return new PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() | Constants::PERMISSION_SHARE]);
-		});
-		Filesystem::addStorageWrapper('shareOwner', function ($mountPoint, $storage) use ($share) {
-			return new PublicOwnerWrapper(['storage' => $storage, 'owner' => $share->getShareOwner()]);
-		});
-		Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
-
-		$rootFolder = Server::get(IRootFolder::class);
-		$userFolder = $rootFolder->getUserFolder($owner);
-		$node = $userFolder->getFirstNodeById($fileId);
-		if (!$node) {
-			throw new \Sabre\DAV\Exception\NotFound();
-		}
-		$linkCheckPlugin->setFileInfo($node);
-
-		// If not readable (files_drop) enable the filesdrop plugin
-		if (!$isReadable) {
-			$filesDropPlugin->enable();
-		}
-		$filesDropPlugin->setShare($share);
-
-		return new View($node->getPath());
-	});
+    true,
+    $baseuri,
+    $requestUri,
+    $authPlugin,
+    function (\Sabre\DAV\Server $server) use (
+        $authBackend,
+        $linkCheckPlugin,
+        $filesDropPlugin
+    ) {
+        $isAjax = in_array('XMLHttpRequest', explode(',', $_SERVER['HTTP_X_REQUESTED_WITH'] ?? ''));
+        /** @var FederatedShareProvider $shareProvider */
+        $federatedShareProvider = Server::get(FederatedShareProvider::class);
+        if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && !$isAjax) {
+            // this is what is thrown when trying to access a non-existing share
+            throw new \Sabre\DAV\Exception\NotAuthenticated();
+        }
+
+        $share = $authBackend->getShare();
+        $owner = $share->getShareOwner();
+        $isReadable = $share->getPermissions() & Constants::PERMISSION_READ;
+        $fileId = $share->getNodeId();
+
+        // FIXME: should not add storage wrappers outside of preSetup, need to find a better way
+        $previousLog = Filesystem::logWarningWhenAddingStorageWrapper(false);
+        Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
+            return new PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() | Constants::PERMISSION_SHARE]);
+        });
+        Filesystem::addStorageWrapper('shareOwner', function ($mountPoint, $storage) use ($share) {
+            return new PublicOwnerWrapper(['storage' => $storage, 'owner' => $share->getShareOwner()]);
+        });
+        Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
+
+        $rootFolder = Server::get(IRootFolder::class);
+        $userFolder = $rootFolder->getUserFolder($owner);
+        $node = $userFolder->getFirstNodeById($fileId);
+        if (!$node) {
+            throw new \Sabre\DAV\Exception\NotFound();
+        }
+        $linkCheckPlugin->setFileInfo($node);
+
+        // If not readable (files_drop) enable the filesdrop plugin
+        if (!$isReadable) {
+            $filesDropPlugin->enable();
+        }
+        $filesDropPlugin->setShare($share);
+
+        return new View($node->getPath());
+    });
 
 $server->addPlugin($linkCheckPlugin);
 $server->addPlugin($filesDropPlugin);

Spacing +3 added lines, -3 removed lines

@@ -73,7 +73,7 @@ 
 	$baseuri,
 	$requestUri,
 	$authPlugin,
-	function (\Sabre\DAV\Server $server) use (
+	function(\Sabre\DAV\Server $server) use (
 		$authBackend,
 		$linkCheckPlugin,
 		$filesDropPlugin
@@ -93,10 +93,10 @@ 
 
 		// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
 		$previousLog = Filesystem::logWarningWhenAddingStorageWrapper(false);
-		Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
+		Filesystem::addStorageWrapper('sharePermissions', function($mountPoint, $storage) use ($share) {
 			return new PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() | Constants::PERMISSION_SHARE]);
 		});
-		Filesystem::addStorageWrapper('shareOwner', function ($mountPoint, $storage) use ($share) {
+		Filesystem::addStorageWrapper('shareOwner', function($mountPoint, $storage) use ($share) {
 			return new PublicOwnerWrapper(['storage' => $storage, 'owner' => $share->getShareOwner()]);
 		});
 		Filesystem::logWarningWhenAddingStorageWrapper($previousLog);

apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php

Indentation +425 added lines, -425 removed lines

@@ -27,445 +27,445 @@
 use Test\Traits\UserTrait;
 
 class TestViewDirectory extends View {
-	public function __construct(
-		private $updatables,
-		private $deletables,
-		private $canRename = true,
-	) {
-	}
-
-	public function isUpdatable($path) {
-		return $this->updatables[$path];
-	}
-
-	public function isCreatable($path) {
-		return $this->updatables[$path];
-	}
-
-	public function isDeletable($path) {
-		return $this->deletables[$path];
-	}
-
-	public function rename($source, $target, array $options = []) {
-		return $this->canRename;
-	}
-
-	public function getRelativePath($path): ?string {
-		return $path;
-	}
+    public function __construct(
+        private $updatables,
+        private $deletables,
+        private $canRename = true,
+    ) {
+    }
+
+    public function isUpdatable($path) {
+        return $this->updatables[$path];
+    }
+
+    public function isCreatable($path) {
+        return $this->updatables[$path];
+    }
+
+    public function isDeletable($path) {
+        return $this->deletables[$path];
+    }
+
+    public function rename($source, $target, array $options = []) {
+        return $this->canRename;
+    }
+
+    public function getRelativePath($path): ?string {
+        return $path;
+    }
 }
 
 
 #[\PHPUnit\Framework\Attributes\Group('DB')]
 class DirectoryTest extends \Test\TestCase {
-	use UserTrait;
-
-	private View&MockObject $view;
-	private FileInfo&MockObject $info;
-	private IStorage&MockObject $storage;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->view = $this->createMock(View::class);
-		$this->info = $this->createMock(FileInfo::class);
-		$this->storage = $this->createMock(IStorage::class);
-		$this->info->method('getStorage')
-			->willReturn($this->storage);
-		$this->info->method('isReadable')
-			->willReturn(true);
-		$this->info->method('getType')
-			->willReturn(Node::TYPE_FOLDER);
-		$this->info->method('getName')
-			->willReturn('folder');
-		$this->info->method('getPath')
-			->willReturn('/admin/files/folder');
-		$this->info->method('getPermissions')
-			->willReturn(Constants::PERMISSION_READ);
-	}
-
-	private function getDir(string $path = '/'): Directory {
-		$this->view->expects($this->once())
-			->method('getRelativePath')
-			->willReturn($path);
-
-		$this->info->expects($this->once())
-			->method('getPath')
-			->willReturn($path);
-
-		return new Directory($this->view, $this->info);
-	}
-
-
-	public function testDeleteRootFolderFails(): void {
-		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
-
-		$this->info->expects($this->any())
-			->method('isDeletable')
-			->willReturn(true);
-		$this->view->expects($this->never())
-			->method('rmdir');
-		$dir = $this->getDir();
-		$dir->delete();
-	}
-
-
-	public function testDeleteForbidden(): void {
-		$this->expectException(Forbidden::class);
-
-		// deletion allowed
-		$this->info->expects($this->once())
-			->method('isDeletable')
-			->willReturn(true);
-
-		// but fails
-		$this->view->expects($this->once())
-			->method('rmdir')
-			->with('sub')
-			->willThrowException(new ForbiddenException('', true));
-
-		$dir = $this->getDir('sub');
-		$dir->delete();
-	}
-
-
-	public function testDeleteFolderWhenAllowed(): void {
-		// deletion allowed
-		$this->info->expects($this->once())
-			->method('isDeletable')
-			->willReturn(true);
-
-		// but fails
-		$this->view->expects($this->once())
-			->method('rmdir')
-			->with('sub')
-			->willReturn(true);
-
-		$dir = $this->getDir('sub');
-		$dir->delete();
-	}
-
-
-	public function testDeleteFolderFailsWhenNotAllowed(): void {
-		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
-
-		$this->info->expects($this->once())
-			->method('isDeletable')
-			->willReturn(false);
-
-		$dir = $this->getDir('sub');
-		$dir->delete();
-	}
-
-
-	public function testDeleteFolderThrowsWhenDeletionFailed(): void {
-		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
-
-		// deletion allowed
-		$this->info->expects($this->once())
-			->method('isDeletable')
-			->willReturn(true);
-
-		// but fails
-		$this->view->expects($this->once())
-			->method('rmdir')
-			->with('sub')
-			->willReturn(false);
-
-		$dir = $this->getDir('sub');
-		$dir->delete();
-	}
-
-	public function testGetChildren(): void {
-		$info1 = $this->createMock(FileInfo::class);
-		$info2 = $this->createMock(FileInfo::class);
-		$info1->method('getName')
-			->willReturn('first');
-		$info1->method('getPath')
-			->willReturn('folder/first');
-		$info1->method('getEtag')
-			->willReturn('abc');
-		$info2->method('getName')
-			->willReturn('second');
-		$info2->method('getPath')
-			->willReturn('folder/second');
-		$info2->method('getEtag')
-			->willReturn('def');
+    use UserTrait;
+
+    private View&MockObject $view;
+    private FileInfo&MockObject $info;
+    private IStorage&MockObject $storage;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->view = $this->createMock(View::class);
+        $this->info = $this->createMock(FileInfo::class);
+        $this->storage = $this->createMock(IStorage::class);
+        $this->info->method('getStorage')
+            ->willReturn($this->storage);
+        $this->info->method('isReadable')
+            ->willReturn(true);
+        $this->info->method('getType')
+            ->willReturn(Node::TYPE_FOLDER);
+        $this->info->method('getName')
+            ->willReturn('folder');
+        $this->info->method('getPath')
+            ->willReturn('/admin/files/folder');
+        $this->info->method('getPermissions')
+            ->willReturn(Constants::PERMISSION_READ);
+    }
+
+    private function getDir(string $path = '/'): Directory {
+        $this->view->expects($this->once())
+            ->method('getRelativePath')
+            ->willReturn($path);
+
+        $this->info->expects($this->once())
+            ->method('getPath')
+            ->willReturn($path);
+
+        return new Directory($this->view, $this->info);
+    }
+
+
+    public function testDeleteRootFolderFails(): void {
+        $this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
+        $this->info->expects($this->any())
+            ->method('isDeletable')
+            ->willReturn(true);
+        $this->view->expects($this->never())
+            ->method('rmdir');
+        $dir = $this->getDir();
+        $dir->delete();
+    }
+
+
+    public function testDeleteForbidden(): void {
+        $this->expectException(Forbidden::class);
+
+        // deletion allowed
+        $this->info->expects($this->once())
+            ->method('isDeletable')
+            ->willReturn(true);
+
+        // but fails
+        $this->view->expects($this->once())
+            ->method('rmdir')
+            ->with('sub')
+            ->willThrowException(new ForbiddenException('', true));
+
+        $dir = $this->getDir('sub');
+        $dir->delete();
+    }
+
+
+    public function testDeleteFolderWhenAllowed(): void {
+        // deletion allowed
+        $this->info->expects($this->once())
+            ->method('isDeletable')
+            ->willReturn(true);
+
+        // but fails
+        $this->view->expects($this->once())
+            ->method('rmdir')
+            ->with('sub')
+            ->willReturn(true);
+
+        $dir = $this->getDir('sub');
+        $dir->delete();
+    }
+
+
+    public function testDeleteFolderFailsWhenNotAllowed(): void {
+        $this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
+        $this->info->expects($this->once())
+            ->method('isDeletable')
+            ->willReturn(false);
+
+        $dir = $this->getDir('sub');
+        $dir->delete();
+    }
+
+
+    public function testDeleteFolderThrowsWhenDeletionFailed(): void {
+        $this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
+        // deletion allowed
+        $this->info->expects($this->once())
+            ->method('isDeletable')
+            ->willReturn(true);
+
+        // but fails
+        $this->view->expects($this->once())
+            ->method('rmdir')
+            ->with('sub')
+            ->willReturn(false);
+
+        $dir = $this->getDir('sub');
+        $dir->delete();
+    }
+
+    public function testGetChildren(): void {
+        $info1 = $this->createMock(FileInfo::class);
+        $info2 = $this->createMock(FileInfo::class);
+        $info1->method('getName')
+            ->willReturn('first');
+        $info1->method('getPath')
+            ->willReturn('folder/first');
+        $info1->method('getEtag')
+            ->willReturn('abc');
+        $info2->method('getName')
+            ->willReturn('second');
+        $info2->method('getPath')
+            ->willReturn('folder/second');
+        $info2->method('getEtag')
+            ->willReturn('def');
 
-		$this->view->expects($this->once())
-			->method('getDirectoryContent')
-			->willReturn([$info1, $info2]);
+        $this->view->expects($this->once())
+            ->method('getDirectoryContent')
+            ->willReturn([$info1, $info2]);
 
-		$this->view->expects($this->any())
-			->method('getRelativePath')
-			->willReturnCallback(function ($path) {
-				return str_replace('/admin/files/', '', $path);
-			});
-
-		$this->view->expects($this->any())
-			->method('getAbsolutePath')
-			->willReturnCallback(function ($path) {
-				return Filesystem::normalizePath('/admin/files' . $path);
-			});
+        $this->view->expects($this->any())
+            ->method('getRelativePath')
+            ->willReturnCallback(function ($path) {
+                return str_replace('/admin/files/', '', $path);
+            });
+
+        $this->view->expects($this->any())
+            ->method('getAbsolutePath')
+            ->willReturnCallback(function ($path) {
+                return Filesystem::normalizePath('/admin/files' . $path);
+            });
 
-		$this->overwriteService(View::class, $this->view);
-
-		$dir = new Directory($this->view, $this->info);
-		$nodes = $dir->getChildren();
-
-		$this->assertCount(2, $nodes);
-
-		// calling a second time just returns the cached values,
-		// does not call getDirectoryContents again
-		$dir->getChildren();
-	}
+        $this->overwriteService(View::class, $this->view);
+
+        $dir = new Directory($this->view, $this->info);
+        $nodes = $dir->getChildren();
+
+        $this->assertCount(2, $nodes);
+
+        // calling a second time just returns the cached values,
+        // does not call getDirectoryContents again
+        $dir->getChildren();
+    }
 
 
-	public function testGetChildrenNoPermission(): void {
-		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+    public function testGetChildrenNoPermission(): void {
+        $this->expectException(\Sabre\DAV\Exception\Forbidden::class);
 
-		$info = $this->createMock(FileInfo::class);
-		$info->expects($this->any())
-			->method('isReadable')
-			->willReturn(false);
-
-		$dir = new Directory($this->view, $info);
-		$dir->getChildren();
-	}
-
-
-	public function testGetChildNoPermission(): void {
-		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
-
-		$this->info->expects($this->any())
-			->method('isReadable')
-			->willReturn(false);
-
-		$dir = new Directory($this->view, $this->info);
-		$dir->getChild('test');
-	}
-
-
-	public function testGetChildThrowStorageNotAvailableException(): void {
-		$this->expectException(\Sabre\DAV\Exception\ServiceUnavailable::class);
-
-		$this->view->expects($this->once())
-			->method('getFileInfo')
-			->willThrowException(new StorageNotAvailableException());
-
-		$dir = new Directory($this->view, $this->info);
-		$dir->getChild('.');
-	}
-
-
-	public function testGetChildThrowInvalidPath(): void {
-		$this->expectException(InvalidPath::class);
-
-		$this->view->expects($this->once())
-			->method('verifyPath')
-			->willThrowException(new InvalidPathException());
-		$this->view->expects($this->never())
-			->method('getFileInfo');
-
-		$dir = new Directory($this->view, $this->info);
-		$dir->getChild('.');
-	}
-
-	public function testGetQuotaInfoUnlimited(): void {
-		$this->createUser('user', 'password');
-		self::loginAsUser('user');
-		$mountPoint = $this->createMock(IMountPoint::class);
-		$storage = $this->createMock(Quota::class);
-		$mountPoint->method('getStorage')
-			->willReturn($storage);
-
-		$storage->expects($this->any())
-			->method('instanceOfStorage')
-			->willReturnMap([
-				['\OCA\Files_Sharing\SharedStorage', false],
-				['\OC\Files\Storage\Wrapper\Quota', false],
-				[Storage::class, false],
-			]);
-
-		$storage->expects($this->once())
-			->method('getOwner')
-			->willReturn('user');
+        $info = $this->createMock(FileInfo::class);
+        $info->expects($this->any())
+            ->method('isReadable')
+            ->willReturn(false);
+
+        $dir = new Directory($this->view, $info);
+        $dir->getChildren();
+    }
+
+
+    public function testGetChildNoPermission(): void {
+        $this->expectException(\Sabre\DAV\Exception\NotFound::class);
+
+        $this->info->expects($this->any())
+            ->method('isReadable')
+            ->willReturn(false);
+
+        $dir = new Directory($this->view, $this->info);
+        $dir->getChild('test');
+    }
+
+
+    public function testGetChildThrowStorageNotAvailableException(): void {
+        $this->expectException(\Sabre\DAV\Exception\ServiceUnavailable::class);
+
+        $this->view->expects($this->once())
+            ->method('getFileInfo')
+            ->willThrowException(new StorageNotAvailableException());
+
+        $dir = new Directory($this->view, $this->info);
+        $dir->getChild('.');
+    }
+
+
+    public function testGetChildThrowInvalidPath(): void {
+        $this->expectException(InvalidPath::class);
+
+        $this->view->expects($this->once())
+            ->method('verifyPath')
+            ->willThrowException(new InvalidPathException());
+        $this->view->expects($this->never())
+            ->method('getFileInfo');
+
+        $dir = new Directory($this->view, $this->info);
+        $dir->getChild('.');
+    }
+
+    public function testGetQuotaInfoUnlimited(): void {
+        $this->createUser('user', 'password');
+        self::loginAsUser('user');
+        $mountPoint = $this->createMock(IMountPoint::class);
+        $storage = $this->createMock(Quota::class);
+        $mountPoint->method('getStorage')
+            ->willReturn($storage);
+
+        $storage->expects($this->any())
+            ->method('instanceOfStorage')
+            ->willReturnMap([
+                ['\OCA\Files_Sharing\SharedStorage', false],
+                ['\OC\Files\Storage\Wrapper\Quota', false],
+                [Storage::class, false],
+            ]);
+
+        $storage->expects($this->once())
+            ->method('getOwner')
+            ->willReturn('user');
 
-		$storage->expects($this->never())
-			->method('getQuota');
+        $storage->expects($this->never())
+            ->method('getQuota');
 
-		$storage->expects($this->once())
-			->method('free_space')
-			->willReturn(800);
+        $storage->expects($this->once())
+            ->method('free_space')
+            ->willReturn(800);
 
-		$this->info->expects($this->any())
-			->method('getPath')
-			->willReturn('/admin/files/foo');
+        $this->info->expects($this->any())
+            ->method('getPath')
+            ->willReturn('/admin/files/foo');
 
-		$this->info->expects($this->once())
-			->method('getSize')
-			->willReturn(200);
+        $this->info->expects($this->once())
+            ->method('getSize')
+            ->willReturn(200);
 
-		$this->info->expects($this->once())
-			->method('getMountPoint')
-			->willReturn($mountPoint);
-
-		$this->view->expects($this->any())
-			->method('getRelativePath')
-			->willReturn('/foo');
-
-		$this->info->expects($this->once())
-			->method('getInternalPath')
-			->willReturn('/foo');
-
-		$mountPoint->method('getMountPoint')
-			->willReturn('/user/files/mymountpoint');
-
-		$dir = new Directory($this->view, $this->info);
-		$this->assertEquals([200, -3], $dir->getQuotaInfo()); //200 used, unlimited
-	}
-
-	public function testGetQuotaInfoSpecific(): void {
-		$this->createUser('user', 'password');
-		self::loginAsUser('user');
-		$mountPoint = $this->createMock(IMountPoint::class);
-		$storage = $this->createMock(Quota::class);
-		$mountPoint->method('getStorage')
-			->willReturn($storage);
-
-		$storage->expects($this->any())
-			->method('instanceOfStorage')
-			->willReturnMap([
-				['\OCA\Files_Sharing\SharedStorage', false],
-				['\OC\Files\Storage\Wrapper\Quota', true],
-				[Storage::class, false],
-			]);
-
-		$storage->expects($this->once())
-			->method('getOwner')
-			->willReturn('user');
-
-		$storage->expects($this->once())
-			->method('getQuota')
-			->willReturn(1000);
-
-		$storage->expects($this->once())
-			->method('free_space')
-			->willReturn(800);
-
-		$this->info->expects($this->once())
-			->method('getSize')
-			->willReturn(200);
-
-		$this->info->expects($this->once())
-			->method('getMountPoint')
-			->willReturn($mountPoint);
-
-		$this->info->expects($this->once())
-			->method('getInternalPath')
-			->willReturn('/foo');
-
-		$mountPoint->method('getMountPoint')
-			->willReturn('/user/files/mymountpoint');
-
-		$this->view->expects($this->any())
-			->method('getRelativePath')
-			->willReturn('/foo');
-
-		$dir = new Directory($this->view, $this->info);
-		$this->assertEquals([200, 800], $dir->getQuotaInfo()); //200 used, 800 free
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('moveFailedProvider')]
-	public function testMoveFailed(string $source, string $destination, array $updatables, array $deletables): void {
-		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
-
-		$this->moveTest($source, $destination, $updatables, $deletables);
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('moveSuccessProvider')]
-	public function testMoveSuccess(string $source, string $destination, array $updatables, array $deletables): void {
-		$this->moveTest($source, $destination, $updatables, $deletables);
-		$this->addToAssertionCount(1);
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('moveFailedInvalidCharsProvider')]
-	public function testMoveFailedInvalidChars(string $source, string $destination, array $updatables, array $deletables): void {
-		$this->expectException(InvalidPath::class);
-
-		$this->moveTest($source, $destination, $updatables, $deletables);
-	}
-
-	public static function moveFailedInvalidCharsProvider(): array {
-		return [
-			['a/valid', "a/i\nvalid", ['a' => true, 'a/valid' => true, 'a/c*' => false], []],
-		];
-	}
-
-	public static function moveFailedProvider(): array {
-		return [
-			['a/b', 'a/c', ['a' => false, 'a/b' => false, 'a/c' => false], []],
-			['a/b', 'b/b', ['a' => false, 'a/b' => false, 'b' => false, 'b/b' => false], []],
-			['a/b', 'b/b', ['a' => false, 'a/b' => true, 'b' => false, 'b/b' => false], []],
-			['a/b', 'b/b', ['a' => true, 'a/b' => true, 'b' => false, 'b/b' => false], []],
-			['a/b', 'b/b', ['a' => true, 'a/b' => true, 'b' => true, 'b/b' => false], ['a/b' => false]],
-			['a/b', 'a/c', ['a' => false, 'a/b' => true, 'a/c' => false], []],
-		];
-	}
-
-	public static function moveSuccessProvider(): array {
-		return [
-			['a/b', 'b/b', ['a' => true, 'a/b' => true, 'b' => true, 'b/b' => false], ['a/b' => true]],
-			// older files with special chars can still be renamed to valid names
-			['a/b*', 'b/b', ['a' => true, 'a/b*' => true, 'b' => true, 'b/b' => false], ['a/b*' => true]],
-		];
-	}
-
-	private function moveTest(string $source, string $destination, array $updatables, array $deletables): void {
-		$view = new TestViewDirectory($updatables, $deletables);
-
-		$sourceInfo = new FileInfo($source, null, null, [
-			'type' => FileInfo::TYPE_FOLDER,
-		], null);
-		$targetInfo = new FileInfo(dirname($destination), null, null, [
-			'type' => FileInfo::TYPE_FOLDER,
-		], null);
-
-		$sourceNode = new Directory($view, $sourceInfo);
-		$targetNode = $this->getMockBuilder(Directory::class)
-			->onlyMethods(['childExists'])
-			->setConstructorArgs([$view, $targetInfo])
-			->getMock();
-		$targetNode->expects($this->any())->method('childExists')
-			->with(basename($destination))
-			->willReturn(false);
-		$this->assertTrue($targetNode->moveInto(basename($destination), $source, $sourceNode));
-	}
-
-
-	public function testFailingMove(): void {
-		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
-		$this->expectExceptionMessage('Could not copy directory b, target exists');
-
-		$source = 'a/b';
-		$destination = 'c/b';
-		$updatables = ['a' => true, 'a/b' => true, 'b' => true, 'c/b' => false];
-		$deletables = ['a/b' => true];
-
-		$view = new TestViewDirectory($updatables, $deletables);
-
-		$sourceInfo = new FileInfo($source, null, null, ['type' => FileInfo::TYPE_FOLDER], null);
-		$targetInfo = new FileInfo(dirname($destination), null, null, ['type' => FileInfo::TYPE_FOLDER], null);
-
-		$sourceNode = new Directory($view, $sourceInfo);
-		$targetNode = $this->getMockBuilder(Directory::class)
-			->onlyMethods(['childExists'])
-			->setConstructorArgs([$view, $targetInfo])
-			->getMock();
-		$targetNode->expects($this->once())->method('childExists')
-			->with(basename($destination))
-			->willReturn(true);
-
-		$targetNode->moveInto(basename($destination), $source, $sourceNode);
-	}
+        $this->info->expects($this->once())
+            ->method('getMountPoint')
+            ->willReturn($mountPoint);
+
+        $this->view->expects($this->any())
+            ->method('getRelativePath')
+            ->willReturn('/foo');
+
+        $this->info->expects($this->once())
+            ->method('getInternalPath')
+            ->willReturn('/foo');
+
+        $mountPoint->method('getMountPoint')
+            ->willReturn('/user/files/mymountpoint');
+
+        $dir = new Directory($this->view, $this->info);
+        $this->assertEquals([200, -3], $dir->getQuotaInfo()); //200 used, unlimited
+    }
+
+    public function testGetQuotaInfoSpecific(): void {
+        $this->createUser('user', 'password');
+        self::loginAsUser('user');
+        $mountPoint = $this->createMock(IMountPoint::class);
+        $storage = $this->createMock(Quota::class);
+        $mountPoint->method('getStorage')
+            ->willReturn($storage);
+
+        $storage->expects($this->any())
+            ->method('instanceOfStorage')
+            ->willReturnMap([
+                ['\OCA\Files_Sharing\SharedStorage', false],
+                ['\OC\Files\Storage\Wrapper\Quota', true],
+                [Storage::class, false],
+            ]);
+
+        $storage->expects($this->once())
+            ->method('getOwner')
+            ->willReturn('user');
+
+        $storage->expects($this->once())
+            ->method('getQuota')
+            ->willReturn(1000);
+
+        $storage->expects($this->once())
+            ->method('free_space')
+            ->willReturn(800);
+
+        $this->info->expects($this->once())
+            ->method('getSize')
+            ->willReturn(200);
+
+        $this->info->expects($this->once())
+            ->method('getMountPoint')
+            ->willReturn($mountPoint);
+
+        $this->info->expects($this->once())
+            ->method('getInternalPath')
+            ->willReturn('/foo');
+
+        $mountPoint->method('getMountPoint')
+            ->willReturn('/user/files/mymountpoint');
+
+        $this->view->expects($this->any())
+            ->method('getRelativePath')
+            ->willReturn('/foo');
+
+        $dir = new Directory($this->view, $this->info);
+        $this->assertEquals([200, 800], $dir->getQuotaInfo()); //200 used, 800 free
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('moveFailedProvider')]
+    public function testMoveFailed(string $source, string $destination, array $updatables, array $deletables): void {
+        $this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
+        $this->moveTest($source, $destination, $updatables, $deletables);
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('moveSuccessProvider')]
+    public function testMoveSuccess(string $source, string $destination, array $updatables, array $deletables): void {
+        $this->moveTest($source, $destination, $updatables, $deletables);
+        $this->addToAssertionCount(1);
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('moveFailedInvalidCharsProvider')]
+    public function testMoveFailedInvalidChars(string $source, string $destination, array $updatables, array $deletables): void {
+        $this->expectException(InvalidPath::class);
+
+        $this->moveTest($source, $destination, $updatables, $deletables);
+    }
+
+    public static function moveFailedInvalidCharsProvider(): array {
+        return [
+            ['a/valid', "a/i\nvalid", ['a' => true, 'a/valid' => true, 'a/c*' => false], []],
+        ];
+    }
+
+    public static function moveFailedProvider(): array {
+        return [
+            ['a/b', 'a/c', ['a' => false, 'a/b' => false, 'a/c' => false], []],
+            ['a/b', 'b/b', ['a' => false, 'a/b' => false, 'b' => false, 'b/b' => false], []],
+            ['a/b', 'b/b', ['a' => false, 'a/b' => true, 'b' => false, 'b/b' => false], []],
+            ['a/b', 'b/b', ['a' => true, 'a/b' => true, 'b' => false, 'b/b' => false], []],
+            ['a/b', 'b/b', ['a' => true, 'a/b' => true, 'b' => true, 'b/b' => false], ['a/b' => false]],
+            ['a/b', 'a/c', ['a' => false, 'a/b' => true, 'a/c' => false], []],
+        ];
+    }
+
+    public static function moveSuccessProvider(): array {
+        return [
+            ['a/b', 'b/b', ['a' => true, 'a/b' => true, 'b' => true, 'b/b' => false], ['a/b' => true]],
+            // older files with special chars can still be renamed to valid names
+            ['a/b*', 'b/b', ['a' => true, 'a/b*' => true, 'b' => true, 'b/b' => false], ['a/b*' => true]],
+        ];
+    }
+
+    private function moveTest(string $source, string $destination, array $updatables, array $deletables): void {
+        $view = new TestViewDirectory($updatables, $deletables);
+
+        $sourceInfo = new FileInfo($source, null, null, [
+            'type' => FileInfo::TYPE_FOLDER,
+        ], null);
+        $targetInfo = new FileInfo(dirname($destination), null, null, [
+            'type' => FileInfo::TYPE_FOLDER,
+        ], null);
+
+        $sourceNode = new Directory($view, $sourceInfo);
+        $targetNode = $this->getMockBuilder(Directory::class)
+            ->onlyMethods(['childExists'])
+            ->setConstructorArgs([$view, $targetInfo])
+            ->getMock();
+        $targetNode->expects($this->any())->method('childExists')
+            ->with(basename($destination))
+            ->willReturn(false);
+        $this->assertTrue($targetNode->moveInto(basename($destination), $source, $sourceNode));
+    }
+
+
+    public function testFailingMove(): void {
+        $this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+        $this->expectExceptionMessage('Could not copy directory b, target exists');
+
+        $source = 'a/b';
+        $destination = 'c/b';
+        $updatables = ['a' => true, 'a/b' => true, 'b' => true, 'c/b' => false];
+        $deletables = ['a/b' => true];
+
+        $view = new TestViewDirectory($updatables, $deletables);
+
+        $sourceInfo = new FileInfo($source, null, null, ['type' => FileInfo::TYPE_FOLDER], null);
+        $targetInfo = new FileInfo(dirname($destination), null, null, ['type' => FileInfo::TYPE_FOLDER], null);
+
+        $sourceNode = new Directory($view, $sourceInfo);
+        $targetNode = $this->getMockBuilder(Directory::class)
+            ->onlyMethods(['childExists'])
+            ->setConstructorArgs([$view, $targetInfo])
+            ->getMock();
+        $targetNode->expects($this->once())->method('childExists')
+            ->with(basename($destination))
+            ->willReturn(true);
+
+        $targetNode->moveInto(basename($destination), $source, $sourceNode);
+    }
 }

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

Indentation +213 added lines, -213 removed lines

@@ -47,237 +47,237 @@
 
 class ServerFactory {
 
-	public function __construct(
-		private IConfig $config,
-		private LoggerInterface $logger,
-		private IDBConnection $databaseConnection,
-		private IUserSession $userSession,
-		private IMountManager $mountManager,
-		private ITagManager $tagManager,
-		private IRequest $request,
-		private IPreview $previewManager,
-		private IEventDispatcher $eventDispatcher,
-		private IL10N $l10n,
-	) {
-	}
+    public function __construct(
+        private IConfig $config,
+        private LoggerInterface $logger,
+        private IDBConnection $databaseConnection,
+        private IUserSession $userSession,
+        private IMountManager $mountManager,
+        private ITagManager $tagManager,
+        private IRequest $request,
+        private IPreview $previewManager,
+        private IEventDispatcher $eventDispatcher,
+        private IL10N $l10n,
+    ) {
+    }
 
-	/**
-	 * @param callable $viewCallBack callback that should return the view for the dav endpoint
-	 */
-	public function createServer(
-		bool $isPublicShare,
-		string $baseUri,
-		string $requestUri,
-		Plugin $authPlugin,
-		callable $viewCallBack,
-	): Server {
-		// /public.php/webdav/ shows the files in the share in the root itself
-		// and not under /public.php/webdav/files/{token} so we should keep
-		// compatibility for that.
-		$needsSharesInRoot = $baseUri === '/public.php/webdav/';
-		$useCollection = $isPublicShare && !$needsSharesInRoot;
-		$debugEnabled = $this->config->getSystemValue('debug', false);
-		[$tree, $rootCollection] = $this->getTree($useCollection);
-		$server = new Server($tree);
-		// Set URL explicitly due to reverse-proxy situations
-		$server->httpRequest->setUrl($requestUri);
-		$server->setBaseUri($baseUri);
+    /**
+     * @param callable $viewCallBack callback that should return the view for the dav endpoint
+     */
+    public function createServer(
+        bool $isPublicShare,
+        string $baseUri,
+        string $requestUri,
+        Plugin $authPlugin,
+        callable $viewCallBack,
+    ): Server {
+        // /public.php/webdav/ shows the files in the share in the root itself
+        // and not under /public.php/webdav/files/{token} so we should keep
+        // compatibility for that.
+        $needsSharesInRoot = $baseUri === '/public.php/webdav/';
+        $useCollection = $isPublicShare && !$needsSharesInRoot;
+        $debugEnabled = $this->config->getSystemValue('debug', false);
+        [$tree, $rootCollection] = $this->getTree($useCollection);
+        $server = new Server($tree);
+        // Set URL explicitly due to reverse-proxy situations
+        $server->httpRequest->setUrl($requestUri);
+        $server->setBaseUri($baseUri);
 
-		// Load plugins
-		$server->addPlugin(new MaintenancePlugin($this->config, $this->l10n));
-		$server->addPlugin(new BlockLegacyClientPlugin(
-			$this->config,
-			\OCP\Server::get(ThemingDefaults::class),
-		));
-		$server->addPlugin(new AnonymousOptionsPlugin());
-		$server->addPlugin($authPlugin);
-		if ($debugEnabled) {
-			$server->debugEnabled = $debugEnabled;
-			$server->addPlugin(new PropFindMonitorPlugin());
-		}
+        // Load plugins
+        $server->addPlugin(new MaintenancePlugin($this->config, $this->l10n));
+        $server->addPlugin(new BlockLegacyClientPlugin(
+            $this->config,
+            \OCP\Server::get(ThemingDefaults::class),
+        ));
+        $server->addPlugin(new AnonymousOptionsPlugin());
+        $server->addPlugin($authPlugin);
+        if ($debugEnabled) {
+            $server->debugEnabled = $debugEnabled;
+            $server->addPlugin(new PropFindMonitorPlugin());
+        }
 
-		$server->addPlugin(new PropFindPreloadNotifyPlugin());
-		// FIXME: The following line is a workaround for legacy components relying on being able to send a GET to /
-		$server->addPlugin(new DummyGetResponsePlugin());
-		$server->addPlugin(new ExceptionLoggerPlugin('webdav', $this->logger));
-		$server->addPlugin(new LockPlugin());
+        $server->addPlugin(new PropFindPreloadNotifyPlugin());
+        // FIXME: The following line is a workaround for legacy components relying on being able to send a GET to /
+        $server->addPlugin(new DummyGetResponsePlugin());
+        $server->addPlugin(new ExceptionLoggerPlugin('webdav', $this->logger));
+        $server->addPlugin(new LockPlugin());
 
-		$server->addPlugin(new RequestIdHeaderPlugin($this->request));
+        $server->addPlugin(new RequestIdHeaderPlugin($this->request));
 
-		$server->addPlugin(new ZipFolderPlugin(
-			$tree,
-			$this->logger,
-			$this->eventDispatcher,
-			\OCP\Server::get(IDateTimeZone::class),
-		));
+        $server->addPlugin(new ZipFolderPlugin(
+            $tree,
+            $this->logger,
+            $this->eventDispatcher,
+            \OCP\Server::get(IDateTimeZone::class),
+        ));
 
-		// Some WebDAV clients do require Class 2 WebDAV support (locking), since
-		// we do not provide locking we emulate it using a fake locking plugin.
-		if ($this->request->isUserAgent([
-			'/WebDAVFS/',
-			'/OneNote/',
-			'/Microsoft-WebDAV-MiniRedir/',
-		])) {
-			$server->addPlugin(new FakeLockerPlugin());
-		}
+        // Some WebDAV clients do require Class 2 WebDAV support (locking), since
+        // we do not provide locking we emulate it using a fake locking plugin.
+        if ($this->request->isUserAgent([
+            '/WebDAVFS/',
+            '/OneNote/',
+            '/Microsoft-WebDAV-MiniRedir/',
+        ])) {
+            $server->addPlugin(new FakeLockerPlugin());
+        }
 
-		if (BrowserErrorPagePlugin::isBrowserRequest($this->request)) {
-			$server->addPlugin(new BrowserErrorPagePlugin());
-		}
+        if (BrowserErrorPagePlugin::isBrowserRequest($this->request)) {
+            $server->addPlugin(new BrowserErrorPagePlugin());
+        }
 
-		// wait with registering these until auth is handled and the filesystem is setup
-		$server->on('beforeMethod:*', function () use ($server,
-			$tree, $viewCallBack, $isPublicShare, $rootCollection, $debugEnabled): void {
-			// ensure the skeleton is copied
-			$userFolder = \OC::$server->getUserFolder();
+        // wait with registering these until auth is handled and the filesystem is setup
+        $server->on('beforeMethod:*', function () use ($server,
+            $tree, $viewCallBack, $isPublicShare, $rootCollection, $debugEnabled): void {
+            // ensure the skeleton is copied
+            $userFolder = \OC::$server->getUserFolder();
 
-			/** @var View $view */
-			$view = $viewCallBack($server);
-			if ($userFolder instanceof Folder && $userFolder->getPath() === $view->getRoot()) {
-				$rootInfo = $userFolder;
-			} else {
-				$rootInfo = $view->getFileInfo('');
-			}
+            /** @var View $view */
+            $view = $viewCallBack($server);
+            if ($userFolder instanceof Folder && $userFolder->getPath() === $view->getRoot()) {
+                $rootInfo = $userFolder;
+            } else {
+                $rootInfo = $view->getFileInfo('');
+            }
 
-			// Create Nextcloud Dir
-			if ($rootInfo->getType() === 'dir') {
-				$root = new Directory($view, $rootInfo, $tree);
-			} else {
-				$root = new File($view, $rootInfo);
-			}
+            // Create Nextcloud Dir
+            if ($rootInfo->getType() === 'dir') {
+                $root = new Directory($view, $rootInfo, $tree);
+            } else {
+                $root = new File($view, $rootInfo);
+            }
 
-			if ($rootCollection !== null) {
-				$this->initRootCollection($rootCollection, $root);
-			} else {
-				/** @var ObjectTree $tree */
-				$tree->init($root, $view, $this->mountManager);
-			}
+            if ($rootCollection !== null) {
+                $this->initRootCollection($rootCollection, $root);
+            } else {
+                /** @var ObjectTree $tree */
+                $tree->init($root, $view, $this->mountManager);
+            }
 
-			$server->addPlugin(
-				new FilesPlugin(
-					$tree,
-					$this->config,
-					$this->request,
-					$this->previewManager,
-					$this->userSession,
-					\OCP\Server::get(IFilenameValidator::class),
-					\OCP\Server::get(IAccountManager::class),
-					$isPublicShare,
-					!$debugEnabled
-				)
-			);
-			$server->addPlugin(new QuotaPlugin($view));
-			$server->addPlugin(new ChecksumUpdatePlugin());
+            $server->addPlugin(
+                new FilesPlugin(
+                    $tree,
+                    $this->config,
+                    $this->request,
+                    $this->previewManager,
+                    $this->userSession,
+                    \OCP\Server::get(IFilenameValidator::class),
+                    \OCP\Server::get(IAccountManager::class),
+                    $isPublicShare,
+                    !$debugEnabled
+                )
+            );
+            $server->addPlugin(new QuotaPlugin($view));
+            $server->addPlugin(new ChecksumUpdatePlugin());
 
-			// Allow view-only plugin for webdav requests
-			$server->addPlugin(new ViewOnlyPlugin(
-				$userFolder,
-			));
+            // Allow view-only plugin for webdav requests
+            $server->addPlugin(new ViewOnlyPlugin(
+                $userFolder,
+            ));
 
-			if ($this->userSession->isLoggedIn()) {
-				$server->addPlugin(new TagsPlugin($tree, $this->tagManager, $this->eventDispatcher, $this->userSession));
-				$server->addPlugin(new SharesPlugin(
-					$tree,
-					$this->userSession,
-					$userFolder,
-					\OCP\Server::get(\OCP\Share\IManager::class)
-				));
-				$server->addPlugin(new CommentPropertiesPlugin(\OCP\Server::get(ICommentsManager::class), $this->userSession));
-				$server->addPlugin(new FilesReportPlugin(
-					$tree,
-					$view,
-					\OCP\Server::get(ISystemTagManager::class),
-					\OCP\Server::get(ISystemTagObjectMapper::class),
-					\OCP\Server::get(ITagManager::class),
-					$this->userSession,
-					\OCP\Server::get(IGroupManager::class),
-					$userFolder,
-					\OCP\Server::get(IAppManager::class)
-				));
-				// custom properties plugin must be the last one
-				$server->addPlugin(
-					new \Sabre\DAV\PropertyStorage\Plugin(
-						new CustomPropertiesBackend(
-							$server,
-							$tree,
-							$this->databaseConnection,
-							$this->userSession->getUser(),
-							\OCP\Server::get(PropertyMapper::class),
-							\OCP\Server::get(DefaultCalendarValidator::class),
-						)
-					)
-				);
-			}
-			$server->addPlugin(new CopyEtagHeaderPlugin());
+            if ($this->userSession->isLoggedIn()) {
+                $server->addPlugin(new TagsPlugin($tree, $this->tagManager, $this->eventDispatcher, $this->userSession));
+                $server->addPlugin(new SharesPlugin(
+                    $tree,
+                    $this->userSession,
+                    $userFolder,
+                    \OCP\Server::get(\OCP\Share\IManager::class)
+                ));
+                $server->addPlugin(new CommentPropertiesPlugin(\OCP\Server::get(ICommentsManager::class), $this->userSession));
+                $server->addPlugin(new FilesReportPlugin(
+                    $tree,
+                    $view,
+                    \OCP\Server::get(ISystemTagManager::class),
+                    \OCP\Server::get(ISystemTagObjectMapper::class),
+                    \OCP\Server::get(ITagManager::class),
+                    $this->userSession,
+                    \OCP\Server::get(IGroupManager::class),
+                    $userFolder,
+                    \OCP\Server::get(IAppManager::class)
+                ));
+                // custom properties plugin must be the last one
+                $server->addPlugin(
+                    new \Sabre\DAV\PropertyStorage\Plugin(
+                        new CustomPropertiesBackend(
+                            $server,
+                            $tree,
+                            $this->databaseConnection,
+                            $this->userSession->getUser(),
+                            \OCP\Server::get(PropertyMapper::class),
+                            \OCP\Server::get(DefaultCalendarValidator::class),
+                        )
+                    )
+                );
+            }
+            $server->addPlugin(new CopyEtagHeaderPlugin());
 
-			// Load dav plugins from apps
-			$event = new SabrePluginEvent($server);
-			$this->eventDispatcher->dispatchTyped($event);
-			$pluginManager = new PluginManager(
-				\OC::$server,
-				\OCP\Server::get(IAppManager::class)
-			);
-			foreach ($pluginManager->getAppPlugins() as $appPlugin) {
-				$server->addPlugin($appPlugin);
-			}
-		}, 30); // priority 30: after auth (10) and acl(20), before lock(50) and handling the request
-		return $server;
-	}
+            // Load dav plugins from apps
+            $event = new SabrePluginEvent($server);
+            $this->eventDispatcher->dispatchTyped($event);
+            $pluginManager = new PluginManager(
+                \OC::$server,
+                \OCP\Server::get(IAppManager::class)
+            );
+            foreach ($pluginManager->getAppPlugins() as $appPlugin) {
+                $server->addPlugin($appPlugin);
+            }
+        }, 30); // priority 30: after auth (10) and acl(20), before lock(50) and handling the request
+        return $server;
+    }
 
-	/**
-	 * Returns a Tree object and, if $useCollection is true, the collection used
-	 * as root.
-	 *
-	 * @param bool $useCollection Whether to use a collection or the legacy
-	 *                            ObjectTree, which doesn't use collections.
-	 * @return array{0: CachingTree|ObjectTree, 1: SimpleCollection|null}
-	 */
-	public function getTree(bool $useCollection): array {
-		if ($useCollection) {
-			$rootCollection = new SimpleCollection('root');
-			$tree = new CachingTree($rootCollection);
-			return [$tree, $rootCollection];
-		}
+    /**
+     * Returns a Tree object and, if $useCollection is true, the collection used
+     * as root.
+     *
+     * @param bool $useCollection Whether to use a collection or the legacy
+     *                            ObjectTree, which doesn't use collections.
+     * @return array{0: CachingTree|ObjectTree, 1: SimpleCollection|null}
+     */
+    public function getTree(bool $useCollection): array {
+        if ($useCollection) {
+            $rootCollection = new SimpleCollection('root');
+            $tree = new CachingTree($rootCollection);
+            return [$tree, $rootCollection];
+        }
 
-		return [new ObjectTree(), null];
-	}
+        return [new ObjectTree(), null];
+    }
 
-	/**
-	 * Adds the user's principal backend to $rootCollection.
-	 */
-	private function initRootCollection(SimpleCollection $rootCollection, Directory|File $root): void {
-		$userPrincipalBackend = new Principal(
-			\OCP\Server::get(IUserManager::class),
-			\OCP\Server::get(IGroupManager::class),
-			\OCP\Server::get(IAccountManager::class),
-			\OCP\Server::get(\OCP\Share\IManager::class),
-			\OCP\Server::get(IUserSession::class),
-			\OCP\Server::get(IAppManager::class),
-			\OCP\Server::get(ProxyMapper::class),
-			\OCP\Server::get(KnownUserService::class),
-			\OCP\Server::get(IConfig::class),
-			\OCP\Server::get(IFactory::class),
-		);
+    /**
+     * Adds the user's principal backend to $rootCollection.
+     */
+    private function initRootCollection(SimpleCollection $rootCollection, Directory|File $root): void {
+        $userPrincipalBackend = new Principal(
+            \OCP\Server::get(IUserManager::class),
+            \OCP\Server::get(IGroupManager::class),
+            \OCP\Server::get(IAccountManager::class),
+            \OCP\Server::get(\OCP\Share\IManager::class),
+            \OCP\Server::get(IUserSession::class),
+            \OCP\Server::get(IAppManager::class),
+            \OCP\Server::get(ProxyMapper::class),
+            \OCP\Server::get(KnownUserService::class),
+            \OCP\Server::get(IConfig::class),
+            \OCP\Server::get(IFactory::class),
+        );
 
-		// Mount the share collection at /public.php/dav/files/<share token>
-		$rootCollection->addChild(
-			new RootCollection(
-				$root,
-				$userPrincipalBackend,
-				'principals/shares',
-			)
-		);
+        // Mount the share collection at /public.php/dav/files/<share token>
+        $rootCollection->addChild(
+            new RootCollection(
+                $root,
+                $userPrincipalBackend,
+                'principals/shares',
+            )
+        );
 
-		// Mount the upload collection at /public.php/dav/uploads/<share token>
-		$rootCollection->addChild(
-			new \OCA\DAV\Upload\RootCollection(
-				$userPrincipalBackend,
-				'principals/shares',
-				\OCP\Server::get(CleanupService::class),
-				\OCP\Server::get(IRootFolder::class),
-				\OCP\Server::get(IUserSession::class),
-				\OCP\Server::get(\OCP\Share\IManager::class),
-			)
-		);
-	}
+        // Mount the upload collection at /public.php/dav/uploads/<share token>
+        $rootCollection->addChild(
+            new \OCA\DAV\Upload\RootCollection(
+                $userPrincipalBackend,
+                'principals/shares',
+                \OCP\Server::get(CleanupService::class),
+                \OCP\Server::get(IRootFolder::class),
+                \OCP\Server::get(IUserSession::class),
+                \OCP\Server::get(\OCP\Share\IManager::class),
+            )
+        );
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -126,7 +126,7 @@ 
 		}
 
 		// wait with registering these until auth is handled and the filesystem is setup
-		$server->on('beforeMethod:*', function () use ($server,
+		$server->on('beforeMethod:*', function() use ($server,
 			$tree, $viewCallBack, $isPublicShare, $rootCollection, $debugEnabled): void {
 			// ensure the skeleton is copied
 			$userFolder = \OC::$server->getUserFolder();
@@ -245,7 +245,7 @@ 
 	/**
 	 * Adds the user's principal backend to $rootCollection.
 	 */
-	private function initRootCollection(SimpleCollection $rootCollection, Directory|File $root): void {
+	private function initRootCollection(SimpleCollection $rootCollection, Directory | File $root): void {
 		$userPrincipalBackend = new Principal(
 			\OCP\Server::get(IUserManager::class),
 			\OCP\Server::get(IGroupManager::class),

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

Indentation +450 added lines, -450 removed lines

@@ -40,454 +40,454 @@
 use Sabre\DAV\INode;
 
 class Directory extends Node implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota, \Sabre\DAV\IMoveTarget, \Sabre\DAV\ICopyTarget {
-	/**
-	 * Cached directory content
-	 * @var FileInfo[]
-	 */
-	private ?array $dirContent = null;
-
-	/** Cached quota info */
-	private ?array $quotaInfo = null;
-
-	/**
-	 * Sets up the node, expects a full path name
-	 */
-	public function __construct(
-		View $view,
-		FileInfo $info,
-		private ?CachingTree $tree = null,
-		?IShareManager $shareManager = null,
-	) {
-		parent::__construct($view, $info, $shareManager);
-	}
-
-	/**
-	 * Creates a new file in the directory
-	 *
-	 * Data will either be supplied as a stream resource, or in certain cases
-	 * as a string. Keep in mind that you may have to support either.
-	 *
-	 * After successful creation of the file, you may choose to return the ETag
-	 * of the new file here.
-	 *
-	 * The returned ETag must be surrounded by double-quotes (The quotes should
-	 * be part of the actual string).
-	 *
-	 * If you cannot accurately determine the ETag, you should not return it.
-	 * If you don't store the file exactly as-is (you're transforming it
-	 * somehow) you should also not return an ETag.
-	 *
-	 * This means that if a subsequent GET to this new file does not exactly
-	 * return the same contents of what was submitted here, you are strongly
-	 * recommended to omit the ETag.
-	 *
-	 * @param string $name Name of the file
-	 * @param resource|string $data Initial payload
-	 * @return null|string
-	 * @throws Exception\EntityTooLarge
-	 * @throws Exception\UnsupportedMediaType
-	 * @throws FileLocked
-	 * @throws InvalidPath
-	 * @throws \Sabre\DAV\Exception
-	 * @throws \Sabre\DAV\Exception\BadRequest
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
-	 */
-	public function createFile($name, $data = null) {
-		try {
-			if (!$this->fileView->isCreatable($this->path)) {
-				throw new \Sabre\DAV\Exception\Forbidden();
-			}
-
-			$this->fileView->verifyPath($this->path, $name);
-
-			$path = $this->fileView->getAbsolutePath($this->path) . '/' . $name;
-			// in case the file already exists/overwriting
-			$info = $this->fileView->getFileInfo($this->path . '/' . $name);
-			if (!$info) {
-				// use a dummy FileInfo which is acceptable here since it will be refreshed after the put is complete
-				$info = new \OC\Files\FileInfo($path, null, null, [
-					'type' => FileInfo::TYPE_FILE
-				], null);
-			}
-			$node = new File($this->fileView, $info);
-
-			// only allow 1 process to upload a file at once but still allow reading the file while writing the part file
-			$node->acquireLock(ILockingProvider::LOCK_SHARED);
-			$this->fileView->lockFile($this->path . '/' . $name . '.upload.part', ILockingProvider::LOCK_EXCLUSIVE);
-
-			$result = $node->put($data);
-
-			$this->fileView->unlockFile($this->path . '/' . $name . '.upload.part', ILockingProvider::LOCK_EXCLUSIVE);
-			$node->releaseLock(ILockingProvider::LOCK_SHARED);
-			return $result;
-		} catch (StorageNotAvailableException $e) {
-			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage(), $e->getCode(), $e);
-		} catch (InvalidPathException $ex) {
-			throw new InvalidPath($ex->getMessage(), false, $ex);
-		} catch (ForbiddenException $ex) {
-			throw new Forbidden($ex->getMessage(), $ex->getRetry(), $ex);
-		} catch (LockedException $e) {
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	/**
-	 * Creates a new subdirectory
-	 *
-	 * @param string $name
-	 * @throws FileLocked
-	 * @throws InvalidPath
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
-	 */
-	public function createDirectory($name) {
-		try {
-			if (!$this->info->isCreatable()) {
-				throw new \Sabre\DAV\Exception\Forbidden();
-			}
-
-			$this->fileView->verifyPath($this->path, $name);
-			$newPath = $this->path . '/' . $name;
-			if (!$this->fileView->mkdir($newPath)) {
-				throw new \Sabre\DAV\Exception\Forbidden('Could not create directory ' . $newPath);
-			}
-		} catch (StorageNotAvailableException $e) {
-			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage(), 0, $e);
-		} catch (InvalidPathException $ex) {
-			throw new InvalidPath($ex->getMessage(), false, $ex);
-		} catch (ForbiddenException $ex) {
-			throw new Forbidden($ex->getMessage(), $ex->getRetry(), $ex);
-		} catch (LockedException $e) {
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	/**
-	 * Returns a specific child node, referenced by its name
-	 *
-	 * @param string $name
-	 * @param FileInfo $info
-	 * @return \Sabre\DAV\INode
-	 * @throws InvalidPath
-	 * @throws \Sabre\DAV\Exception\NotFound
-	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
-	 */
-	public function getChild($name, $info = null, ?IRequest $request = null, ?IL10N $l10n = null) {
-		$storage = $this->info->getStorage();
-		$allowDirectory = false;
-
-		// Checking if we're in a file drop
-		// If we are, then only PUT and MKCOL are allowed (see plugin)
-		// so we are safe to return the directory without a risk of
-		// leaking files and folders structure.
-		if ($storage->instanceOfStorage(PublicShareWrapper::class)) {
-			$share = $storage->getShare();
-			$allowDirectory = ($share->getPermissions() & Constants::PERMISSION_READ) !== Constants::PERMISSION_READ;
-		}
-
-		// 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();
-		}
-
-		$path = $this->path . '/' . $name;
-		if (is_null($info)) {
-			try {
-				$this->fileView->verifyPath($this->path, $name, true);
-				$info = $this->fileView->getFileInfo($path);
-			} catch (StorageNotAvailableException $e) {
-				throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage(), 0, $e);
-			} catch (InvalidPathException $ex) {
-				throw new InvalidPath($ex->getMessage(), false, $ex);
-			} catch (ForbiddenException $e) {
-				throw new \Sabre\DAV\Exception\Forbidden($e->getMessage(), $e->getCode(), $e);
-			}
-		}
-
-		if (!$info) {
-			throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
-		}
-
-		if ($info->getMimeType() === FileInfo::MIMETYPE_FOLDER) {
-			$node = new 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) {
-			$this->tree->cacheNode($node);
-		}
-		return $node;
-	}
-
-	/**
-	 * Returns an array with all the child nodes
-	 *
-	 * @return \Sabre\DAV\INode[]
-	 * @throws \Sabre\DAV\Exception\Locked
-	 * @throws Forbidden
-	 */
-	public function getChildren() {
-		if (!is_null($this->dirContent)) {
-			return $this->dirContent;
-		}
-		try {
-			if (!$this->info->isReadable()) {
-				// return 403 instead of 404 because a 404 would make
-				// the caller believe that the collection itself does not exist
-				if (Server::get(IAppManager::class)->isEnabledForAnyone('files_accesscontrol')) {
-					throw new Forbidden('No read permissions. This might be caused by files_accesscontrol, check your configured rules');
-				} else {
-					throw new Forbidden('No read permissions');
-				}
-			}
-			$folderContent = $this->getNode()->getDirectoryListing();
-		} catch (LockedException $e) {
-			throw new Locked();
-		}
-
-		$nodes = [];
-		$request = Server::get(IRequest::class);
-		$l10nFactory = Server::get(IFactory::class);
-		$l10n = $l10nFactory->get(Application::APP_ID);
-		foreach ($folderContent as $info) {
-			$node = $this->getChild($info->getName(), $info, $request, $l10n);
-			$nodes[] = $node;
-		}
-		$this->dirContent = $nodes;
-		return $this->dirContent;
-	}
-
-	/**
-	 * Checks if a child exists.
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function childExists($name) {
-		// note: here we do NOT resolve the chunk file name to the real file name
-		// to make sure we return false when checking for file existence with a chunk
-		// file name.
-		// This is to make sure that "createFile" is still triggered
-		// (required old code) instead of "updateFile".
-		//
-		// TODO: resolve chunk file name here and implement "updateFile"
-		$path = $this->path . '/' . $name;
-		return $this->fileView->file_exists($path);
-	}
-
-	/**
-	 * Deletes all files in this directory, and then itself
-	 *
-	 * @return void
-	 * @throws FileLocked
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 */
-	public function delete() {
-		if ($this->path === '' || $this->path === '/' || !$this->info->isDeletable()) {
-			throw new \Sabre\DAV\Exception\Forbidden();
-		}
-
-		try {
-			if (!$this->fileView->rmdir($this->path)) {
-				// assume it wasn't possible to remove due to permission issue
-				throw new \Sabre\DAV\Exception\Forbidden();
-			}
-		} catch (ForbiddenException $ex) {
-			throw new Forbidden($ex->getMessage(), $ex->getRetry());
-		} catch (LockedException $e) {
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	private function getLogger(): LoggerInterface {
-		return Server::get(LoggerInterface::class);
-	}
-
-	/**
-	 * Returns available diskspace information
-	 *
-	 * @return array
-	 */
-	public function getQuotaInfo() {
-		if ($this->quotaInfo) {
-			return $this->quotaInfo;
-		}
-		$relativePath = $this->fileView->getRelativePath($this->info->getPath());
-		if ($relativePath === null) {
-			$this->getLogger()->warning('error while getting quota as the relative path cannot be found');
-			return [0, 0];
-		}
-
-		try {
-			$storageInfo = \OC_Helper::getStorageInfo($relativePath, $this->info, false);
-			if ($storageInfo['quota'] === FileInfo::SPACE_UNLIMITED) {
-				$free = FileInfo::SPACE_UNLIMITED;
-			} else {
-				$free = $storageInfo['free'];
-			}
-			$this->quotaInfo = [
-				$storageInfo['used'],
-				$free
-			];
-			return $this->quotaInfo;
-		} catch (NotFoundException $e) {
-			$this->getLogger()->warning('error while getting quota into', ['exception' => $e]);
-			return [0, 0];
-		} catch (StorageNotAvailableException $e) {
-			$this->getLogger()->warning('error while getting quota into', ['exception' => $e]);
-			return [0, 0];
-		} catch (NotPermittedException $e) {
-			$this->getLogger()->warning('error while getting quota into', ['exception' => $e]);
-			return [0, 0];
-		}
-	}
-
-	/**
-	 * Moves a node into this collection.
-	 *
-	 * It is up to the implementors to:
-	 *   1. Create the new resource.
-	 *   2. Remove the old resource.
-	 *   3. Transfer any properties or other data.
-	 *
-	 * Generally you should make very sure that your collection can easily move
-	 * the move.
-	 *
-	 * If you don't, just return false, which will trigger sabre/dav to handle
-	 * the move itself. If you return true from this function, the assumption
-	 * is that the move was successful.
-	 *
-	 * @param string $targetName New local file/collection name.
-	 * @param string $fullSourcePath Full path to source node
-	 * @param INode $sourceNode Source node itself
-	 * @return bool
-	 * @throws BadRequest
-	 * @throws ServiceUnavailable
-	 * @throws Forbidden
-	 * @throws FileLocked
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 */
-	public function moveInto($targetName, $fullSourcePath, INode $sourceNode) {
-		if (!$sourceNode instanceof Node) {
-			// it's a file of another kind, like FutureFile
-			if ($sourceNode instanceof IFile) {
-				// fallback to default copy+delete handling
-				return false;
-			}
-			throw new BadRequest('Incompatible node types');
-		}
-
-		$destinationPath = $this->getPath() . '/' . $targetName;
-
-
-		$targetNodeExists = $this->childExists($targetName);
-
-		// at getNodeForPath we also check the path for isForbiddenFileOrDir
-		// with that we have covered both source and destination
-		if ($sourceNode instanceof Directory && $targetNodeExists) {
-			throw new \Sabre\DAV\Exception\Forbidden('Could not copy directory ' . $sourceNode->getName() . ', target exists');
-		}
-
-		[$sourceDir,] = \Sabre\Uri\split($sourceNode->getPath());
-		$destinationDir = $this->getPath();
-
-		$sourcePath = $sourceNode->getPath();
-
-		$isMovableMount = false;
-		$sourceMount = Server::get(IMountManager::class)->find($this->fileView->getAbsolutePath($sourcePath));
-		$internalPath = $sourceMount->getInternalPath($this->fileView->getAbsolutePath($sourcePath));
-		if ($sourceMount instanceof MoveableMount && $internalPath === '') {
-			$isMovableMount = true;
-		}
-
-		try {
-			$sameFolder = ($sourceDir === $destinationDir);
-			// if we're overwriting or same folder
-			if ($targetNodeExists || $sameFolder) {
-				// note that renaming a share mount point is always allowed
-				if (!$this->fileView->isUpdatable($destinationDir) && !$isMovableMount) {
-					throw new \Sabre\DAV\Exception\Forbidden();
-				}
-			} else {
-				if (!$this->fileView->isCreatable($destinationDir)) {
-					throw new \Sabre\DAV\Exception\Forbidden();
-				}
-			}
-
-			if (!$sameFolder) {
-				// moving to a different folder, source will be gone, like a deletion
-				// note that moving a share mount point is always allowed
-				if (!$this->fileView->isDeletable($sourcePath) && !$isMovableMount) {
-					throw new \Sabre\DAV\Exception\Forbidden();
-				}
-			}
-
-			$fileName = basename($destinationPath);
-			try {
-				$this->fileView->verifyPath($destinationDir, $fileName);
-			} catch (InvalidPathException $ex) {
-				throw new InvalidPath($ex->getMessage());
-			}
-
-			$renameOkay = $this->fileView->rename($sourcePath, $destinationPath);
-			if (!$renameOkay) {
-				throw new \Sabre\DAV\Exception\Forbidden('');
-			}
-		} catch (StorageNotAvailableException $e) {
-			throw new ServiceUnavailable($e->getMessage(), $e->getCode(), $e);
-		} catch (ForbiddenException $ex) {
-			throw new Forbidden($ex->getMessage(), $ex->getRetry(), $ex);
-		} catch (LockedException $e) {
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-		}
-
-		return true;
-	}
-
-
-	public function copyInto($targetName, $sourcePath, INode $sourceNode) {
-		if ($sourceNode instanceof File || $sourceNode instanceof Directory) {
-			try {
-				$destinationPath = $this->getPath() . '/' . $targetName;
-				$sourcePath = $sourceNode->getPath();
-
-				if (!$this->fileView->isCreatable($this->getPath())) {
-					throw new \Sabre\DAV\Exception\Forbidden();
-				}
-
-				try {
-					$this->fileView->verifyPath($this->getPath(), $targetName);
-				} catch (InvalidPathException $ex) {
-					throw new InvalidPath($ex->getMessage());
-				}
-
-				$copyOkay = $this->fileView->copy($sourcePath, $destinationPath);
-
-				if (!$copyOkay) {
-					throw new \Sabre\DAV\Exception\Forbidden('Copy did not proceed');
-				}
-
-				return true;
-			} catch (StorageNotAvailableException $e) {
-				throw new ServiceUnavailable($e->getMessage(), $e->getCode(), $e);
-			} catch (ForbiddenException $ex) {
-				throw new Forbidden($ex->getMessage(), $ex->getRetry(), $ex);
-			} catch (LockedException $e) {
-				throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-			}
-		}
-
-		return false;
-	}
-
-	public function getNode(): Folder {
-		return $this->node;
-	}
+    /**
+     * Cached directory content
+     * @var FileInfo[]
+     */
+    private ?array $dirContent = null;
+
+    /** Cached quota info */
+    private ?array $quotaInfo = null;
+
+    /**
+     * Sets up the node, expects a full path name
+     */
+    public function __construct(
+        View $view,
+        FileInfo $info,
+        private ?CachingTree $tree = null,
+        ?IShareManager $shareManager = null,
+    ) {
+        parent::__construct($view, $info, $shareManager);
+    }
+
+    /**
+     * Creates a new file in the directory
+     *
+     * Data will either be supplied as a stream resource, or in certain cases
+     * as a string. Keep in mind that you may have to support either.
+     *
+     * After successful creation of the file, you may choose to return the ETag
+     * of the new file here.
+     *
+     * The returned ETag must be surrounded by double-quotes (The quotes should
+     * be part of the actual string).
+     *
+     * If you cannot accurately determine the ETag, you should not return it.
+     * If you don't store the file exactly as-is (you're transforming it
+     * somehow) you should also not return an ETag.
+     *
+     * This means that if a subsequent GET to this new file does not exactly
+     * return the same contents of what was submitted here, you are strongly
+     * recommended to omit the ETag.
+     *
+     * @param string $name Name of the file
+     * @param resource|string $data Initial payload
+     * @return null|string
+     * @throws Exception\EntityTooLarge
+     * @throws Exception\UnsupportedMediaType
+     * @throws FileLocked
+     * @throws InvalidPath
+     * @throws \Sabre\DAV\Exception
+     * @throws \Sabre\DAV\Exception\BadRequest
+     * @throws \Sabre\DAV\Exception\Forbidden
+     * @throws \Sabre\DAV\Exception\ServiceUnavailable
+     */
+    public function createFile($name, $data = null) {
+        try {
+            if (!$this->fileView->isCreatable($this->path)) {
+                throw new \Sabre\DAV\Exception\Forbidden();
+            }
+
+            $this->fileView->verifyPath($this->path, $name);
+
+            $path = $this->fileView->getAbsolutePath($this->path) . '/' . $name;
+            // in case the file already exists/overwriting
+            $info = $this->fileView->getFileInfo($this->path . '/' . $name);
+            if (!$info) {
+                // use a dummy FileInfo which is acceptable here since it will be refreshed after the put is complete
+                $info = new \OC\Files\FileInfo($path, null, null, [
+                    'type' => FileInfo::TYPE_FILE
+                ], null);
+            }
+            $node = new File($this->fileView, $info);
+
+            // only allow 1 process to upload a file at once but still allow reading the file while writing the part file
+            $node->acquireLock(ILockingProvider::LOCK_SHARED);
+            $this->fileView->lockFile($this->path . '/' . $name . '.upload.part', ILockingProvider::LOCK_EXCLUSIVE);
+
+            $result = $node->put($data);
+
+            $this->fileView->unlockFile($this->path . '/' . $name . '.upload.part', ILockingProvider::LOCK_EXCLUSIVE);
+            $node->releaseLock(ILockingProvider::LOCK_SHARED);
+            return $result;
+        } catch (StorageNotAvailableException $e) {
+            throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage(), $e->getCode(), $e);
+        } catch (InvalidPathException $ex) {
+            throw new InvalidPath($ex->getMessage(), false, $ex);
+        } catch (ForbiddenException $ex) {
+            throw new Forbidden($ex->getMessage(), $ex->getRetry(), $ex);
+        } catch (LockedException $e) {
+            throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * Creates a new subdirectory
+     *
+     * @param string $name
+     * @throws FileLocked
+     * @throws InvalidPath
+     * @throws \Sabre\DAV\Exception\Forbidden
+     * @throws \Sabre\DAV\Exception\ServiceUnavailable
+     */
+    public function createDirectory($name) {
+        try {
+            if (!$this->info->isCreatable()) {
+                throw new \Sabre\DAV\Exception\Forbidden();
+            }
+
+            $this->fileView->verifyPath($this->path, $name);
+            $newPath = $this->path . '/' . $name;
+            if (!$this->fileView->mkdir($newPath)) {
+                throw new \Sabre\DAV\Exception\Forbidden('Could not create directory ' . $newPath);
+            }
+        } catch (StorageNotAvailableException $e) {
+            throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage(), 0, $e);
+        } catch (InvalidPathException $ex) {
+            throw new InvalidPath($ex->getMessage(), false, $ex);
+        } catch (ForbiddenException $ex) {
+            throw new Forbidden($ex->getMessage(), $ex->getRetry(), $ex);
+        } catch (LockedException $e) {
+            throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * Returns a specific child node, referenced by its name
+     *
+     * @param string $name
+     * @param FileInfo $info
+     * @return \Sabre\DAV\INode
+     * @throws InvalidPath
+     * @throws \Sabre\DAV\Exception\NotFound
+     * @throws \Sabre\DAV\Exception\ServiceUnavailable
+     */
+    public function getChild($name, $info = null, ?IRequest $request = null, ?IL10N $l10n = null) {
+        $storage = $this->info->getStorage();
+        $allowDirectory = false;
+
+        // Checking if we're in a file drop
+        // If we are, then only PUT and MKCOL are allowed (see plugin)
+        // so we are safe to return the directory without a risk of
+        // leaking files and folders structure.
+        if ($storage->instanceOfStorage(PublicShareWrapper::class)) {
+            $share = $storage->getShare();
+            $allowDirectory = ($share->getPermissions() & Constants::PERMISSION_READ) !== Constants::PERMISSION_READ;
+        }
+
+        // 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();
+        }
+
+        $path = $this->path . '/' . $name;
+        if (is_null($info)) {
+            try {
+                $this->fileView->verifyPath($this->path, $name, true);
+                $info = $this->fileView->getFileInfo($path);
+            } catch (StorageNotAvailableException $e) {
+                throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage(), 0, $e);
+            } catch (InvalidPathException $ex) {
+                throw new InvalidPath($ex->getMessage(), false, $ex);
+            } catch (ForbiddenException $e) {
+                throw new \Sabre\DAV\Exception\Forbidden($e->getMessage(), $e->getCode(), $e);
+            }
+        }
+
+        if (!$info) {
+            throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+        }
+
+        if ($info->getMimeType() === FileInfo::MIMETYPE_FOLDER) {
+            $node = new 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) {
+            $this->tree->cacheNode($node);
+        }
+        return $node;
+    }
+
+    /**
+     * Returns an array with all the child nodes
+     *
+     * @return \Sabre\DAV\INode[]
+     * @throws \Sabre\DAV\Exception\Locked
+     * @throws Forbidden
+     */
+    public function getChildren() {
+        if (!is_null($this->dirContent)) {
+            return $this->dirContent;
+        }
+        try {
+            if (!$this->info->isReadable()) {
+                // return 403 instead of 404 because a 404 would make
+                // the caller believe that the collection itself does not exist
+                if (Server::get(IAppManager::class)->isEnabledForAnyone('files_accesscontrol')) {
+                    throw new Forbidden('No read permissions. This might be caused by files_accesscontrol, check your configured rules');
+                } else {
+                    throw new Forbidden('No read permissions');
+                }
+            }
+            $folderContent = $this->getNode()->getDirectoryListing();
+        } catch (LockedException $e) {
+            throw new Locked();
+        }
+
+        $nodes = [];
+        $request = Server::get(IRequest::class);
+        $l10nFactory = Server::get(IFactory::class);
+        $l10n = $l10nFactory->get(Application::APP_ID);
+        foreach ($folderContent as $info) {
+            $node = $this->getChild($info->getName(), $info, $request, $l10n);
+            $nodes[] = $node;
+        }
+        $this->dirContent = $nodes;
+        return $this->dirContent;
+    }
+
+    /**
+     * Checks if a child exists.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name) {
+        // note: here we do NOT resolve the chunk file name to the real file name
+        // to make sure we return false when checking for file existence with a chunk
+        // file name.
+        // This is to make sure that "createFile" is still triggered
+        // (required old code) instead of "updateFile".
+        //
+        // TODO: resolve chunk file name here and implement "updateFile"
+        $path = $this->path . '/' . $name;
+        return $this->fileView->file_exists($path);
+    }
+
+    /**
+     * Deletes all files in this directory, and then itself
+     *
+     * @return void
+     * @throws FileLocked
+     * @throws \Sabre\DAV\Exception\Forbidden
+     */
+    public function delete() {
+        if ($this->path === '' || $this->path === '/' || !$this->info->isDeletable()) {
+            throw new \Sabre\DAV\Exception\Forbidden();
+        }
+
+        try {
+            if (!$this->fileView->rmdir($this->path)) {
+                // assume it wasn't possible to remove due to permission issue
+                throw new \Sabre\DAV\Exception\Forbidden();
+            }
+        } catch (ForbiddenException $ex) {
+            throw new Forbidden($ex->getMessage(), $ex->getRetry());
+        } catch (LockedException $e) {
+            throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    private function getLogger(): LoggerInterface {
+        return Server::get(LoggerInterface::class);
+    }
+
+    /**
+     * Returns available diskspace information
+     *
+     * @return array
+     */
+    public function getQuotaInfo() {
+        if ($this->quotaInfo) {
+            return $this->quotaInfo;
+        }
+        $relativePath = $this->fileView->getRelativePath($this->info->getPath());
+        if ($relativePath === null) {
+            $this->getLogger()->warning('error while getting quota as the relative path cannot be found');
+            return [0, 0];
+        }
+
+        try {
+            $storageInfo = \OC_Helper::getStorageInfo($relativePath, $this->info, false);
+            if ($storageInfo['quota'] === FileInfo::SPACE_UNLIMITED) {
+                $free = FileInfo::SPACE_UNLIMITED;
+            } else {
+                $free = $storageInfo['free'];
+            }
+            $this->quotaInfo = [
+                $storageInfo['used'],
+                $free
+            ];
+            return $this->quotaInfo;
+        } catch (NotFoundException $e) {
+            $this->getLogger()->warning('error while getting quota into', ['exception' => $e]);
+            return [0, 0];
+        } catch (StorageNotAvailableException $e) {
+            $this->getLogger()->warning('error while getting quota into', ['exception' => $e]);
+            return [0, 0];
+        } catch (NotPermittedException $e) {
+            $this->getLogger()->warning('error while getting quota into', ['exception' => $e]);
+            return [0, 0];
+        }
+    }
+
+    /**
+     * Moves a node into this collection.
+     *
+     * It is up to the implementors to:
+     *   1. Create the new resource.
+     *   2. Remove the old resource.
+     *   3. Transfer any properties or other data.
+     *
+     * Generally you should make very sure that your collection can easily move
+     * the move.
+     *
+     * If you don't, just return false, which will trigger sabre/dav to handle
+     * the move itself. If you return true from this function, the assumption
+     * is that the move was successful.
+     *
+     * @param string $targetName New local file/collection name.
+     * @param string $fullSourcePath Full path to source node
+     * @param INode $sourceNode Source node itself
+     * @return bool
+     * @throws BadRequest
+     * @throws ServiceUnavailable
+     * @throws Forbidden
+     * @throws FileLocked
+     * @throws \Sabre\DAV\Exception\Forbidden
+     */
+    public function moveInto($targetName, $fullSourcePath, INode $sourceNode) {
+        if (!$sourceNode instanceof Node) {
+            // it's a file of another kind, like FutureFile
+            if ($sourceNode instanceof IFile) {
+                // fallback to default copy+delete handling
+                return false;
+            }
+            throw new BadRequest('Incompatible node types');
+        }
+
+        $destinationPath = $this->getPath() . '/' . $targetName;
+
+
+        $targetNodeExists = $this->childExists($targetName);
+
+        // at getNodeForPath we also check the path for isForbiddenFileOrDir
+        // with that we have covered both source and destination
+        if ($sourceNode instanceof Directory && $targetNodeExists) {
+            throw new \Sabre\DAV\Exception\Forbidden('Could not copy directory ' . $sourceNode->getName() . ', target exists');
+        }
+
+        [$sourceDir,] = \Sabre\Uri\split($sourceNode->getPath());
+        $destinationDir = $this->getPath();
+
+        $sourcePath = $sourceNode->getPath();
+
+        $isMovableMount = false;
+        $sourceMount = Server::get(IMountManager::class)->find($this->fileView->getAbsolutePath($sourcePath));
+        $internalPath = $sourceMount->getInternalPath($this->fileView->getAbsolutePath($sourcePath));
+        if ($sourceMount instanceof MoveableMount && $internalPath === '') {
+            $isMovableMount = true;
+        }
+
+        try {
+            $sameFolder = ($sourceDir === $destinationDir);
+            // if we're overwriting or same folder
+            if ($targetNodeExists || $sameFolder) {
+                // note that renaming a share mount point is always allowed
+                if (!$this->fileView->isUpdatable($destinationDir) && !$isMovableMount) {
+                    throw new \Sabre\DAV\Exception\Forbidden();
+                }
+            } else {
+                if (!$this->fileView->isCreatable($destinationDir)) {
+                    throw new \Sabre\DAV\Exception\Forbidden();
+                }
+            }
+
+            if (!$sameFolder) {
+                // moving to a different folder, source will be gone, like a deletion
+                // note that moving a share mount point is always allowed
+                if (!$this->fileView->isDeletable($sourcePath) && !$isMovableMount) {
+                    throw new \Sabre\DAV\Exception\Forbidden();
+                }
+            }
+
+            $fileName = basename($destinationPath);
+            try {
+                $this->fileView->verifyPath($destinationDir, $fileName);
+            } catch (InvalidPathException $ex) {
+                throw new InvalidPath($ex->getMessage());
+            }
+
+            $renameOkay = $this->fileView->rename($sourcePath, $destinationPath);
+            if (!$renameOkay) {
+                throw new \Sabre\DAV\Exception\Forbidden('');
+            }
+        } catch (StorageNotAvailableException $e) {
+            throw new ServiceUnavailable($e->getMessage(), $e->getCode(), $e);
+        } catch (ForbiddenException $ex) {
+            throw new Forbidden($ex->getMessage(), $ex->getRetry(), $ex);
+        } catch (LockedException $e) {
+            throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+        }
+
+        return true;
+    }
+
+
+    public function copyInto($targetName, $sourcePath, INode $sourceNode) {
+        if ($sourceNode instanceof File || $sourceNode instanceof Directory) {
+            try {
+                $destinationPath = $this->getPath() . '/' . $targetName;
+                $sourcePath = $sourceNode->getPath();
+
+                if (!$this->fileView->isCreatable($this->getPath())) {
+                    throw new \Sabre\DAV\Exception\Forbidden();
+                }
+
+                try {
+                    $this->fileView->verifyPath($this->getPath(), $targetName);
+                } catch (InvalidPathException $ex) {
+                    throw new InvalidPath($ex->getMessage());
+                }
+
+                $copyOkay = $this->fileView->copy($sourcePath, $destinationPath);
+
+                if (!$copyOkay) {
+                    throw new \Sabre\DAV\Exception\Forbidden('Copy did not proceed');
+                }
+
+                return true;
+            } catch (StorageNotAvailableException $e) {
+                throw new ServiceUnavailable($e->getMessage(), $e->getCode(), $e);
+            } catch (ForbiddenException $ex) {
+                throw new Forbidden($ex->getMessage(), $ex->getRetry(), $ex);
+            } catch (LockedException $e) {
+                throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+            }
+        }
+
+        return false;
+    }
+
+    public function getNode(): Folder {
+        return $this->node;
+    }
 }