nextcloud / server

apps/dav/appinfo/v2/publicremote.php

Indentation +72 added lines, -72 removed lines

@@ -52,26 +52,26 @@ 
 
 // Backends
 $authBackend = new PublicAuth(
-	$request,
-	Server::get(IManager::class),
-	$session,
-	Server::get(IThrottler::class),
-	Server::get(LoggerInterface::class)
+    $request,
+    Server::get(IManager::class),
+    $session,
+    Server::get(IThrottler::class),
+    Server::get(LoggerInterface::class)
 );
 $authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
 
 $l10nFactory = Server::get(IFactory::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),
-	$request,
-	Server::get(IPreview::class),
-	$eventDispatcher,
-	$l10nFactory->get('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),
+    $request,
+    Server::get(IPreview::class),
+    $eventDispatcher,
+    $l10nFactory->get('dav'),
 );
 
 
@@ -80,63 +80,63 @@ 
 
 /** @var string $baseuri defined in public.php */
 $server = $serverFactory->createServer(true, $baseuri, $requestUri, $authPlugin, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
-	// GET must be allowed for e.g. showing images and allowing Zip downloads
-	if ($server->httpRequest->getMethod() !== 'GET') {
-		// If this is *not* a GET request we only allow access to public DAV from AJAX or when Server2Server is allowed
-		$isAjax = in_array('XMLHttpRequest', explode(',', $_SERVER['HTTP_X_REQUESTED_WITH'] ?? ''));
-		$federatedShareProvider = Server::get(FederatedShareProvider::class);
-		if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && $isAjax === false) {
-			// this is what is thrown when trying to access a non-existing share
-			throw new 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
-	/** @psalm-suppress InternalMethod */
-	$previousLog = Filesystem::logWarningWhenAddingStorageWrapper(false);
-
-	/** @psalm-suppress MissingClosureParamType */
-	Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
-		return new PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() | Constants::PERMISSION_SHARE]);
-	});
-
-	/** @psalm-suppress MissingClosureParamType */
-	Filesystem::addStorageWrapper('shareOwner', function ($mountPoint, $storage) use ($share) {
-		return new PublicOwnerWrapper(['storage' => $storage, 'owner' => $share->getShareOwner()]);
-	});
-
-	// Ensure that also private shares have the `getShare` method
-	/** @psalm-suppress MissingClosureParamType */
-	Filesystem::addStorageWrapper('getShare', function ($mountPoint, $storage) use ($share) {
-		return new PublicShareWrapper(['storage' => $storage, 'share' => $share]);
-	}, 0);
-
-	/** @psalm-suppress InternalMethod */
-	Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
-
-	$rootFolder = Server::get(IRootFolder::class);
-	$userFolder = $rootFolder->getUserFolder($owner);
-	$node = $userFolder->getFirstNodeById($fileId);
-	if (!$node) {
-		throw new NotFound();
-	}
-	$linkCheckPlugin->setFileInfo($node);
-
-	// If not readable (files_drop) enable the filesdrop plugin
-	if (!$isReadable) {
-		$filesDropPlugin->enable();
-	}
-
-	$view = new View($node->getPath());
-	$filesDropPlugin->setView($view);
-	$filesDropPlugin->setShare($share);
-
-	return $view;
+    // GET must be allowed for e.g. showing images and allowing Zip downloads
+    if ($server->httpRequest->getMethod() !== 'GET') {
+        // If this is *not* a GET request we only allow access to public DAV from AJAX or when Server2Server is allowed
+        $isAjax = in_array('XMLHttpRequest', explode(',', $_SERVER['HTTP_X_REQUESTED_WITH'] ?? ''));
+        $federatedShareProvider = Server::get(FederatedShareProvider::class);
+        if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && $isAjax === false) {
+            // this is what is thrown when trying to access a non-existing share
+            throw new 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
+    /** @psalm-suppress InternalMethod */
+    $previousLog = Filesystem::logWarningWhenAddingStorageWrapper(false);
+
+    /** @psalm-suppress MissingClosureParamType */
+    Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
+        return new PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() | Constants::PERMISSION_SHARE]);
+    });
+
+    /** @psalm-suppress MissingClosureParamType */
+    Filesystem::addStorageWrapper('shareOwner', function ($mountPoint, $storage) use ($share) {
+        return new PublicOwnerWrapper(['storage' => $storage, 'owner' => $share->getShareOwner()]);
+    });
+
+    // Ensure that also private shares have the `getShare` method
+    /** @psalm-suppress MissingClosureParamType */
+    Filesystem::addStorageWrapper('getShare', function ($mountPoint, $storage) use ($share) {
+        return new PublicShareWrapper(['storage' => $storage, 'share' => $share]);
+    }, 0);
+
+    /** @psalm-suppress InternalMethod */
+    Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
+
+    $rootFolder = Server::get(IRootFolder::class);
+    $userFolder = $rootFolder->getUserFolder($owner);
+    $node = $userFolder->getFirstNodeById($fileId);
+    if (!$node) {
+        throw new NotFound();
+    }
+    $linkCheckPlugin->setFileInfo($node);
+
+    // If not readable (files_drop) enable the filesdrop plugin
+    if (!$isReadable) {
+        $filesDropPlugin->enable();
+    }
+
+    $view = new View($node->getPath());
+    $filesDropPlugin->setView($view);
+    $filesDropPlugin->setShare($share);
+
+    return $view;
 });
 
 $server->addPlugin($linkCheckPlugin);

apps/dav/appinfo/v1/publicwebdav.php

Indentation +55 added lines, -55 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,47 +69,47 @@ 
 $filesDropPlugin = new FilesDropPlugin();
 
 $server = $serverFactory->createServer(false, $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();
-	}
-
-	$view = new View($node->getPath());
-	$filesDropPlugin->setView($view);
-	$filesDropPlugin->setShare($share);
-
-	return $view;
+    $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();
+    }
+
+    $view = new View($node->getPath());
+    $filesDropPlugin->setView($view);
+    $filesDropPlugin->setShare($share);
+
+    return $view;
 });
 
 $server->addPlugin($linkCheckPlugin);

apps/dav/appinfo/v1/webdav.php

Indentation +23 added lines, -23 removed lines

@@ -26,7 +26,7 @@ 
 
 // no php execution timeout for webdav
 if (!str_contains(@ini_get('disable_functions'), 'set_time_limit')) {
-	@set_time_limit(0);
+    @set_time_limit(0);
 }
 ignore_user_abort(true);
 
@@ -36,41 +36,41 @@ 
 $dispatcher = 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),
-	$dispatcher,
-	\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),
+    $dispatcher,
+    \OC::$server->getL10N('dav')
 );
 
 // Backends
 $authBackend = new Auth(
-	Server::get(ISession::class),
-	Server::get(IUserSession::class),
-	Server::get(IRequest::class),
-	Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
-	Server::get(IThrottler::class),
-	'principals/'
+    Server::get(ISession::class),
+    Server::get(IUserSession::class),
+    Server::get(IRequest::class),
+    Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
+    Server::get(IThrottler::class),
+    'principals/'
 );
 $authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
 $bearerAuthPlugin = new BearerAuth(
-	Server::get(IUserSession::class),
-	Server::get(ISession::class),
-	Server::get(IRequest::class),
-	Server::get(IConfig::class),
+    Server::get(IUserSession::class),
+    Server::get(ISession::class),
+    Server::get(IRequest::class),
+    Server::get(IConfig::class),
 );
 $authPlugin->addBackend($bearerAuthPlugin);
 
 $requestUri = Server::get(IRequest::class)->getRequestUri();
 
 $server = $serverFactory->createServer(false, $baseuri, $requestUri, $authPlugin, function () {
-	// use the view for the logged in user
-	return Filesystem::getView();
+    // use the view for the logged in user
+    return Filesystem::getView();
 });
 
 // allow setup of additional plugins

apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTestCase.php

Indentation +117 added lines, -117 removed lines

@@ -27,121 +27,121 @@
 use Test\Traits\UserTrait;
 
 abstract class RequestTestCase extends TestCase {
-	use UserTrait;
-	use MountProviderTrait;
-
-	/**
-	 * @var ServerFactory
-	 */
-	protected $serverFactory;
-
-	protected function getStream($string) {
-		$stream = fopen('php://temp', 'r+');
-		fwrite($stream, $string);
-		fseek($stream, 0);
-		return $stream;
-	}
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->serverFactory = new ServerFactory(
-			\OCP\Server::get(IConfig::class),
-			\OCP\Server::get(LoggerInterface::class),
-			\OCP\Server::get(IDBConnection::class),
-			\OCP\Server::get(IUserSession::class),
-			\OCP\Server::get(IMountManager::class),
-			\OCP\Server::get(ITagManager::class),
-			$this->getMockBuilder(IRequest::class)
-				->disableOriginalConstructor()
-				->getMock(),
-			\OCP\Server::get(IPreview::class),
-			\OCP\Server::get(IEventDispatcher::class),
-			\OC::$server->getL10N('dav')
-		);
-	}
-
-	protected function setupUser($name, $password) {
-		$this->createUser($name, $password);
-		$tmpFolder = \OCP\Server::get(ITempManager::class)->getTemporaryFolder();
-		$this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
-		$this->loginAsUser($name);
-		return new View('/' . $name . '/files');
-	}
-
-	/**
-	 * @param View $view the view to run the webdav server against
-	 * @param string $user
-	 * @param string $password
-	 * @param string $method
-	 * @param string $url
-	 * @param resource|string|null $body
-	 * @param array|null $headers
-	 * @return \Sabre\HTTP\Response
-	 * @throws \Exception
-	 */
-	protected function request($view, $user, $password, $method, $url, $body = null, $headers = []) {
-		if (is_string($body)) {
-			$body = $this->getStream($body);
-		}
-		$this->logout();
-		$exceptionPlugin = new ExceptionPlugin('webdav', \OCP\Server::get(LoggerInterface::class));
-		$server = $this->getSabreServer($view, $user, $password, $exceptionPlugin);
-		$request = new Request($method, $url, $headers, $body);
-
-		// since sabre catches all exceptions we need to save them and throw them from outside the sabre server
-
-		$serverParams = [];
-		if (is_array($headers)) {
-			foreach ($headers as $header => $value) {
-				$serverParams['HTTP_' . strtoupper(str_replace('-', '_', $header))] = $value;
-			}
-		}
-		$ncRequest = new \OC\AppFramework\Http\Request([
-			'server' => $serverParams
-		], $this->createMock(IRequestId::class), $this->createMock(IConfig::class), null);
-
-		$this->overwriteService(IRequest::class, $ncRequest);
-
-		$result = $this->makeRequest($server, $request);
-
-		$this->restoreService(IRequest::class);
-
-		foreach ($exceptionPlugin->getExceptions() as $exception) {
-			throw $exception;
-		}
-		return $result;
-	}
-
-	/**
-	 * @param Server $server
-	 * @param Request $request
-	 * @return \Sabre\HTTP\Response
-	 */
-	protected function makeRequest(Server $server, Request $request) {
-		$sapi = new Sapi($request);
-		$server->sapi = $sapi;
-		$server->httpRequest = $request;
-		$server->exec();
-		return $sapi->getResponse();
-	}
-
-	/**
-	 * @param View $view
-	 * @param string $user
-	 * @param string $password
-	 * @param ExceptionPlugin $exceptionPlugin
-	 * @return Server
-	 */
-	protected function getSabreServer(View $view, $user, $password, ExceptionPlugin $exceptionPlugin) {
-		$authBackend = new Auth($user, $password);
-		$authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
-
-		$server = $this->serverFactory->createServer(false, '/', 'dummy', $authPlugin, function () use ($view) {
-			return $view;
-		});
-		$server->addPlugin($exceptionPlugin);
-
-		return $server;
-	}
+    use UserTrait;
+    use MountProviderTrait;
+
+    /**
+     * @var ServerFactory
+     */
+    protected $serverFactory;
+
+    protected function getStream($string) {
+        $stream = fopen('php://temp', 'r+');
+        fwrite($stream, $string);
+        fseek($stream, 0);
+        return $stream;
+    }
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->serverFactory = new ServerFactory(
+            \OCP\Server::get(IConfig::class),
+            \OCP\Server::get(LoggerInterface::class),
+            \OCP\Server::get(IDBConnection::class),
+            \OCP\Server::get(IUserSession::class),
+            \OCP\Server::get(IMountManager::class),
+            \OCP\Server::get(ITagManager::class),
+            $this->getMockBuilder(IRequest::class)
+                ->disableOriginalConstructor()
+                ->getMock(),
+            \OCP\Server::get(IPreview::class),
+            \OCP\Server::get(IEventDispatcher::class),
+            \OC::$server->getL10N('dav')
+        );
+    }
+
+    protected function setupUser($name, $password) {
+        $this->createUser($name, $password);
+        $tmpFolder = \OCP\Server::get(ITempManager::class)->getTemporaryFolder();
+        $this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
+        $this->loginAsUser($name);
+        return new View('/' . $name . '/files');
+    }
+
+    /**
+     * @param View $view the view to run the webdav server against
+     * @param string $user
+     * @param string $password
+     * @param string $method
+     * @param string $url
+     * @param resource|string|null $body
+     * @param array|null $headers
+     * @return \Sabre\HTTP\Response
+     * @throws \Exception
+     */
+    protected function request($view, $user, $password, $method, $url, $body = null, $headers = []) {
+        if (is_string($body)) {
+            $body = $this->getStream($body);
+        }
+        $this->logout();
+        $exceptionPlugin = new ExceptionPlugin('webdav', \OCP\Server::get(LoggerInterface::class));
+        $server = $this->getSabreServer($view, $user, $password, $exceptionPlugin);
+        $request = new Request($method, $url, $headers, $body);
+
+        // since sabre catches all exceptions we need to save them and throw them from outside the sabre server
+
+        $serverParams = [];
+        if (is_array($headers)) {
+            foreach ($headers as $header => $value) {
+                $serverParams['HTTP_' . strtoupper(str_replace('-', '_', $header))] = $value;
+            }
+        }
+        $ncRequest = new \OC\AppFramework\Http\Request([
+            'server' => $serverParams
+        ], $this->createMock(IRequestId::class), $this->createMock(IConfig::class), null);
+
+        $this->overwriteService(IRequest::class, $ncRequest);
+
+        $result = $this->makeRequest($server, $request);
+
+        $this->restoreService(IRequest::class);
+
+        foreach ($exceptionPlugin->getExceptions() as $exception) {
+            throw $exception;
+        }
+        return $result;
+    }
+
+    /**
+     * @param Server $server
+     * @param Request $request
+     * @return \Sabre\HTTP\Response
+     */
+    protected function makeRequest(Server $server, Request $request) {
+        $sapi = new Sapi($request);
+        $server->sapi = $sapi;
+        $server->httpRequest = $request;
+        $server->exec();
+        return $sapi->getResponse();
+    }
+
+    /**
+     * @param View $view
+     * @param string $user
+     * @param string $password
+     * @param ExceptionPlugin $exceptionPlugin
+     * @return Server
+     */
+    protected function getSabreServer(View $view, $user, $password, ExceptionPlugin $exceptionPlugin) {
+        $authBackend = new Auth($user, $password);
+        $authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
+
+        $server = $this->serverFactory->createServer(false, '/', 'dummy', $authPlugin, function () use ($view) {
+            return $view;
+        });
+        $server->addPlugin($exceptionPlugin);
+
+        return $server;
+    }
 }

apps/dav/tests/unit/CapabilitiesTest.php

Indentation +60 added lines, -60 removed lines

@@ -14,66 +14,66 @@
  * @package OCA\DAV\Tests\unit
  */
 class CapabilitiesTest extends TestCase {
-	public function testGetCapabilities(): void {
-		$config = $this->createMock(IConfig::class);
-		$config->expects($this->once())
-			->method('getSystemValueBool')
-			->with('bulkupload.enabled', $this->isType('bool'))
-			->willReturn(false);
-		$coordinator = $this->createMock(IAvailabilityCoordinator::class);
-		$coordinator->expects($this->once())
-			->method('isEnabled')
-			->willReturn(false);
-		$capabilities = new Capabilities($config, $coordinator);
-		$expected = [
-			'dav' => [
-				'chunking' => '1.0',
-				'public_shares_chunking' => true,
-			],
-		];
-		$this->assertSame($expected, $capabilities->getCapabilities());
-	}
+    public function testGetCapabilities(): void {
+        $config = $this->createMock(IConfig::class);
+        $config->expects($this->once())
+            ->method('getSystemValueBool')
+            ->with('bulkupload.enabled', $this->isType('bool'))
+            ->willReturn(false);
+        $coordinator = $this->createMock(IAvailabilityCoordinator::class);
+        $coordinator->expects($this->once())
+            ->method('isEnabled')
+            ->willReturn(false);
+        $capabilities = new Capabilities($config, $coordinator);
+        $expected = [
+            'dav' => [
+                'chunking' => '1.0',
+                'public_shares_chunking' => true,
+            ],
+        ];
+        $this->assertSame($expected, $capabilities->getCapabilities());
+    }
 
-	public function testGetCapabilitiesWithBulkUpload(): void {
-		$config = $this->createMock(IConfig::class);
-		$config->expects($this->once())
-			->method('getSystemValueBool')
-			->with('bulkupload.enabled', $this->isType('bool'))
-			->willReturn(true);
-		$coordinator = $this->createMock(IAvailabilityCoordinator::class);
-		$coordinator->expects($this->once())
-			->method('isEnabled')
-			->willReturn(false);
-		$capabilities = new Capabilities($config, $coordinator);
-		$expected = [
-			'dav' => [
-				'chunking' => '1.0',
-				'public_shares_chunking' => true,
-				'bulkupload' => '1.0',
-			],
-		];
-		$this->assertSame($expected, $capabilities->getCapabilities());
-	}
+    public function testGetCapabilitiesWithBulkUpload(): void {
+        $config = $this->createMock(IConfig::class);
+        $config->expects($this->once())
+            ->method('getSystemValueBool')
+            ->with('bulkupload.enabled', $this->isType('bool'))
+            ->willReturn(true);
+        $coordinator = $this->createMock(IAvailabilityCoordinator::class);
+        $coordinator->expects($this->once())
+            ->method('isEnabled')
+            ->willReturn(false);
+        $capabilities = new Capabilities($config, $coordinator);
+        $expected = [
+            'dav' => [
+                'chunking' => '1.0',
+                'public_shares_chunking' => true,
+                'bulkupload' => '1.0',
+            ],
+        ];
+        $this->assertSame($expected, $capabilities->getCapabilities());
+    }
 
-	public function testGetCapabilitiesWithAbsence(): void {
-		$config = $this->createMock(IConfig::class);
-		$config->expects($this->once())
-			->method('getSystemValueBool')
-			->with('bulkupload.enabled', $this->isType('bool'))
-			->willReturn(false);
-		$coordinator = $this->createMock(IAvailabilityCoordinator::class);
-		$coordinator->expects($this->once())
-			->method('isEnabled')
-			->willReturn(true);
-		$capabilities = new Capabilities($config, $coordinator);
-		$expected = [
-			'dav' => [
-				'chunking' => '1.0',
-				'public_shares_chunking' => true,
-				'absence-supported' => true,
-				'absence-replacement' => true,
-			],
-		];
-		$this->assertSame($expected, $capabilities->getCapabilities());
-	}
+    public function testGetCapabilitiesWithAbsence(): void {
+        $config = $this->createMock(IConfig::class);
+        $config->expects($this->once())
+            ->method('getSystemValueBool')
+            ->with('bulkupload.enabled', $this->isType('bool'))
+            ->willReturn(false);
+        $coordinator = $this->createMock(IAvailabilityCoordinator::class);
+        $coordinator->expects($this->once())
+            ->method('isEnabled')
+            ->willReturn(true);
+        $capabilities = new Capabilities($config, $coordinator);
+        $expected = [
+            'dav' => [
+                'chunking' => '1.0',
+                'public_shares_chunking' => true,
+                'absence-supported' => true,
+                'absence-replacement' => true,
+            ],
+        ];
+        $this->assertSame($expected, $capabilities->getCapabilities());
+    }
 }

apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php

Indentation +120 added lines, -120 removed lines

@@ -17,165 +17,165 @@
 
 class FilesDropPluginTest extends TestCase {
 
-	/** @var View|\PHPUnit\Framework\MockObject\MockObject */
-	private $view;
+    /** @var View|\PHPUnit\Framework\MockObject\MockObject */
+    private $view;
 
-	/** @var IShare|\PHPUnit\Framework\MockObject\MockObject */
-	private $share;
+    /** @var IShare|\PHPUnit\Framework\MockObject\MockObject */
+    private $share;
 
-	/** @var Server|\PHPUnit\Framework\MockObject\MockObject */
-	private $server;
+    /** @var Server|\PHPUnit\Framework\MockObject\MockObject */
+    private $server;
 
-	/** @var FilesDropPlugin */
-	private $plugin;
+    /** @var FilesDropPlugin */
+    private $plugin;
 
-	/** @var RequestInterface|\PHPUnit\Framework\MockObject\MockObject */
-	private $request;
+    /** @var RequestInterface|\PHPUnit\Framework\MockObject\MockObject */
+    private $request;
 
-	/** @var ResponseInterface|\PHPUnit\Framework\MockObject\MockObject */
-	private $response;
+    /** @var ResponseInterface|\PHPUnit\Framework\MockObject\MockObject */
+    private $response;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->view = $this->createMock(View::class);
-		$this->share = $this->createMock(IShare::class);
-		$this->server = $this->createMock(Server::class);
-		$this->plugin = new FilesDropPlugin();
+        $this->view = $this->createMock(View::class);
+        $this->share = $this->createMock(IShare::class);
+        $this->server = $this->createMock(Server::class);
+        $this->plugin = new FilesDropPlugin();
 
-		$this->request = $this->createMock(RequestInterface::class);
-		$this->response = $this->createMock(ResponseInterface::class);
+        $this->request = $this->createMock(RequestInterface::class);
+        $this->response = $this->createMock(ResponseInterface::class);
 
-		$this->response->expects($this->never())
-			->method($this->anything());
+        $this->response->expects($this->never())
+            ->method($this->anything());
 
-		$attributes = $this->createMock(IAttributes::class);
-		$this->share->expects($this->any())
-			->method('getAttributes')
-			->willReturn($attributes);
+        $attributes = $this->createMock(IAttributes::class);
+        $this->share->expects($this->any())
+            ->method('getAttributes')
+            ->willReturn($attributes);
 
-		$this->share
-			->method('getToken')
-			->willReturn('token');
-	}
+        $this->share
+            ->method('getToken')
+            ->willReturn('token');
+    }
 
-	public function testInitialize(): void {
-		$this->server->expects($this->once())
-			->method('on')
-			->with(
-				$this->equalTo('beforeMethod:*'),
-				$this->equalTo([$this->plugin, 'beforeMethod']),
-				$this->equalTo(999)
-			);
+    public function testInitialize(): void {
+        $this->server->expects($this->once())
+            ->method('on')
+            ->with(
+                $this->equalTo('beforeMethod:*'),
+                $this->equalTo([$this->plugin, 'beforeMethod']),
+                $this->equalTo(999)
+            );
 
-		$this->plugin->initialize($this->server);
-	}
+        $this->plugin->initialize($this->server);
+    }
 
-	public function testNotEnabled(): void {
-		$this->view->expects($this->never())
-			->method($this->anything());
+    public function testNotEnabled(): void {
+        $this->view->expects($this->never())
+            ->method($this->anything());
 
-		$this->request->expects($this->never())
-			->method($this->anything());
+        $this->request->expects($this->never())
+            ->method($this->anything());
 
-		$this->plugin->beforeMethod($this->request, $this->response);
-	}
+        $this->plugin->beforeMethod($this->request, $this->response);
+    }
 
-	public function testValid(): void {
-		$this->plugin->enable();
-		$this->plugin->setView($this->view);
-		$this->plugin->setShare($this->share);
+    public function testValid(): void {
+        $this->plugin->enable();
+        $this->plugin->setView($this->view);
+        $this->plugin->setShare($this->share);
 
-		$this->request->method('getMethod')
-			->willReturn('PUT');
+        $this->request->method('getMethod')
+            ->willReturn('PUT');
 
-		$this->request->method('getPath')
-			->willReturn('/files/token/file.txt');
+        $this->request->method('getPath')
+            ->willReturn('/files/token/file.txt');
 
-		$this->request->method('getBaseUrl')
-			->willReturn('https://example.com');
+        $this->request->method('getBaseUrl')
+            ->willReturn('https://example.com');
 
-		$this->view->method('file_exists')
-			->with('/file.txt')
-			->willReturn(false);
+        $this->view->method('file_exists')
+            ->with('/file.txt')
+            ->willReturn(false);
 
-		$this->request->expects($this->once())
-			->method('setUrl')
-			->with('https://example.com/files/token/file.txt');
+        $this->request->expects($this->once())
+            ->method('setUrl')
+            ->with('https://example.com/files/token/file.txt');
 
-		$this->plugin->beforeMethod($this->request, $this->response);
-	}
+        $this->plugin->beforeMethod($this->request, $this->response);
+    }
 
-	public function testFileAlreadyExistsValid(): void {
-		$this->plugin->enable();
-		$this->plugin->setView($this->view);
-		$this->plugin->setShare($this->share);
+    public function testFileAlreadyExistsValid(): void {
+        $this->plugin->enable();
+        $this->plugin->setView($this->view);
+        $this->plugin->setShare($this->share);
 
-		$this->request->method('getMethod')
-			->willReturn('PUT');
+        $this->request->method('getMethod')
+            ->willReturn('PUT');
 
-		$this->request->method('getPath')
-			->willReturn('/files/token/file.txt');
+        $this->request->method('getPath')
+            ->willReturn('/files/token/file.txt');
 
-		$this->request->method('getBaseUrl')
-			->willReturn('https://example.com');
+        $this->request->method('getBaseUrl')
+            ->willReturn('https://example.com');
 
-		$this->view->method('file_exists')
-			->willReturnCallback(function ($path) {
-				if ($path === 'file.txt' || $path === '/file.txt') {
-					return true;
-				} else {
-					return false;
-				}
-			});
+        $this->view->method('file_exists')
+            ->willReturnCallback(function ($path) {
+                if ($path === 'file.txt' || $path === '/file.txt') {
+                    return true;
+                } else {
+                    return false;
+                }
+            });
 
-		$this->request->expects($this->once())
-			->method('setUrl')
-			->with($this->equalTo('https://example.com/files/token/file (2).txt'));
+        $this->request->expects($this->once())
+            ->method('setUrl')
+            ->with($this->equalTo('https://example.com/files/token/file (2).txt'));
 
-		$this->plugin->beforeMethod($this->request, $this->response);
-	}
+        $this->plugin->beforeMethod($this->request, $this->response);
+    }
 
-	public function testNoMKCOL(): void {
-		$this->plugin->enable();
-		$this->plugin->setView($this->view);
-		$this->plugin->setShare($this->share);
+    public function testNoMKCOL(): void {
+        $this->plugin->enable();
+        $this->plugin->setView($this->view);
+        $this->plugin->setShare($this->share);
 
-		$this->request->method('getMethod')
-			->willReturn('MKCOL');
+        $this->request->method('getMethod')
+            ->willReturn('MKCOL');
 
-		$this->expectException(MethodNotAllowed::class);
+        $this->expectException(MethodNotAllowed::class);
 
-		$this->plugin->beforeMethod($this->request, $this->response);
-	}
+        $this->plugin->beforeMethod($this->request, $this->response);
+    }
 
-	public function testNoSubdirPut(): void {
-		$this->plugin->enable();
-		$this->plugin->setView($this->view);
-		$this->plugin->setShare($this->share);
+    public function testNoSubdirPut(): void {
+        $this->plugin->enable();
+        $this->plugin->setView($this->view);
+        $this->plugin->setShare($this->share);
 
-		$this->request->method('getMethod')
-			->willReturn('PUT');
+        $this->request->method('getMethod')
+            ->willReturn('PUT');
 
-		$this->request->method('getPath')
-			->willReturn('/files/token/folder/file.txt');
+        $this->request->method('getPath')
+            ->willReturn('/files/token/folder/file.txt');
 
-		$this->request->method('getBaseUrl')
-			->willReturn('https://example.com');
+        $this->request->method('getBaseUrl')
+            ->willReturn('https://example.com');
 
-		$this->view->method('file_exists')
-			->willReturnCallback(function ($path) {
-				if ($path === 'file.txt' || $path === '/file.txt') {
-					return true;
-				} else {
-					return false;
-				}
-			});
+        $this->view->method('file_exists')
+            ->willReturnCallback(function ($path) {
+                if ($path === 'file.txt' || $path === '/file.txt') {
+                    return true;
+                } else {
+                    return false;
+                }
+            });
 
-		$this->request->expects($this->once())
-			->method('setUrl')
-			->with($this->equalTo('https://example.com/files/token/file (2).txt'));
+        $this->request->expects($this->once())
+            ->method('setUrl')
+            ->with($this->equalTo('https://example.com/files/token/file (2).txt'));
 
-		$this->plugin->beforeMethod($this->request, $this->response);
-	}
+        $this->plugin->beforeMethod($this->request, $this->response);
+    }
 }

apps/dav/lib/Capabilities.php

Indentation +24 added lines, -24 removed lines

@@ -10,29 +10,29 @@
 use OCP\User\IAvailabilityCoordinator;
 
 class Capabilities implements ICapability {
-	public function __construct(
-		private IConfig $config,
-		private IAvailabilityCoordinator $coordinator,
-	) {
-	}
+    public function __construct(
+        private IConfig $config,
+        private IAvailabilityCoordinator $coordinator,
+    ) {
+    }
 
-	/**
-	 * @return array{dav: array{chunking: string, public_shares_chunking: bool, bulkupload?: string, absence-supported?: bool, absence-replacement?: bool}}
-	 */
-	public function getCapabilities() {
-		$capabilities = [
-			'dav' => [
-				'chunking' => '1.0',
-				'public_shares_chunking' => true,
-			]
-		];
-		if ($this->config->getSystemValueBool('bulkupload.enabled', true)) {
-			$capabilities['dav']['bulkupload'] = '1.0';
-		}
-		if ($this->coordinator->isEnabled()) {
-			$capabilities['dav']['absence-supported'] = true;
-			$capabilities['dav']['absence-replacement'] = true;
-		}
-		return $capabilities;
-	}
+    /**
+     * @return array{dav: array{chunking: string, public_shares_chunking: bool, bulkupload?: string, absence-supported?: bool, absence-replacement?: bool}}
+     */
+    public function getCapabilities() {
+        $capabilities = [
+            'dav' => [
+                'chunking' => '1.0',
+                'public_shares_chunking' => true,
+            ]
+        ];
+        if ($this->config->getSystemValueBool('bulkupload.enabled', true)) {
+            $capabilities['dav']['bulkupload'] = '1.0';
+        }
+        if ($this->coordinator->isEnabled()) {
+            $capabilities['dav']['absence-supported'] = true;
+            $capabilities['dav']['absence-replacement'] = true;
+        }
+        return $capabilities;
+    }
 }

apps/dav/lib/RootCollection.php

Indentation +154 added lines, -154 removed lines

@@ -46,158 +46,158 @@
 use Sabre\DAV\SimpleCollection;
 
 class RootCollection extends SimpleCollection {
-	public function __construct() {
-		$l10n = \OC::$server->getL10N('dav');
-		$random = Server::get(ISecureRandom::class);
-		$logger = Server::get(LoggerInterface::class);
-		$userManager = Server::get(IUserManager::class);
-		$userSession = Server::get(IUserSession::class);
-		$groupManager = Server::get(IGroupManager::class);
-		$shareManager = Server::get(\OCP\Share\IManager::class);
-		$db = Server::get(IDBConnection::class);
-		$dispatcher = Server::get(IEventDispatcher::class);
-		$config = Server::get(IConfig::class);
-		$proxyMapper = Server::get(ProxyMapper::class);
-		$rootFolder = Server::get(IRootFolder::class);
-
-		$userPrincipalBackend = new Principal(
-			$userManager,
-			$groupManager,
-			Server::get(IAccountManager::class),
-			$shareManager,
-			Server::get(IUserSession::class),
-			Server::get(IAppManager::class),
-			$proxyMapper,
-			Server::get(KnownUserService::class),
-			Server::get(IConfig::class),
-			\OC::$server->getL10NFactory()
-		);
-
-		$groupPrincipalBackend = new GroupPrincipalBackend($groupManager, $userSession, $shareManager, $config);
-		$calendarResourcePrincipalBackend = new ResourcePrincipalBackend($db, $userSession, $groupManager, $logger, $proxyMapper);
-		$calendarRoomPrincipalBackend = new RoomPrincipalBackend($db, $userSession, $groupManager, $logger, $proxyMapper);
-		// as soon as debug mode is enabled we allow listing of principals
-		$disableListing = !$config->getSystemValue('debug', false);
-
-		// setup the first level of the dav tree
-		$userPrincipals = new Collection($userPrincipalBackend, 'principals/users');
-		$userPrincipals->disableListing = $disableListing;
-		$groupPrincipals = new Collection($groupPrincipalBackend, 'principals/groups');
-		$groupPrincipals->disableListing = $disableListing;
-		$systemPrincipals = new Collection(new SystemPrincipalBackend(), 'principals/system');
-		$systemPrincipals->disableListing = $disableListing;
-		$calendarResourcePrincipals = new Collection($calendarResourcePrincipalBackend, 'principals/calendar-resources');
-		$calendarRoomPrincipals = new Collection($calendarRoomPrincipalBackend, 'principals/calendar-rooms');
-		$calendarSharingBackend = Server::get(Backend::class);
-
-		$filesCollection = new Files\RootCollection($userPrincipalBackend, 'principals/users');
-		$filesCollection->disableListing = $disableListing;
-		$caldavBackend = new CalDavBackend(
-			$db,
-			$userPrincipalBackend,
-			$userManager,
-			$random,
-			$logger,
-			$dispatcher,
-			$config,
-			$calendarSharingBackend,
-			false,
-		);
-		$userCalendarRoot = new CalendarRoot($userPrincipalBackend, $caldavBackend, 'principals/users', $logger);
-		$userCalendarRoot->disableListing = $disableListing;
-
-		$resourceCalendarRoot = new CalendarRoot($calendarResourcePrincipalBackend, $caldavBackend, 'principals/calendar-resources', $logger);
-		$resourceCalendarRoot->disableListing = $disableListing;
-		$roomCalendarRoot = new CalendarRoot($calendarRoomPrincipalBackend, $caldavBackend, 'principals/calendar-rooms', $logger);
-		$roomCalendarRoot->disableListing = $disableListing;
-
-		$publicCalendarRoot = new PublicCalendarRoot($caldavBackend, $l10n, $config, $logger);
-
-		$systemTagCollection = Server::get(SystemTagsByIdCollection::class);
-		$systemTagRelationsCollection = new SystemTagsRelationsCollection(
-			Server::get(ISystemTagManager::class),
-			Server::get(ISystemTagObjectMapper::class),
-			Server::get(IUserSession::class),
-			$groupManager,
-			$dispatcher,
-			$rootFolder,
-		);
-		$systemTagInUseCollection = Server::get(SystemTagsInUseCollection::class);
-		$commentsCollection = new Comments\RootCollection(
-			Server::get(ICommentsManager::class),
-			$userManager,
-			Server::get(IUserSession::class),
-			$dispatcher,
-			$logger
-		);
-
-		$contactsSharingBackend = Server::get(\OCA\DAV\CardDAV\Sharing\Backend::class);
-
-		$pluginManager = new PluginManager(\OC::$server, Server::get(IAppManager::class));
-		$usersCardDavBackend = new CardDavBackend(
-			$db,
-			$userPrincipalBackend,
-			$userManager,
-			$dispatcher,
-			$contactsSharingBackend,
-		);
-		$usersAddressBookRoot = new AddressBookRoot($userPrincipalBackend, $usersCardDavBackend, $pluginManager, $userSession->getUser(), $groupManager, 'principals/users');
-		$usersAddressBookRoot->disableListing = $disableListing;
-
-		$systemCardDavBackend = new CardDavBackend(
-			$db,
-			$userPrincipalBackend,
-			$userManager,
-			$dispatcher,
-			$contactsSharingBackend,
-		);
-		$systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, $pluginManager, $userSession->getUser(), $groupManager, 'principals/system');
-		$systemAddressBookRoot->disableListing = $disableListing;
-
-		$uploadCollection = new Upload\RootCollection(
-			$userPrincipalBackend,
-			'principals/users',
-			Server::get(CleanupService::class),
-			$rootFolder,
-			$userSession,
-			$shareManager,
-		);
-		$uploadCollection->disableListing = $disableListing;
-
-		$avatarCollection = new Avatars\RootCollection($userPrincipalBackend, 'principals/users');
-		$avatarCollection->disableListing = $disableListing;
-
-		$appleProvisioning = new AppleProvisioningNode(
-			Server::get(ITimeFactory::class));
-
-		$children = [
-			new SimpleCollection('principals', [
-				$userPrincipals,
-				$groupPrincipals,
-				$systemPrincipals,
-				$calendarResourcePrincipals,
-				$calendarRoomPrincipals]),
-			$filesCollection,
-			$userCalendarRoot,
-			new SimpleCollection('system-calendars', [
-				$resourceCalendarRoot,
-				$roomCalendarRoot,
-			]),
-			$publicCalendarRoot,
-			new SimpleCollection('addressbooks', [
-				$usersAddressBookRoot,
-				$systemAddressBookRoot]),
-			$systemTagCollection,
-			$systemTagRelationsCollection,
-			$systemTagInUseCollection,
-			$commentsCollection,
-			$uploadCollection,
-			$avatarCollection,
-			new SimpleCollection('provisioning', [
-				$appleProvisioning
-			])
-		];
-
-		parent::__construct('root', $children);
-	}
+    public function __construct() {
+        $l10n = \OC::$server->getL10N('dav');
+        $random = Server::get(ISecureRandom::class);
+        $logger = Server::get(LoggerInterface::class);
+        $userManager = Server::get(IUserManager::class);
+        $userSession = Server::get(IUserSession::class);
+        $groupManager = Server::get(IGroupManager::class);
+        $shareManager = Server::get(\OCP\Share\IManager::class);
+        $db = Server::get(IDBConnection::class);
+        $dispatcher = Server::get(IEventDispatcher::class);
+        $config = Server::get(IConfig::class);
+        $proxyMapper = Server::get(ProxyMapper::class);
+        $rootFolder = Server::get(IRootFolder::class);
+
+        $userPrincipalBackend = new Principal(
+            $userManager,
+            $groupManager,
+            Server::get(IAccountManager::class),
+            $shareManager,
+            Server::get(IUserSession::class),
+            Server::get(IAppManager::class),
+            $proxyMapper,
+            Server::get(KnownUserService::class),
+            Server::get(IConfig::class),
+            \OC::$server->getL10NFactory()
+        );
+
+        $groupPrincipalBackend = new GroupPrincipalBackend($groupManager, $userSession, $shareManager, $config);
+        $calendarResourcePrincipalBackend = new ResourcePrincipalBackend($db, $userSession, $groupManager, $logger, $proxyMapper);
+        $calendarRoomPrincipalBackend = new RoomPrincipalBackend($db, $userSession, $groupManager, $logger, $proxyMapper);
+        // as soon as debug mode is enabled we allow listing of principals
+        $disableListing = !$config->getSystemValue('debug', false);
+
+        // setup the first level of the dav tree
+        $userPrincipals = new Collection($userPrincipalBackend, 'principals/users');
+        $userPrincipals->disableListing = $disableListing;
+        $groupPrincipals = new Collection($groupPrincipalBackend, 'principals/groups');
+        $groupPrincipals->disableListing = $disableListing;
+        $systemPrincipals = new Collection(new SystemPrincipalBackend(), 'principals/system');
+        $systemPrincipals->disableListing = $disableListing;
+        $calendarResourcePrincipals = new Collection($calendarResourcePrincipalBackend, 'principals/calendar-resources');
+        $calendarRoomPrincipals = new Collection($calendarRoomPrincipalBackend, 'principals/calendar-rooms');
+        $calendarSharingBackend = Server::get(Backend::class);
+
+        $filesCollection = new Files\RootCollection($userPrincipalBackend, 'principals/users');
+        $filesCollection->disableListing = $disableListing;
+        $caldavBackend = new CalDavBackend(
+            $db,
+            $userPrincipalBackend,
+            $userManager,
+            $random,
+            $logger,
+            $dispatcher,
+            $config,
+            $calendarSharingBackend,
+            false,
+        );
+        $userCalendarRoot = new CalendarRoot($userPrincipalBackend, $caldavBackend, 'principals/users', $logger);
+        $userCalendarRoot->disableListing = $disableListing;
+
+        $resourceCalendarRoot = new CalendarRoot($calendarResourcePrincipalBackend, $caldavBackend, 'principals/calendar-resources', $logger);
+        $resourceCalendarRoot->disableListing = $disableListing;
+        $roomCalendarRoot = new CalendarRoot($calendarRoomPrincipalBackend, $caldavBackend, 'principals/calendar-rooms', $logger);
+        $roomCalendarRoot->disableListing = $disableListing;
+
+        $publicCalendarRoot = new PublicCalendarRoot($caldavBackend, $l10n, $config, $logger);
+
+        $systemTagCollection = Server::get(SystemTagsByIdCollection::class);
+        $systemTagRelationsCollection = new SystemTagsRelationsCollection(
+            Server::get(ISystemTagManager::class),
+            Server::get(ISystemTagObjectMapper::class),
+            Server::get(IUserSession::class),
+            $groupManager,
+            $dispatcher,
+            $rootFolder,
+        );
+        $systemTagInUseCollection = Server::get(SystemTagsInUseCollection::class);
+        $commentsCollection = new Comments\RootCollection(
+            Server::get(ICommentsManager::class),
+            $userManager,
+            Server::get(IUserSession::class),
+            $dispatcher,
+            $logger
+        );
+
+        $contactsSharingBackend = Server::get(\OCA\DAV\CardDAV\Sharing\Backend::class);
+
+        $pluginManager = new PluginManager(\OC::$server, Server::get(IAppManager::class));
+        $usersCardDavBackend = new CardDavBackend(
+            $db,
+            $userPrincipalBackend,
+            $userManager,
+            $dispatcher,
+            $contactsSharingBackend,
+        );
+        $usersAddressBookRoot = new AddressBookRoot($userPrincipalBackend, $usersCardDavBackend, $pluginManager, $userSession->getUser(), $groupManager, 'principals/users');
+        $usersAddressBookRoot->disableListing = $disableListing;
+
+        $systemCardDavBackend = new CardDavBackend(
+            $db,
+            $userPrincipalBackend,
+            $userManager,
+            $dispatcher,
+            $contactsSharingBackend,
+        );
+        $systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, $pluginManager, $userSession->getUser(), $groupManager, 'principals/system');
+        $systemAddressBookRoot->disableListing = $disableListing;
+
+        $uploadCollection = new Upload\RootCollection(
+            $userPrincipalBackend,
+            'principals/users',
+            Server::get(CleanupService::class),
+            $rootFolder,
+            $userSession,
+            $shareManager,
+        );
+        $uploadCollection->disableListing = $disableListing;
+
+        $avatarCollection = new Avatars\RootCollection($userPrincipalBackend, 'principals/users');
+        $avatarCollection->disableListing = $disableListing;
+
+        $appleProvisioning = new AppleProvisioningNode(
+            Server::get(ITimeFactory::class));
+
+        $children = [
+            new SimpleCollection('principals', [
+                $userPrincipals,
+                $groupPrincipals,
+                $systemPrincipals,
+                $calendarResourcePrincipals,
+                $calendarRoomPrincipals]),
+            $filesCollection,
+            $userCalendarRoot,
+            new SimpleCollection('system-calendars', [
+                $resourceCalendarRoot,
+                $roomCalendarRoot,
+            ]),
+            $publicCalendarRoot,
+            new SimpleCollection('addressbooks', [
+                $usersAddressBookRoot,
+                $systemAddressBookRoot]),
+            $systemTagCollection,
+            $systemTagRelationsCollection,
+            $systemTagInUseCollection,
+            $commentsCollection,
+            $uploadCollection,
+            $avatarCollection,
+            new SimpleCollection('provisioning', [
+                $appleProvisioning
+            ])
+        ];
+
+        parent::__construct('root', $children);
+    }
 }

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

Indentation +196 added lines, -196 removed lines

@@ -43,200 +43,200 @@
 
 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,
-	) {
-	}
-
-	/**
-	 * @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 {
-		// Fire up server
-		if ($isPublicShare) {
-			$rootCollection = new SimpleCollection('root');
-			$tree = new CachingTree($rootCollection);
-		} else {
-			$rootCollection = null;
-			$tree = new ObjectTree();
-		}
-		$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);
-		// 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 ZipFolderPlugin(
-			$tree,
-			$this->logger,
-			$this->eventDispatcher,
-		));
-
-		// 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());
-		}
-
-		// wait with registering these until auth is handled and the filesystem is setup
-		$server->on('beforeMethod:*', function () use ($server, $tree, $viewCallBack, $isPublicShare, $rootCollection): 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('');
-			}
-
-			// Create Nextcloud Dir
-			if ($rootInfo->getType() === 'dir') {
-				$root = new Directory($view, $rootInfo, $tree);
-			} else {
-				$root = new File($view, $rootInfo);
-			}
-
-			if ($isPublicShare) {
-				$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),
-					\OC::$server->getL10NFactory(),
-				);
-
-				// Mount the share collection at /public.php/dav/shares/<share token>
-				$rootCollection->addChild(new \OCA\DAV\Files\Sharing\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),
-				));
-			} 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),
-					false,
-					!$this->config->getSystemValue('debug', false)
-				)
-			);
-			$server->addPlugin(new QuotaPlugin($view, true));
-			$server->addPlugin(new ChecksumUpdatePlugin());
-
-			// 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(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;
-	}
+    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 {
+        // Fire up server
+        if ($isPublicShare) {
+            $rootCollection = new SimpleCollection('root');
+            $tree = new CachingTree($rootCollection);
+        } else {
+            $rootCollection = null;
+            $tree = new ObjectTree();
+        }
+        $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);
+        // 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 ZipFolderPlugin(
+            $tree,
+            $this->logger,
+            $this->eventDispatcher,
+        ));
+
+        // 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());
+        }
+
+        // wait with registering these until auth is handled and the filesystem is setup
+        $server->on('beforeMethod:*', function () use ($server, $tree, $viewCallBack, $isPublicShare, $rootCollection): 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('');
+            }
+
+            // Create Nextcloud Dir
+            if ($rootInfo->getType() === 'dir') {
+                $root = new Directory($view, $rootInfo, $tree);
+            } else {
+                $root = new File($view, $rootInfo);
+            }
+
+            if ($isPublicShare) {
+                $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),
+                    \OC::$server->getL10NFactory(),
+                );
+
+                // Mount the share collection at /public.php/dav/shares/<share token>
+                $rootCollection->addChild(new \OCA\DAV\Files\Sharing\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),
+                ));
+            } 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),
+                    false,
+                    !$this->config->getSystemValue('debug', false)
+                )
+            );
+            $server->addPlugin(new QuotaPlugin($view, true));
+            $server->addPlugin(new ChecksumUpdatePlugin());
+
+            // 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(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;
+    }
 }