nextcloud / server

apps/dav/appinfo/v1/caldav.php

Indentation +30 added lines, -30 removed lines

@@ -35,25 +35,25 @@ 
 use Psr\Log\LoggerInterface;
 
 $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/'
 );
 $principalBackend = new Principal(
-	Server::get(IUserManager::class),
-	Server::get(IGroupManager::class),
-	Server::get(IAccountManager::class),
-	Server::get(\OCP\Share\IManager::class),
-	Server::get(IUserSession::class),
-	Server::get(IAppManager::class),
-	Server::get(ProxyMapper::class),
-	Server::get(KnownUserService::class),
-	Server::get(IConfig::class),
-	\OC::$server->getL10NFactory(),
-	'principals/'
+    Server::get(IUserManager::class),
+    Server::get(IGroupManager::class),
+    Server::get(IAccountManager::class),
+    Server::get(\OCP\Share\IManager::class),
+    Server::get(IUserSession::class),
+    Server::get(IAppManager::class),
+    Server::get(ProxyMapper::class),
+    Server::get(KnownUserService::class),
+    Server::get(IConfig::class),
+    \OC::$server->getL10NFactory(),
+    'principals/'
 );
 $db = Server::get(IDBConnection::class);
 $userManager = Server::get(IUserManager::class);
@@ -63,15 +63,15 @@ 
 $config = Server::get(IConfig::class);
 
 $calDavBackend = new CalDavBackend(
-	$db,
-	$principalBackend,
-	$userManager,
-	$random,
-	$logger,
-	$dispatcher,
-	$config,
-	Server::get(\OCA\DAV\CalDAV\Sharing\Backend::class),
-	true
+    $db,
+    $principalBackend,
+    $userManager,
+    $random,
+    $logger,
+    $dispatcher,
+    $config,
+    Server::get(\OCA\DAV\CalDAV\Sharing\Backend::class),
+    true
 );
 
 $debugging = Server::get(IConfig::class)->getSystemValue('debug', false);
@@ -85,8 +85,8 @@ 
 $addressBookRoot->disableListing = !$debugging; // Disable listing
 
 $nodes = [
-	$principalCollection,
-	$addressBookRoot,
+    $principalCollection,
+    $addressBookRoot,
 ];
 
 // Fire up server
@@ -102,7 +102,7 @@ 
 
 $server->addPlugin(new LegacyDAVACL());
 if ($debugging) {
-	$server->addPlugin(new Sabre\DAV\Browser\Plugin());
+    $server->addPlugin(new Sabre\DAV\Browser\Plugin());
 }
 
 $server->addPlugin(new \Sabre\DAV\Sync\Plugin());
@@ -110,7 +110,7 @@ 
 $server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(Server::get(IConfig::class), Server::get(LoggerInterface::class), Server::get(DefaultCalendarValidator::class)));
 
 if ($sendInvitations) {
-	$server->addPlugin(Server::get(IMipPlugin::class));
+    $server->addPlugin(Server::get(IMipPlugin::class));
 }
 $server->addPlugin(new ExceptionLoggerPlugin('caldav', $logger));
 $server->addPlugin(Server::get(RateLimitingPlugin::class));

lib/private/Cache/File.php

Indentation +161 added lines, -161 removed lines

@@ -16,175 +16,175 @@
 use Psr\Log\LoggerInterface;
 
 class File implements ICache {
-	/** @var View */
-	protected $storage;
+    /** @var View */
+    protected $storage;
 
-	/**
-	 * Returns the cache storage for the logged in user
-	 *
-	 * @return \OC\Files\View cache storage
-	 * @throws \OC\ForbiddenException
-	 * @throws \OC\User\NoUserException
-	 */
-	protected function getStorage() {
-		if ($this->storage !== null) {
-			return $this->storage;
-		}
-		$session = Server::get(IUserSession::class);
-		if ($session->isLoggedIn()) {
-			$rootView = new View();
-			$userId = $session->getUser()->getUID();
-			Filesystem::initMountPoints($userId);
-			if (!$rootView->file_exists('/' . $userId . '/cache')) {
-				$rootView->mkdir('/' . $userId . '/cache');
-			}
-			$this->storage = new View('/' . $userId . '/cache');
-			return $this->storage;
-		} else {
-			Server::get(LoggerInterface::class)->error('Can\'t get cache storage, user not logged in', ['app' => 'core']);
-			throw new \OC\ForbiddenException('Can\t get cache storage, user not logged in');
-		}
-	}
+    /**
+     * Returns the cache storage for the logged in user
+     *
+     * @return \OC\Files\View cache storage
+     * @throws \OC\ForbiddenException
+     * @throws \OC\User\NoUserException
+     */
+    protected function getStorage() {
+        if ($this->storage !== null) {
+            return $this->storage;
+        }
+        $session = Server::get(IUserSession::class);
+        if ($session->isLoggedIn()) {
+            $rootView = new View();
+            $userId = $session->getUser()->getUID();
+            Filesystem::initMountPoints($userId);
+            if (!$rootView->file_exists('/' . $userId . '/cache')) {
+                $rootView->mkdir('/' . $userId . '/cache');
+            }
+            $this->storage = new View('/' . $userId . '/cache');
+            return $this->storage;
+        } else {
+            Server::get(LoggerInterface::class)->error('Can\'t get cache storage, user not logged in', ['app' => 'core']);
+            throw new \OC\ForbiddenException('Can\t get cache storage, user not logged in');
+        }
+    }
 
-	/**
-	 * @param string $key
-	 * @return mixed|null
-	 * @throws \OC\ForbiddenException
-	 */
-	public function get($key) {
-		$result = null;
-		if ($this->hasKey($key)) {
-			$storage = $this->getStorage();
-			$result = $storage->file_get_contents($key);
-		}
-		return $result;
-	}
+    /**
+     * @param string $key
+     * @return mixed|null
+     * @throws \OC\ForbiddenException
+     */
+    public function get($key) {
+        $result = null;
+        if ($this->hasKey($key)) {
+            $storage = $this->getStorage();
+            $result = $storage->file_get_contents($key);
+        }
+        return $result;
+    }
 
-	/**
-	 * Returns the size of the stored/cached data
-	 *
-	 * @param string $key
-	 * @return int
-	 */
-	public function size($key) {
-		$result = 0;
-		if ($this->hasKey($key)) {
-			$storage = $this->getStorage();
-			$result = $storage->filesize($key);
-		}
-		return $result;
-	}
+    /**
+     * Returns the size of the stored/cached data
+     *
+     * @param string $key
+     * @return int
+     */
+    public function size($key) {
+        $result = 0;
+        if ($this->hasKey($key)) {
+            $storage = $this->getStorage();
+            $result = $storage->filesize($key);
+        }
+        return $result;
+    }
 
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 * @param int $ttl
-	 * @return bool|mixed
-	 * @throws \OC\ForbiddenException
-	 */
-	public function set($key, $value, $ttl = 0) {
-		$storage = $this->getStorage();
-		$result = false;
-		// unique id to avoid chunk collision, just in case
-		$uniqueId = Server::get(ISecureRandom::class)->generate(
-			16,
-			ISecureRandom::CHAR_ALPHANUMERIC
-		);
+    /**
+     * @param string $key
+     * @param mixed $value
+     * @param int $ttl
+     * @return bool|mixed
+     * @throws \OC\ForbiddenException
+     */
+    public function set($key, $value, $ttl = 0) {
+        $storage = $this->getStorage();
+        $result = false;
+        // unique id to avoid chunk collision, just in case
+        $uniqueId = Server::get(ISecureRandom::class)->generate(
+            16,
+            ISecureRandom::CHAR_ALPHANUMERIC
+        );
 
-		// use part file to prevent hasKey() to find the key
-		// while it is being written
-		$keyPart = $key . '.' . $uniqueId . '.part';
-		if ($storage && $storage->file_put_contents($keyPart, $value)) {
-			if ($ttl === 0) {
-				$ttl = 86400; // 60*60*24
-			}
-			$result = $storage->touch($keyPart, time() + $ttl);
-			$result &= $storage->rename($keyPart, $key);
-		}
-		return $result;
-	}
+        // use part file to prevent hasKey() to find the key
+        // while it is being written
+        $keyPart = $key . '.' . $uniqueId . '.part';
+        if ($storage && $storage->file_put_contents($keyPart, $value)) {
+            if ($ttl === 0) {
+                $ttl = 86400; // 60*60*24
+            }
+            $result = $storage->touch($keyPart, time() + $ttl);
+            $result &= $storage->rename($keyPart, $key);
+        }
+        return $result;
+    }
 
-	/**
-	 * @param string $key
-	 * @return bool
-	 * @throws \OC\ForbiddenException
-	 */
-	public function hasKey($key) {
-		$storage = $this->getStorage();
-		if ($storage && $storage->is_file($key) && $storage->isReadable($key)) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     * @param string $key
+     * @return bool
+     * @throws \OC\ForbiddenException
+     */
+    public function hasKey($key) {
+        $storage = $this->getStorage();
+        if ($storage && $storage->is_file($key) && $storage->isReadable($key)) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * @param string $key
-	 * @return bool|mixed
-	 * @throws \OC\ForbiddenException
-	 */
-	public function remove($key) {
-		$storage = $this->getStorage();
-		if (!$storage) {
-			return false;
-		}
-		return $storage->unlink($key);
-	}
+    /**
+     * @param string $key
+     * @return bool|mixed
+     * @throws \OC\ForbiddenException
+     */
+    public function remove($key) {
+        $storage = $this->getStorage();
+        if (!$storage) {
+            return false;
+        }
+        return $storage->unlink($key);
+    }
 
-	/**
-	 * @param string $prefix
-	 * @return bool
-	 * @throws \OC\ForbiddenException
-	 */
-	public function clear($prefix = '') {
-		$storage = $this->getStorage();
-		if ($storage && $storage->is_dir('/')) {
-			$dh = $storage->opendir('/');
-			if (is_resource($dh)) {
-				while (($file = readdir($dh)) !== false) {
-					if ($file !== '.' && $file !== '..' && ($prefix === '' || str_starts_with($file, $prefix))) {
-						$storage->unlink('/' . $file);
-					}
-				}
-			}
-		}
-		return true;
-	}
+    /**
+     * @param string $prefix
+     * @return bool
+     * @throws \OC\ForbiddenException
+     */
+    public function clear($prefix = '') {
+        $storage = $this->getStorage();
+        if ($storage && $storage->is_dir('/')) {
+            $dh = $storage->opendir('/');
+            if (is_resource($dh)) {
+                while (($file = readdir($dh)) !== false) {
+                    if ($file !== '.' && $file !== '..' && ($prefix === '' || str_starts_with($file, $prefix))) {
+                        $storage->unlink('/' . $file);
+                    }
+                }
+            }
+        }
+        return true;
+    }
 
-	/**
-	 * Runs GC
-	 * @throws \OC\ForbiddenException
-	 */
-	public function gc() {
-		$storage = $this->getStorage();
-		if ($storage) {
-			// extra hour safety, in case of stray part chunks that take longer to write,
-			// because touch() is only called after the chunk was finished
-			$now = time() - 3600;
-			$dh = $storage->opendir('/');
-			if (!is_resource($dh)) {
-				return null;
-			}
-			while (($file = readdir($dh)) !== false) {
-				if ($file !== '.' && $file !== '..') {
-					try {
-						$mtime = $storage->filemtime('/' . $file);
-						if ($mtime < $now) {
-							$storage->unlink('/' . $file);
-						}
-					} catch (\OCP\Lock\LockedException $e) {
-						// ignore locked chunks
-						Server::get(LoggerInterface::class)->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
-					} catch (\OCP\Files\ForbiddenException $e) {
-						Server::get(LoggerInterface::class)->debug('Could not cleanup forbidden chunk "' . $file . '"', ['app' => 'core']);
-					} catch (\OCP\Files\LockNotAcquiredException $e) {
-						Server::get(LoggerInterface::class)->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
-					}
-				}
-			}
-		}
-	}
+    /**
+     * Runs GC
+     * @throws \OC\ForbiddenException
+     */
+    public function gc() {
+        $storage = $this->getStorage();
+        if ($storage) {
+            // extra hour safety, in case of stray part chunks that take longer to write,
+            // because touch() is only called after the chunk was finished
+            $now = time() - 3600;
+            $dh = $storage->opendir('/');
+            if (!is_resource($dh)) {
+                return null;
+            }
+            while (($file = readdir($dh)) !== false) {
+                if ($file !== '.' && $file !== '..') {
+                    try {
+                        $mtime = $storage->filemtime('/' . $file);
+                        if ($mtime < $now) {
+                            $storage->unlink('/' . $file);
+                        }
+                    } catch (\OCP\Lock\LockedException $e) {
+                        // ignore locked chunks
+                        Server::get(LoggerInterface::class)->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
+                    } catch (\OCP\Files\ForbiddenException $e) {
+                        Server::get(LoggerInterface::class)->debug('Could not cleanup forbidden chunk "' . $file . '"', ['app' => 'core']);
+                    } catch (\OCP\Files\LockNotAcquiredException $e) {
+                        Server::get(LoggerInterface::class)->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
+                    }
+                }
+            }
+        }
+    }
 
-	public static function isAvailable(): bool {
-		return true;
-	}
+    public static function isAvailable(): bool {
+        return true;
+    }
 }

lib/private/Cache/CappedMemoryCache.php

Indentation +89 added lines, -89 removed lines

@@ -17,93 +17,93 @@
  * @deprecated 25.0.0 use OCP\Cache\CappedMemoryCache instead
  */
 class CappedMemoryCache implements ICache, \ArrayAccess {
-	private $capacity;
-	/** @var T[] */
-	private $cache = [];
-
-	public function __construct($capacity = 512) {
-		$this->capacity = $capacity;
-	}
-
-	public function hasKey($key): bool {
-		return isset($this->cache[$key]);
-	}
-
-	/**
-	 * @return ?T
-	 */
-	public function get($key) {
-		return $this->cache[$key] ?? null;
-	}
-
-	/**
-	 * @param string $key
-	 * @param T $value
-	 * @param int $ttl
-	 * @return bool
-	 */
-	public function set($key, $value, $ttl = 0): bool {
-		if (is_null($key)) {
-			$this->cache[] = $value;
-		} else {
-			$this->cache[$key] = $value;
-		}
-		$this->garbageCollect();
-		return true;
-	}
-
-	public function remove($key) {
-		unset($this->cache[$key]);
-		return true;
-	}
-
-	public function clear($prefix = '') {
-		$this->cache = [];
-		return true;
-	}
-
-	public function offsetExists($offset): bool {
-		return $this->hasKey($offset);
-	}
-
-	/**
-	 * @return T
-	 */
-	#[\ReturnTypeWillChange]
-	public function &offsetGet($offset) {
-		return $this->cache[$offset];
-	}
-
-	/**
-	 * @param string $offset
-	 * @param T $value
-	 * @return void
-	 */
-	public function offsetSet($offset, $value): void {
-		$this->set($offset, $value);
-	}
-
-	public function offsetUnset($offset): void {
-		$this->remove($offset);
-	}
-
-	/**
-	 * @return T[]
-	 */
-	public function getData() {
-		return $this->cache;
-	}
-
-
-	private function garbageCollect() {
-		while (count($this->cache) > $this->capacity) {
-			reset($this->cache);
-			$key = key($this->cache);
-			$this->remove($key);
-		}
-	}
-
-	public static function isAvailable(): bool {
-		return true;
-	}
+    private $capacity;
+    /** @var T[] */
+    private $cache = [];
+
+    public function __construct($capacity = 512) {
+        $this->capacity = $capacity;
+    }
+
+    public function hasKey($key): bool {
+        return isset($this->cache[$key]);
+    }
+
+    /**
+     * @return ?T
+     */
+    public function get($key) {
+        return $this->cache[$key] ?? null;
+    }
+
+    /**
+     * @param string $key
+     * @param T $value
+     * @param int $ttl
+     * @return bool
+     */
+    public function set($key, $value, $ttl = 0): bool {
+        if (is_null($key)) {
+            $this->cache[] = $value;
+        } else {
+            $this->cache[$key] = $value;
+        }
+        $this->garbageCollect();
+        return true;
+    }
+
+    public function remove($key) {
+        unset($this->cache[$key]);
+        return true;
+    }
+
+    public function clear($prefix = '') {
+        $this->cache = [];
+        return true;
+    }
+
+    public function offsetExists($offset): bool {
+        return $this->hasKey($offset);
+    }
+
+    /**
+     * @return T
+     */
+    #[\ReturnTypeWillChange]
+    public function &offsetGet($offset) {
+        return $this->cache[$offset];
+    }
+
+    /**
+     * @param string $offset
+     * @param T $value
+     * @return void
+     */
+    public function offsetSet($offset, $value): void {
+        $this->set($offset, $value);
+    }
+
+    public function offsetUnset($offset): void {
+        $this->remove($offset);
+    }
+
+    /**
+     * @return T[]
+     */
+    public function getData() {
+        return $this->cache;
+    }
+
+
+    private function garbageCollect() {
+        while (count($this->cache) > $this->capacity) {
+            reset($this->cache);
+            $key = key($this->cache);
+            $this->remove($key);
+        }
+    }
+
+    public static function isAvailable(): bool {
+        return true;
+    }
 }

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/appinfo/v1/carddav.php

Indentation +25 added lines, -25 removed lines

@@ -36,33 +36,33 @@ 
 use Sabre\CardDAV\Plugin;
 
 $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/'
 );
 $principalBackend = new Principal(
-	Server::get(IUserManager::class),
-	Server::get(IGroupManager::class),
-	Server::get(IAccountManager::class),
-	Server::get(\OCP\Share\IManager::class),
-	Server::get(IUserSession::class),
-	Server::get(IAppManager::class),
-	Server::get(ProxyMapper::class),
-	Server::get(KnownUserService::class),
-	Server::get(IConfig::class),
-	\OC::$server->getL10NFactory(),
-	'principals/'
+    Server::get(IUserManager::class),
+    Server::get(IGroupManager::class),
+    Server::get(IAccountManager::class),
+    Server::get(\OCP\Share\IManager::class),
+    Server::get(IUserSession::class),
+    Server::get(IAppManager::class),
+    Server::get(ProxyMapper::class),
+    Server::get(KnownUserService::class),
+    Server::get(IConfig::class),
+    \OC::$server->getL10NFactory(),
+    'principals/'
 );
 $db = Server::get(IDBConnection::class);
 $cardDavBackend = new CardDavBackend(
-	$db,
-	$principalBackend,
-	Server::get(IUserManager::class),
-	Server::get(IEventDispatcher::class),
-	Server::get(\OCA\DAV\CardDAV\Sharing\Backend::class),
+    $db,
+    $principalBackend,
+    Server::get(IUserManager::class),
+    Server::get(IEventDispatcher::class),
+    Server::get(\OCA\DAV\CardDAV\Sharing\Backend::class),
 );
 
 $debugging = Server::get(IConfig::class)->getSystemValue('debug', false);
@@ -76,8 +76,8 @@ 
 $addressBookRoot->disableListing = !$debugging; // Disable listing
 
 $nodes = [
-	$principalCollection,
-	$addressBookRoot,
+    $principalCollection,
+    $addressBookRoot,
 ];
 
 // Fire up server
@@ -92,7 +92,7 @@ 
 
 $server->addPlugin(new LegacyDAVACL());
 if ($debugging) {
-	$server->addPlugin(new Sabre\DAV\Browser\Plugin());
+    $server->addPlugin(new Sabre\DAV\Browser\Plugin());
 }
 
 $server->addPlugin(new \Sabre\DAV\Sync\Plugin());

tests/lib/Cache/CappedMemoryCacheTest.php

Indentation +36 added lines, -36 removed lines

@@ -15,50 +15,50 @@
  * @package Test\Cache
  */
 class CappedMemoryCacheTest extends TestCache {
-	protected function setUp(): void {
-		parent::setUp();
-		$this->instance = new CappedMemoryCache();
-	}
+    protected function setUp(): void {
+        parent::setUp();
+        $this->instance = new CappedMemoryCache();
+    }
 
-	public function testSetOverCap(): void {
-		$instance = new CappedMemoryCache(3);
+    public function testSetOverCap(): void {
+        $instance = new CappedMemoryCache(3);
 
-		$instance->set('1', 'a');
-		$instance->set('2', 'b');
-		$instance->set('3', 'c');
-		$instance->set('4', 'd');
-		$instance->set('5', 'e');
+        $instance->set('1', 'a');
+        $instance->set('2', 'b');
+        $instance->set('3', 'c');
+        $instance->set('4', 'd');
+        $instance->set('5', 'e');
 
-		$this->assertFalse($instance->hasKey('1'));
-		$this->assertFalse($instance->hasKey('2'));
-		$this->assertTrue($instance->hasKey('3'));
-		$this->assertTrue($instance->hasKey('4'));
-		$this->assertTrue($instance->hasKey('5'));
-	}
+        $this->assertFalse($instance->hasKey('1'));
+        $this->assertFalse($instance->hasKey('2'));
+        $this->assertTrue($instance->hasKey('3'));
+        $this->assertTrue($instance->hasKey('4'));
+        $this->assertTrue($instance->hasKey('5'));
+    }
 
-	public function testClear(): void {
-		$value = 'ipsum lorum';
-		$this->instance->set('1_value1', $value);
-		$this->instance->set('1_value2', $value);
-		$this->instance->set('2_value1', $value);
-		$this->instance->set('3_value1', $value);
+    public function testClear(): void {
+        $value = 'ipsum lorum';
+        $this->instance->set('1_value1', $value);
+        $this->instance->set('1_value2', $value);
+        $this->instance->set('2_value1', $value);
+        $this->instance->set('3_value1', $value);
 
-		$this->assertTrue($this->instance->clear());
-		$this->assertFalse($this->instance->hasKey('1_value1'));
-		$this->assertFalse($this->instance->hasKey('1_value2'));
-		$this->assertFalse($this->instance->hasKey('2_value1'));
-		$this->assertFalse($this->instance->hasKey('3_value1'));
-	}
+        $this->assertTrue($this->instance->clear());
+        $this->assertFalse($this->instance->hasKey('1_value1'));
+        $this->assertFalse($this->instance->hasKey('1_value2'));
+        $this->assertFalse($this->instance->hasKey('2_value1'));
+        $this->assertFalse($this->instance->hasKey('3_value1'));
+    }
 
-	public function testIndirectSet(): void {
-		$this->instance->set('array', []);
+    public function testIndirectSet(): void {
+        $this->instance->set('array', []);
 
-		$this->instance['array'][] = 'foo';
+        $this->instance['array'][] = 'foo';
 
-		$this->assertEquals(['foo'], $this->instance->get('array'));
+        $this->assertEquals(['foo'], $this->instance->get('array'));
 
-		$this->instance['array']['bar'] = 'qwerty';
+        $this->instance['array']['bar'] = 'qwerty';
 
-		$this->assertEquals(['foo', 'bar' => 'qwerty'], $this->instance->get('array'));
-	}
+        $this->assertEquals(['foo', 'bar' => 'qwerty'], $this->instance->get('array'));
+    }
 }

tests/Core/Controller/AvatarControllerTest.php

Indentation +523 added lines, -523 removed lines

@@ -12,7 +12,7 @@ 
  * proper unit testing of the postAvatar call.
  */
 function is_uploaded_file($filename) {
-	return file_exists($filename);
+    return file_exists($filename);
 }
 
 namespace Tests\Core\Controller;
@@ -41,526 +41,526 @@ 
  * @package OC\Core\Controller
  */
 class AvatarControllerTest extends \Test\TestCase {
-	/** @var AvatarController */
-	private $avatarController;
-	/** @var GuestAvatarController */
-	private $guestAvatarController;
-
-	/** @var IAvatar|\PHPUnit\Framework\MockObject\MockObject */
-	private $avatarMock;
-	/** @var IUser|\PHPUnit\Framework\MockObject\MockObject */
-	private $userMock;
-	/** @var ISimpleFile|\PHPUnit\Framework\MockObject\MockObject */
-	private $avatarFile;
-	/** @var IAvatarManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $avatarManager;
-	/** @var ICache|\PHPUnit\Framework\MockObject\MockObject */
-	private $cache;
-	/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
-	private $l;
-	/** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $userManager;
-	/** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */
-	private $rootFolder;
-	/** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
-	private $logger;
-	/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
-	private $request;
-	/** @var TimeFactory|\PHPUnit\Framework\MockObject\MockObject */
-	private $timeFactory;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->avatarManager = $this->getMockBuilder('OCP\IAvatarManager')->getMock();
-		$this->cache = $this->getMockBuilder('OCP\ICache')
-			->disableOriginalConstructor()->getMock();
-		$this->l = $this->getMockBuilder(IL10N::class)->getMock();
-		$this->l->method('t')->willReturnArgument(0);
-		$this->userManager = $this->getMockBuilder(IUserManager::class)->getMock();
-		$this->request = $this->getMockBuilder(IRequest::class)->getMock();
-		$this->rootFolder = $this->getMockBuilder('OCP\Files\IRootFolder')->getMock();
-		$this->logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
-		$this->timeFactory = $this->getMockBuilder('OC\AppFramework\Utility\TimeFactory')->getMock();
-
-		$this->avatarMock = $this->getMockBuilder('OCP\IAvatar')->getMock();
-		$this->userMock = $this->getMockBuilder(IUser::class)->getMock();
-
-		$this->guestAvatarController = new GuestAvatarController(
-			'core',
-			$this->request,
-			$this->avatarManager,
-			$this->logger
-		);
-
-		$this->avatarController = new AvatarController(
-			'core',
-			$this->request,
-			$this->avatarManager,
-			$this->cache,
-			$this->l,
-			$this->userManager,
-			$this->rootFolder,
-			$this->logger,
-			'userid',
-			$this->timeFactory,
-			$this->guestAvatarController,
-		);
-
-		// Configure userMock
-		$this->userMock->method('getDisplayName')->willReturn('displayName');
-		$this->userMock->method('getUID')->willReturn('userId');
-		$this->userManager->method('get')
-			->willReturnMap([['userId', $this->userMock]]);
-
-		$this->avatarFile = $this->getMockBuilder(ISimpleFile::class)->getMock();
-		$this->avatarFile->method('getContent')->willReturn('image data');
-		$this->avatarFile->method('getMimeType')->willReturn('image type');
-		$this->avatarFile->method('getEtag')->willReturn('my etag');
-		$this->avatarFile->method('getName')->willReturn('my name');
-		$this->avatarFile->method('getMTime')->willReturn(42);
-	}
-
-	protected function tearDown(): void {
-		parent::tearDown();
-	}
-
-	/**
-	 * Fetch an avatar if a user has no avatar
-	 */
-	public function testGetAvatarNoAvatar(): void {
-		$this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
-		$this->avatarMock->method('getFile')->willThrowException(new NotFoundException());
-		$response = $this->avatarController->getAvatar('userId', 32);
-
-		//Comment out until JS is fixed
-		$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
-	}
-
-	/**
-	 * Fetch the user's avatar
-	 */
-	public function testGetAvatar(): void {
-		$this->avatarMock->method('getFile')->willReturn($this->avatarFile);
-		$this->avatarManager->method('getAvatar')->with('userId')->willReturn($this->avatarMock);
-		$this->avatarMock->expects($this->once())
-			->method('isCustomAvatar')
-			->willReturn(true);
-
-		$response = $this->avatarController->getAvatar('userId', 32);
-
-		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
-		$this->assertArrayHasKey('Content-Type', $response->getHeaders());
-		$this->assertEquals('image type', $response->getHeaders()['Content-Type']);
-		$this->assertArrayHasKey('X-NC-IsCustomAvatar', $response->getHeaders());
-		$this->assertEquals('1', $response->getHeaders()['X-NC-IsCustomAvatar']);
-
-		$this->assertEquals('my etag', $response->getETag());
-	}
-
-	/**
-	 * Fetch the user's avatar
-	 */
-	public function testGetGeneratedAvatar(): void {
-		$this->avatarMock->method('getFile')->willReturn($this->avatarFile);
-		$this->avatarManager->method('getAvatar')->with('userId')->willReturn($this->avatarMock);
-
-		$response = $this->avatarController->getAvatar('userId', 32);
-
-		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
-		$this->assertArrayHasKey('Content-Type', $response->getHeaders());
-		$this->assertEquals('image type', $response->getHeaders()['Content-Type']);
-		$this->assertArrayHasKey('X-NC-IsCustomAvatar', $response->getHeaders());
-		$this->assertEquals('0', $response->getHeaders()['X-NC-IsCustomAvatar']);
-
-		$this->assertEquals('my etag', $response->getETag());
-	}
-
-	/**
-	 * Fetch the avatar of a non-existing user
-	 */
-	public function testGetAvatarNoUser(): void {
-		$this->avatarManager
-			->method('getAvatar')
-			->with('userDoesNotExist')
-			->willThrowException(new \Exception('user does not exist'));
-
-		$response = $this->avatarController->getAvatar('userDoesNotExist', 32);
-
-		//Comment out until JS is fixed
-		$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
-	}
-
-	public function testGetAvatarSize64(): void {
-		$this->avatarMock->expects($this->once())
-			->method('getFile')
-			->with($this->equalTo(64))
-			->willReturn($this->avatarFile);
-
-		$this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
-
-		$this->logger->expects($this->never())
-			->method('debug');
-
-		$this->avatarController->getAvatar('userId', 64);
-	}
-
-	public function testGetAvatarSize512(): void {
-		$this->avatarMock->expects($this->once())
-			->method('getFile')
-			->with($this->equalTo(512))
-			->willReturn($this->avatarFile);
-
-		$this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
-
-		$this->logger->expects($this->never())
-			->method('debug');
-
-		$this->avatarController->getAvatar('userId', 512);
-	}
-
-	/**
-	 * Small sizes return 64 and generate a log
-	 */
-	public function testGetAvatarSizeTooSmall(): void {
-		$this->avatarMock->expects($this->once())
-			->method('getFile')
-			->with($this->equalTo(64))
-			->willReturn($this->avatarFile);
-
-		$this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
-
-		$this->logger->expects($this->once())
-			->method('debug')
-			->with('Avatar requested in deprecated size 32');
-
-		$this->avatarController->getAvatar('userId', 32);
-	}
-
-	/**
-	 * Avatars between 64 and 512 are upgraded to 512
-	 */
-	public function testGetAvatarSizeBetween(): void {
-		$this->avatarMock->expects($this->once())
-			->method('getFile')
-			->with($this->equalTo(512))
-			->willReturn($this->avatarFile);
-
-		$this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
-
-		$this->logger->expects($this->once())
-			->method('debug')
-			->with('Avatar requested in deprecated size 65');
-
-		$this->avatarController->getAvatar('userId', 65);
-	}
-
-	/**
-	 * We do not support avatars larger than 512
-	 */
-	public function testGetAvatarSizeTooBig(): void {
-		$this->avatarMock->expects($this->once())
-			->method('getFile')
-			->with($this->equalTo(512))
-			->willReturn($this->avatarFile);
-
-		$this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
-
-		$this->logger->expects($this->once())
-			->method('debug')
-			->with('Avatar requested in deprecated size 513');
-
-		$this->avatarController->getAvatar('userId', 513);
-	}
-
-	/**
-	 * Remove an avatar
-	 */
-	public function testDeleteAvatar(): void {
-		$this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
-
-		$response = $this->avatarController->deleteAvatar();
-		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
-	}
-
-	/**
-	 * Test what happens if the removing of the avatar fails
-	 */
-	public function testDeleteAvatarException(): void {
-		$this->avatarMock->method('remove')->willThrowException(new \Exception('foo'));
-		$this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
-
-		$this->logger->expects($this->once())
-			->method('error')
-			->with('foo', ['exception' => new \Exception('foo'), 'app' => 'core']);
-		$expectedResponse = new Http\JSONResponse(['data' => ['message' => 'An error occurred. Please contact your admin.']], Http::STATUS_BAD_REQUEST);
-		$this->assertEquals($expectedResponse, $this->avatarController->deleteAvatar());
-	}
-
-	/**
-	 * Trying to get a tmp avatar when it is not available. 404
-	 */
-	public function testTmpAvatarNoTmp(): void {
-		$response = $this->avatarController->getTmpAvatar();
-		$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
-	}
-
-	/**
-	 * Fetch tmp avatar
-	 */
-	public function testTmpAvatarValid(): void {
-		$this->cache->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT . '/tests/data/testimage.jpg'));
-
-		$response = $this->avatarController->getTmpAvatar();
-		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
-	}
-
-
-	/**
-	 * When trying to post a new avatar a path or image should be posted.
-	 */
-	public function testPostAvatarNoPathOrImage(): void {
-		$response = $this->avatarController->postAvatar(null);
-
-		$this->assertEquals(Http::STATUS_BAD_REQUEST, $response->getStatus());
-	}
-
-	/**
-	 * Test a correct post of an avatar using POST
-	 */
-	public function testPostAvatarFile(): void {
-		//Create temp file
-		$fileName = tempnam('', 'avatarTest');
-		$copyRes = copy(\OC::$SERVERROOT . '/tests/data/testimage.jpg', $fileName);
-		$this->assertTrue($copyRes);
-
-		//Create file in cache
-		$this->cache->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT . '/tests/data/testimage.jpg'));
-
-		//Create request return
-		$reqRet = ['error' => [0], 'tmp_name' => [$fileName], 'size' => [filesize(\OC::$SERVERROOT . '/tests/data/testimage.jpg')]];
-		$this->request->method('getUploadedFile')->willReturn($reqRet);
-
-		$response = $this->avatarController->postAvatar(null);
-
-		//On correct upload always respond with the notsquare message
-		$this->assertEquals('notsquare', $response->getData()['data']);
-
-		//File should be deleted
-		$this->assertFalse(file_exists($fileName));
-	}
-
-	/**
-	 * Test invalid post os an avatar using POST
-	 */
-	public function testPostAvatarInvalidFile(): void {
-		//Create request return
-		$reqRet = ['error' => [1], 'tmp_name' => ['foo']];
-		$this->request->method('getUploadedFile')->willReturn($reqRet);
-
-		$response = $this->avatarController->postAvatar(null);
-
-		$this->assertEquals(Http::STATUS_BAD_REQUEST, $response->getStatus());
-	}
-
-	/**
-	 * Check what happens when we upload a GIF
-	 */
-	public function testPostAvatarFileGif(): void {
-		//Create temp file
-		$fileName = tempnam('', 'avatarTest');
-		$copyRes = copy(\OC::$SERVERROOT . '/tests/data/testimage.gif', $fileName);
-		$this->assertTrue($copyRes);
-
-		//Create file in cache
-		$this->cache->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT . '/tests/data/testimage.gif'));
-
-		//Create request return
-		$reqRet = ['error' => [0], 'tmp_name' => [$fileName], 'size' => [filesize(\OC::$SERVERROOT . '/tests/data/testimage.gif')]];
-		$this->request->method('getUploadedFile')->willReturn($reqRet);
-
-		$response = $this->avatarController->postAvatar(null);
-
-		$this->assertEquals('Unknown filetype', $response->getData()['data']['message']);
-
-		//File should be deleted
-		$this->assertFalse(file_exists($fileName));
-	}
-
-	/**
-	 * Test posting avatar from existing file
-	 */
-	public function testPostAvatarFromFile(): void {
-		//Mock node API call
-		$file = $this->getMockBuilder('OCP\Files\File')
-			->disableOriginalConstructor()->getMock();
-		$file->expects($this->once())
-			->method('getContent')
-			->willReturn(file_get_contents(\OC::$SERVERROOT . '/tests/data/testimage.jpg'));
-		$file->expects($this->once())
-			->method('getMimeType')
-			->willReturn('image/jpeg');
-		$userFolder = $this->getMockBuilder('OCP\Files\Folder')->getMock();
-		$this->rootFolder->method('getUserFolder')->with('userid')->willReturn($userFolder);
-		$userFolder->method('get')->willReturn($file);
-
-		//Create request return
-		$response = $this->avatarController->postAvatar('avatar.jpg');
-
-		//On correct upload always respond with the notsquare message
-		$this->assertEquals('notsquare', $response->getData()['data']);
-	}
-
-	/**
-	 * Test posting avatar from existing folder
-	 */
-	public function testPostAvatarFromNoFile(): void {
-		$file = $this->getMockBuilder('OCP\Files\Node')->getMock();
-		$userFolder = $this->getMockBuilder('OCP\Files\Folder')->getMock();
-		$this->rootFolder->method('getUserFolder')->with('userid')->willReturn($userFolder);
-		$userFolder
-			->method('get')
-			->with('folder')
-			->willReturn($file);
-
-		//Create request return
-		$response = $this->avatarController->postAvatar('folder');
-
-		//On correct upload always respond with the notsquare message
-		$this->assertEquals(['data' => ['message' => 'Please select a file.']], $response->getData());
-	}
-
-	public function testPostAvatarInvalidType(): void {
-		$file = $this->getMockBuilder('OCP\Files\File')
-			->disableOriginalConstructor()->getMock();
-		$file->expects($this->never())
-			->method('getContent');
-		$file->expects($this->exactly(2))
-			->method('getMimeType')
-			->willReturn('text/plain');
-		$userFolder = $this->getMockBuilder('OCP\Files\Folder')->getMock();
-		$this->rootFolder->method('getUserFolder')->with('userid')->willReturn($userFolder);
-		$userFolder->method('get')->willReturn($file);
-
-		$expectedResponse = new Http\JSONResponse(['data' => ['message' => 'The selected file is not an image.']], Http::STATUS_BAD_REQUEST);
-		$this->assertEquals($expectedResponse, $this->avatarController->postAvatar('avatar.jpg'));
-	}
-
-	public function testPostAvatarNotPermittedException(): void {
-		$file = $this->getMockBuilder('OCP\Files\File')
-			->disableOriginalConstructor()->getMock();
-		$file->expects($this->once())
-			->method('getContent')
-			->willThrowException(new NotPermittedException());
-		$file->expects($this->once())
-			->method('getMimeType')
-			->willReturn('image/jpeg');
-		$userFolder = $this->getMockBuilder('OCP\Files\Folder')->getMock();
-		$this->rootFolder->method('getUserFolder')->with('userid')->willReturn($userFolder);
-		$userFolder->method('get')->willReturn($file);
-
-		$expectedResponse = new Http\JSONResponse(['data' => ['message' => 'The selected file cannot be read.']], Http::STATUS_BAD_REQUEST);
-		$this->assertEquals($expectedResponse, $this->avatarController->postAvatar('avatar.jpg'));
-	}
-
-	/**
-	 * Test what happens if the upload of the avatar fails
-	 */
-	public function testPostAvatarException(): void {
-		$this->cache->expects($this->once())
-			->method('set')
-			->willThrowException(new \Exception('foo'));
-		$file = $this->getMockBuilder('OCP\Files\File')
-			->disableOriginalConstructor()->getMock();
-		$file->expects($this->once())
-			->method('getContent')
-			->willReturn(file_get_contents(\OC::$SERVERROOT . '/tests/data/testimage.jpg'));
-		$file->expects($this->once())
-			->method('getMimeType')
-			->willReturn('image/jpeg');
-		$userFolder = $this->getMockBuilder('OCP\Files\Folder')->getMock();
-		$this->rootFolder->method('getUserFolder')->with('userid')->willReturn($userFolder);
-		$userFolder->method('get')->willReturn($file);
-
-		$this->logger->expects($this->once())
-			->method('error')
-			->with('foo', ['exception' => new \Exception('foo'), 'app' => 'core']);
-		$expectedResponse = new Http\JSONResponse(['data' => ['message' => 'An error occurred. Please contact your admin.']], Http::STATUS_OK);
-		$this->assertEquals($expectedResponse, $this->avatarController->postAvatar('avatar.jpg'));
-	}
-
-
-	/**
-	 * Test invalid crop argument
-	 */
-	public function testPostCroppedAvatarInvalidCrop(): void {
-		$response = $this->avatarController->postCroppedAvatar([]);
-
-		$this->assertEquals(Http::STATUS_BAD_REQUEST, $response->getStatus());
-	}
-
-	/**
-	 * Test no tmp avatar to crop
-	 */
-	public function testPostCroppedAvatarNoTmpAvatar(): void {
-		$response = $this->avatarController->postCroppedAvatar(['x' => 0, 'y' => 0, 'w' => 10, 'h' => 10]);
-
-		$this->assertEquals(Http::STATUS_BAD_REQUEST, $response->getStatus());
-	}
-
-	/**
-	 * Test with non square crop
-	 */
-	public function testPostCroppedAvatarNoSquareCrop(): void {
-		$this->cache->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT . '/tests/data/testimage.jpg'));
-
-		$this->avatarMock->method('set')->willThrowException(new \OC\NotSquareException);
-		$this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
-		$response = $this->avatarController->postCroppedAvatar(['x' => 0, 'y' => 0, 'w' => 10, 'h' => 11]);
-
-		$this->assertEquals(Http::STATUS_BAD_REQUEST, $response->getStatus());
-	}
-
-	/**
-	 * Check for proper reply on proper crop argument
-	 */
-	public function testPostCroppedAvatarValidCrop(): void {
-		$this->cache->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT . '/tests/data/testimage.jpg'));
-		$this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
-		$response = $this->avatarController->postCroppedAvatar(['x' => 0, 'y' => 0, 'w' => 10, 'h' => 10]);
-
-		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
-		$this->assertEquals('success', $response->getData()['status']);
-	}
-
-	/**
-	 * Test what happens if the cropping of the avatar fails
-	 */
-	public function testPostCroppedAvatarException(): void {
-		$this->cache->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT . '/tests/data/testimage.jpg'));
-
-		$this->avatarMock->method('set')->willThrowException(new \Exception('foo'));
-		$this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
-
-		$this->logger->expects($this->once())
-			->method('error')
-			->with('foo', ['exception' => new \Exception('foo'), 'app' => 'core']);
-		$expectedResponse = new Http\JSONResponse(['data' => ['message' => 'An error occurred. Please contact your admin.']], Http::STATUS_BAD_REQUEST);
-		$this->assertEquals($expectedResponse, $this->avatarController->postCroppedAvatar(['x' => 0, 'y' => 0, 'w' => 10, 'h' => 11]));
-	}
-
-
-	/**
-	 * Check for proper reply on proper crop argument
-	 */
-	public function testFileTooBig(): void {
-		$fileName = \OC::$SERVERROOT . '/tests/data/testimage.jpg';
-		//Create request return
-		$reqRet = ['error' => [0], 'tmp_name' => [$fileName], 'size' => [21 * 1024 * 1024]];
-		$this->request->method('getUploadedFile')->willReturn($reqRet);
-
-		$response = $this->avatarController->postAvatar(null);
-
-		$this->assertEquals('File is too big', $response->getData()['data']['message']);
-	}
+    /** @var AvatarController */
+    private $avatarController;
+    /** @var GuestAvatarController */
+    private $guestAvatarController;
+
+    /** @var IAvatar|\PHPUnit\Framework\MockObject\MockObject */
+    private $avatarMock;
+    /** @var IUser|\PHPUnit\Framework\MockObject\MockObject */
+    private $userMock;
+    /** @var ISimpleFile|\PHPUnit\Framework\MockObject\MockObject */
+    private $avatarFile;
+    /** @var IAvatarManager|\PHPUnit\Framework\MockObject\MockObject */
+    private $avatarManager;
+    /** @var ICache|\PHPUnit\Framework\MockObject\MockObject */
+    private $cache;
+    /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
+    private $l;
+    /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */
+    private $userManager;
+    /** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */
+    private $rootFolder;
+    /** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
+    private $logger;
+    /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
+    private $request;
+    /** @var TimeFactory|\PHPUnit\Framework\MockObject\MockObject */
+    private $timeFactory;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->avatarManager = $this->getMockBuilder('OCP\IAvatarManager')->getMock();
+        $this->cache = $this->getMockBuilder('OCP\ICache')
+            ->disableOriginalConstructor()->getMock();
+        $this->l = $this->getMockBuilder(IL10N::class)->getMock();
+        $this->l->method('t')->willReturnArgument(0);
+        $this->userManager = $this->getMockBuilder(IUserManager::class)->getMock();
+        $this->request = $this->getMockBuilder(IRequest::class)->getMock();
+        $this->rootFolder = $this->getMockBuilder('OCP\Files\IRootFolder')->getMock();
+        $this->logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
+        $this->timeFactory = $this->getMockBuilder('OC\AppFramework\Utility\TimeFactory')->getMock();
+
+        $this->avatarMock = $this->getMockBuilder('OCP\IAvatar')->getMock();
+        $this->userMock = $this->getMockBuilder(IUser::class)->getMock();
+
+        $this->guestAvatarController = new GuestAvatarController(
+            'core',
+            $this->request,
+            $this->avatarManager,
+            $this->logger
+        );
+
+        $this->avatarController = new AvatarController(
+            'core',
+            $this->request,
+            $this->avatarManager,
+            $this->cache,
+            $this->l,
+            $this->userManager,
+            $this->rootFolder,
+            $this->logger,
+            'userid',
+            $this->timeFactory,
+            $this->guestAvatarController,
+        );
+
+        // Configure userMock
+        $this->userMock->method('getDisplayName')->willReturn('displayName');
+        $this->userMock->method('getUID')->willReturn('userId');
+        $this->userManager->method('get')
+            ->willReturnMap([['userId', $this->userMock]]);
+
+        $this->avatarFile = $this->getMockBuilder(ISimpleFile::class)->getMock();
+        $this->avatarFile->method('getContent')->willReturn('image data');
+        $this->avatarFile->method('getMimeType')->willReturn('image type');
+        $this->avatarFile->method('getEtag')->willReturn('my etag');
+        $this->avatarFile->method('getName')->willReturn('my name');
+        $this->avatarFile->method('getMTime')->willReturn(42);
+    }
+
+    protected function tearDown(): void {
+        parent::tearDown();
+    }
+
+    /**
+     * Fetch an avatar if a user has no avatar
+     */
+    public function testGetAvatarNoAvatar(): void {
+        $this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
+        $this->avatarMock->method('getFile')->willThrowException(new NotFoundException());
+        $response = $this->avatarController->getAvatar('userId', 32);
+
+        //Comment out until JS is fixed
+        $this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
+    }
+
+    /**
+     * Fetch the user's avatar
+     */
+    public function testGetAvatar(): void {
+        $this->avatarMock->method('getFile')->willReturn($this->avatarFile);
+        $this->avatarManager->method('getAvatar')->with('userId')->willReturn($this->avatarMock);
+        $this->avatarMock->expects($this->once())
+            ->method('isCustomAvatar')
+            ->willReturn(true);
+
+        $response = $this->avatarController->getAvatar('userId', 32);
+
+        $this->assertEquals(Http::STATUS_OK, $response->getStatus());
+        $this->assertArrayHasKey('Content-Type', $response->getHeaders());
+        $this->assertEquals('image type', $response->getHeaders()['Content-Type']);
+        $this->assertArrayHasKey('X-NC-IsCustomAvatar', $response->getHeaders());
+        $this->assertEquals('1', $response->getHeaders()['X-NC-IsCustomAvatar']);
+
+        $this->assertEquals('my etag', $response->getETag());
+    }
+
+    /**
+     * Fetch the user's avatar
+     */
+    public function testGetGeneratedAvatar(): void {
+        $this->avatarMock->method('getFile')->willReturn($this->avatarFile);
+        $this->avatarManager->method('getAvatar')->with('userId')->willReturn($this->avatarMock);
+
+        $response = $this->avatarController->getAvatar('userId', 32);
+
+        $this->assertEquals(Http::STATUS_OK, $response->getStatus());
+        $this->assertArrayHasKey('Content-Type', $response->getHeaders());
+        $this->assertEquals('image type', $response->getHeaders()['Content-Type']);
+        $this->assertArrayHasKey('X-NC-IsCustomAvatar', $response->getHeaders());
+        $this->assertEquals('0', $response->getHeaders()['X-NC-IsCustomAvatar']);
+
+        $this->assertEquals('my etag', $response->getETag());
+    }
+
+    /**
+     * Fetch the avatar of a non-existing user
+     */
+    public function testGetAvatarNoUser(): void {
+        $this->avatarManager
+            ->method('getAvatar')
+            ->with('userDoesNotExist')
+            ->willThrowException(new \Exception('user does not exist'));
+
+        $response = $this->avatarController->getAvatar('userDoesNotExist', 32);
+
+        //Comment out until JS is fixed
+        $this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
+    }
+
+    public function testGetAvatarSize64(): void {
+        $this->avatarMock->expects($this->once())
+            ->method('getFile')
+            ->with($this->equalTo(64))
+            ->willReturn($this->avatarFile);
+
+        $this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
+
+        $this->logger->expects($this->never())
+            ->method('debug');
+
+        $this->avatarController->getAvatar('userId', 64);
+    }
+
+    public function testGetAvatarSize512(): void {
+        $this->avatarMock->expects($this->once())
+            ->method('getFile')
+            ->with($this->equalTo(512))
+            ->willReturn($this->avatarFile);
+
+        $this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
+
+        $this->logger->expects($this->never())
+            ->method('debug');
+
+        $this->avatarController->getAvatar('userId', 512);
+    }
+
+    /**
+     * Small sizes return 64 and generate a log
+     */
+    public function testGetAvatarSizeTooSmall(): void {
+        $this->avatarMock->expects($this->once())
+            ->method('getFile')
+            ->with($this->equalTo(64))
+            ->willReturn($this->avatarFile);
+
+        $this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
+
+        $this->logger->expects($this->once())
+            ->method('debug')
+            ->with('Avatar requested in deprecated size 32');
+
+        $this->avatarController->getAvatar('userId', 32);
+    }
+
+    /**
+     * Avatars between 64 and 512 are upgraded to 512
+     */
+    public function testGetAvatarSizeBetween(): void {
+        $this->avatarMock->expects($this->once())
+            ->method('getFile')
+            ->with($this->equalTo(512))
+            ->willReturn($this->avatarFile);
+
+        $this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
+
+        $this->logger->expects($this->once())
+            ->method('debug')
+            ->with('Avatar requested in deprecated size 65');
+
+        $this->avatarController->getAvatar('userId', 65);
+    }
+
+    /**
+     * We do not support avatars larger than 512
+     */
+    public function testGetAvatarSizeTooBig(): void {
+        $this->avatarMock->expects($this->once())
+            ->method('getFile')
+            ->with($this->equalTo(512))
+            ->willReturn($this->avatarFile);
+
+        $this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
+
+        $this->logger->expects($this->once())
+            ->method('debug')
+            ->with('Avatar requested in deprecated size 513');
+
+        $this->avatarController->getAvatar('userId', 513);
+    }
+
+    /**
+     * Remove an avatar
+     */
+    public function testDeleteAvatar(): void {
+        $this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
+
+        $response = $this->avatarController->deleteAvatar();
+        $this->assertEquals(Http::STATUS_OK, $response->getStatus());
+    }
+
+    /**
+     * Test what happens if the removing of the avatar fails
+     */
+    public function testDeleteAvatarException(): void {
+        $this->avatarMock->method('remove')->willThrowException(new \Exception('foo'));
+        $this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
+
+        $this->logger->expects($this->once())
+            ->method('error')
+            ->with('foo', ['exception' => new \Exception('foo'), 'app' => 'core']);
+        $expectedResponse = new Http\JSONResponse(['data' => ['message' => 'An error occurred. Please contact your admin.']], Http::STATUS_BAD_REQUEST);
+        $this->assertEquals($expectedResponse, $this->avatarController->deleteAvatar());
+    }
+
+    /**
+     * Trying to get a tmp avatar when it is not available. 404
+     */
+    public function testTmpAvatarNoTmp(): void {
+        $response = $this->avatarController->getTmpAvatar();
+        $this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
+    }
+
+    /**
+     * Fetch tmp avatar
+     */
+    public function testTmpAvatarValid(): void {
+        $this->cache->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT . '/tests/data/testimage.jpg'));
+
+        $response = $this->avatarController->getTmpAvatar();
+        $this->assertEquals(Http::STATUS_OK, $response->getStatus());
+    }
+
+
+    /**
+     * When trying to post a new avatar a path or image should be posted.
+     */
+    public function testPostAvatarNoPathOrImage(): void {
+        $response = $this->avatarController->postAvatar(null);
+
+        $this->assertEquals(Http::STATUS_BAD_REQUEST, $response->getStatus());
+    }
+
+    /**
+     * Test a correct post of an avatar using POST
+     */
+    public function testPostAvatarFile(): void {
+        //Create temp file
+        $fileName = tempnam('', 'avatarTest');
+        $copyRes = copy(\OC::$SERVERROOT . '/tests/data/testimage.jpg', $fileName);
+        $this->assertTrue($copyRes);
+
+        //Create file in cache
+        $this->cache->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT . '/tests/data/testimage.jpg'));
+
+        //Create request return
+        $reqRet = ['error' => [0], 'tmp_name' => [$fileName], 'size' => [filesize(\OC::$SERVERROOT . '/tests/data/testimage.jpg')]];
+        $this->request->method('getUploadedFile')->willReturn($reqRet);
+
+        $response = $this->avatarController->postAvatar(null);
+
+        //On correct upload always respond with the notsquare message
+        $this->assertEquals('notsquare', $response->getData()['data']);
+
+        //File should be deleted
+        $this->assertFalse(file_exists($fileName));
+    }
+
+    /**
+     * Test invalid post os an avatar using POST
+     */
+    public function testPostAvatarInvalidFile(): void {
+        //Create request return
+        $reqRet = ['error' => [1], 'tmp_name' => ['foo']];
+        $this->request->method('getUploadedFile')->willReturn($reqRet);
+
+        $response = $this->avatarController->postAvatar(null);
+
+        $this->assertEquals(Http::STATUS_BAD_REQUEST, $response->getStatus());
+    }
+
+    /**
+     * Check what happens when we upload a GIF
+     */
+    public function testPostAvatarFileGif(): void {
+        //Create temp file
+        $fileName = tempnam('', 'avatarTest');
+        $copyRes = copy(\OC::$SERVERROOT . '/tests/data/testimage.gif', $fileName);
+        $this->assertTrue($copyRes);
+
+        //Create file in cache
+        $this->cache->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT . '/tests/data/testimage.gif'));
+
+        //Create request return
+        $reqRet = ['error' => [0], 'tmp_name' => [$fileName], 'size' => [filesize(\OC::$SERVERROOT . '/tests/data/testimage.gif')]];
+        $this->request->method('getUploadedFile')->willReturn($reqRet);
+
+        $response = $this->avatarController->postAvatar(null);
+
+        $this->assertEquals('Unknown filetype', $response->getData()['data']['message']);
+
+        //File should be deleted
+        $this->assertFalse(file_exists($fileName));
+    }
+
+    /**
+     * Test posting avatar from existing file
+     */
+    public function testPostAvatarFromFile(): void {
+        //Mock node API call
+        $file = $this->getMockBuilder('OCP\Files\File')
+            ->disableOriginalConstructor()->getMock();
+        $file->expects($this->once())
+            ->method('getContent')
+            ->willReturn(file_get_contents(\OC::$SERVERROOT . '/tests/data/testimage.jpg'));
+        $file->expects($this->once())
+            ->method('getMimeType')
+            ->willReturn('image/jpeg');
+        $userFolder = $this->getMockBuilder('OCP\Files\Folder')->getMock();
+        $this->rootFolder->method('getUserFolder')->with('userid')->willReturn($userFolder);
+        $userFolder->method('get')->willReturn($file);
+
+        //Create request return
+        $response = $this->avatarController->postAvatar('avatar.jpg');
+
+        //On correct upload always respond with the notsquare message
+        $this->assertEquals('notsquare', $response->getData()['data']);
+    }
+
+    /**
+     * Test posting avatar from existing folder
+     */
+    public function testPostAvatarFromNoFile(): void {
+        $file = $this->getMockBuilder('OCP\Files\Node')->getMock();
+        $userFolder = $this->getMockBuilder('OCP\Files\Folder')->getMock();
+        $this->rootFolder->method('getUserFolder')->with('userid')->willReturn($userFolder);
+        $userFolder
+            ->method('get')
+            ->with('folder')
+            ->willReturn($file);
+
+        //Create request return
+        $response = $this->avatarController->postAvatar('folder');
+
+        //On correct upload always respond with the notsquare message
+        $this->assertEquals(['data' => ['message' => 'Please select a file.']], $response->getData());
+    }
+
+    public function testPostAvatarInvalidType(): void {
+        $file = $this->getMockBuilder('OCP\Files\File')
+            ->disableOriginalConstructor()->getMock();
+        $file->expects($this->never())
+            ->method('getContent');
+        $file->expects($this->exactly(2))
+            ->method('getMimeType')
+            ->willReturn('text/plain');
+        $userFolder = $this->getMockBuilder('OCP\Files\Folder')->getMock();
+        $this->rootFolder->method('getUserFolder')->with('userid')->willReturn($userFolder);
+        $userFolder->method('get')->willReturn($file);
+
+        $expectedResponse = new Http\JSONResponse(['data' => ['message' => 'The selected file is not an image.']], Http::STATUS_BAD_REQUEST);
+        $this->assertEquals($expectedResponse, $this->avatarController->postAvatar('avatar.jpg'));
+    }
+
+    public function testPostAvatarNotPermittedException(): void {
+        $file = $this->getMockBuilder('OCP\Files\File')
+            ->disableOriginalConstructor()->getMock();
+        $file->expects($this->once())
+            ->method('getContent')
+            ->willThrowException(new NotPermittedException());
+        $file->expects($this->once())
+            ->method('getMimeType')
+            ->willReturn('image/jpeg');
+        $userFolder = $this->getMockBuilder('OCP\Files\Folder')->getMock();
+        $this->rootFolder->method('getUserFolder')->with('userid')->willReturn($userFolder);
+        $userFolder->method('get')->willReturn($file);
+
+        $expectedResponse = new Http\JSONResponse(['data' => ['message' => 'The selected file cannot be read.']], Http::STATUS_BAD_REQUEST);
+        $this->assertEquals($expectedResponse, $this->avatarController->postAvatar('avatar.jpg'));
+    }
+
+    /**
+     * Test what happens if the upload of the avatar fails
+     */
+    public function testPostAvatarException(): void {
+        $this->cache->expects($this->once())
+            ->method('set')
+            ->willThrowException(new \Exception('foo'));
+        $file = $this->getMockBuilder('OCP\Files\File')
+            ->disableOriginalConstructor()->getMock();
+        $file->expects($this->once())
+            ->method('getContent')
+            ->willReturn(file_get_contents(\OC::$SERVERROOT . '/tests/data/testimage.jpg'));
+        $file->expects($this->once())
+            ->method('getMimeType')
+            ->willReturn('image/jpeg');
+        $userFolder = $this->getMockBuilder('OCP\Files\Folder')->getMock();
+        $this->rootFolder->method('getUserFolder')->with('userid')->willReturn($userFolder);
+        $userFolder->method('get')->willReturn($file);
+
+        $this->logger->expects($this->once())
+            ->method('error')
+            ->with('foo', ['exception' => new \Exception('foo'), 'app' => 'core']);
+        $expectedResponse = new Http\JSONResponse(['data' => ['message' => 'An error occurred. Please contact your admin.']], Http::STATUS_OK);
+        $this->assertEquals($expectedResponse, $this->avatarController->postAvatar('avatar.jpg'));
+    }
+
+
+    /**
+     * Test invalid crop argument
+     */
+    public function testPostCroppedAvatarInvalidCrop(): void {
+        $response = $this->avatarController->postCroppedAvatar([]);
+
+        $this->assertEquals(Http::STATUS_BAD_REQUEST, $response->getStatus());
+    }
+
+    /**
+     * Test no tmp avatar to crop
+     */
+    public function testPostCroppedAvatarNoTmpAvatar(): void {
+        $response = $this->avatarController->postCroppedAvatar(['x' => 0, 'y' => 0, 'w' => 10, 'h' => 10]);
+
+        $this->assertEquals(Http::STATUS_BAD_REQUEST, $response->getStatus());
+    }
+
+    /**
+     * Test with non square crop
+     */
+    public function testPostCroppedAvatarNoSquareCrop(): void {
+        $this->cache->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT . '/tests/data/testimage.jpg'));
+
+        $this->avatarMock->method('set')->willThrowException(new \OC\NotSquareException);
+        $this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
+        $response = $this->avatarController->postCroppedAvatar(['x' => 0, 'y' => 0, 'w' => 10, 'h' => 11]);
+
+        $this->assertEquals(Http::STATUS_BAD_REQUEST, $response->getStatus());
+    }
+
+    /**
+     * Check for proper reply on proper crop argument
+     */
+    public function testPostCroppedAvatarValidCrop(): void {
+        $this->cache->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT . '/tests/data/testimage.jpg'));
+        $this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
+        $response = $this->avatarController->postCroppedAvatar(['x' => 0, 'y' => 0, 'w' => 10, 'h' => 10]);
+
+        $this->assertEquals(Http::STATUS_OK, $response->getStatus());
+        $this->assertEquals('success', $response->getData()['status']);
+    }
+
+    /**
+     * Test what happens if the cropping of the avatar fails
+     */
+    public function testPostCroppedAvatarException(): void {
+        $this->cache->method('get')->willReturn(file_get_contents(\OC::$SERVERROOT . '/tests/data/testimage.jpg'));
+
+        $this->avatarMock->method('set')->willThrowException(new \Exception('foo'));
+        $this->avatarManager->method('getAvatar')->willReturn($this->avatarMock);
+
+        $this->logger->expects($this->once())
+            ->method('error')
+            ->with('foo', ['exception' => new \Exception('foo'), 'app' => 'core']);
+        $expectedResponse = new Http\JSONResponse(['data' => ['message' => 'An error occurred. Please contact your admin.']], Http::STATUS_BAD_REQUEST);
+        $this->assertEquals($expectedResponse, $this->avatarController->postCroppedAvatar(['x' => 0, 'y' => 0, 'w' => 10, 'h' => 11]));
+    }
+
+
+    /**
+     * Check for proper reply on proper crop argument
+     */
+    public function testFileTooBig(): void {
+        $fileName = \OC::$SERVERROOT . '/tests/data/testimage.jpg';
+        //Create request return
+        $reqRet = ['error' => [0], 'tmp_name' => [$fileName], 'size' => [21 * 1024 * 1024]];
+        $this->request->method('getUploadedFile')->willReturn($reqRet);
+
+        $response = $this->avatarController->postAvatar(null);
+
+        $this->assertEquals('File is too big', $response->getData()['data']['message']);
+    }
 }

apps/dav/lib/Server.php

Indentation +326 added lines, -326 removed lines

@@ -100,331 +100,331 @@
 use SearchDAV\DAV\SearchPlugin;
 
 class Server {
-	public Connector\Sabre\Server $server;
-	private IProfiler $profiler;
-
-	public function __construct(
-		private IRequest $request,
-		private string $baseUri,
-	) {
-		$this->profiler = \OCP\Server::get(IProfiler::class);
-		if ($this->profiler->isEnabled()) {
-			/** @var IEventLogger $eventLogger */
-			$eventLogger = \OCP\Server::get(IEventLogger::class);
-			$eventLogger->start('runtime', 'DAV Runtime');
-		}
-
-		$logger = \OCP\Server::get(LoggerInterface::class);
-		$eventDispatcher = \OCP\Server::get(IEventDispatcher::class);
-
-		$root = new RootCollection();
-		$this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
-
-		// Add maintenance plugin
-		$this->server->addPlugin(new MaintenancePlugin(\OCP\Server::get(IConfig::class), \OC::$server->getL10N('dav')));
-
-		$this->server->addPlugin(new AppleQuirksPlugin());
-
-		// Backends
-		$authBackend = new Auth(
-			\OCP\Server::get(ISession::class),
-			\OCP\Server::get(IUserSession::class),
-			\OCP\Server::get(IRequest::class),
-			\OCP\Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
-			\OCP\Server::get(IThrottler::class)
-		);
-
-		// Set URL explicitly due to reverse-proxy situations
-		$this->server->httpRequest->setUrl($this->request->getRequestUri());
-		$this->server->setBaseUri($this->baseUri);
-
-		$this->server->addPlugin(new ProfilerPlugin($this->request));
-		$this->server->addPlugin(new BlockLegacyClientPlugin(
-			\OCP\Server::get(IConfig::class),
-			\OCP\Server::get(ThemingDefaults::class),
-		));
-		$this->server->addPlugin(new AnonymousOptionsPlugin());
-		$authPlugin = new Plugin();
-		$authPlugin->addBackend(new PublicAuth());
-		$this->server->addPlugin($authPlugin);
-
-		// allow setup of additional auth backends
-		$event = new SabrePluginEvent($this->server);
-		$eventDispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
-
-		$newAuthEvent = new SabrePluginAuthInitEvent($this->server);
-		$eventDispatcher->dispatchTyped($newAuthEvent);
-
-		$bearerAuthBackend = new BearerAuth(
-			\OCP\Server::get(IUserSession::class),
-			\OCP\Server::get(ISession::class),
-			\OCP\Server::get(IRequest::class),
-			\OCP\Server::get(IConfig::class),
-		);
-		$authPlugin->addBackend($bearerAuthBackend);
-		// because we are throwing exceptions this plugin has to be the last one
-		$authPlugin->addBackend($authBackend);
-
-		// debugging
-		if (\OCP\Server::get(IConfig::class)->getSystemValue('debug', false)) {
-			$this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
-		} else {
-			$this->server->addPlugin(new DummyGetResponsePlugin());
-		}
-
-		$this->server->addPlugin(new ExceptionLoggerPlugin('webdav', $logger));
-		$this->server->addPlugin(new LockPlugin());
-		$this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
-
-		// acl
-		$acl = new DavAclPlugin();
-		$acl->principalCollectionSet = [
-			'principals/users',
-			'principals/groups',
-			'principals/calendar-resources',
-			'principals/calendar-rooms',
-		];
-		$this->server->addPlugin($acl);
-
-		// calendar plugins
-		if ($this->requestIsForSubtree(['calendars', 'public-calendars', 'system-calendars', 'principals'])) {
-			$this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OCP\Server::get(IRequest::class), \OCP\Server::get(IConfig::class)));
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
-			$this->server->addPlugin(new ICSExportPlugin(\OCP\Server::get(IConfig::class), $logger));
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(\OCP\Server::get(IConfig::class), \OCP\Server::get(LoggerInterface::class), \OCP\Server::get(DefaultCalendarValidator::class)));
-
-			$this->server->addPlugin(\OCP\Server::get(\OCA\DAV\CalDAV\Trashbin\Plugin::class));
-			$this->server->addPlugin(new \OCA\DAV\CalDAV\WebcalCaching\Plugin($this->request));
-			if (\OCP\Server::get(IConfig::class)->getAppValue('dav', 'allow_calendar_link_subscriptions', 'yes') === 'yes') {
-				$this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
-			}
-
-			$this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
-			$this->server->addPlugin(new PublishPlugin(
-				\OCP\Server::get(IConfig::class),
-				\OCP\Server::get(IURLGenerator::class)
-			));
-
-			$this->server->addPlugin(\OCP\Server::get(RateLimitingPlugin::class));
-			$this->server->addPlugin(\OCP\Server::get(CalDavValidatePlugin::class));
-		}
-
-		// addressbook plugins
-		if ($this->requestIsForSubtree(['addressbooks', 'principals'])) {
-			$this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OCP\Server::get(IRequest::class), \OCP\Server::get(IConfig::class)));
-			$this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
-			$this->server->addPlugin(new VCFExportPlugin());
-			$this->server->addPlugin(new MultiGetExportPlugin());
-			$this->server->addPlugin(new HasPhotoPlugin());
-			$this->server->addPlugin(new ImageExportPlugin(\OCP\Server::get(PhotoCache::class)));
-
-			$this->server->addPlugin(\OCP\Server::get(CardDavRateLimitingPlugin::class));
-			$this->server->addPlugin(\OCP\Server::get(CardDavValidatePlugin::class));
-		}
-
-		// system tags plugins
-		$this->server->addPlugin(\OCP\Server::get(SystemTagPlugin::class));
-
-		// comments plugin
-		$this->server->addPlugin(new CommentsPlugin(
-			\OCP\Server::get(ICommentsManager::class),
-			\OCP\Server::get(IUserSession::class)
-		));
-
-		$this->server->addPlugin(new CopyEtagHeaderPlugin());
-		$this->server->addPlugin(new RequestIdHeaderPlugin(\OCP\Server::get(IRequest::class)));
-		$this->server->addPlugin(new UploadAutoMkcolPlugin());
-		$this->server->addPlugin(new ChunkingV2Plugin(\OCP\Server::get(ICacheFactory::class)));
-		$this->server->addPlugin(new ChunkingPlugin());
-		$this->server->addPlugin(new ZipFolderPlugin(
-			$this->server->tree,
-			$logger,
-			$eventDispatcher,
-		));
-		$this->server->addPlugin(\OCP\Server::get(PaginatePlugin::class));
-
-		// allow setup of additional plugins
-		$eventDispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
-		$typedEvent = new SabrePluginAddEvent($this->server);
-		$eventDispatcher->dispatchTyped($typedEvent);
-
-		// 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/',// Microsoft-WebDAV-MiniRedir/6.1.7601
-		])) {
-			$this->server->addPlugin(new FakeLockerPlugin());
-		}
-
-		if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
-			$this->server->addPlugin(new BrowserErrorPagePlugin());
-		}
-
-		$lazySearchBackend = new LazySearchBackend();
-		$this->server->addPlugin(new SearchPlugin($lazySearchBackend));
-
-		// wait with registering these until auth is handled and the filesystem is setup
-		$this->server->on('beforeMethod:*', function () use ($root, $lazySearchBackend, $logger): void {
-			// Allow view-only plugin for webdav requests
-			$this->server->addPlugin(new ViewOnlyPlugin(
-				\OC::$server->getUserFolder(),
-			));
-
-			// custom properties plugin must be the last one
-			$userSession = \OCP\Server::get(IUserSession::class);
-			$user = $userSession->getUser();
-			if ($user !== null) {
-				$view = Filesystem::getView();
-				$config = \OCP\Server::get(IConfig::class);
-				$this->server->addPlugin(
-					new FilesPlugin(
-						$this->server->tree,
-						$config,
-						$this->request,
-						\OCP\Server::get(IPreview::class),
-						\OCP\Server::get(IUserSession::class),
-						\OCP\Server::get(IFilenameValidator::class),
-						\OCP\Server::get(IAccountManager::class),
-						false,
-						$config->getSystemValueBool('debug', false) === false,
-					)
-				);
-				$this->server->addPlugin(new ChecksumUpdatePlugin());
-
-				$this->server->addPlugin(
-					new \Sabre\DAV\PropertyStorage\Plugin(
-						new CustomPropertiesBackend(
-							$this->server,
-							$this->server->tree,
-							\OCP\Server::get(IDBConnection::class),
-							\OCP\Server::get(IUserSession::class)->getUser(),
-							\OCP\Server::get(DefaultCalendarValidator::class),
-						)
-					)
-				);
-				if ($view !== null) {
-					$this->server->addPlugin(
-						new QuotaPlugin($view));
-				}
-				$this->server->addPlugin(
-					new TagsPlugin(
-						$this->server->tree, \OCP\Server::get(ITagManager::class), \OCP\Server::get(IEventDispatcher::class), \OCP\Server::get(IUserSession::class)
-					)
-				);
-
-				// TODO: switch to LazyUserFolder
-				$userFolder = \OC::$server->getUserFolder();
-				$shareManager = \OCP\Server::get(\OCP\Share\IManager::class);
-				$this->server->addPlugin(new SharesPlugin(
-					$this->server->tree,
-					$userSession,
-					$userFolder,
-					$shareManager,
-				));
-				$this->server->addPlugin(new CommentPropertiesPlugin(
-					\OCP\Server::get(ICommentsManager::class),
-					$userSession
-				));
-				if (\OCP\Server::get(IConfig::class)->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') {
-					$this->server->addPlugin(new IMipPlugin(
-						\OCP\Server::get(IAppConfig::class),
-						\OCP\Server::get(IMailer::class),
-						\OCP\Server::get(LoggerInterface::class),
-						\OCP\Server::get(ITimeFactory::class),
-						\OCP\Server::get(Defaults::class),
-						$userSession,
-						\OCP\Server::get(IMipService::class),
-						\OCP\Server::get(EventComparisonService::class),
-						\OCP\Server::get(\OCP\Mail\Provider\IManager::class)
-					));
-				}
-				$this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
-				if ($view !== null) {
-					$this->server->addPlugin(new FilesReportPlugin(
-						$this->server->tree,
-						$view,
-						\OCP\Server::get(ISystemTagManager::class),
-						\OCP\Server::get(ISystemTagObjectMapper::class),
-						\OCP\Server::get(ITagManager::class),
-						$userSession,
-						\OCP\Server::get(IGroupManager::class),
-						$userFolder,
-						\OCP\Server::get(IAppManager::class)
-					));
-					$lazySearchBackend->setBackend(new FileSearchBackend(
-						$this->server,
-						$this->server->tree,
-						$user,
-						\OCP\Server::get(IRootFolder::class),
-						$shareManager,
-						$view,
-						\OCP\Server::get(IFilesMetadataManager::class)
-					));
-					$this->server->addPlugin(
-						new BulkUploadPlugin(
-							$userFolder,
-							$logger
-						)
-					);
-				}
-				$this->server->addPlugin(new EnablePlugin(
-					\OCP\Server::get(IConfig::class),
-					\OCP\Server::get(BirthdayService::class),
-					$user
-				));
-				$this->server->addPlugin(new AppleProvisioningPlugin(
-					\OCP\Server::get(IUserSession::class),
-					\OCP\Server::get(IURLGenerator::class),
-					\OCP\Server::get(ThemingDefaults::class),
-					\OCP\Server::get(IRequest::class),
-					\OC::$server->getL10N('dav'),
-					function () {
-						return UUIDUtil::getUUID();
-					}
-				));
-			}
-
-			// register plugins from apps
-			$pluginManager = new PluginManager(
-				\OC::$server,
-				\OCP\Server::get(IAppManager::class)
-			);
-			foreach ($pluginManager->getAppPlugins() as $appPlugin) {
-				$this->server->addPlugin($appPlugin);
-			}
-			foreach ($pluginManager->getAppCollections() as $appCollection) {
-				$root->addChild($appCollection);
-			}
-		});
-
-		$this->server->addPlugin(
-			new PropfindCompressionPlugin()
-		);
-	}
-
-	public function exec() {
-		/** @var IEventLogger $eventLogger */
-		$eventLogger = \OCP\Server::get(IEventLogger::class);
-		$eventLogger->start('dav_server_exec', '');
-		$this->server->start();
-		$eventLogger->end('dav_server_exec');
-		if ($this->profiler->isEnabled()) {
-			$eventLogger->end('runtime');
-			$profile = $this->profiler->collect(\OCP\Server::get(IRequest::class), new Response());
-			$this->profiler->saveProfile($profile);
-		}
-	}
-
-	private function requestIsForSubtree(array $subTrees): bool {
-		foreach ($subTrees as $subTree) {
-			$subTree = trim($subTree, ' /');
-			if (str_starts_with($this->server->getRequestUri(), $subTree . '/')) {
-				return true;
-			}
-		}
-		return false;
-	}
+    public Connector\Sabre\Server $server;
+    private IProfiler $profiler;
+
+    public function __construct(
+        private IRequest $request,
+        private string $baseUri,
+    ) {
+        $this->profiler = \OCP\Server::get(IProfiler::class);
+        if ($this->profiler->isEnabled()) {
+            /** @var IEventLogger $eventLogger */
+            $eventLogger = \OCP\Server::get(IEventLogger::class);
+            $eventLogger->start('runtime', 'DAV Runtime');
+        }
+
+        $logger = \OCP\Server::get(LoggerInterface::class);
+        $eventDispatcher = \OCP\Server::get(IEventDispatcher::class);
+
+        $root = new RootCollection();
+        $this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
+
+        // Add maintenance plugin
+        $this->server->addPlugin(new MaintenancePlugin(\OCP\Server::get(IConfig::class), \OC::$server->getL10N('dav')));
+
+        $this->server->addPlugin(new AppleQuirksPlugin());
+
+        // Backends
+        $authBackend = new Auth(
+            \OCP\Server::get(ISession::class),
+            \OCP\Server::get(IUserSession::class),
+            \OCP\Server::get(IRequest::class),
+            \OCP\Server::get(\OC\Authentication\TwoFactorAuth\Manager::class),
+            \OCP\Server::get(IThrottler::class)
+        );
+
+        // Set URL explicitly due to reverse-proxy situations
+        $this->server->httpRequest->setUrl($this->request->getRequestUri());
+        $this->server->setBaseUri($this->baseUri);
+
+        $this->server->addPlugin(new ProfilerPlugin($this->request));
+        $this->server->addPlugin(new BlockLegacyClientPlugin(
+            \OCP\Server::get(IConfig::class),
+            \OCP\Server::get(ThemingDefaults::class),
+        ));
+        $this->server->addPlugin(new AnonymousOptionsPlugin());
+        $authPlugin = new Plugin();
+        $authPlugin->addBackend(new PublicAuth());
+        $this->server->addPlugin($authPlugin);
+
+        // allow setup of additional auth backends
+        $event = new SabrePluginEvent($this->server);
+        $eventDispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
+
+        $newAuthEvent = new SabrePluginAuthInitEvent($this->server);
+        $eventDispatcher->dispatchTyped($newAuthEvent);
+
+        $bearerAuthBackend = new BearerAuth(
+            \OCP\Server::get(IUserSession::class),
+            \OCP\Server::get(ISession::class),
+            \OCP\Server::get(IRequest::class),
+            \OCP\Server::get(IConfig::class),
+        );
+        $authPlugin->addBackend($bearerAuthBackend);
+        // because we are throwing exceptions this plugin has to be the last one
+        $authPlugin->addBackend($authBackend);
+
+        // debugging
+        if (\OCP\Server::get(IConfig::class)->getSystemValue('debug', false)) {
+            $this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
+        } else {
+            $this->server->addPlugin(new DummyGetResponsePlugin());
+        }
+
+        $this->server->addPlugin(new ExceptionLoggerPlugin('webdav', $logger));
+        $this->server->addPlugin(new LockPlugin());
+        $this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
+
+        // acl
+        $acl = new DavAclPlugin();
+        $acl->principalCollectionSet = [
+            'principals/users',
+            'principals/groups',
+            'principals/calendar-resources',
+            'principals/calendar-rooms',
+        ];
+        $this->server->addPlugin($acl);
+
+        // calendar plugins
+        if ($this->requestIsForSubtree(['calendars', 'public-calendars', 'system-calendars', 'principals'])) {
+            $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OCP\Server::get(IRequest::class), \OCP\Server::get(IConfig::class)));
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
+            $this->server->addPlugin(new ICSExportPlugin(\OCP\Server::get(IConfig::class), $logger));
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin(\OCP\Server::get(IConfig::class), \OCP\Server::get(LoggerInterface::class), \OCP\Server::get(DefaultCalendarValidator::class)));
+
+            $this->server->addPlugin(\OCP\Server::get(\OCA\DAV\CalDAV\Trashbin\Plugin::class));
+            $this->server->addPlugin(new \OCA\DAV\CalDAV\WebcalCaching\Plugin($this->request));
+            if (\OCP\Server::get(IConfig::class)->getAppValue('dav', 'allow_calendar_link_subscriptions', 'yes') === 'yes') {
+                $this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
+            }
+
+            $this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
+            $this->server->addPlugin(new PublishPlugin(
+                \OCP\Server::get(IConfig::class),
+                \OCP\Server::get(IURLGenerator::class)
+            ));
+
+            $this->server->addPlugin(\OCP\Server::get(RateLimitingPlugin::class));
+            $this->server->addPlugin(\OCP\Server::get(CalDavValidatePlugin::class));
+        }
+
+        // addressbook plugins
+        if ($this->requestIsForSubtree(['addressbooks', 'principals'])) {
+            $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OCP\Server::get(IRequest::class), \OCP\Server::get(IConfig::class)));
+            $this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
+            $this->server->addPlugin(new VCFExportPlugin());
+            $this->server->addPlugin(new MultiGetExportPlugin());
+            $this->server->addPlugin(new HasPhotoPlugin());
+            $this->server->addPlugin(new ImageExportPlugin(\OCP\Server::get(PhotoCache::class)));
+
+            $this->server->addPlugin(\OCP\Server::get(CardDavRateLimitingPlugin::class));
+            $this->server->addPlugin(\OCP\Server::get(CardDavValidatePlugin::class));
+        }
+
+        // system tags plugins
+        $this->server->addPlugin(\OCP\Server::get(SystemTagPlugin::class));
+
+        // comments plugin
+        $this->server->addPlugin(new CommentsPlugin(
+            \OCP\Server::get(ICommentsManager::class),
+            \OCP\Server::get(IUserSession::class)
+        ));
+
+        $this->server->addPlugin(new CopyEtagHeaderPlugin());
+        $this->server->addPlugin(new RequestIdHeaderPlugin(\OCP\Server::get(IRequest::class)));
+        $this->server->addPlugin(new UploadAutoMkcolPlugin());
+        $this->server->addPlugin(new ChunkingV2Plugin(\OCP\Server::get(ICacheFactory::class)));
+        $this->server->addPlugin(new ChunkingPlugin());
+        $this->server->addPlugin(new ZipFolderPlugin(
+            $this->server->tree,
+            $logger,
+            $eventDispatcher,
+        ));
+        $this->server->addPlugin(\OCP\Server::get(PaginatePlugin::class));
+
+        // allow setup of additional plugins
+        $eventDispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
+        $typedEvent = new SabrePluginAddEvent($this->server);
+        $eventDispatcher->dispatchTyped($typedEvent);
+
+        // 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/',// Microsoft-WebDAV-MiniRedir/6.1.7601
+        ])) {
+            $this->server->addPlugin(new FakeLockerPlugin());
+        }
+
+        if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
+            $this->server->addPlugin(new BrowserErrorPagePlugin());
+        }
+
+        $lazySearchBackend = new LazySearchBackend();
+        $this->server->addPlugin(new SearchPlugin($lazySearchBackend));
+
+        // wait with registering these until auth is handled and the filesystem is setup
+        $this->server->on('beforeMethod:*', function () use ($root, $lazySearchBackend, $logger): void {
+            // Allow view-only plugin for webdav requests
+            $this->server->addPlugin(new ViewOnlyPlugin(
+                \OC::$server->getUserFolder(),
+            ));
+
+            // custom properties plugin must be the last one
+            $userSession = \OCP\Server::get(IUserSession::class);
+            $user = $userSession->getUser();
+            if ($user !== null) {
+                $view = Filesystem::getView();
+                $config = \OCP\Server::get(IConfig::class);
+                $this->server->addPlugin(
+                    new FilesPlugin(
+                        $this->server->tree,
+                        $config,
+                        $this->request,
+                        \OCP\Server::get(IPreview::class),
+                        \OCP\Server::get(IUserSession::class),
+                        \OCP\Server::get(IFilenameValidator::class),
+                        \OCP\Server::get(IAccountManager::class),
+                        false,
+                        $config->getSystemValueBool('debug', false) === false,
+                    )
+                );
+                $this->server->addPlugin(new ChecksumUpdatePlugin());
+
+                $this->server->addPlugin(
+                    new \Sabre\DAV\PropertyStorage\Plugin(
+                        new CustomPropertiesBackend(
+                            $this->server,
+                            $this->server->tree,
+                            \OCP\Server::get(IDBConnection::class),
+                            \OCP\Server::get(IUserSession::class)->getUser(),
+                            \OCP\Server::get(DefaultCalendarValidator::class),
+                        )
+                    )
+                );
+                if ($view !== null) {
+                    $this->server->addPlugin(
+                        new QuotaPlugin($view));
+                }
+                $this->server->addPlugin(
+                    new TagsPlugin(
+                        $this->server->tree, \OCP\Server::get(ITagManager::class), \OCP\Server::get(IEventDispatcher::class), \OCP\Server::get(IUserSession::class)
+                    )
+                );
+
+                // TODO: switch to LazyUserFolder
+                $userFolder = \OC::$server->getUserFolder();
+                $shareManager = \OCP\Server::get(\OCP\Share\IManager::class);
+                $this->server->addPlugin(new SharesPlugin(
+                    $this->server->tree,
+                    $userSession,
+                    $userFolder,
+                    $shareManager,
+                ));
+                $this->server->addPlugin(new CommentPropertiesPlugin(
+                    \OCP\Server::get(ICommentsManager::class),
+                    $userSession
+                ));
+                if (\OCP\Server::get(IConfig::class)->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') {
+                    $this->server->addPlugin(new IMipPlugin(
+                        \OCP\Server::get(IAppConfig::class),
+                        \OCP\Server::get(IMailer::class),
+                        \OCP\Server::get(LoggerInterface::class),
+                        \OCP\Server::get(ITimeFactory::class),
+                        \OCP\Server::get(Defaults::class),
+                        $userSession,
+                        \OCP\Server::get(IMipService::class),
+                        \OCP\Server::get(EventComparisonService::class),
+                        \OCP\Server::get(\OCP\Mail\Provider\IManager::class)
+                    ));
+                }
+                $this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
+                if ($view !== null) {
+                    $this->server->addPlugin(new FilesReportPlugin(
+                        $this->server->tree,
+                        $view,
+                        \OCP\Server::get(ISystemTagManager::class),
+                        \OCP\Server::get(ISystemTagObjectMapper::class),
+                        \OCP\Server::get(ITagManager::class),
+                        $userSession,
+                        \OCP\Server::get(IGroupManager::class),
+                        $userFolder,
+                        \OCP\Server::get(IAppManager::class)
+                    ));
+                    $lazySearchBackend->setBackend(new FileSearchBackend(
+                        $this->server,
+                        $this->server->tree,
+                        $user,
+                        \OCP\Server::get(IRootFolder::class),
+                        $shareManager,
+                        $view,
+                        \OCP\Server::get(IFilesMetadataManager::class)
+                    ));
+                    $this->server->addPlugin(
+                        new BulkUploadPlugin(
+                            $userFolder,
+                            $logger
+                        )
+                    );
+                }
+                $this->server->addPlugin(new EnablePlugin(
+                    \OCP\Server::get(IConfig::class),
+                    \OCP\Server::get(BirthdayService::class),
+                    $user
+                ));
+                $this->server->addPlugin(new AppleProvisioningPlugin(
+                    \OCP\Server::get(IUserSession::class),
+                    \OCP\Server::get(IURLGenerator::class),
+                    \OCP\Server::get(ThemingDefaults::class),
+                    \OCP\Server::get(IRequest::class),
+                    \OC::$server->getL10N('dav'),
+                    function () {
+                        return UUIDUtil::getUUID();
+                    }
+                ));
+            }
+
+            // register plugins from apps
+            $pluginManager = new PluginManager(
+                \OC::$server,
+                \OCP\Server::get(IAppManager::class)
+            );
+            foreach ($pluginManager->getAppPlugins() as $appPlugin) {
+                $this->server->addPlugin($appPlugin);
+            }
+            foreach ($pluginManager->getAppCollections() as $appCollection) {
+                $root->addChild($appCollection);
+            }
+        });
+
+        $this->server->addPlugin(
+            new PropfindCompressionPlugin()
+        );
+    }
+
+    public function exec() {
+        /** @var IEventLogger $eventLogger */
+        $eventLogger = \OCP\Server::get(IEventLogger::class);
+        $eventLogger->start('dav_server_exec', '');
+        $this->server->start();
+        $eventLogger->end('dav_server_exec');
+        if ($this->profiler->isEnabled()) {
+            $eventLogger->end('runtime');
+            $profile = $this->profiler->collect(\OCP\Server::get(IRequest::class), new Response());
+            $this->profiler->saveProfile($profile);
+        }
+    }
+
+    private function requestIsForSubtree(array $subTrees): bool {
+        foreach ($subTrees as $subTree) {
+            $subTree = trim($subTree, ' /');
+            if (str_starts_with($this->server->getRequestUri(), $subTree . '/')) {
+                return true;
+            }
+        }
+        return false;
+    }
 
 }

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

Indentation +175 added lines, -175 removed lines

@@ -28,179 +28,179 @@
 use Sabre\HTTP\ResponseInterface;
 
 class Auth extends AbstractBasic {
-	public const DAV_AUTHENTICATED = 'AUTHENTICATED_TO_DAV_BACKEND';
-	private ?string $currentUser = null;
-
-	public function __construct(
-		private ISession $session,
-		private Session $userSession,
-		private IRequest $request,
-		private Manager $twoFactorManager,
-		private IThrottler $throttler,
-		string $principalPrefix = 'principals/users/',
-	) {
-		$this->principalPrefix = $principalPrefix;
-
-		// setup realm
-		$defaults = new Defaults();
-		$this->realm = $defaults->getName() ?: 'Nextcloud';
-	}
-
-	/**
-	 * Whether the user has initially authenticated via DAV
-	 *
-	 * This is required for WebDAV clients that resent the cookies even when the
-	 * account was changed.
-	 *
-	 * @see https://github.com/owncloud/core/issues/13245
-	 */
-	public function isDavAuthenticated(string $username): bool {
-		return !is_null($this->session->get(self::DAV_AUTHENTICATED))
-		&& $this->session->get(self::DAV_AUTHENTICATED) === $username;
-	}
-
-	/**
-	 * Validates a username and password
-	 *
-	 * This method should return true or false depending on if login
-	 * succeeded.
-	 *
-	 * @param string $username
-	 * @param string $password
-	 * @return bool
-	 * @throws PasswordLoginForbidden
-	 */
-	protected function validateUserPass($username, $password) {
-		if ($this->userSession->isLoggedIn()
-			&& $this->isDavAuthenticated($this->userSession->getUser()->getUID())
-		) {
-			$this->session->close();
-			return true;
-		} else {
-			try {
-				if ($this->userSession->logClientIn($username, $password, $this->request, $this->throttler)) {
-					$this->session->set(self::DAV_AUTHENTICATED, $this->userSession->getUser()->getUID());
-					$this->session->close();
-					return true;
-				} else {
-					$this->session->close();
-					return false;
-				}
-			} catch (PasswordLoginForbiddenException $ex) {
-				$this->session->close();
-				throw new PasswordLoginForbidden();
-			} catch (MaxDelayReached $ex) {
-				$this->session->close();
-				throw new TooManyRequests();
-			}
-		}
-	}
-
-	/**
-	 * @return array{bool, string}
-	 * @throws NotAuthenticated
-	 * @throws ServiceUnavailable
-	 */
-	public function check(RequestInterface $request, ResponseInterface $response) {
-		try {
-			return $this->auth($request, $response);
-		} catch (NotAuthenticated $e) {
-			throw $e;
-		} catch (Exception $e) {
-			$class = get_class($e);
-			$msg = $e->getMessage();
-			Server::get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
-			throw new ServiceUnavailable("$class: $msg");
-		}
-	}
-
-	/**
-	 * Checks whether a CSRF check is required on the request
-	 */
-	private function requiresCSRFCheck(): bool {
-
-		$methodsWithoutCsrf = ['GET', 'HEAD', 'OPTIONS'];
-		if (in_array($this->request->getMethod(), $methodsWithoutCsrf)) {
-			return false;
-		}
-
-		// Official Nextcloud clients require no checks
-		if ($this->request->isUserAgent([
-			IRequest::USER_AGENT_CLIENT_DESKTOP,
-			IRequest::USER_AGENT_CLIENT_ANDROID,
-			IRequest::USER_AGENT_CLIENT_IOS,
-		])) {
-			return false;
-		}
-
-		// If not logged-in no check is required
-		if (!$this->userSession->isLoggedIn()) {
-			return false;
-		}
-
-		// POST always requires a check
-		if ($this->request->getMethod() === 'POST') {
-			return true;
-		}
-
-		// If logged-in AND DAV authenticated no check is required
-		if ($this->userSession->isLoggedIn()
-			&& $this->isDavAuthenticated($this->userSession->getUser()->getUID())) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @return array{bool, string}
-	 * @throws NotAuthenticated
-	 */
-	private function auth(RequestInterface $request, ResponseInterface $response): array {
-		$forcedLogout = false;
-
-		if (!$this->request->passesCSRFCheck()
-			&& $this->requiresCSRFCheck()) {
-			// In case of a fail with POST we need to recheck the credentials
-			if ($this->request->getMethod() === 'POST') {
-				$forcedLogout = true;
-			} else {
-				$response->setStatus(Http::STATUS_UNAUTHORIZED);
-				throw new \Sabre\DAV\Exception\NotAuthenticated('CSRF check not passed.');
-			}
-		}
-
-		if ($forcedLogout) {
-			$this->userSession->logout();
-		} else {
-			if ($this->twoFactorManager->needsSecondFactor($this->userSession->getUser())) {
-				throw new \Sabre\DAV\Exception\NotAuthenticated('2FA challenge not passed.');
-			}
-			if (
-				//Fix for broken webdav clients
-				($this->userSession->isLoggedIn() && is_null($this->session->get(self::DAV_AUTHENTICATED)))
-				//Well behaved clients that only send the cookie are allowed
-				|| ($this->userSession->isLoggedIn() && $this->session->get(self::DAV_AUTHENTICATED) === $this->userSession->getUser()->getUID() && empty($request->getHeader('Authorization')))
-				|| \OC_User::handleApacheAuth()
-			) {
-				$user = $this->userSession->getUser()->getUID();
-				$this->currentUser = $user;
-				$this->session->close();
-				return [true, $this->principalPrefix . $user];
-			}
-		}
-
-		$data = parent::check($request, $response);
-		if ($data[0] === true) {
-			$startPos = strrpos($data[1], '/') + 1;
-			$user = $this->userSession->getUser()->getUID();
-			$data[1] = substr_replace($data[1], $user, $startPos);
-		} elseif (in_array('XMLHttpRequest', explode(',', $request->getHeader('X-Requested-With') ?? ''))) {
-			// For ajax requests use dummy auth name to prevent browser popup in case of invalid creditials
-			$response->addHeader('WWW-Authenticate', 'DummyBasic realm="' . $this->realm . '"');
-			$response->setStatus(Http::STATUS_UNAUTHORIZED);
-			throw new \Sabre\DAV\Exception\NotAuthenticated('Cannot authenticate over ajax calls');
-		}
-		return $data;
-	}
+    public const DAV_AUTHENTICATED = 'AUTHENTICATED_TO_DAV_BACKEND';
+    private ?string $currentUser = null;
+
+    public function __construct(
+        private ISession $session,
+        private Session $userSession,
+        private IRequest $request,
+        private Manager $twoFactorManager,
+        private IThrottler $throttler,
+        string $principalPrefix = 'principals/users/',
+    ) {
+        $this->principalPrefix = $principalPrefix;
+
+        // setup realm
+        $defaults = new Defaults();
+        $this->realm = $defaults->getName() ?: 'Nextcloud';
+    }
+
+    /**
+     * Whether the user has initially authenticated via DAV
+     *
+     * This is required for WebDAV clients that resent the cookies even when the
+     * account was changed.
+     *
+     * @see https://github.com/owncloud/core/issues/13245
+     */
+    public function isDavAuthenticated(string $username): bool {
+        return !is_null($this->session->get(self::DAV_AUTHENTICATED))
+        && $this->session->get(self::DAV_AUTHENTICATED) === $username;
+    }
+
+    /**
+     * Validates a username and password
+     *
+     * This method should return true or false depending on if login
+     * succeeded.
+     *
+     * @param string $username
+     * @param string $password
+     * @return bool
+     * @throws PasswordLoginForbidden
+     */
+    protected function validateUserPass($username, $password) {
+        if ($this->userSession->isLoggedIn()
+            && $this->isDavAuthenticated($this->userSession->getUser()->getUID())
+        ) {
+            $this->session->close();
+            return true;
+        } else {
+            try {
+                if ($this->userSession->logClientIn($username, $password, $this->request, $this->throttler)) {
+                    $this->session->set(self::DAV_AUTHENTICATED, $this->userSession->getUser()->getUID());
+                    $this->session->close();
+                    return true;
+                } else {
+                    $this->session->close();
+                    return false;
+                }
+            } catch (PasswordLoginForbiddenException $ex) {
+                $this->session->close();
+                throw new PasswordLoginForbidden();
+            } catch (MaxDelayReached $ex) {
+                $this->session->close();
+                throw new TooManyRequests();
+            }
+        }
+    }
+
+    /**
+     * @return array{bool, string}
+     * @throws NotAuthenticated
+     * @throws ServiceUnavailable
+     */
+    public function check(RequestInterface $request, ResponseInterface $response) {
+        try {
+            return $this->auth($request, $response);
+        } catch (NotAuthenticated $e) {
+            throw $e;
+        } catch (Exception $e) {
+            $class = get_class($e);
+            $msg = $e->getMessage();
+            Server::get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
+            throw new ServiceUnavailable("$class: $msg");
+        }
+    }
+
+    /**
+     * Checks whether a CSRF check is required on the request
+     */
+    private function requiresCSRFCheck(): bool {
+
+        $methodsWithoutCsrf = ['GET', 'HEAD', 'OPTIONS'];
+        if (in_array($this->request->getMethod(), $methodsWithoutCsrf)) {
+            return false;
+        }
+
+        // Official Nextcloud clients require no checks
+        if ($this->request->isUserAgent([
+            IRequest::USER_AGENT_CLIENT_DESKTOP,
+            IRequest::USER_AGENT_CLIENT_ANDROID,
+            IRequest::USER_AGENT_CLIENT_IOS,
+        ])) {
+            return false;
+        }
+
+        // If not logged-in no check is required
+        if (!$this->userSession->isLoggedIn()) {
+            return false;
+        }
+
+        // POST always requires a check
+        if ($this->request->getMethod() === 'POST') {
+            return true;
+        }
+
+        // If logged-in AND DAV authenticated no check is required
+        if ($this->userSession->isLoggedIn()
+            && $this->isDavAuthenticated($this->userSession->getUser()->getUID())) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @return array{bool, string}
+     * @throws NotAuthenticated
+     */
+    private function auth(RequestInterface $request, ResponseInterface $response): array {
+        $forcedLogout = false;
+
+        if (!$this->request->passesCSRFCheck()
+            && $this->requiresCSRFCheck()) {
+            // In case of a fail with POST we need to recheck the credentials
+            if ($this->request->getMethod() === 'POST') {
+                $forcedLogout = true;
+            } else {
+                $response->setStatus(Http::STATUS_UNAUTHORIZED);
+                throw new \Sabre\DAV\Exception\NotAuthenticated('CSRF check not passed.');
+            }
+        }
+
+        if ($forcedLogout) {
+            $this->userSession->logout();
+        } else {
+            if ($this->twoFactorManager->needsSecondFactor($this->userSession->getUser())) {
+                throw new \Sabre\DAV\Exception\NotAuthenticated('2FA challenge not passed.');
+            }
+            if (
+                //Fix for broken webdav clients
+                ($this->userSession->isLoggedIn() && is_null($this->session->get(self::DAV_AUTHENTICATED)))
+                //Well behaved clients that only send the cookie are allowed
+                || ($this->userSession->isLoggedIn() && $this->session->get(self::DAV_AUTHENTICATED) === $this->userSession->getUser()->getUID() && empty($request->getHeader('Authorization')))
+                || \OC_User::handleApacheAuth()
+            ) {
+                $user = $this->userSession->getUser()->getUID();
+                $this->currentUser = $user;
+                $this->session->close();
+                return [true, $this->principalPrefix . $user];
+            }
+        }
+
+        $data = parent::check($request, $response);
+        if ($data[0] === true) {
+            $startPos = strrpos($data[1], '/') + 1;
+            $user = $this->userSession->getUser()->getUID();
+            $data[1] = substr_replace($data[1], $user, $startPos);
+        } elseif (in_array('XMLHttpRequest', explode(',', $request->getHeader('X-Requested-With') ?? ''))) {
+            // For ajax requests use dummy auth name to prevent browser popup in case of invalid creditials
+            $response->addHeader('WWW-Authenticate', 'DummyBasic realm="' . $this->realm . '"');
+            $response->setStatus(Http::STATUS_UNAUTHORIZED);
+            throw new \Sabre\DAV\Exception\NotAuthenticated('Cannot authenticate over ajax calls');
+        }
+        return $data;
+    }
 }