nextcloud / server

build/integration/features/bootstrap/Avatar.php

Indentation +205 added lines, -205 removed lines

@@ -9,209 +9,209 @@
 require __DIR__ . '/../../vendor/autoload.php';
 
 trait Avatar {
-	/** @var string * */
-	private $lastAvatar;
-
-	/** @AfterScenario **/
-	public function cleanupLastAvatar() {
-		$this->lastAvatar = null;
-	}
-
-	private function getLastAvatar() {
-		$this->lastAvatar = '';
-
-		$body = $this->response->getBody();
-		while (!$body->eof()) {
-			$this->lastAvatar .= $body->read(8192);
-		}
-		$body->close();
-	}
-
-	/**
-	 * @When user :user gets avatar for user :userAvatar
-	 *
-	 * @param string $user
-	 * @param string $userAvatar
-	 */
-	public function userGetsAvatarForUser(string $user, string $userAvatar) {
-		$this->userGetsAvatarForUserWithSize($user, $userAvatar, '128');
-	}
-
-	/**
-	 * @When user :user gets avatar for user :userAvatar with size :size
-	 *
-	 * @param string $user
-	 * @param string $userAvatar
-	 * @param string $size
-	 */
-	public function userGetsAvatarForUserWithSize(string $user, string $userAvatar, string $size) {
-		$this->asAn($user);
-		$this->sendingToDirectUrl('GET', '/index.php/avatar/' . $userAvatar . '/' . $size);
-		$this->theHTTPStatusCodeShouldBe('200');
-
-		$this->getLastAvatar();
-	}
-
-	/**
-	 * @When user :user gets avatar for guest :guestAvatar
-	 *
-	 * @param string $user
-	 * @param string $guestAvatar
-	 */
-	public function userGetsAvatarForGuest(string $user, string $guestAvatar) {
-		$this->asAn($user);
-		$this->sendingToDirectUrl('GET', '/index.php/avatar/guest/' . $guestAvatar . '/128');
-		$this->theHTTPStatusCodeShouldBe('201');
-
-		$this->getLastAvatar();
-	}
-
-	/**
-	 * @When logged in user posts avatar from file :source
-	 *
-	 * @param string $source
-	 */
-	public function loggedInUserPostsAvatarFromFile(string $source) {
-		$file = \GuzzleHttp\Psr7\Utils::streamFor(fopen($source, 'r'));
-
-		$this->sendingAToWithRequesttoken('POST', '/index.php/avatar',
-			[
-				'multipart' => [
-					[
-						'name' => 'files[]',
-						'contents' => $file
-					]
-				]
-			]);
-		$this->theHTTPStatusCodeShouldBe('200');
-	}
-
-	/**
-	 * @When logged in user posts avatar from internal path :path
-	 *
-	 * @param string $path
-	 */
-	public function loggedInUserPostsAvatarFromInternalPath(string $path) {
-		$this->sendingAToWithRequesttoken('POST', '/index.php/avatar?path=' . $path);
-		$this->theHTTPStatusCodeShouldBe('200');
-	}
-
-	/**
-	 * @When logged in user deletes the user avatar
-	 */
-	public function loggedInUserDeletesTheUserAvatar() {
-		$this->sendingAToWithRequesttoken('DELETE', '/index.php/avatar');
-		$this->theHTTPStatusCodeShouldBe('200');
-	}
-
-	/**
-	 * @Then last avatar is a square of size :size
-	 *
-	 * @param string size
-	 */
-	public function lastAvatarIsASquareOfSize(string $size) {
-		[$width, $height] = getimagesizefromstring($this->lastAvatar);
-
-		Assert::assertEquals($width, $height, 'Expected avatar to be a square');
-		Assert::assertEquals($size, $width);
-	}
-
-	/**
-	 * @Then last avatar is not a square
-	 */
-	public function lastAvatarIsNotASquare() {
-		[$width, $height] = getimagesizefromstring($this->lastAvatar);
-
-		Assert::assertNotEquals($width, $height, 'Expected avatar to not be a square');
-	}
-
-	/**
-	 * @Then last avatar is not a single color
-	 */
-	public function lastAvatarIsNotASingleColor() {
-		Assert::assertEquals(null, $this->getColorFromLastAvatar());
-	}
-
-	/**
-	 * @Then last avatar is a single :color color
-	 *
-	 * @param string $color
-	 * @param string $size
-	 */
-	public function lastAvatarIsASingleColor(string $color) {
-		$expectedColor = $this->hexStringToRgbColor($color);
-		$colorFromLastAvatar = $this->getColorFromLastAvatar();
-
-		Assert::assertTrue($this->isSameColor($expectedColor, $colorFromLastAvatar),
-			$this->rgbColorToHexString($colorFromLastAvatar) . ' does not match expected ' . $color);
-	}
-
-	private function hexStringToRgbColor($hexString) {
-		// Strip initial "#"
-		$hexString = substr($hexString, 1);
-
-		$rgbColorInt = hexdec($hexString);
-
-		// RGBA hex strings are not supported; the given string is assumed to be
-		// an RGB hex string.
-		return [
-			'red' => ($rgbColorInt >> 16) & 0xFF,
-			'green' => ($rgbColorInt >> 8) & 0xFF,
-			'blue' => $rgbColorInt & 0xFF,
-			'alpha' => 0
-		];
-	}
-
-	private function rgbColorToHexString($rgbColor) {
-		$rgbColorInt = ($rgbColor['red'] << 16) + ($rgbColor['green'] << 8) + ($rgbColor['blue']);
-
-		return '#' . str_pad(strtoupper(dechex($rgbColorInt)), 6, '0', STR_PAD_LEFT);
-	}
-
-	private function getColorFromLastAvatar() {
-		$image = imagecreatefromstring($this->lastAvatar);
-
-		$firstPixelColorIndex = imagecolorat($image, 0, 0);
-		$firstPixelColor = imagecolorsforindex($image, $firstPixelColorIndex);
-
-		for ($i = 0; $i < imagesx($image); $i++) {
-			for ($j = 0; $j < imagesx($image); $j++) {
-				$currentPixelColorIndex = imagecolorat($image, $i, $j);
-				$currentPixelColor = imagecolorsforindex($image, $currentPixelColorIndex);
-
-				// The colors are compared with a small allowed delta, as even
-				// on solid color images the resizing can cause some small
-				// artifacts that slightly modify the color of certain pixels.
-				if (!$this->isSameColor($firstPixelColor, $currentPixelColor)) {
-					imagedestroy($image);
-
-					return null;
-				}
-			}
-		}
-
-		imagedestroy($image);
-
-		return $firstPixelColor;
-	}
-
-	private function isSameColor(array $firstColor, array $secondColor, int $allowedDelta = 1) {
-		if ($this->isSameColorComponent($firstColor['red'], $secondColor['red'], $allowedDelta)
-			&& $this->isSameColorComponent($firstColor['green'], $secondColor['green'], $allowedDelta)
-			&& $this->isSameColorComponent($firstColor['blue'], $secondColor['blue'], $allowedDelta)
-			&& $this->isSameColorComponent($firstColor['alpha'], $secondColor['alpha'], $allowedDelta)) {
-			return true;
-		}
-
-		return false;
-	}
-
-	private function isSameColorComponent(int $firstColorComponent, int $secondColorComponent, int $allowedDelta) {
-		if ($firstColorComponent >= ($secondColorComponent - $allowedDelta)
-			&& $firstColorComponent <= ($secondColorComponent + $allowedDelta)) {
-			return true;
-		}
-
-		return false;
-	}
+    /** @var string * */
+    private $lastAvatar;
+
+    /** @AfterScenario **/
+    public function cleanupLastAvatar() {
+        $this->lastAvatar = null;
+    }
+
+    private function getLastAvatar() {
+        $this->lastAvatar = '';
+
+        $body = $this->response->getBody();
+        while (!$body->eof()) {
+            $this->lastAvatar .= $body->read(8192);
+        }
+        $body->close();
+    }
+
+    /**
+     * @When user :user gets avatar for user :userAvatar
+     *
+     * @param string $user
+     * @param string $userAvatar
+     */
+    public function userGetsAvatarForUser(string $user, string $userAvatar) {
+        $this->userGetsAvatarForUserWithSize($user, $userAvatar, '128');
+    }
+
+    /**
+     * @When user :user gets avatar for user :userAvatar with size :size
+     *
+     * @param string $user
+     * @param string $userAvatar
+     * @param string $size
+     */
+    public function userGetsAvatarForUserWithSize(string $user, string $userAvatar, string $size) {
+        $this->asAn($user);
+        $this->sendingToDirectUrl('GET', '/index.php/avatar/' . $userAvatar . '/' . $size);
+        $this->theHTTPStatusCodeShouldBe('200');
+
+        $this->getLastAvatar();
+    }
+
+    /**
+     * @When user :user gets avatar for guest :guestAvatar
+     *
+     * @param string $user
+     * @param string $guestAvatar
+     */
+    public function userGetsAvatarForGuest(string $user, string $guestAvatar) {
+        $this->asAn($user);
+        $this->sendingToDirectUrl('GET', '/index.php/avatar/guest/' . $guestAvatar . '/128');
+        $this->theHTTPStatusCodeShouldBe('201');
+
+        $this->getLastAvatar();
+    }
+
+    /**
+     * @When logged in user posts avatar from file :source
+     *
+     * @param string $source
+     */
+    public function loggedInUserPostsAvatarFromFile(string $source) {
+        $file = \GuzzleHttp\Psr7\Utils::streamFor(fopen($source, 'r'));
+
+        $this->sendingAToWithRequesttoken('POST', '/index.php/avatar',
+            [
+                'multipart' => [
+                    [
+                        'name' => 'files[]',
+                        'contents' => $file
+                    ]
+                ]
+            ]);
+        $this->theHTTPStatusCodeShouldBe('200');
+    }
+
+    /**
+     * @When logged in user posts avatar from internal path :path
+     *
+     * @param string $path
+     */
+    public function loggedInUserPostsAvatarFromInternalPath(string $path) {
+        $this->sendingAToWithRequesttoken('POST', '/index.php/avatar?path=' . $path);
+        $this->theHTTPStatusCodeShouldBe('200');
+    }
+
+    /**
+     * @When logged in user deletes the user avatar
+     */
+    public function loggedInUserDeletesTheUserAvatar() {
+        $this->sendingAToWithRequesttoken('DELETE', '/index.php/avatar');
+        $this->theHTTPStatusCodeShouldBe('200');
+    }
+
+    /**
+     * @Then last avatar is a square of size :size
+     *
+     * @param string size
+     */
+    public function lastAvatarIsASquareOfSize(string $size) {
+        [$width, $height] = getimagesizefromstring($this->lastAvatar);
+
+        Assert::assertEquals($width, $height, 'Expected avatar to be a square');
+        Assert::assertEquals($size, $width);
+    }
+
+    /**
+     * @Then last avatar is not a square
+     */
+    public function lastAvatarIsNotASquare() {
+        [$width, $height] = getimagesizefromstring($this->lastAvatar);
+
+        Assert::assertNotEquals($width, $height, 'Expected avatar to not be a square');
+    }
+
+    /**
+     * @Then last avatar is not a single color
+     */
+    public function lastAvatarIsNotASingleColor() {
+        Assert::assertEquals(null, $this->getColorFromLastAvatar());
+    }
+
+    /**
+     * @Then last avatar is a single :color color
+     *
+     * @param string $color
+     * @param string $size
+     */
+    public function lastAvatarIsASingleColor(string $color) {
+        $expectedColor = $this->hexStringToRgbColor($color);
+        $colorFromLastAvatar = $this->getColorFromLastAvatar();
+
+        Assert::assertTrue($this->isSameColor($expectedColor, $colorFromLastAvatar),
+            $this->rgbColorToHexString($colorFromLastAvatar) . ' does not match expected ' . $color);
+    }
+
+    private function hexStringToRgbColor($hexString) {
+        // Strip initial "#"
+        $hexString = substr($hexString, 1);
+
+        $rgbColorInt = hexdec($hexString);
+
+        // RGBA hex strings are not supported; the given string is assumed to be
+        // an RGB hex string.
+        return [
+            'red' => ($rgbColorInt >> 16) & 0xFF,
+            'green' => ($rgbColorInt >> 8) & 0xFF,
+            'blue' => $rgbColorInt & 0xFF,
+            'alpha' => 0
+        ];
+    }
+
+    private function rgbColorToHexString($rgbColor) {
+        $rgbColorInt = ($rgbColor['red'] << 16) + ($rgbColor['green'] << 8) + ($rgbColor['blue']);
+
+        return '#' . str_pad(strtoupper(dechex($rgbColorInt)), 6, '0', STR_PAD_LEFT);
+    }
+
+    private function getColorFromLastAvatar() {
+        $image = imagecreatefromstring($this->lastAvatar);
+
+        $firstPixelColorIndex = imagecolorat($image, 0, 0);
+        $firstPixelColor = imagecolorsforindex($image, $firstPixelColorIndex);
+
+        for ($i = 0; $i < imagesx($image); $i++) {
+            for ($j = 0; $j < imagesx($image); $j++) {
+                $currentPixelColorIndex = imagecolorat($image, $i, $j);
+                $currentPixelColor = imagecolorsforindex($image, $currentPixelColorIndex);
+
+                // The colors are compared with a small allowed delta, as even
+                // on solid color images the resizing can cause some small
+                // artifacts that slightly modify the color of certain pixels.
+                if (!$this->isSameColor($firstPixelColor, $currentPixelColor)) {
+                    imagedestroy($image);
+
+                    return null;
+                }
+            }
+        }
+
+        imagedestroy($image);
+
+        return $firstPixelColor;
+    }
+
+    private function isSameColor(array $firstColor, array $secondColor, int $allowedDelta = 1) {
+        if ($this->isSameColorComponent($firstColor['red'], $secondColor['red'], $allowedDelta)
+            && $this->isSameColorComponent($firstColor['green'], $secondColor['green'], $allowedDelta)
+            && $this->isSameColorComponent($firstColor['blue'], $secondColor['blue'], $allowedDelta)
+            && $this->isSameColorComponent($firstColor['alpha'], $secondColor['alpha'], $allowedDelta)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private function isSameColorComponent(int $firstColorComponent, int $secondColorComponent, int $allowedDelta) {
+        if ($firstColorComponent >= ($secondColorComponent - $allowedDelta)
+            && $firstColorComponent <= ($secondColorComponent + $allowedDelta)) {
+            return true;
+        }
+
+        return false;
+    }
 }

lib/private/Server.php

Indentation +1411 added lines, -1411 removed lines

@@ -249,1452 +249,1452 @@
  * TODO: hookup all manager classes
  */
 class Server extends ServerContainer implements IServerContainer {
-	/** @var string */
-	private $webRoot;
-
-	/**
-	 * @param string $webRoot
-	 * @param \OC\Config $config
-	 */
-	public function __construct($webRoot, \OC\Config $config) {
-		parent::__construct();
-		$this->webRoot = $webRoot;
-
-		// To find out if we are running from CLI or not
-		$this->registerParameter('isCLI', \OC::$CLI);
-		$this->registerParameter('serverRoot', \OC::$SERVERROOT);
-
-		$this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
-			return $c;
-		});
-		$this->registerDeprecatedAlias(\OCP\IServerContainer::class, ContainerInterface::class);
-
-		$this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class);
-
-		$this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class);
-
-		$this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class);
-
-		$this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
-
-		$this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class);
-		$this->registerAlias(ITemplateManager::class, TemplateManager::class);
-		$this->registerAlias(\OCP\Template\ITemplateManager::class, \OC\Template\TemplateManager::class);
-
-		$this->registerAlias(IActionFactory::class, ActionFactory::class);
-
-		$this->registerService(View::class, function (Server $c) {
-			return new View();
-		}, false);
-
-		$this->registerService(IPreview::class, function (ContainerInterface $c) {
-			return new PreviewManager(
-				$c->get(\OCP\IConfig::class),
-				$c->get(IRootFolder::class),
-				new \OC\Preview\Storage\Root(
-					$c->get(IRootFolder::class),
-					$c->get(SystemConfig::class)
-				),
-				$c->get(IEventDispatcher::class),
-				$c->get(GeneratorHelper::class),
-				$c->get(ISession::class)->get('user_id'),
-				$c->get(Coordinator::class),
-				$c->get(IServerContainer::class),
-				$c->get(IBinaryFinder::class),
-				$c->get(IMagickSupport::class)
-			);
-		});
-		$this->registerAlias(IMimeIconProvider::class, MimeIconProvider::class);
-
-		$this->registerService(\OC\Preview\Watcher::class, function (ContainerInterface $c) {
-			return new \OC\Preview\Watcher(
-				new \OC\Preview\Storage\Root(
-					$c->get(IRootFolder::class),
-					$c->get(SystemConfig::class)
-				)
-			);
-		});
-
-		$this->registerService(IProfiler::class, function (Server $c) {
-			return new Profiler($c->get(SystemConfig::class));
-		});
-
-		$this->registerService(Encryption\Manager::class, function (Server $c): Encryption\Manager {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-			return new Encryption\Manager(
-				$c->get(\OCP\IConfig::class),
-				$c->get(LoggerInterface::class),
-				$c->getL10N('core'),
-				new View(),
-				$util,
-				new ArrayCache()
-			);
-		});
-		$this->registerAlias(\OCP\Encryption\IManager::class, Encryption\Manager::class);
-
-		$this->registerService(IFile::class, function (ContainerInterface $c) {
-			$util = new Encryption\Util(
-				new View(),
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-			return new Encryption\File(
-				$util,
-				$c->get(IRootFolder::class),
-				$c->get(\OCP\Share\IManager::class)
-			);
-		});
-
-		$this->registerService(IStorage::class, function (ContainerInterface $c) {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-
-			return new Encryption\Keys\Storage(
-				$view,
-				$util,
-				$c->get(ICrypto::class),
-				$c->get(\OCP\IConfig::class)
-			);
-		});
-
-		$this->registerAlias(\OCP\ITagManager::class, TagManager::class);
-
-		$this->registerService('SystemTagManagerFactory', function (ContainerInterface $c) {
-			/** @var \OCP\IConfig $config */
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
-			return new $factoryClass($this);
-		});
-		$this->registerService(ISystemTagManager::class, function (ContainerInterface $c) {
-			return $c->get('SystemTagManagerFactory')->getManager();
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
-
-		$this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) {
-			return $c->get('SystemTagManagerFactory')->getObjectMapper();
-		});
-		$this->registerAlias(IFileAccess::class, FileAccess::class);
-		$this->registerService('RootFolder', function (ContainerInterface $c) {
-			$manager = \OC\Files\Filesystem::getMountManager();
-			$view = new View();
-			/** @var IUserSession $userSession */
-			$userSession = $c->get(IUserSession::class);
-			$root = new Root(
-				$manager,
-				$view,
-				$userSession->getUser(),
-				$c->get(IUserMountCache::class),
-				$this->get(LoggerInterface::class),
-				$this->get(IUserManager::class),
-				$this->get(IEventDispatcher::class),
-				$this->get(ICacheFactory::class),
-			);
-
-			$previewConnector = new \OC\Preview\WatcherConnector(
-				$root,
-				$c->get(SystemConfig::class),
-				$this->get(IEventDispatcher::class)
-			);
-			$previewConnector->connectWatcher();
-
-			return $root;
-		});
-		$this->registerService(HookConnector::class, function (ContainerInterface $c) {
-			return new HookConnector(
-				$c->get(IRootFolder::class),
-				new View(),
-				$c->get(IEventDispatcher::class),
-				$c->get(LoggerInterface::class)
-			);
-		});
-
-		$this->registerService(IRootFolder::class, function (ContainerInterface $c) {
-			return new LazyRoot(function () use ($c) {
-				return $c->get('RootFolder');
-			});
-		});
-
-		$this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
-
-		$this->registerService(DisplayNameCache::class, function (ContainerInterface $c) {
-			return $c->get(\OC\User\Manager::class)->getDisplayNameCache();
-		});
-
-		$this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) {
-			$groupManager = new \OC\Group\Manager(
-				$this->get(IUserManager::class),
-				$this->get(IEventDispatcher::class),
-				$this->get(LoggerInterface::class),
-				$this->get(ICacheFactory::class),
-				$this->get(IRemoteAddress::class),
-			);
-			return $groupManager;
-		});
-
-		$this->registerService(Store::class, function (ContainerInterface $c) {
-			$session = $c->get(ISession::class);
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$tokenProvider = $c->get(IProvider::class);
-			} else {
-				$tokenProvider = null;
-			}
-			$logger = $c->get(LoggerInterface::class);
-			$crypto = $c->get(ICrypto::class);
-			return new Store($session, $logger, $crypto, $tokenProvider);
-		});
-		$this->registerAlias(IStore::class, Store::class);
-		$this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
-		$this->registerAlias(OCPIProvider::class, Authentication\Token\Manager::class);
-
-		$this->registerService(\OC\User\Session::class, function (Server $c) {
-			$manager = $c->get(IUserManager::class);
-			$session = new \OC\Session\Memory();
-			$timeFactory = new TimeFactory();
-			// Token providers might require a working database. This code
-			// might however be called when Nextcloud is not yet setup.
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$provider = $c->get(IProvider::class);
-			} else {
-				$provider = null;
-			}
-
-			$userSession = new \OC\User\Session(
-				$manager,
-				$session,
-				$timeFactory,
-				$provider,
-				$c->get(\OCP\IConfig::class),
-				$c->get(ISecureRandom::class),
-				$c->get('LockdownManager'),
-				$c->get(LoggerInterface::class),
-				$c->get(IEventDispatcher::class),
-			);
-			/** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
-				\OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]);
-			});
-			/** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_createUser', ['uid' => $user->getUID(), 'password' => $password]);
-			});
-			/** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preDelete', function ($user) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]);
-			});
-			/** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postDelete', function ($user) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
-			});
-			$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'pre_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
-			});
-			$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
-			});
-			$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
-				\OC_Hook::emit('OC_User', 'pre_login', ['run' => true, 'uid' => $uid, 'password' => $password]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password));
-			});
-			$userSession->listen('\OC\User', 'postLogin', function ($user, $loginName, $password, $isTokenLogin) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin));
-			});
-			$userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid));
-			});
-			$userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password));
-			});
-			$userSession->listen('\OC\User', 'logout', function ($user) {
-				\OC_Hook::emit('OC_User', 'logout', []);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user));
-			});
-			$userSession->listen('\OC\User', 'postLogout', function ($user) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedOutEvent($user));
-			});
-			$userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'changeUser', ['run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue]);
-			});
-			return $userSession;
-		});
-		$this->registerAlias(\OCP\IUserSession::class, \OC\User\Session::class);
-
-		$this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class);
-
-		$this->registerAlias(INavigationManager::class, \OC\NavigationManager::class);
-
-		$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
-
-		$this->registerService(\OC\SystemConfig::class, function ($c) use ($config) {
-			return new \OC\SystemConfig($config);
-		});
-
-		$this->registerAlias(IAppConfig::class, \OC\AppConfig::class);
-		$this->registerAlias(IUserConfig::class, \OC\Config\UserConfig::class);
-		$this->registerAlias(IAppManager::class, AppManager::class);
-
-		$this->registerService(IFactory::class, function (Server $c) {
-			return new \OC\L10N\Factory(
-				$c->get(\OCP\IConfig::class),
-				$c->getRequest(),
-				$c->get(IUserSession::class),
-				$c->get(ICacheFactory::class),
-				\OC::$SERVERROOT,
-				$c->get(IAppManager::class),
-			);
-		});
-
-		$this->registerAlias(IURLGenerator::class, URLGenerator::class);
-
-		$this->registerService(ICache::class, function ($c) {
-			/** @var LoggerInterface $logger */
-			$logger = $c->get(LoggerInterface::class);
-			$logger->debug('The requested service "' . ICache::class . '" is deprecated. Please use "' . ICacheFactory::class . '" instead to create a cache. This service will be removed in a future Nextcloud version.', ['app' => 'serverDI']);
-
-			/** @var ICacheFactory $cacheFactory */
-			$cacheFactory = $c->get(ICacheFactory::class);
-			return $cacheFactory->createDistributed();
-		});
-
-		$this->registerService(Factory::class, function (Server $c) {
-			$profiler = $c->get(IProfiler::class);
-			$arrayCacheFactory = new \OC\Memcache\Factory(fn () => '', $c->get(LoggerInterface::class),
-				$profiler,
-				ArrayCache::class,
-				ArrayCache::class,
-				ArrayCache::class
-			);
-			/** @var SystemConfig $config */
-			$config = $c->get(SystemConfig::class);
-			/** @var ServerVersion $serverVersion */
-			$serverVersion = $c->get(ServerVersion::class);
-
-			if ($config->getValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				$logQuery = $config->getValue('log_query');
-				$prefixClosure = function () use ($logQuery, $serverVersion): ?string {
-					if (!$logQuery) {
-						try {
-							$v = \OCP\Server::get(IAppConfig::class)->getAppInstalledVersions(true);
-						} catch (\Doctrine\DBAL\Exception $e) {
-							// Database service probably unavailable
-							// Probably related to https://github.com/nextcloud/server/issues/37424
-							return null;
-						}
-					} else {
-						// If the log_query is enabled, we can not get the app versions
-						// as that does a query, which will be logged and the logging
-						// depends on redis and here we are back again in the same function.
-						$v = [
-							'log_query' => 'enabled',
-						];
-					}
-					$v['core'] = implode(',', $serverVersion->getVersion());
-					$version = implode(',', array_keys($v)) . implode(',', $v);
-					$instanceId = \OC_Util::getInstanceId();
-					$path = \OC::$SERVERROOT;
-					return md5($instanceId . '-' . $version . '-' . $path);
-				};
-				return new \OC\Memcache\Factory($prefixClosure,
-					$c->get(LoggerInterface::class),
-					$profiler,
-					/** @psalm-taint-escape callable */
-					$config->getValue('memcache.local', null),
-					/** @psalm-taint-escape callable */
-					$config->getValue('memcache.distributed', null),
-					/** @psalm-taint-escape callable */
-					$config->getValue('memcache.locking', null),
-					/** @psalm-taint-escape callable */
-					$config->getValue('redis_log_file')
-				);
-			}
-			return $arrayCacheFactory;
-		});
-		$this->registerAlias(ICacheFactory::class, Factory::class);
-
-		$this->registerService('RedisFactory', function (Server $c) {
-			$systemConfig = $c->get(SystemConfig::class);
-			return new RedisFactory($systemConfig, $c->get(IEventLogger::class));
-		});
-
-		$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
-			$l10n = $this->get(IFactory::class)->get('lib');
-			return new \OC\Activity\Manager(
-				$c->getRequest(),
-				$c->get(IUserSession::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(IValidator::class),
-				$c->get(IRichTextFormatter::class),
-				$l10n
-			);
-		});
-
-		$this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
-			return new \OC\Activity\EventMerger(
-				$c->getL10N('lib')
-			);
-		});
-		$this->registerAlias(IValidator::class, Validator::class);
-
-		$this->registerService(AvatarManager::class, function (Server $c) {
-			return new AvatarManager(
-				$c->get(IUserSession::class),
-				$c->get(\OC\User\Manager::class),
-				$c->getAppDataDir('avatar'),
-				$c->getL10N('lib'),
-				$c->get(LoggerInterface::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(IAccountManager::class),
-				$c->get(KnownUserService::class)
-			);
-		});
-
-		$this->registerAlias(IAvatarManager::class, AvatarManager::class);
-
-		$this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
-		$this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
-		$this->registerAlias(\OCP\Support\Subscription\IAssertion::class, \OC\Support\Subscription\Assertion::class);
-
-		/** Only used by the PsrLoggerAdapter should not be used by apps */
-		$this->registerService(\OC\Log::class, function (Server $c) {
-			$logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file');
-			$factory = new LogFactory($c, $this->get(SystemConfig::class));
-			$logger = $factory->get($logType);
-			$registry = $c->get(\OCP\Support\CrashReport\IRegistry::class);
-
-			return new Log($logger, $this->get(SystemConfig::class), crashReporters: $registry);
-		});
-		// PSR-3 logger
-		$this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
-
-		$this->registerService(ILogFactory::class, function (Server $c) {
-			return new LogFactory($c, $this->get(SystemConfig::class));
-		});
-
-		$this->registerAlias(IJobList::class, \OC\BackgroundJob\JobList::class);
-
-		$this->registerService(Router::class, function (Server $c) {
-			$cacheFactory = $c->get(ICacheFactory::class);
-			if ($cacheFactory->isLocalCacheAvailable()) {
-				$router = $c->resolve(CachingRouter::class);
-			} else {
-				$router = $c->resolve(Router::class);
-			}
-			return $router;
-		});
-		$this->registerAlias(IRouter::class, Router::class);
-
-		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
-			$config = $c->get(\OCP\IConfig::class);
-			if (ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
-				$backend = new \OC\Security\RateLimiting\Backend\MemoryCacheBackend(
-					$c->get(AllConfig::class),
-					$this->get(ICacheFactory::class),
-					new \OC\AppFramework\Utility\TimeFactory()
-				);
-			} else {
-				$backend = new \OC\Security\RateLimiting\Backend\DatabaseBackend(
-					$c->get(AllConfig::class),
-					$c->get(IDBConnection::class),
-					new \OC\AppFramework\Utility\TimeFactory()
-				);
-			}
-
-			return $backend;
-		});
-
-		$this->registerAlias(\OCP\Security\ISecureRandom::class, SecureRandom::class);
-		$this->registerAlias(\OCP\Security\IRemoteHostValidator::class, \OC\Security\RemoteHostValidator::class);
-		$this->registerAlias(IVerificationToken::class, VerificationToken::class);
-
-		$this->registerAlias(ICrypto::class, Crypto::class);
-
-		$this->registerAlias(IHasher::class, Hasher::class);
-
-		$this->registerAlias(ICredentialsManager::class, CredentialsManager::class);
-
-		$this->registerAlias(IDBConnection::class, ConnectionAdapter::class);
-		$this->registerService(Connection::class, function (Server $c) {
-			$systemConfig = $c->get(SystemConfig::class);
-			$factory = new \OC\DB\ConnectionFactory($systemConfig, $c->get(ICacheFactory::class));
-			$type = $systemConfig->getValue('dbtype', 'sqlite');
-			if (!$factory->isValidType($type)) {
-				throw new \OC\DatabaseException('Invalid database type');
-			}
-			$connection = $factory->getConnection($type, []);
-			return $connection;
-		});
-
-		$this->registerAlias(ICertificateManager::class, CertificateManager::class);
-		$this->registerAlias(IClientService::class, ClientService::class);
-		$this->registerService(NegativeDnsCache::class, function (ContainerInterface $c) {
-			return new NegativeDnsCache(
-				$c->get(ICacheFactory::class),
-			);
-		});
-		$this->registerDeprecatedAlias('HttpClientService', IClientService::class);
-		$this->registerService(IEventLogger::class, function (ContainerInterface $c) {
-			return new EventLogger($c->get(SystemConfig::class), $c->get(LoggerInterface::class), $c->get(Log::class));
-		});
-
-		$this->registerService(IQueryLogger::class, function (ContainerInterface $c) {
-			$queryLogger = new QueryLogger();
-			if ($c->get(SystemConfig::class)->getValue('debug', false)) {
-				// In debug mode, module is being activated by default
-				$queryLogger->activate();
-			}
-			return $queryLogger;
-		});
-
-		$this->registerAlias(ITempManager::class, TempManager::class);
-		$this->registerAlias(IDateTimeZone::class, DateTimeZone::class);
-
-		$this->registerService(IDateTimeFormatter::class, function (Server $c) {
-			$language = $c->get(\OCP\IConfig::class)->getUserValue($c->get(ISession::class)->get('user_id'), 'core', 'lang', null);
-
-			return new DateTimeFormatter(
-				$c->get(IDateTimeZone::class)->getTimeZone(),
-				$c->getL10N('lib', $language)
-			);
-		});
-
-		$this->registerService(IUserMountCache::class, function (ContainerInterface $c) {
-			$mountCache = $c->get(UserMountCache::class);
-			$listener = new UserMountCacheListener($mountCache);
-			$listener->listen($c->get(IUserManager::class));
-			return $mountCache;
-		});
-
-		$this->registerService(IMountProviderCollection::class, function (ContainerInterface $c) {
-			$loader = $c->get(IStorageFactory::class);
-			$mountCache = $c->get(IUserMountCache::class);
-			$eventLogger = $c->get(IEventLogger::class);
-			$manager = new MountProviderCollection($loader, $mountCache, $eventLogger);
-
-			// builtin providers
-
-			$config = $c->get(\OCP\IConfig::class);
-			$logger = $c->get(LoggerInterface::class);
-			$objectStoreConfig = $c->get(PrimaryObjectStoreConfig::class);
-			$manager->registerProvider(new CacheMountProvider($config));
-			$manager->registerHomeProvider(new LocalHomeMountProvider());
-			$manager->registerHomeProvider(new ObjectHomeMountProvider($objectStoreConfig));
-			$manager->registerRootProvider(new RootMountProvider($objectStoreConfig, $config));
-			$manager->registerRootProvider(new ObjectStorePreviewCacheMountProvider($logger, $config));
-
-			return $manager;
-		});
-
-		$this->registerService(IBus::class, function (ContainerInterface $c) {
-			$busClass = $c->get(\OCP\IConfig::class)->getSystemValueString('commandbus');
-			if ($busClass) {
-				[$app, $class] = explode('::', $busClass, 2);
-				if ($c->get(IAppManager::class)->isEnabledForUser($app)) {
-					$c->get(IAppManager::class)->loadApp($app);
-					return $c->get($class);
-				} else {
-					throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
-				}
-			} else {
-				$jobList = $c->get(IJobList::class);
-				return new CronBus($jobList);
-			}
-		});
-		$this->registerDeprecatedAlias('AsyncCommandBus', IBus::class);
-		$this->registerAlias(ITrustedDomainHelper::class, TrustedDomainHelper::class);
-		$this->registerAlias(IThrottler::class, Throttler::class);
-
-		$this->registerService(\OC\Security\Bruteforce\Backend\IBackend::class, function ($c) {
-			$config = $c->get(\OCP\IConfig::class);
-			if (!$config->getSystemValueBool('auth.bruteforce.protection.force.database', false)
-				&& ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
-				$backend = $c->get(\OC\Security\Bruteforce\Backend\MemoryCacheBackend::class);
-			} else {
-				$backend = $c->get(\OC\Security\Bruteforce\Backend\DatabaseBackend::class);
-			}
-
-			return $backend;
-		});
-
-		$this->registerDeprecatedAlias('IntegrityCodeChecker', Checker::class);
-		$this->registerService(Checker::class, function (ContainerInterface $c) {
-			// IConfig requires a working database. This code
-			// might however be called when Nextcloud is not yet setup.
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$config = $c->get(\OCP\IConfig::class);
-				$appConfig = $c->get(\OCP\IAppConfig::class);
-			} else {
-				$config = null;
-				$appConfig = null;
-			}
-
-			return new Checker(
-				$c->get(ServerVersion::class),
-				$c->get(EnvironmentHelper::class),
-				new FileAccessHelper(),
-				new AppLocator(),
-				$config,
-				$appConfig,
-				$c->get(ICacheFactory::class),
-				$c->get(IAppManager::class),
-				$c->get(IMimeTypeDetector::class)
-			);
-		});
-		$this->registerService(Request::class, function (ContainerInterface $c) {
-			if (isset($this['urlParams'])) {
-				$urlParams = $this['urlParams'];
-			} else {
-				$urlParams = [];
-			}
-
-			if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
-				&& in_array('fakeinput', stream_get_wrappers())
-			) {
-				$stream = 'fakeinput://data';
-			} else {
-				$stream = 'php://input';
-			}
-
-			return new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: '',
-					'urlParams' => $urlParams,
-				],
-				$this->get(IRequestId::class),
-				$this->get(\OCP\IConfig::class),
-				$this->get(CsrfTokenManager::class),
-				$stream
-			);
-		});
-		$this->registerAlias(\OCP\IRequest::class, Request::class);
-
-		$this->registerService(IRequestId::class, function (ContainerInterface $c): IRequestId {
-			return new RequestId(
-				$_SERVER['UNIQUE_ID'] ?? '',
-				$this->get(ISecureRandom::class)
-			);
-		});
-
-		$this->registerService(IMailer::class, function (Server $c) {
-			return new Mailer(
-				$c->get(\OCP\IConfig::class),
-				$c->get(LoggerInterface::class),
-				$c->get(Defaults::class),
-				$c->get(IURLGenerator::class),
-				$c->getL10N('lib'),
-				$c->get(IEventDispatcher::class),
-				$c->get(IFactory::class)
-			);
-		});
-
-		/** @since 30.0.0 */
-		$this->registerAlias(\OCP\Mail\Provider\IManager::class, \OC\Mail\Provider\Manager::class);
-
-		$this->registerService(ILDAPProviderFactory::class, function (ContainerInterface $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
-			if (is_null($factoryClass) || !class_exists($factoryClass)) {
-				return new NullLDAPProviderFactory($this);
-			}
-			/** @var \OCP\LDAP\ILDAPProviderFactory $factory */
-			return new $factoryClass($this);
-		});
-		$this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
-			$factory = $c->get(ILDAPProviderFactory::class);
-			return $factory->getLDAPProvider();
-		});
-		$this->registerService(ILockingProvider::class, function (ContainerInterface $c) {
-			$ini = $c->get(IniGetWrapper::class);
-			$config = $c->get(\OCP\IConfig::class);
-			$ttl = $config->getSystemValueInt('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
-			if ($config->getSystemValueBool('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				/** @var \OC\Memcache\Factory $memcacheFactory */
-				$memcacheFactory = $c->get(ICacheFactory::class);
-				$memcache = $memcacheFactory->createLocking('lock');
-				if (!($memcache instanceof \OC\Memcache\NullCache)) {
-					$timeFactory = $c->get(ITimeFactory::class);
-					return new MemcacheLockingProvider($memcache, $timeFactory, $ttl);
-				}
-				return new DBLockingProvider(
-					$c->get(IDBConnection::class),
-					new TimeFactory(),
-					$ttl,
-					!\OC::$CLI
-				);
-			}
-			return new NoopLockingProvider();
-		});
-
-		$this->registerService(ILockManager::class, function (Server $c): LockManager {
-			return new LockManager();
-		});
-
-		$this->registerAlias(ILockdownManager::class, 'LockdownManager');
-		$this->registerService(SetupManager::class, function ($c) {
-			// create the setupmanager through the mount manager to resolve the cyclic dependency
-			return $c->get(\OC\Files\Mount\Manager::class)->getSetupManager();
-		});
-		$this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class);
-
-		$this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) {
-			return new \OC\Files\Type\Detection(
-				$c->get(IURLGenerator::class),
-				$c->get(LoggerInterface::class),
-				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
-			);
-		});
-
-		$this->registerAlias(IMimeTypeLoader::class, Loader::class);
-		$this->registerService(BundleFetcher::class, function () {
-			return new BundleFetcher($this->getL10N('lib'));
-		});
-		$this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
-
-		$this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
-			$manager = new CapabilitiesManager($c->get(LoggerInterface::class));
-			$manager->registerCapability(function () use ($c) {
-				return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
-			});
-			$manager->registerCapability(function () use ($c) {
-				return $c->get(\OC\Security\Bruteforce\Capabilities::class);
-			});
-			return $manager;
-		});
-
-		$this->registerService(ICommentsManager::class, function (Server $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
-			/** @var \OCP\Comments\ICommentsManagerFactory $factory */
-			$factory = new $factoryClass($this);
-			$manager = $factory->getManager();
-
-			$manager->registerDisplayNameResolver('user', function ($id) use ($c) {
-				$manager = $c->get(IUserManager::class);
-				$userDisplayName = $manager->getDisplayName($id);
-				if ($userDisplayName === null) {
-					$l = $c->get(IFactory::class)->get('core');
-					return $l->t('Unknown account');
-				}
-				return $userDisplayName;
-			});
-
-			return $manager;
-		});
-
-		$this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
-		$this->registerService('ThemingDefaults', function (Server $c) {
-			try {
-				$classExists = class_exists('OCA\Theming\ThemingDefaults');
-			} catch (\OCP\AutoloadNotAllowedException $e) {
-				// App disabled or in maintenance mode
-				$classExists = false;
-			}
-
-			if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isEnabledForAnyone('theming') && $c->get(TrustedDomainHelper::class)->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
-				$backgroundService = new BackgroundService(
-					$c->get(IRootFolder::class),
-					$c->getAppDataDir('theming'),
-					$c->get(IAppConfig::class),
-					$c->get(\OCP\IConfig::class),
-					$c->get(ISession::class)->get('user_id'),
-				);
-				$imageManager = new ImageManager(
-					$c->get(\OCP\IConfig::class),
-					$c->getAppDataDir('theming'),
-					$c->get(IURLGenerator::class),
-					$c->get(ICacheFactory::class),
-					$c->get(LoggerInterface::class),
-					$c->get(ITempManager::class),
-					$backgroundService,
-				);
-				return new ThemingDefaults(
-					$c->get(\OCP\IConfig::class),
-					$c->get(\OCP\IAppConfig::class),
-					$c->getL10N('theming'),
-					$c->get(IUserSession::class),
-					$c->get(IURLGenerator::class),
-					$c->get(ICacheFactory::class),
-					new Util($c->get(ServerVersion::class), $c->get(\OCP\IConfig::class), $this->get(IAppManager::class), $c->getAppDataDir('theming'), $imageManager),
-					$imageManager,
-					$c->get(IAppManager::class),
-					$c->get(INavigationManager::class),
-					$backgroundService,
-				);
-			}
-			return new \OC_Defaults();
-		});
-		$this->registerService(JSCombiner::class, function (Server $c) {
-			return new JSCombiner(
-				$c->getAppDataDir('js'),
-				$c->get(IURLGenerator::class),
-				$this->get(ICacheFactory::class),
-				$c->get(SystemConfig::class),
-				$c->get(LoggerInterface::class)
-			);
-		});
-		$this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
-
-		$this->registerService('CryptoWrapper', function (ContainerInterface $c) {
-			// FIXME: Instantiated here due to cyclic dependency
-			$request = new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: null,
-				],
-				$c->get(IRequestId::class),
-				$c->get(\OCP\IConfig::class)
-			);
-
-			return new CryptoWrapper(
-				$c->get(ICrypto::class),
-				$c->get(ISecureRandom::class),
-				$request
-			);
-		});
-		$this->registerService(SessionStorage::class, function (ContainerInterface $c) {
-			return new SessionStorage($c->get(ISession::class));
-		});
-		$this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
-
-		$this->registerService(IProviderFactory::class, function (ContainerInterface $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
-			/** @var \OCP\Share\IProviderFactory $factory */
-			return $c->get($factoryClass);
-		});
-
-		$this->registerAlias(\OCP\Share\IManager::class, \OC\Share20\Manager::class);
-
-		$this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
-			$instance = new Collaboration\Collaborators\Search($c);
-
-			// register default plugins
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE_GROUP', 'class' => RemoteGroupPlugin::class]);
-
-			return $instance;
-		});
-		$this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class);
-
-		$this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
-
-		$this->registerAlias(\OCP\Collaboration\Resources\IProviderManager::class, \OC\Collaboration\Resources\ProviderManager::class);
-		$this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
-
-		$this->registerAlias(IReferenceManager::class, ReferenceManager::class);
-		$this->registerAlias(ITeamManager::class, TeamManager::class);
-
-		$this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class);
-		$this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class);
-		$this->registerService(\OC\Files\AppData\Factory::class, function (ContainerInterface $c) {
-			return new \OC\Files\AppData\Factory(
-				$c->get(IRootFolder::class),
-				$c->get(SystemConfig::class)
-			);
-		});
-
-		$this->registerService('LockdownManager', function (ContainerInterface $c) {
-			return new LockdownManager(function () use ($c) {
-				return $c->get(ISession::class);
-			});
-		});
-
-		$this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
-			return new DiscoveryService(
-				$c->get(ICacheFactory::class),
-				$c->get(IClientService::class)
-			);
-		});
-		$this->registerAlias(IOCMDiscoveryService::class, OCMDiscoveryService::class);
-
-		$this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
-			return new CloudIdManager(
-				$c->get(\OCP\Contacts\IManager::class),
-				$c->get(IURLGenerator::class),
-				$c->get(IUserManager::class),
-				$c->get(ICacheFactory::class),
-				$c->get(IEventDispatcher::class),
-			);
-		});
-
-		$this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
-		$this->registerAlias(ICloudFederationProviderManager::class, CloudFederationProviderManager::class);
-		$this->registerService(ICloudFederationFactory::class, function (Server $c) {
-			return new CloudFederationFactory();
-		});
+    /** @var string */
+    private $webRoot;
+
+    /**
+     * @param string $webRoot
+     * @param \OC\Config $config
+     */
+    public function __construct($webRoot, \OC\Config $config) {
+        parent::__construct();
+        $this->webRoot = $webRoot;
+
+        // To find out if we are running from CLI or not
+        $this->registerParameter('isCLI', \OC::$CLI);
+        $this->registerParameter('serverRoot', \OC::$SERVERROOT);
+
+        $this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
+            return $c;
+        });
+        $this->registerDeprecatedAlias(\OCP\IServerContainer::class, ContainerInterface::class);
+
+        $this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class);
+
+        $this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
+
+        $this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class);
+        $this->registerAlias(ITemplateManager::class, TemplateManager::class);
+        $this->registerAlias(\OCP\Template\ITemplateManager::class, \OC\Template\TemplateManager::class);
+
+        $this->registerAlias(IActionFactory::class, ActionFactory::class);
+
+        $this->registerService(View::class, function (Server $c) {
+            return new View();
+        }, false);
+
+        $this->registerService(IPreview::class, function (ContainerInterface $c) {
+            return new PreviewManager(
+                $c->get(\OCP\IConfig::class),
+                $c->get(IRootFolder::class),
+                new \OC\Preview\Storage\Root(
+                    $c->get(IRootFolder::class),
+                    $c->get(SystemConfig::class)
+                ),
+                $c->get(IEventDispatcher::class),
+                $c->get(GeneratorHelper::class),
+                $c->get(ISession::class)->get('user_id'),
+                $c->get(Coordinator::class),
+                $c->get(IServerContainer::class),
+                $c->get(IBinaryFinder::class),
+                $c->get(IMagickSupport::class)
+            );
+        });
+        $this->registerAlias(IMimeIconProvider::class, MimeIconProvider::class);
+
+        $this->registerService(\OC\Preview\Watcher::class, function (ContainerInterface $c) {
+            return new \OC\Preview\Watcher(
+                new \OC\Preview\Storage\Root(
+                    $c->get(IRootFolder::class),
+                    $c->get(SystemConfig::class)
+                )
+            );
+        });
+
+        $this->registerService(IProfiler::class, function (Server $c) {
+            return new Profiler($c->get(SystemConfig::class));
+        });
+
+        $this->registerService(Encryption\Manager::class, function (Server $c): Encryption\Manager {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+            return new Encryption\Manager(
+                $c->get(\OCP\IConfig::class),
+                $c->get(LoggerInterface::class),
+                $c->getL10N('core'),
+                new View(),
+                $util,
+                new ArrayCache()
+            );
+        });
+        $this->registerAlias(\OCP\Encryption\IManager::class, Encryption\Manager::class);
+
+        $this->registerService(IFile::class, function (ContainerInterface $c) {
+            $util = new Encryption\Util(
+                new View(),
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+            return new Encryption\File(
+                $util,
+                $c->get(IRootFolder::class),
+                $c->get(\OCP\Share\IManager::class)
+            );
+        });
+
+        $this->registerService(IStorage::class, function (ContainerInterface $c) {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+
+            return new Encryption\Keys\Storage(
+                $view,
+                $util,
+                $c->get(ICrypto::class),
+                $c->get(\OCP\IConfig::class)
+            );
+        });
+
+        $this->registerAlias(\OCP\ITagManager::class, TagManager::class);
+
+        $this->registerService('SystemTagManagerFactory', function (ContainerInterface $c) {
+            /** @var \OCP\IConfig $config */
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
+            return new $factoryClass($this);
+        });
+        $this->registerService(ISystemTagManager::class, function (ContainerInterface $c) {
+            return $c->get('SystemTagManagerFactory')->getManager();
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
+
+        $this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) {
+            return $c->get('SystemTagManagerFactory')->getObjectMapper();
+        });
+        $this->registerAlias(IFileAccess::class, FileAccess::class);
+        $this->registerService('RootFolder', function (ContainerInterface $c) {
+            $manager = \OC\Files\Filesystem::getMountManager();
+            $view = new View();
+            /** @var IUserSession $userSession */
+            $userSession = $c->get(IUserSession::class);
+            $root = new Root(
+                $manager,
+                $view,
+                $userSession->getUser(),
+                $c->get(IUserMountCache::class),
+                $this->get(LoggerInterface::class),
+                $this->get(IUserManager::class),
+                $this->get(IEventDispatcher::class),
+                $this->get(ICacheFactory::class),
+            );
+
+            $previewConnector = new \OC\Preview\WatcherConnector(
+                $root,
+                $c->get(SystemConfig::class),
+                $this->get(IEventDispatcher::class)
+            );
+            $previewConnector->connectWatcher();
+
+            return $root;
+        });
+        $this->registerService(HookConnector::class, function (ContainerInterface $c) {
+            return new HookConnector(
+                $c->get(IRootFolder::class),
+                new View(),
+                $c->get(IEventDispatcher::class),
+                $c->get(LoggerInterface::class)
+            );
+        });
+
+        $this->registerService(IRootFolder::class, function (ContainerInterface $c) {
+            return new LazyRoot(function () use ($c) {
+                return $c->get('RootFolder');
+            });
+        });
+
+        $this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
+
+        $this->registerService(DisplayNameCache::class, function (ContainerInterface $c) {
+            return $c->get(\OC\User\Manager::class)->getDisplayNameCache();
+        });
+
+        $this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) {
+            $groupManager = new \OC\Group\Manager(
+                $this->get(IUserManager::class),
+                $this->get(IEventDispatcher::class),
+                $this->get(LoggerInterface::class),
+                $this->get(ICacheFactory::class),
+                $this->get(IRemoteAddress::class),
+            );
+            return $groupManager;
+        });
+
+        $this->registerService(Store::class, function (ContainerInterface $c) {
+            $session = $c->get(ISession::class);
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $tokenProvider = $c->get(IProvider::class);
+            } else {
+                $tokenProvider = null;
+            }
+            $logger = $c->get(LoggerInterface::class);
+            $crypto = $c->get(ICrypto::class);
+            return new Store($session, $logger, $crypto, $tokenProvider);
+        });
+        $this->registerAlias(IStore::class, Store::class);
+        $this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
+        $this->registerAlias(OCPIProvider::class, Authentication\Token\Manager::class);
+
+        $this->registerService(\OC\User\Session::class, function (Server $c) {
+            $manager = $c->get(IUserManager::class);
+            $session = new \OC\Session\Memory();
+            $timeFactory = new TimeFactory();
+            // Token providers might require a working database. This code
+            // might however be called when Nextcloud is not yet setup.
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $provider = $c->get(IProvider::class);
+            } else {
+                $provider = null;
+            }
+
+            $userSession = new \OC\User\Session(
+                $manager,
+                $session,
+                $timeFactory,
+                $provider,
+                $c->get(\OCP\IConfig::class),
+                $c->get(ISecureRandom::class),
+                $c->get('LockdownManager'),
+                $c->get(LoggerInterface::class),
+                $c->get(IEventDispatcher::class),
+            );
+            /** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+                \OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]);
+            });
+            /** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_createUser', ['uid' => $user->getUID(), 'password' => $password]);
+            });
+            /** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'preDelete', function ($user) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]);
+            });
+            /** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'postDelete', function ($user) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
+            });
+            $userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'pre_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
+            });
+            $userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
+            });
+            $userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
+                \OC_Hook::emit('OC_User', 'pre_login', ['run' => true, 'uid' => $uid, 'password' => $password]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password));
+            });
+            $userSession->listen('\OC\User', 'postLogin', function ($user, $loginName, $password, $isTokenLogin) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin));
+            });
+            $userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid));
+            });
+            $userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password));
+            });
+            $userSession->listen('\OC\User', 'logout', function ($user) {
+                \OC_Hook::emit('OC_User', 'logout', []);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user));
+            });
+            $userSession->listen('\OC\User', 'postLogout', function ($user) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedOutEvent($user));
+            });
+            $userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'changeUser', ['run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue]);
+            });
+            return $userSession;
+        });
+        $this->registerAlias(\OCP\IUserSession::class, \OC\User\Session::class);
+
+        $this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class);
+
+        $this->registerAlias(INavigationManager::class, \OC\NavigationManager::class);
+
+        $this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
+
+        $this->registerService(\OC\SystemConfig::class, function ($c) use ($config) {
+            return new \OC\SystemConfig($config);
+        });
+
+        $this->registerAlias(IAppConfig::class, \OC\AppConfig::class);
+        $this->registerAlias(IUserConfig::class, \OC\Config\UserConfig::class);
+        $this->registerAlias(IAppManager::class, AppManager::class);
+
+        $this->registerService(IFactory::class, function (Server $c) {
+            return new \OC\L10N\Factory(
+                $c->get(\OCP\IConfig::class),
+                $c->getRequest(),
+                $c->get(IUserSession::class),
+                $c->get(ICacheFactory::class),
+                \OC::$SERVERROOT,
+                $c->get(IAppManager::class),
+            );
+        });
+
+        $this->registerAlias(IURLGenerator::class, URLGenerator::class);
+
+        $this->registerService(ICache::class, function ($c) {
+            /** @var LoggerInterface $logger */
+            $logger = $c->get(LoggerInterface::class);
+            $logger->debug('The requested service "' . ICache::class . '" is deprecated. Please use "' . ICacheFactory::class . '" instead to create a cache. This service will be removed in a future Nextcloud version.', ['app' => 'serverDI']);
+
+            /** @var ICacheFactory $cacheFactory */
+            $cacheFactory = $c->get(ICacheFactory::class);
+            return $cacheFactory->createDistributed();
+        });
+
+        $this->registerService(Factory::class, function (Server $c) {
+            $profiler = $c->get(IProfiler::class);
+            $arrayCacheFactory = new \OC\Memcache\Factory(fn () => '', $c->get(LoggerInterface::class),
+                $profiler,
+                ArrayCache::class,
+                ArrayCache::class,
+                ArrayCache::class
+            );
+            /** @var SystemConfig $config */
+            $config = $c->get(SystemConfig::class);
+            /** @var ServerVersion $serverVersion */
+            $serverVersion = $c->get(ServerVersion::class);
+
+            if ($config->getValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                $logQuery = $config->getValue('log_query');
+                $prefixClosure = function () use ($logQuery, $serverVersion): ?string {
+                    if (!$logQuery) {
+                        try {
+                            $v = \OCP\Server::get(IAppConfig::class)->getAppInstalledVersions(true);
+                        } catch (\Doctrine\DBAL\Exception $e) {
+                            // Database service probably unavailable
+                            // Probably related to https://github.com/nextcloud/server/issues/37424
+                            return null;
+                        }
+                    } else {
+                        // If the log_query is enabled, we can not get the app versions
+                        // as that does a query, which will be logged and the logging
+                        // depends on redis and here we are back again in the same function.
+                        $v = [
+                            'log_query' => 'enabled',
+                        ];
+                    }
+                    $v['core'] = implode(',', $serverVersion->getVersion());
+                    $version = implode(',', array_keys($v)) . implode(',', $v);
+                    $instanceId = \OC_Util::getInstanceId();
+                    $path = \OC::$SERVERROOT;
+                    return md5($instanceId . '-' . $version . '-' . $path);
+                };
+                return new \OC\Memcache\Factory($prefixClosure,
+                    $c->get(LoggerInterface::class),
+                    $profiler,
+                    /** @psalm-taint-escape callable */
+                    $config->getValue('memcache.local', null),
+                    /** @psalm-taint-escape callable */
+                    $config->getValue('memcache.distributed', null),
+                    /** @psalm-taint-escape callable */
+                    $config->getValue('memcache.locking', null),
+                    /** @psalm-taint-escape callable */
+                    $config->getValue('redis_log_file')
+                );
+            }
+            return $arrayCacheFactory;
+        });
+        $this->registerAlias(ICacheFactory::class, Factory::class);
+
+        $this->registerService('RedisFactory', function (Server $c) {
+            $systemConfig = $c->get(SystemConfig::class);
+            return new RedisFactory($systemConfig, $c->get(IEventLogger::class));
+        });
+
+        $this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
+            $l10n = $this->get(IFactory::class)->get('lib');
+            return new \OC\Activity\Manager(
+                $c->getRequest(),
+                $c->get(IUserSession::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(IValidator::class),
+                $c->get(IRichTextFormatter::class),
+                $l10n
+            );
+        });
+
+        $this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
+            return new \OC\Activity\EventMerger(
+                $c->getL10N('lib')
+            );
+        });
+        $this->registerAlias(IValidator::class, Validator::class);
+
+        $this->registerService(AvatarManager::class, function (Server $c) {
+            return new AvatarManager(
+                $c->get(IUserSession::class),
+                $c->get(\OC\User\Manager::class),
+                $c->getAppDataDir('avatar'),
+                $c->getL10N('lib'),
+                $c->get(LoggerInterface::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(IAccountManager::class),
+                $c->get(KnownUserService::class)
+            );
+        });
+
+        $this->registerAlias(IAvatarManager::class, AvatarManager::class);
+
+        $this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
+        $this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
+        $this->registerAlias(\OCP\Support\Subscription\IAssertion::class, \OC\Support\Subscription\Assertion::class);
+
+        /** Only used by the PsrLoggerAdapter should not be used by apps */
+        $this->registerService(\OC\Log::class, function (Server $c) {
+            $logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file');
+            $factory = new LogFactory($c, $this->get(SystemConfig::class));
+            $logger = $factory->get($logType);
+            $registry = $c->get(\OCP\Support\CrashReport\IRegistry::class);
+
+            return new Log($logger, $this->get(SystemConfig::class), crashReporters: $registry);
+        });
+        // PSR-3 logger
+        $this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
+
+        $this->registerService(ILogFactory::class, function (Server $c) {
+            return new LogFactory($c, $this->get(SystemConfig::class));
+        });
+
+        $this->registerAlias(IJobList::class, \OC\BackgroundJob\JobList::class);
+
+        $this->registerService(Router::class, function (Server $c) {
+            $cacheFactory = $c->get(ICacheFactory::class);
+            if ($cacheFactory->isLocalCacheAvailable()) {
+                $router = $c->resolve(CachingRouter::class);
+            } else {
+                $router = $c->resolve(Router::class);
+            }
+            return $router;
+        });
+        $this->registerAlias(IRouter::class, Router::class);
+
+        $this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
+            $config = $c->get(\OCP\IConfig::class);
+            if (ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
+                $backend = new \OC\Security\RateLimiting\Backend\MemoryCacheBackend(
+                    $c->get(AllConfig::class),
+                    $this->get(ICacheFactory::class),
+                    new \OC\AppFramework\Utility\TimeFactory()
+                );
+            } else {
+                $backend = new \OC\Security\RateLimiting\Backend\DatabaseBackend(
+                    $c->get(AllConfig::class),
+                    $c->get(IDBConnection::class),
+                    new \OC\AppFramework\Utility\TimeFactory()
+                );
+            }
+
+            return $backend;
+        });
+
+        $this->registerAlias(\OCP\Security\ISecureRandom::class, SecureRandom::class);
+        $this->registerAlias(\OCP\Security\IRemoteHostValidator::class, \OC\Security\RemoteHostValidator::class);
+        $this->registerAlias(IVerificationToken::class, VerificationToken::class);
+
+        $this->registerAlias(ICrypto::class, Crypto::class);
+
+        $this->registerAlias(IHasher::class, Hasher::class);
+
+        $this->registerAlias(ICredentialsManager::class, CredentialsManager::class);
+
+        $this->registerAlias(IDBConnection::class, ConnectionAdapter::class);
+        $this->registerService(Connection::class, function (Server $c) {
+            $systemConfig = $c->get(SystemConfig::class);
+            $factory = new \OC\DB\ConnectionFactory($systemConfig, $c->get(ICacheFactory::class));
+            $type = $systemConfig->getValue('dbtype', 'sqlite');
+            if (!$factory->isValidType($type)) {
+                throw new \OC\DatabaseException('Invalid database type');
+            }
+            $connection = $factory->getConnection($type, []);
+            return $connection;
+        });
+
+        $this->registerAlias(ICertificateManager::class, CertificateManager::class);
+        $this->registerAlias(IClientService::class, ClientService::class);
+        $this->registerService(NegativeDnsCache::class, function (ContainerInterface $c) {
+            return new NegativeDnsCache(
+                $c->get(ICacheFactory::class),
+            );
+        });
+        $this->registerDeprecatedAlias('HttpClientService', IClientService::class);
+        $this->registerService(IEventLogger::class, function (ContainerInterface $c) {
+            return new EventLogger($c->get(SystemConfig::class), $c->get(LoggerInterface::class), $c->get(Log::class));
+        });
+
+        $this->registerService(IQueryLogger::class, function (ContainerInterface $c) {
+            $queryLogger = new QueryLogger();
+            if ($c->get(SystemConfig::class)->getValue('debug', false)) {
+                // In debug mode, module is being activated by default
+                $queryLogger->activate();
+            }
+            return $queryLogger;
+        });
+
+        $this->registerAlias(ITempManager::class, TempManager::class);
+        $this->registerAlias(IDateTimeZone::class, DateTimeZone::class);
+
+        $this->registerService(IDateTimeFormatter::class, function (Server $c) {
+            $language = $c->get(\OCP\IConfig::class)->getUserValue($c->get(ISession::class)->get('user_id'), 'core', 'lang', null);
+
+            return new DateTimeFormatter(
+                $c->get(IDateTimeZone::class)->getTimeZone(),
+                $c->getL10N('lib', $language)
+            );
+        });
+
+        $this->registerService(IUserMountCache::class, function (ContainerInterface $c) {
+            $mountCache = $c->get(UserMountCache::class);
+            $listener = new UserMountCacheListener($mountCache);
+            $listener->listen($c->get(IUserManager::class));
+            return $mountCache;
+        });
+
+        $this->registerService(IMountProviderCollection::class, function (ContainerInterface $c) {
+            $loader = $c->get(IStorageFactory::class);
+            $mountCache = $c->get(IUserMountCache::class);
+            $eventLogger = $c->get(IEventLogger::class);
+            $manager = new MountProviderCollection($loader, $mountCache, $eventLogger);
+
+            // builtin providers
+
+            $config = $c->get(\OCP\IConfig::class);
+            $logger = $c->get(LoggerInterface::class);
+            $objectStoreConfig = $c->get(PrimaryObjectStoreConfig::class);
+            $manager->registerProvider(new CacheMountProvider($config));
+            $manager->registerHomeProvider(new LocalHomeMountProvider());
+            $manager->registerHomeProvider(new ObjectHomeMountProvider($objectStoreConfig));
+            $manager->registerRootProvider(new RootMountProvider($objectStoreConfig, $config));
+            $manager->registerRootProvider(new ObjectStorePreviewCacheMountProvider($logger, $config));
+
+            return $manager;
+        });
+
+        $this->registerService(IBus::class, function (ContainerInterface $c) {
+            $busClass = $c->get(\OCP\IConfig::class)->getSystemValueString('commandbus');
+            if ($busClass) {
+                [$app, $class] = explode('::', $busClass, 2);
+                if ($c->get(IAppManager::class)->isEnabledForUser($app)) {
+                    $c->get(IAppManager::class)->loadApp($app);
+                    return $c->get($class);
+                } else {
+                    throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
+                }
+            } else {
+                $jobList = $c->get(IJobList::class);
+                return new CronBus($jobList);
+            }
+        });
+        $this->registerDeprecatedAlias('AsyncCommandBus', IBus::class);
+        $this->registerAlias(ITrustedDomainHelper::class, TrustedDomainHelper::class);
+        $this->registerAlias(IThrottler::class, Throttler::class);
+
+        $this->registerService(\OC\Security\Bruteforce\Backend\IBackend::class, function ($c) {
+            $config = $c->get(\OCP\IConfig::class);
+            if (!$config->getSystemValueBool('auth.bruteforce.protection.force.database', false)
+                && ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
+                $backend = $c->get(\OC\Security\Bruteforce\Backend\MemoryCacheBackend::class);
+            } else {
+                $backend = $c->get(\OC\Security\Bruteforce\Backend\DatabaseBackend::class);
+            }
+
+            return $backend;
+        });
+
+        $this->registerDeprecatedAlias('IntegrityCodeChecker', Checker::class);
+        $this->registerService(Checker::class, function (ContainerInterface $c) {
+            // IConfig requires a working database. This code
+            // might however be called when Nextcloud is not yet setup.
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $config = $c->get(\OCP\IConfig::class);
+                $appConfig = $c->get(\OCP\IAppConfig::class);
+            } else {
+                $config = null;
+                $appConfig = null;
+            }
+
+            return new Checker(
+                $c->get(ServerVersion::class),
+                $c->get(EnvironmentHelper::class),
+                new FileAccessHelper(),
+                new AppLocator(),
+                $config,
+                $appConfig,
+                $c->get(ICacheFactory::class),
+                $c->get(IAppManager::class),
+                $c->get(IMimeTypeDetector::class)
+            );
+        });
+        $this->registerService(Request::class, function (ContainerInterface $c) {
+            if (isset($this['urlParams'])) {
+                $urlParams = $this['urlParams'];
+            } else {
+                $urlParams = [];
+            }
+
+            if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
+                && in_array('fakeinput', stream_get_wrappers())
+            ) {
+                $stream = 'fakeinput://data';
+            } else {
+                $stream = 'php://input';
+            }
+
+            return new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : '',
+                    'urlParams' => $urlParams,
+                ],
+                $this->get(IRequestId::class),
+                $this->get(\OCP\IConfig::class),
+                $this->get(CsrfTokenManager::class),
+                $stream
+            );
+        });
+        $this->registerAlias(\OCP\IRequest::class, Request::class);
+
+        $this->registerService(IRequestId::class, function (ContainerInterface $c): IRequestId {
+            return new RequestId(
+                $_SERVER['UNIQUE_ID'] ?? '',
+                $this->get(ISecureRandom::class)
+            );
+        });
+
+        $this->registerService(IMailer::class, function (Server $c) {
+            return new Mailer(
+                $c->get(\OCP\IConfig::class),
+                $c->get(LoggerInterface::class),
+                $c->get(Defaults::class),
+                $c->get(IURLGenerator::class),
+                $c->getL10N('lib'),
+                $c->get(IEventDispatcher::class),
+                $c->get(IFactory::class)
+            );
+        });
+
+        /** @since 30.0.0 */
+        $this->registerAlias(\OCP\Mail\Provider\IManager::class, \OC\Mail\Provider\Manager::class);
+
+        $this->registerService(ILDAPProviderFactory::class, function (ContainerInterface $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('ldapProviderFactory', null);
+            if (is_null($factoryClass) || !class_exists($factoryClass)) {
+                return new NullLDAPProviderFactory($this);
+            }
+            /** @var \OCP\LDAP\ILDAPProviderFactory $factory */
+            return new $factoryClass($this);
+        });
+        $this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
+            $factory = $c->get(ILDAPProviderFactory::class);
+            return $factory->getLDAPProvider();
+        });
+        $this->registerService(ILockingProvider::class, function (ContainerInterface $c) {
+            $ini = $c->get(IniGetWrapper::class);
+            $config = $c->get(\OCP\IConfig::class);
+            $ttl = $config->getSystemValueInt('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
+            if ($config->getSystemValueBool('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                /** @var \OC\Memcache\Factory $memcacheFactory */
+                $memcacheFactory = $c->get(ICacheFactory::class);
+                $memcache = $memcacheFactory->createLocking('lock');
+                if (!($memcache instanceof \OC\Memcache\NullCache)) {
+                    $timeFactory = $c->get(ITimeFactory::class);
+                    return new MemcacheLockingProvider($memcache, $timeFactory, $ttl);
+                }
+                return new DBLockingProvider(
+                    $c->get(IDBConnection::class),
+                    new TimeFactory(),
+                    $ttl,
+                    !\OC::$CLI
+                );
+            }
+            return new NoopLockingProvider();
+        });
+
+        $this->registerService(ILockManager::class, function (Server $c): LockManager {
+            return new LockManager();
+        });
+
+        $this->registerAlias(ILockdownManager::class, 'LockdownManager');
+        $this->registerService(SetupManager::class, function ($c) {
+            // create the setupmanager through the mount manager to resolve the cyclic dependency
+            return $c->get(\OC\Files\Mount\Manager::class)->getSetupManager();
+        });
+        $this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class);
+
+        $this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) {
+            return new \OC\Files\Type\Detection(
+                $c->get(IURLGenerator::class),
+                $c->get(LoggerInterface::class),
+                \OC::$configDir,
+                \OC::$SERVERROOT . '/resources/config/'
+            );
+        });
+
+        $this->registerAlias(IMimeTypeLoader::class, Loader::class);
+        $this->registerService(BundleFetcher::class, function () {
+            return new BundleFetcher($this->getL10N('lib'));
+        });
+        $this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
+
+        $this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
+            $manager = new CapabilitiesManager($c->get(LoggerInterface::class));
+            $manager->registerCapability(function () use ($c) {
+                return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
+            });
+            $manager->registerCapability(function () use ($c) {
+                return $c->get(\OC\Security\Bruteforce\Capabilities::class);
+            });
+            return $manager;
+        });
+
+        $this->registerService(ICommentsManager::class, function (Server $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
+            /** @var \OCP\Comments\ICommentsManagerFactory $factory */
+            $factory = new $factoryClass($this);
+            $manager = $factory->getManager();
+
+            $manager->registerDisplayNameResolver('user', function ($id) use ($c) {
+                $manager = $c->get(IUserManager::class);
+                $userDisplayName = $manager->getDisplayName($id);
+                if ($userDisplayName === null) {
+                    $l = $c->get(IFactory::class)->get('core');
+                    return $l->t('Unknown account');
+                }
+                return $userDisplayName;
+            });
+
+            return $manager;
+        });
+
+        $this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
+        $this->registerService('ThemingDefaults', function (Server $c) {
+            try {
+                $classExists = class_exists('OCA\Theming\ThemingDefaults');
+            } catch (\OCP\AutoloadNotAllowedException $e) {
+                // App disabled or in maintenance mode
+                $classExists = false;
+            }
+
+            if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isEnabledForAnyone('theming') && $c->get(TrustedDomainHelper::class)->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
+                $backgroundService = new BackgroundService(
+                    $c->get(IRootFolder::class),
+                    $c->getAppDataDir('theming'),
+                    $c->get(IAppConfig::class),
+                    $c->get(\OCP\IConfig::class),
+                    $c->get(ISession::class)->get('user_id'),
+                );
+                $imageManager = new ImageManager(
+                    $c->get(\OCP\IConfig::class),
+                    $c->getAppDataDir('theming'),
+                    $c->get(IURLGenerator::class),
+                    $c->get(ICacheFactory::class),
+                    $c->get(LoggerInterface::class),
+                    $c->get(ITempManager::class),
+                    $backgroundService,
+                );
+                return new ThemingDefaults(
+                    $c->get(\OCP\IConfig::class),
+                    $c->get(\OCP\IAppConfig::class),
+                    $c->getL10N('theming'),
+                    $c->get(IUserSession::class),
+                    $c->get(IURLGenerator::class),
+                    $c->get(ICacheFactory::class),
+                    new Util($c->get(ServerVersion::class), $c->get(\OCP\IConfig::class), $this->get(IAppManager::class), $c->getAppDataDir('theming'), $imageManager),
+                    $imageManager,
+                    $c->get(IAppManager::class),
+                    $c->get(INavigationManager::class),
+                    $backgroundService,
+                );
+            }
+            return new \OC_Defaults();
+        });
+        $this->registerService(JSCombiner::class, function (Server $c) {
+            return new JSCombiner(
+                $c->getAppDataDir('js'),
+                $c->get(IURLGenerator::class),
+                $this->get(ICacheFactory::class),
+                $c->get(SystemConfig::class),
+                $c->get(LoggerInterface::class)
+            );
+        });
+        $this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
+
+        $this->registerService('CryptoWrapper', function (ContainerInterface $c) {
+            // FIXME: Instantiated here due to cyclic dependency
+            $request = new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : null,
+                ],
+                $c->get(IRequestId::class),
+                $c->get(\OCP\IConfig::class)
+            );
+
+            return new CryptoWrapper(
+                $c->get(ICrypto::class),
+                $c->get(ISecureRandom::class),
+                $request
+            );
+        });
+        $this->registerService(SessionStorage::class, function (ContainerInterface $c) {
+            return new SessionStorage($c->get(ISession::class));
+        });
+        $this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
+
+        $this->registerService(IProviderFactory::class, function (ContainerInterface $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
+            /** @var \OCP\Share\IProviderFactory $factory */
+            return $c->get($factoryClass);
+        });
+
+        $this->registerAlias(\OCP\Share\IManager::class, \OC\Share20\Manager::class);
+
+        $this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
+            $instance = new Collaboration\Collaborators\Search($c);
+
+            // register default plugins
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE_GROUP', 'class' => RemoteGroupPlugin::class]);
+
+            return $instance;
+        });
+        $this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class);
+
+        $this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
+
+        $this->registerAlias(\OCP\Collaboration\Resources\IProviderManager::class, \OC\Collaboration\Resources\ProviderManager::class);
+        $this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
+
+        $this->registerAlias(IReferenceManager::class, ReferenceManager::class);
+        $this->registerAlias(ITeamManager::class, TeamManager::class);
+
+        $this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class);
+        $this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class);
+        $this->registerService(\OC\Files\AppData\Factory::class, function (ContainerInterface $c) {
+            return new \OC\Files\AppData\Factory(
+                $c->get(IRootFolder::class),
+                $c->get(SystemConfig::class)
+            );
+        });
+
+        $this->registerService('LockdownManager', function (ContainerInterface $c) {
+            return new LockdownManager(function () use ($c) {
+                return $c->get(ISession::class);
+            });
+        });
+
+        $this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
+            return new DiscoveryService(
+                $c->get(ICacheFactory::class),
+                $c->get(IClientService::class)
+            );
+        });
+        $this->registerAlias(IOCMDiscoveryService::class, OCMDiscoveryService::class);
+
+        $this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
+            return new CloudIdManager(
+                $c->get(\OCP\Contacts\IManager::class),
+                $c->get(IURLGenerator::class),
+                $c->get(IUserManager::class),
+                $c->get(ICacheFactory::class),
+                $c->get(IEventDispatcher::class),
+            );
+        });
+
+        $this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
+        $this->registerAlias(ICloudFederationProviderManager::class, CloudFederationProviderManager::class);
+        $this->registerService(ICloudFederationFactory::class, function (Server $c) {
+            return new CloudFederationFactory();
+        });
 
-		$this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
+        $this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
 
-		$this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
-		$this->registerAlias(\Psr\Clock\ClockInterface::class, \OCP\AppFramework\Utility\ITimeFactory::class);
+        $this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
+        $this->registerAlias(\Psr\Clock\ClockInterface::class, \OCP\AppFramework\Utility\ITimeFactory::class);
 
-		$this->registerService(Defaults::class, function (Server $c) {
-			return new Defaults(
-				$c->get('ThemingDefaults')
-			);
-		});
+        $this->registerService(Defaults::class, function (Server $c) {
+            return new Defaults(
+                $c->get('ThemingDefaults')
+            );
+        });
 
-		$this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
-			return $c->get(\OCP\IUserSession::class)->getSession();
-		}, false);
+        $this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
+            return $c->get(\OCP\IUserSession::class)->getSession();
+        }, false);
 
-		$this->registerService(IShareHelper::class, function (ContainerInterface $c) {
-			return new ShareHelper(
-				$c->get(\OCP\Share\IManager::class)
-			);
-		});
+        $this->registerService(IShareHelper::class, function (ContainerInterface $c) {
+            return new ShareHelper(
+                $c->get(\OCP\Share\IManager::class)
+            );
+        });
 
-		$this->registerService(Installer::class, function (ContainerInterface $c) {
-			return new Installer(
-				$c->get(AppFetcher::class),
-				$c->get(IClientService::class),
-				$c->get(ITempManager::class),
-				$c->get(LoggerInterface::class),
-				$c->get(\OCP\IConfig::class),
-				\OC::$CLI
-			);
-		});
+        $this->registerService(Installer::class, function (ContainerInterface $c) {
+            return new Installer(
+                $c->get(AppFetcher::class),
+                $c->get(IClientService::class),
+                $c->get(ITempManager::class),
+                $c->get(LoggerInterface::class),
+                $c->get(\OCP\IConfig::class),
+                \OC::$CLI
+            );
+        });
 
-		$this->registerService(IApiFactory::class, function (ContainerInterface $c) {
-			return new ApiFactory($c->get(IClientService::class));
-		});
+        $this->registerService(IApiFactory::class, function (ContainerInterface $c) {
+            return new ApiFactory($c->get(IClientService::class));
+        });
 
-		$this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
-			$memcacheFactory = $c->get(ICacheFactory::class);
-			return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
-		});
+        $this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
+            $memcacheFactory = $c->get(ICacheFactory::class);
+            return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
+        });
 
-		$this->registerAlias(IContactsStore::class, ContactsStore::class);
-		$this->registerAlias(IAccountManager::class, AccountManager::class);
+        $this->registerAlias(IContactsStore::class, ContactsStore::class);
+        $this->registerAlias(IAccountManager::class, AccountManager::class);
 
-		$this->registerAlias(IStorageFactory::class, StorageFactory::class);
+        $this->registerAlias(IStorageFactory::class, StorageFactory::class);
 
-		$this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class);
+        $this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class);
 
-		$this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
-		$this->registerAlias(IFilesMetadataManager::class, FilesMetadataManager::class);
+        $this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
+        $this->registerAlias(IFilesMetadataManager::class, FilesMetadataManager::class);
 
-		$this->registerAlias(ISubAdmin::class, SubAdmin::class);
+        $this->registerAlias(ISubAdmin::class, SubAdmin::class);
 
-		$this->registerAlias(IInitialStateService::class, InitialStateService::class);
+        $this->registerAlias(IInitialStateService::class, InitialStateService::class);
 
-		$this->registerAlias(\OCP\IEmojiHelper::class, \OC\EmojiHelper::class);
+        $this->registerAlias(\OCP\IEmojiHelper::class, \OC\EmojiHelper::class);
 
-		$this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class);
+        $this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class);
 
-		$this->registerAlias(IBroker::class, Broker::class);
+        $this->registerAlias(IBroker::class, Broker::class);
 
-		$this->registerAlias(\OCP\Files\AppData\IAppDataFactory::class, \OC\Files\AppData\Factory::class);
+        $this->registerAlias(\OCP\Files\AppData\IAppDataFactory::class, \OC\Files\AppData\Factory::class);
 
-		$this->registerAlias(\OCP\Files\IFilenameValidator::class, \OC\Files\FilenameValidator::class);
+        $this->registerAlias(\OCP\Files\IFilenameValidator::class, \OC\Files\FilenameValidator::class);
 
-		$this->registerAlias(IBinaryFinder::class, BinaryFinder::class);
+        $this->registerAlias(IBinaryFinder::class, BinaryFinder::class);
 
-		$this->registerAlias(\OCP\Share\IPublicShareTemplateFactory::class, \OC\Share20\PublicShareTemplateFactory::class);
+        $this->registerAlias(\OCP\Share\IPublicShareTemplateFactory::class, \OC\Share20\PublicShareTemplateFactory::class);
 
-		$this->registerAlias(ITranslationManager::class, TranslationManager::class);
+        $this->registerAlias(ITranslationManager::class, TranslationManager::class);
 
-		$this->registerAlias(IConversionManager::class, ConversionManager::class);
+        $this->registerAlias(IConversionManager::class, ConversionManager::class);
 
-		$this->registerAlias(ISpeechToTextManager::class, SpeechToTextManager::class);
+        $this->registerAlias(ISpeechToTextManager::class, SpeechToTextManager::class);
 
-		$this->registerAlias(IEventSourceFactory::class, EventSourceFactory::class);
+        $this->registerAlias(IEventSourceFactory::class, EventSourceFactory::class);
 
-		$this->registerAlias(\OCP\TextProcessing\IManager::class, \OC\TextProcessing\Manager::class);
+        $this->registerAlias(\OCP\TextProcessing\IManager::class, \OC\TextProcessing\Manager::class);
 
-		$this->registerAlias(\OCP\TextToImage\IManager::class, \OC\TextToImage\Manager::class);
+        $this->registerAlias(\OCP\TextToImage\IManager::class, \OC\TextToImage\Manager::class);
 
-		$this->registerAlias(ILimiter::class, Limiter::class);
+        $this->registerAlias(ILimiter::class, Limiter::class);
 
-		$this->registerAlias(IPhoneNumberUtil::class, PhoneNumberUtil::class);
+        $this->registerAlias(IPhoneNumberUtil::class, PhoneNumberUtil::class);
 
-		$this->registerAlias(ICapabilityAwareOCMProvider::class, OCMProvider::class);
-		$this->registerDeprecatedAlias(IOCMProvider::class, OCMProvider::class);
+        $this->registerAlias(ICapabilityAwareOCMProvider::class, OCMProvider::class);
+        $this->registerDeprecatedAlias(IOCMProvider::class, OCMProvider::class);
 
-		$this->registerAlias(ISetupCheckManager::class, SetupCheckManager::class);
+        $this->registerAlias(ISetupCheckManager::class, SetupCheckManager::class);
 
-		$this->registerAlias(IProfileManager::class, ProfileManager::class);
+        $this->registerAlias(IProfileManager::class, ProfileManager::class);
 
-		$this->registerAlias(IAvailabilityCoordinator::class, AvailabilityCoordinator::class);
+        $this->registerAlias(IAvailabilityCoordinator::class, AvailabilityCoordinator::class);
 
-		$this->registerAlias(IDeclarativeManager::class, DeclarativeManager::class);
+        $this->registerAlias(IDeclarativeManager::class, DeclarativeManager::class);
 
-		$this->registerAlias(\OCP\TaskProcessing\IManager::class, \OC\TaskProcessing\Manager::class);
+        $this->registerAlias(\OCP\TaskProcessing\IManager::class, \OC\TaskProcessing\Manager::class);
 
-		$this->registerAlias(IRemoteAddress::class, RemoteAddress::class);
+        $this->registerAlias(IRemoteAddress::class, RemoteAddress::class);
 
-		$this->registerAlias(\OCP\Security\Ip\IFactory::class, \OC\Security\Ip\Factory::class);
-
-		$this->registerAlias(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class);
-
-		$this->registerAlias(ISignatureManager::class, SignatureManager::class);
-
-		$this->connectDispatcher();
-	}
-
-	public function boot() {
-		/** @var HookConnector $hookConnector */
-		$hookConnector = $this->get(HookConnector::class);
-		$hookConnector->viewToNode();
-	}
-
-	private function connectDispatcher(): void {
-		/** @var IEventDispatcher $eventDispatcher */
-		$eventDispatcher = $this->get(IEventDispatcher::class);
-		$eventDispatcher->addServiceListener(LoginFailed::class, LoginFailedListener::class);
-		$eventDispatcher->addServiceListener(PostLoginEvent::class, UserLoggedInListener::class);
-		$eventDispatcher->addServiceListener(UserChangedEvent::class, UserChangedListener::class);
-		$eventDispatcher->addServiceListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
-
-		FilesMetadataManager::loadListeners($eventDispatcher);
-		GenerateBlurhashMetadata::loadListeners($eventDispatcher);
-	}
-
-	/**
-	 * @return \OCP\Contacts\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getContactsManager() {
-		return $this->get(\OCP\Contacts\IManager::class);
-	}
-
-	/**
-	 * @return \OC\Encryption\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getEncryptionManager() {
-		return $this->get(\OCP\Encryption\IManager::class);
-	}
-
-	/**
-	 * @return \OC\Encryption\File
-	 * @deprecated 20.0.0
-	 */
-	public function getEncryptionFilesHelper() {
-		return $this->get(IFile::class);
-	}
-
-	/**
-	 * The current request object holding all information about the request
-	 * currently being processed is returned from this method.
-	 * In case the current execution was not initiated by a web request null is returned
-	 *
-	 * @return \OCP\IRequest
-	 * @deprecated 20.0.0
-	 */
-	public function getRequest() {
-		return $this->get(IRequest::class);
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 *
-	 * @return IRootFolder
-	 * @deprecated 20.0.0
-	 */
-	public function getRootFolder() {
-		return $this->get(IRootFolder::class);
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 * This is the lazy variant so this gets only initialized once it
-	 * is actually used.
-	 *
-	 * @return IRootFolder
-	 * @deprecated 20.0.0
-	 */
-	public function getLazyRootFolder() {
-		return $this->get(IRootFolder::class);
-	}
-
-	/**
-	 * Returns a view to ownCloud's files folder
-	 *
-	 * @param string $userId user ID
-	 * @return \OCP\Files\Folder|null
-	 * @deprecated 20.0.0
-	 */
-	public function getUserFolder($userId = null) {
-		if ($userId === null) {
-			$user = $this->get(IUserSession::class)->getUser();
-			if (!$user) {
-				return null;
-			}
-			$userId = $user->getUID();
-		}
-		$root = $this->get(IRootFolder::class);
-		return $root->getUserFolder($userId);
-	}
-
-	/**
-	 * @return \OC\User\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getUserManager() {
-		return $this->get(IUserManager::class);
-	}
-
-	/**
-	 * @return \OC\Group\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getGroupManager() {
-		return $this->get(IGroupManager::class);
-	}
-
-	/**
-	 * @return \OC\User\Session
-	 * @deprecated 20.0.0
-	 */
-	public function getUserSession() {
-		return $this->get(IUserSession::class);
-	}
-
-	/**
-	 * @return \OCP\ISession
-	 * @deprecated 20.0.0
-	 */
-	public function getSession() {
-		return $this->get(Session::class)->getSession();
-	}
-
-	/**
-	 * @param \OCP\ISession $session
-	 * @return void
-	 */
-	public function setSession(\OCP\ISession $session) {
-		$this->get(SessionStorage::class)->setSession($session);
-		$this->get(Session::class)->setSession($session);
-		$this->get(Store::class)->setSession($session);
-	}
-
-	/**
-	 * @return \OCP\IConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getConfig() {
-		return $this->get(AllConfig::class);
-	}
-
-	/**
-	 * @return \OC\SystemConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getSystemConfig() {
-		return $this->get(SystemConfig::class);
-	}
-
-	/**
-	 * @return IFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getL10NFactory() {
-		return $this->get(IFactory::class);
-	}
-
-	/**
-	 * get an L10N instance
-	 *
-	 * @param string $app appid
-	 * @param string $lang
-	 * @return IL10N
-	 * @deprecated 20.0.0 use DI of {@see IL10N} or {@see IFactory} instead, or {@see \OCP\Util::getL10N()} as a last resort
-	 */
-	public function getL10N($app, $lang = null) {
-		return $this->get(IFactory::class)->get($app, $lang);
-	}
-
-	/**
-	 * @return IURLGenerator
-	 * @deprecated 20.0.0
-	 */
-	public function getURLGenerator() {
-		return $this->get(IURLGenerator::class);
-	}
-
-	/**
-	 * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
-	 * getMemCacheFactory() instead.
-	 *
-	 * @return ICache
-	 * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
-	 */
-	public function getCache() {
-		return $this->get(ICache::class);
-	}
-
-	/**
-	 * Returns an \OCP\CacheFactory instance
-	 *
-	 * @return \OCP\ICacheFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getMemCacheFactory() {
-		return $this->get(ICacheFactory::class);
-	}
-
-	/**
-	 * Returns the current session
-	 *
-	 * @return \OCP\IDBConnection
-	 * @deprecated 20.0.0
-	 */
-	public function getDatabaseConnection() {
-		return $this->get(IDBConnection::class);
-	}
-
-	/**
-	 * Returns the activity manager
-	 *
-	 * @return \OCP\Activity\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getActivityManager() {
-		return $this->get(\OCP\Activity\IManager::class);
-	}
-
-	/**
-	 * Returns an job list for controlling background jobs
-	 *
-	 * @return IJobList
-	 * @deprecated 20.0.0
-	 */
-	public function getJobList() {
-		return $this->get(IJobList::class);
-	}
-
-	/**
-	 * Returns a SecureRandom instance
-	 *
-	 * @return \OCP\Security\ISecureRandom
-	 * @deprecated 20.0.0
-	 */
-	public function getSecureRandom() {
-		return $this->get(ISecureRandom::class);
-	}
-
-	/**
-	 * Returns a Crypto instance
-	 *
-	 * @return ICrypto
-	 * @deprecated 20.0.0
-	 */
-	public function getCrypto() {
-		return $this->get(ICrypto::class);
-	}
-
-	/**
-	 * Returns a Hasher instance
-	 *
-	 * @return IHasher
-	 * @deprecated 20.0.0
-	 */
-	public function getHasher() {
-		return $this->get(IHasher::class);
-	}
-
-	/**
-	 * Get the certificate manager
-	 *
-	 * @return \OCP\ICertificateManager
-	 */
-	public function getCertificateManager() {
-		return $this->get(ICertificateManager::class);
-	}
-
-	/**
-	 * Get the manager for temporary files and folders
-	 *
-	 * @return \OCP\ITempManager
-	 * @deprecated 20.0.0
-	 */
-	public function getTempManager() {
-		return $this->get(ITempManager::class);
-	}
-
-	/**
-	 * Get the app manager
-	 *
-	 * @return \OCP\App\IAppManager
-	 * @deprecated 20.0.0
-	 */
-	public function getAppManager() {
-		return $this->get(IAppManager::class);
-	}
-
-	/**
-	 * Creates a new mailer
-	 *
-	 * @return IMailer
-	 * @deprecated 20.0.0
-	 */
-	public function getMailer() {
-		return $this->get(IMailer::class);
-	}
-
-	/**
-	 * Get the webroot
-	 *
-	 * @return string
-	 * @deprecated 20.0.0
-	 */
-	public function getWebRoot() {
-		return $this->webRoot;
-	}
-
-	/**
-	 * Get the locking provider
-	 *
-	 * @return ILockingProvider
-	 * @since 8.1.0
-	 * @deprecated 20.0.0
-	 */
-	public function getLockingProvider() {
-		return $this->get(ILockingProvider::class);
-	}
-
-	/**
-	 * Get the MimeTypeDetector
-	 *
-	 * @return IMimeTypeDetector
-	 * @deprecated 20.0.0
-	 */
-	public function getMimeTypeDetector() {
-		return $this->get(IMimeTypeDetector::class);
-	}
-
-	/**
-	 * Get the MimeTypeLoader
-	 *
-	 * @return IMimeTypeLoader
-	 * @deprecated 20.0.0
-	 */
-	public function getMimeTypeLoader() {
-		return $this->get(IMimeTypeLoader::class);
-	}
-
-	/**
-	 * Get the Notification Manager
-	 *
-	 * @return \OCP\Notification\IManager
-	 * @since 8.2.0
-	 * @deprecated 20.0.0
-	 */
-	public function getNotificationManager() {
-		return $this->get(\OCP\Notification\IManager::class);
-	}
-
-	/**
-	 * @return \OCA\Theming\ThemingDefaults
-	 * @deprecated 20.0.0
-	 */
-	public function getThemingDefaults() {
-		return $this->get('ThemingDefaults');
-	}
-
-	/**
-	 * @return \OC\IntegrityCheck\Checker
-	 * @deprecated 20.0.0
-	 */
-	public function getIntegrityCodeChecker() {
-		return $this->get('IntegrityCodeChecker');
-	}
-
-	/**
-	 * @return CsrfTokenManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCsrfTokenManager() {
-		return $this->get(CsrfTokenManager::class);
-	}
-
-	/**
-	 * @return ContentSecurityPolicyNonceManager
-	 * @deprecated 20.0.0
-	 */
-	public function getContentSecurityPolicyNonceManager() {
-		return $this->get(ContentSecurityPolicyNonceManager::class);
-	}
-
-	/**
-	 * @return \OCP\Settings\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getSettingsManager() {
-		return $this->get(\OC\Settings\Manager::class);
-	}
-
-	/**
-	 * @return \OCP\Files\IAppData
-	 * @deprecated 20.0.0 Use get(\OCP\Files\AppData\IAppDataFactory::class)->get($app) instead
-	 */
-	public function getAppDataDir($app) {
-		$factory = $this->get(\OC\Files\AppData\Factory::class);
-		return $factory->get($app);
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudIdManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCloudIdManager() {
-		return $this->get(ICloudIdManager::class);
-	}
+        $this->registerAlias(\OCP\Security\Ip\IFactory::class, \OC\Security\Ip\Factory::class);
+
+        $this->registerAlias(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class);
+
+        $this->registerAlias(ISignatureManager::class, SignatureManager::class);
+
+        $this->connectDispatcher();
+    }
+
+    public function boot() {
+        /** @var HookConnector $hookConnector */
+        $hookConnector = $this->get(HookConnector::class);
+        $hookConnector->viewToNode();
+    }
+
+    private function connectDispatcher(): void {
+        /** @var IEventDispatcher $eventDispatcher */
+        $eventDispatcher = $this->get(IEventDispatcher::class);
+        $eventDispatcher->addServiceListener(LoginFailed::class, LoginFailedListener::class);
+        $eventDispatcher->addServiceListener(PostLoginEvent::class, UserLoggedInListener::class);
+        $eventDispatcher->addServiceListener(UserChangedEvent::class, UserChangedListener::class);
+        $eventDispatcher->addServiceListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
+
+        FilesMetadataManager::loadListeners($eventDispatcher);
+        GenerateBlurhashMetadata::loadListeners($eventDispatcher);
+    }
+
+    /**
+     * @return \OCP\Contacts\IManager
+     * @deprecated 20.0.0
+     */
+    public function getContactsManager() {
+        return $this->get(\OCP\Contacts\IManager::class);
+    }
+
+    /**
+     * @return \OC\Encryption\Manager
+     * @deprecated 20.0.0
+     */
+    public function getEncryptionManager() {
+        return $this->get(\OCP\Encryption\IManager::class);
+    }
+
+    /**
+     * @return \OC\Encryption\File
+     * @deprecated 20.0.0
+     */
+    public function getEncryptionFilesHelper() {
+        return $this->get(IFile::class);
+    }
+
+    /**
+     * The current request object holding all information about the request
+     * currently being processed is returned from this method.
+     * In case the current execution was not initiated by a web request null is returned
+     *
+     * @return \OCP\IRequest
+     * @deprecated 20.0.0
+     */
+    public function getRequest() {
+        return $this->get(IRequest::class);
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     *
+     * @return IRootFolder
+     * @deprecated 20.0.0
+     */
+    public function getRootFolder() {
+        return $this->get(IRootFolder::class);
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     * This is the lazy variant so this gets only initialized once it
+     * is actually used.
+     *
+     * @return IRootFolder
+     * @deprecated 20.0.0
+     */
+    public function getLazyRootFolder() {
+        return $this->get(IRootFolder::class);
+    }
+
+    /**
+     * Returns a view to ownCloud's files folder
+     *
+     * @param string $userId user ID
+     * @return \OCP\Files\Folder|null
+     * @deprecated 20.0.0
+     */
+    public function getUserFolder($userId = null) {
+        if ($userId === null) {
+            $user = $this->get(IUserSession::class)->getUser();
+            if (!$user) {
+                return null;
+            }
+            $userId = $user->getUID();
+        }
+        $root = $this->get(IRootFolder::class);
+        return $root->getUserFolder($userId);
+    }
+
+    /**
+     * @return \OC\User\Manager
+     * @deprecated 20.0.0
+     */
+    public function getUserManager() {
+        return $this->get(IUserManager::class);
+    }
+
+    /**
+     * @return \OC\Group\Manager
+     * @deprecated 20.0.0
+     */
+    public function getGroupManager() {
+        return $this->get(IGroupManager::class);
+    }
+
+    /**
+     * @return \OC\User\Session
+     * @deprecated 20.0.0
+     */
+    public function getUserSession() {
+        return $this->get(IUserSession::class);
+    }
+
+    /**
+     * @return \OCP\ISession
+     * @deprecated 20.0.0
+     */
+    public function getSession() {
+        return $this->get(Session::class)->getSession();
+    }
+
+    /**
+     * @param \OCP\ISession $session
+     * @return void
+     */
+    public function setSession(\OCP\ISession $session) {
+        $this->get(SessionStorage::class)->setSession($session);
+        $this->get(Session::class)->setSession($session);
+        $this->get(Store::class)->setSession($session);
+    }
+
+    /**
+     * @return \OCP\IConfig
+     * @deprecated 20.0.0
+     */
+    public function getConfig() {
+        return $this->get(AllConfig::class);
+    }
+
+    /**
+     * @return \OC\SystemConfig
+     * @deprecated 20.0.0
+     */
+    public function getSystemConfig() {
+        return $this->get(SystemConfig::class);
+    }
+
+    /**
+     * @return IFactory
+     * @deprecated 20.0.0
+     */
+    public function getL10NFactory() {
+        return $this->get(IFactory::class);
+    }
+
+    /**
+     * get an L10N instance
+     *
+     * @param string $app appid
+     * @param string $lang
+     * @return IL10N
+     * @deprecated 20.0.0 use DI of {@see IL10N} or {@see IFactory} instead, or {@see \OCP\Util::getL10N()} as a last resort
+     */
+    public function getL10N($app, $lang = null) {
+        return $this->get(IFactory::class)->get($app, $lang);
+    }
+
+    /**
+     * @return IURLGenerator
+     * @deprecated 20.0.0
+     */
+    public function getURLGenerator() {
+        return $this->get(IURLGenerator::class);
+    }
+
+    /**
+     * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
+     * getMemCacheFactory() instead.
+     *
+     * @return ICache
+     * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
+     */
+    public function getCache() {
+        return $this->get(ICache::class);
+    }
+
+    /**
+     * Returns an \OCP\CacheFactory instance
+     *
+     * @return \OCP\ICacheFactory
+     * @deprecated 20.0.0
+     */
+    public function getMemCacheFactory() {
+        return $this->get(ICacheFactory::class);
+    }
+
+    /**
+     * Returns the current session
+     *
+     * @return \OCP\IDBConnection
+     * @deprecated 20.0.0
+     */
+    public function getDatabaseConnection() {
+        return $this->get(IDBConnection::class);
+    }
+
+    /**
+     * Returns the activity manager
+     *
+     * @return \OCP\Activity\IManager
+     * @deprecated 20.0.0
+     */
+    public function getActivityManager() {
+        return $this->get(\OCP\Activity\IManager::class);
+    }
+
+    /**
+     * Returns an job list for controlling background jobs
+     *
+     * @return IJobList
+     * @deprecated 20.0.0
+     */
+    public function getJobList() {
+        return $this->get(IJobList::class);
+    }
+
+    /**
+     * Returns a SecureRandom instance
+     *
+     * @return \OCP\Security\ISecureRandom
+     * @deprecated 20.0.0
+     */
+    public function getSecureRandom() {
+        return $this->get(ISecureRandom::class);
+    }
+
+    /**
+     * Returns a Crypto instance
+     *
+     * @return ICrypto
+     * @deprecated 20.0.0
+     */
+    public function getCrypto() {
+        return $this->get(ICrypto::class);
+    }
+
+    /**
+     * Returns a Hasher instance
+     *
+     * @return IHasher
+     * @deprecated 20.0.0
+     */
+    public function getHasher() {
+        return $this->get(IHasher::class);
+    }
+
+    /**
+     * Get the certificate manager
+     *
+     * @return \OCP\ICertificateManager
+     */
+    public function getCertificateManager() {
+        return $this->get(ICertificateManager::class);
+    }
+
+    /**
+     * Get the manager for temporary files and folders
+     *
+     * @return \OCP\ITempManager
+     * @deprecated 20.0.0
+     */
+    public function getTempManager() {
+        return $this->get(ITempManager::class);
+    }
+
+    /**
+     * Get the app manager
+     *
+     * @return \OCP\App\IAppManager
+     * @deprecated 20.0.0
+     */
+    public function getAppManager() {
+        return $this->get(IAppManager::class);
+    }
+
+    /**
+     * Creates a new mailer
+     *
+     * @return IMailer
+     * @deprecated 20.0.0
+     */
+    public function getMailer() {
+        return $this->get(IMailer::class);
+    }
+
+    /**
+     * Get the webroot
+     *
+     * @return string
+     * @deprecated 20.0.0
+     */
+    public function getWebRoot() {
+        return $this->webRoot;
+    }
+
+    /**
+     * Get the locking provider
+     *
+     * @return ILockingProvider
+     * @since 8.1.0
+     * @deprecated 20.0.0
+     */
+    public function getLockingProvider() {
+        return $this->get(ILockingProvider::class);
+    }
+
+    /**
+     * Get the MimeTypeDetector
+     *
+     * @return IMimeTypeDetector
+     * @deprecated 20.0.0
+     */
+    public function getMimeTypeDetector() {
+        return $this->get(IMimeTypeDetector::class);
+    }
+
+    /**
+     * Get the MimeTypeLoader
+     *
+     * @return IMimeTypeLoader
+     * @deprecated 20.0.0
+     */
+    public function getMimeTypeLoader() {
+        return $this->get(IMimeTypeLoader::class);
+    }
+
+    /**
+     * Get the Notification Manager
+     *
+     * @return \OCP\Notification\IManager
+     * @since 8.2.0
+     * @deprecated 20.0.0
+     */
+    public function getNotificationManager() {
+        return $this->get(\OCP\Notification\IManager::class);
+    }
+
+    /**
+     * @return \OCA\Theming\ThemingDefaults
+     * @deprecated 20.0.0
+     */
+    public function getThemingDefaults() {
+        return $this->get('ThemingDefaults');
+    }
+
+    /**
+     * @return \OC\IntegrityCheck\Checker
+     * @deprecated 20.0.0
+     */
+    public function getIntegrityCodeChecker() {
+        return $this->get('IntegrityCodeChecker');
+    }
+
+    /**
+     * @return CsrfTokenManager
+     * @deprecated 20.0.0
+     */
+    public function getCsrfTokenManager() {
+        return $this->get(CsrfTokenManager::class);
+    }
+
+    /**
+     * @return ContentSecurityPolicyNonceManager
+     * @deprecated 20.0.0
+     */
+    public function getContentSecurityPolicyNonceManager() {
+        return $this->get(ContentSecurityPolicyNonceManager::class);
+    }
+
+    /**
+     * @return \OCP\Settings\IManager
+     * @deprecated 20.0.0
+     */
+    public function getSettingsManager() {
+        return $this->get(\OC\Settings\Manager::class);
+    }
+
+    /**
+     * @return \OCP\Files\IAppData
+     * @deprecated 20.0.0 Use get(\OCP\Files\AppData\IAppDataFactory::class)->get($app) instead
+     */
+    public function getAppDataDir($app) {
+        $factory = $this->get(\OC\Files\AppData\Factory::class);
+        return $factory->get($app);
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudIdManager
+     * @deprecated 20.0.0
+     */
+    public function getCloudIdManager() {
+        return $this->get(ICloudIdManager::class);
+    }
 }

lib/base.php

Indentation +1130 added lines, -1130 removed lines

@@ -40,1136 +40,1136 @@
  * OC_autoload!
  */
 class OC {
-	/**
-	 * The installation path for Nextcloud  on the server (e.g. /srv/http/nextcloud)
-	 */
-	public static string $SERVERROOT = '';
-	/**
-	 * the current request path relative to the Nextcloud root (e.g. files/index.php)
-	 */
-	private static string $SUBURI = '';
-	/**
-	 * the Nextcloud root path for http requests (e.g. /nextcloud)
-	 */
-	public static string $WEBROOT = '';
-	/**
-	 * The installation path array of the apps folder on the server (e.g. /srv/http/nextcloud) 'path' and
-	 * web path in 'url'
-	 */
-	public static array $APPSROOTS = [];
-
-	public static string $configDir;
-
-	/**
-	 * requested app
-	 */
-	public static string $REQUESTEDAPP = '';
-
-	/**
-	 * check if Nextcloud runs in cli mode
-	 */
-	public static bool $CLI = false;
-
-	public static \Composer\Autoload\ClassLoader $composerAutoloader;
-
-	public static \OC\Server $server;
-
-	private static \OC\Config $config;
-
-	/**
-	 * @throws \RuntimeException when the 3rdparty directory is missing or
-	 *                           the app path list is empty or contains an invalid path
-	 */
-	public static function initPaths(): void {
-		if (defined('PHPUNIT_CONFIG_DIR')) {
-			self::$configDir = OC::$SERVERROOT . '/' . PHPUNIT_CONFIG_DIR . '/';
-		} elseif (defined('PHPUNIT_RUN') and PHPUNIT_RUN and is_dir(OC::$SERVERROOT . '/tests/config/')) {
-			self::$configDir = OC::$SERVERROOT . '/tests/config/';
-		} elseif ($dir = getenv('NEXTCLOUD_CONFIG_DIR')) {
-			self::$configDir = rtrim($dir, '/') . '/';
-		} else {
-			self::$configDir = OC::$SERVERROOT . '/config/';
-		}
-		self::$config = new \OC\Config(self::$configDir);
-
-		OC::$SUBURI = str_replace('\\', '/', substr(realpath($_SERVER['SCRIPT_FILENAME'] ?? ''), strlen(OC::$SERVERROOT)));
-		/**
-		 * FIXME: The following lines are required because we can't yet instantiate
-		 *        Server::get(\OCP\IRequest::class) since \OC::$server does not yet exist.
-		 */
-		$params = [
-			'server' => [
-				'SCRIPT_NAME' => $_SERVER['SCRIPT_NAME'] ?? null,
-				'SCRIPT_FILENAME' => $_SERVER['SCRIPT_FILENAME'] ?? null,
-			],
-		];
-		if (isset($_SERVER['REMOTE_ADDR'])) {
-			$params['server']['REMOTE_ADDR'] = $_SERVER['REMOTE_ADDR'];
-		}
-		$fakeRequest = new \OC\AppFramework\Http\Request(
-			$params,
-			new \OC\AppFramework\Http\RequestId($_SERVER['UNIQUE_ID'] ?? '', new \OC\Security\SecureRandom()),
-			new \OC\AllConfig(new \OC\SystemConfig(self::$config))
-		);
-		$scriptName = $fakeRequest->getScriptName();
-		if (substr($scriptName, -1) == '/') {
-			$scriptName .= 'index.php';
-			//make sure suburi follows the same rules as scriptName
-			if (substr(OC::$SUBURI, -9) != 'index.php') {
-				if (substr(OC::$SUBURI, -1) != '/') {
-					OC::$SUBURI = OC::$SUBURI . '/';
-				}
-				OC::$SUBURI = OC::$SUBURI . 'index.php';
-			}
-		}
-
-		if (OC::$CLI) {
-			OC::$WEBROOT = self::$config->getValue('overwritewebroot', '');
-		} else {
-			if (substr($scriptName, 0 - strlen(OC::$SUBURI)) === OC::$SUBURI) {
-				OC::$WEBROOT = substr($scriptName, 0, 0 - strlen(OC::$SUBURI));
-
-				if (OC::$WEBROOT != '' && OC::$WEBROOT[0] !== '/') {
-					OC::$WEBROOT = '/' . OC::$WEBROOT;
-				}
-			} else {
-				// The scriptName is not ending with OC::$SUBURI
-				// This most likely means that we are calling from CLI.
-				// However some cron jobs still need to generate
-				// a web URL, so we use overwritewebroot as a fallback.
-				OC::$WEBROOT = self::$config->getValue('overwritewebroot', '');
-			}
-
-			// Resolve /nextcloud to /nextcloud/ to ensure to always have a trailing
-			// slash which is required by URL generation.
-			if (isset($_SERVER['REQUEST_URI']) && $_SERVER['REQUEST_URI'] === \OC::$WEBROOT
-					&& substr($_SERVER['REQUEST_URI'], -1) !== '/') {
-				header('Location: ' . \OC::$WEBROOT . '/');
-				exit();
-			}
-		}
-
-		// search the apps folder
-		$config_paths = self::$config->getValue('apps_paths', []);
-		if (!empty($config_paths)) {
-			foreach ($config_paths as $paths) {
-				if (isset($paths['url']) && isset($paths['path'])) {
-					$paths['url'] = rtrim($paths['url'], '/');
-					$paths['path'] = rtrim($paths['path'], '/');
-					OC::$APPSROOTS[] = $paths;
-				}
-			}
-		} elseif (file_exists(OC::$SERVERROOT . '/apps')) {
-			OC::$APPSROOTS[] = ['path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => true];
-		}
-
-		if (empty(OC::$APPSROOTS)) {
-			throw new \RuntimeException('apps directory not found! Please put the Nextcloud apps folder in the Nextcloud folder'
-				. '. You can also configure the location in the config.php file.');
-		}
-		$paths = [];
-		foreach (OC::$APPSROOTS as $path) {
-			$paths[] = $path['path'];
-			if (!is_dir($path['path'])) {
-				throw new \RuntimeException(sprintf('App directory "%s" not found! Please put the Nextcloud apps folder in the'
-					. ' Nextcloud folder. You can also configure the location in the config.php file.', $path['path']));
-			}
-		}
-
-		// set the right include path
-		set_include_path(
-			implode(PATH_SEPARATOR, $paths)
-		);
-	}
-
-	public static function checkConfig(): void {
-		// Create config if it does not already exist
-		$configFilePath = self::$configDir . '/config.php';
-		if (!file_exists($configFilePath)) {
-			@touch($configFilePath);
-		}
-
-		// Check if config is writable
-		$configFileWritable = is_writable($configFilePath);
-		$configReadOnly = Server::get(IConfig::class)->getSystemValueBool('config_is_read_only');
-		if (!$configFileWritable && !$configReadOnly
-			|| !$configFileWritable && \OCP\Util::needUpgrade()) {
-			$urlGenerator = Server::get(IURLGenerator::class);
-			$l = Server::get(\OCP\L10N\IFactory::class)->get('lib');
-
-			if (self::$CLI) {
-				echo $l->t('Cannot write into "config" directory!') . "\n";
-				echo $l->t('This can usually be fixed by giving the web server write access to the config directory.') . "\n";
-				echo "\n";
-				echo $l->t('But, if you prefer to keep config.php file read only, set the option "config_is_read_only" to true in it.') . "\n";
-				echo $l->t('See %s', [ $urlGenerator->linkToDocs('admin-config') ]) . "\n";
-				exit;
-			} else {
-				Server::get(ITemplateManager::class)->printErrorPage(
-					$l->t('Cannot write into "config" directory!'),
-					$l->t('This can usually be fixed by giving the web server write access to the config directory.') . ' '
-					. $l->t('But, if you prefer to keep config.php file read only, set the option "config_is_read_only" to true in it.') . ' '
-					. $l->t('See %s', [ $urlGenerator->linkToDocs('admin-config') ]),
-					503
-				);
-			}
-		}
-	}
-
-	public static function checkInstalled(\OC\SystemConfig $systemConfig): void {
-		if (defined('OC_CONSOLE')) {
-			return;
-		}
-		// Redirect to installer if not installed
-		if (!$systemConfig->getValue('installed', false) && OC::$SUBURI !== '/index.php' && OC::$SUBURI !== '/status.php') {
-			if (OC::$CLI) {
-				throw new Exception('Not installed');
-			} else {
-				$url = OC::$WEBROOT . '/index.php';
-				header('Location: ' . $url);
-			}
-			exit();
-		}
-	}
-
-	public static function checkMaintenanceMode(\OC\SystemConfig $systemConfig): void {
-		// Allow ajax update script to execute without being stopped
-		if (((bool)$systemConfig->getValue('maintenance', false)) && OC::$SUBURI != '/core/ajax/update.php') {
-			// send http status 503
-			http_response_code(503);
-			header('X-Nextcloud-Maintenance-Mode: 1');
-			header('Retry-After: 120');
-
-			// render error page
-			$template = Server::get(ITemplateManager::class)->getTemplate('', 'update.user', 'guest');
-			\OCP\Util::addScript('core', 'maintenance');
-			\OCP\Util::addStyle('core', 'guest');
-			$template->printPage();
-			die();
-		}
-	}
-
-	/**
-	 * Prints the upgrade page
-	 */
-	private static function printUpgradePage(\OC\SystemConfig $systemConfig): void {
-		$cliUpgradeLink = $systemConfig->getValue('upgrade.cli-upgrade-link', '');
-		$disableWebUpdater = $systemConfig->getValue('upgrade.disable-web', false);
-		$tooBig = false;
-		if (!$disableWebUpdater) {
-			$apps = Server::get(\OCP\App\IAppManager::class);
-			if ($apps->isEnabledForAnyone('user_ldap')) {
-				$qb = Server::get(\OCP\IDBConnection::class)->getQueryBuilder();
-
-				$result = $qb->select($qb->func()->count('*', 'user_count'))
-					->from('ldap_user_mapping')
-					->executeQuery();
-				$row = $result->fetch();
-				$result->closeCursor();
-
-				$tooBig = ($row['user_count'] > 50);
-			}
-			if (!$tooBig && $apps->isEnabledForAnyone('user_saml')) {
-				$qb = Server::get(\OCP\IDBConnection::class)->getQueryBuilder();
-
-				$result = $qb->select($qb->func()->count('*', 'user_count'))
-					->from('user_saml_users')
-					->executeQuery();
-				$row = $result->fetch();
-				$result->closeCursor();
-
-				$tooBig = ($row['user_count'] > 50);
-			}
-			if (!$tooBig) {
-				// count users
-				$totalUsers = Server::get(\OCP\IUserManager::class)->countUsersTotal(51);
-				$tooBig = ($totalUsers > 50);
-			}
-		}
-		$ignoreTooBigWarning = isset($_GET['IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup'])
-			&& $_GET['IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup'] === 'IAmSuperSureToDoThis';
-
-		if ($disableWebUpdater || ($tooBig && !$ignoreTooBigWarning)) {
-			// send http status 503
-			http_response_code(503);
-			header('Retry-After: 120');
-
-			$serverVersion = \OCP\Server::get(\OCP\ServerVersion::class);
-
-			// render error page
-			$template = Server::get(ITemplateManager::class)->getTemplate('', 'update.use-cli', 'guest');
-			$template->assign('productName', 'nextcloud'); // for now
-			$template->assign('version', $serverVersion->getVersionString());
-			$template->assign('tooBig', $tooBig);
-			$template->assign('cliUpgradeLink', $cliUpgradeLink);
-
-			$template->printPage();
-			die();
-		}
-
-		// check whether this is a core update or apps update
-		$installedVersion = $systemConfig->getValue('version', '0.0.0');
-		$currentVersion = implode('.', \OCP\Util::getVersion());
-
-		// if not a core upgrade, then it's apps upgrade
-		$isAppsOnlyUpgrade = version_compare($currentVersion, $installedVersion, '=');
-
-		$oldTheme = $systemConfig->getValue('theme');
-		$systemConfig->setValue('theme', '');
-		\OCP\Util::addScript('core', 'common');
-		\OCP\Util::addScript('core', 'main');
-		\OCP\Util::addTranslations('core');
-		\OCP\Util::addScript('core', 'update');
-
-		/** @var \OC\App\AppManager $appManager */
-		$appManager = Server::get(\OCP\App\IAppManager::class);
-
-		$tmpl = Server::get(ITemplateManager::class)->getTemplate('', 'update.admin', 'guest');
-		$tmpl->assign('version', \OCP\Server::get(\OCP\ServerVersion::class)->getVersionString());
-		$tmpl->assign('isAppsOnlyUpgrade', $isAppsOnlyUpgrade);
-
-		// get third party apps
-		$ocVersion = \OCP\Util::getVersion();
-		$ocVersion = implode('.', $ocVersion);
-		$incompatibleApps = $appManager->getIncompatibleApps($ocVersion);
-		$incompatibleOverwrites = $systemConfig->getValue('app_install_overwrite', []);
-		$incompatibleShippedApps = [];
-		$incompatibleDisabledApps = [];
-		foreach ($incompatibleApps as $appInfo) {
-			if ($appManager->isShipped($appInfo['id'])) {
-				$incompatibleShippedApps[] = $appInfo['name'] . ' (' . $appInfo['id'] . ')';
-			}
-			if (!in_array($appInfo['id'], $incompatibleOverwrites)) {
-				$incompatibleDisabledApps[] = $appInfo;
-			}
-		}
-
-		if (!empty($incompatibleShippedApps)) {
-			$l = Server::get(\OCP\L10N\IFactory::class)->get('core');
-			$hint = $l->t('Application %1$s is not present or has a non-compatible version with this server. Please check the apps directory.', [implode(', ', $incompatibleShippedApps)]);
-			throw new \OCP\HintException('Application ' . implode(', ', $incompatibleShippedApps) . ' is not present or has a non-compatible version with this server. Please check the apps directory.', $hint);
-		}
-
-		$tmpl->assign('appsToUpgrade', $appManager->getAppsNeedingUpgrade($ocVersion));
-		$tmpl->assign('incompatibleAppsList', $incompatibleDisabledApps);
-		try {
-			$defaults = new \OC_Defaults();
-			$tmpl->assign('productName', $defaults->getName());
-		} catch (Throwable $error) {
-			$tmpl->assign('productName', 'Nextcloud');
-		}
-		$tmpl->assign('oldTheme', $oldTheme);
-		$tmpl->printPage();
-	}
-
-	public static function initSession(): void {
-		$request = Server::get(IRequest::class);
-
-		// TODO: Temporary disabled again to solve issues with CalDAV/CardDAV clients like DAVx5 that use cookies
-		// TODO: See https://github.com/nextcloud/server/issues/37277#issuecomment-1476366147 and the other comments
-		// TODO: for further information.
-		// $isDavRequest = strpos($request->getRequestUri(), '/remote.php/dav') === 0 || strpos($request->getRequestUri(), '/remote.php/webdav') === 0;
-		// if ($request->getHeader('Authorization') !== '' && is_null($request->getCookie('cookie_test')) && $isDavRequest && !isset($_COOKIE['nc_session_id'])) {
-		// setcookie('cookie_test', 'test', time() + 3600);
-		// // Do not initialize the session if a request is authenticated directly
-		// // unless there is a session cookie already sent along
-		// return;
-		// }
-
-		if ($request->getServerProtocol() === 'https') {
-			ini_set('session.cookie_secure', 'true');
-		}
-
-		// prevents javascript from accessing php session cookies
-		ini_set('session.cookie_httponly', 'true');
-
-		// Do not initialize sessions for 'status.php' requests
-		// Monitoring endpoints can quickly flood session handlers
-		// and 'status.php' doesn't require sessions anyway
-		if (str_ends_with($request->getScriptName(), '/status.php')) {
-			return;
-		}
-
-		// set the cookie path to the Nextcloud directory
-		$cookie_path = OC::$WEBROOT ? : '/';
-		ini_set('session.cookie_path', $cookie_path);
-
-		// set the cookie domain to the Nextcloud domain
-		$cookie_domain = self::$config->getValue('cookie_domain', '');
-		if ($cookie_domain) {
-			ini_set('session.cookie_domain', $cookie_domain);
-		}
-
-		// Let the session name be changed in the initSession Hook
-		$sessionName = OC_Util::getInstanceId();
-
-		try {
-			$logger = null;
-			if (Server::get(\OC\SystemConfig::class)->getValue('installed', false)) {
-				$logger = logger('core');
-			}
-
-			// set the session name to the instance id - which is unique
-			$session = new \OC\Session\Internal(
-				$sessionName,
-				$logger,
-			);
-
-			$cryptoWrapper = Server::get(\OC\Session\CryptoWrapper::class);
-			$session = $cryptoWrapper->wrapSession($session);
-			self::$server->setSession($session);
-
-			// if session can't be started break with http 500 error
-		} catch (Exception $e) {
-			Server::get(LoggerInterface::class)->error($e->getMessage(), ['app' => 'base','exception' => $e]);
-			//show the user a detailed error page
-			Server::get(ITemplateManager::class)->printExceptionErrorPage($e, 500);
-			die();
-		}
-
-		//try to set the session lifetime
-		$sessionLifeTime = self::getSessionLifeTime();
-
-		// session timeout
-		if ($session->exists('LAST_ACTIVITY') && (time() - $session->get('LAST_ACTIVITY') > $sessionLifeTime)) {
-			if (isset($_COOKIE[session_name()])) {
-				setcookie(session_name(), '', -1, self::$WEBROOT ? : '/');
-			}
-			Server::get(IUserSession::class)->logout();
-		}
-
-		if (!self::hasSessionRelaxedExpiry()) {
-			$session->set('LAST_ACTIVITY', time());
-		}
-		$session->close();
-	}
-
-	private static function getSessionLifeTime(): int {
-		return Server::get(\OC\AllConfig::class)->getSystemValueInt('session_lifetime', 60 * 60 * 24);
-	}
-
-	/**
-	 * @return bool true if the session expiry should only be done by gc instead of an explicit timeout
-	 */
-	public static function hasSessionRelaxedExpiry(): bool {
-		return Server::get(\OC\AllConfig::class)->getSystemValueBool('session_relaxed_expiry', false);
-	}
-
-	/**
-	 * Try to set some values to the required Nextcloud default
-	 */
-	public static function setRequiredIniValues(): void {
-		// Don't display errors and log them
-		@ini_set('display_errors', '0');
-		@ini_set('log_errors', '1');
-
-		// Try to configure php to enable big file uploads.
-		// This doesn't work always depending on the webserver and php configuration.
-		// Let's try to overwrite some defaults if they are smaller than 1 hour
-
-		if (intval(@ini_get('max_execution_time') ?: 0) < 3600) {
-			@ini_set('max_execution_time', strval(3600));
-		}
-
-		if (intval(@ini_get('max_input_time') ?: 0) < 3600) {
-			@ini_set('max_input_time', strval(3600));
-		}
-
-		// Try to set the maximum execution time to the largest time limit we have
-		if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-			@set_time_limit(max(intval(@ini_get('max_execution_time')), intval(@ini_get('max_input_time'))));
-		}
-
-		@ini_set('default_charset', 'UTF-8');
-		@ini_set('gd.jpeg_ignore_warning', '1');
-	}
-
-	/**
-	 * Send the same site cookies
-	 */
-	private static function sendSameSiteCookies(): void {
-		$cookieParams = session_get_cookie_params();
-		$secureCookie = ($cookieParams['secure'] === true) ? 'secure; ' : '';
-		$policies = [
-			'lax',
-			'strict',
-		];
-
-		// Append __Host to the cookie if it meets the requirements
-		$cookiePrefix = '';
-		if ($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
-			$cookiePrefix = '__Host-';
-		}
-
-		foreach ($policies as $policy) {
-			header(
-				sprintf(
-					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
-					$cookiePrefix,
-					$policy,
-					$cookieParams['path'],
-					$policy
-				),
-				false
-			);
-		}
-	}
-
-	/**
-	 * Same Site cookie to further mitigate CSRF attacks. This cookie has to
-	 * be set in every request if cookies are sent to add a second level of
-	 * defense against CSRF.
-	 *
-	 * If the cookie is not sent this will set the cookie and reload the page.
-	 * We use an additional cookie since we want to protect logout CSRF and
-	 * also we can't directly interfere with PHP's session mechanism.
-	 */
-	private static function performSameSiteCookieProtection(IConfig $config): void {
-		$request = Server::get(IRequest::class);
-
-		// Some user agents are notorious and don't really properly follow HTTP
-		// specifications. For those, have an automated opt-out. Since the protection
-		// for remote.php is applied in base.php as starting point we need to opt out
-		// here.
-		$incompatibleUserAgents = $config->getSystemValue('csrf.optout');
-
-		// Fallback, if csrf.optout is unset
-		if (!is_array($incompatibleUserAgents)) {
-			$incompatibleUserAgents = [
-				// OS X Finder
-				'/^WebDAVFS/',
-				// Windows webdav drive
-				'/^Microsoft-WebDAV-MiniRedir/',
-			];
-		}
-
-		if ($request->isUserAgent($incompatibleUserAgents)) {
-			return;
-		}
-
-		if (count($_COOKIE) > 0) {
-			$requestUri = $request->getScriptName();
-			$processingScript = explode('/', $requestUri);
-			$processingScript = $processingScript[count($processingScript) - 1];
-
-			if ($processingScript === 'index.php' // index.php routes are handled in the middleware
-				|| $processingScript === 'cron.php' // and cron.php does not need any authentication at all
-				|| $processingScript === 'public.php' // For public.php, auth for password protected shares is done in the PublicAuth plugin
-			) {
-				return;
-			}
-
-			// All other endpoints require the lax and the strict cookie
-			if (!$request->passesStrictCookieCheck()) {
-				logger('core')->warning('Request does not pass strict cookie check');
-				self::sendSameSiteCookies();
-				// Debug mode gets access to the resources without strict cookie
-				// due to the fact that the SabreDAV browser also lives there.
-				if (!$config->getSystemValueBool('debug', false)) {
-					http_response_code(\OCP\AppFramework\Http::STATUS_PRECONDITION_FAILED);
-					header('Content-Type: application/json');
-					echo json_encode(['error' => 'Strict Cookie has not been found in request']);
-					exit();
-				}
-			}
-		} elseif (!isset($_COOKIE['nc_sameSiteCookielax']) || !isset($_COOKIE['nc_sameSiteCookiestrict'])) {
-			self::sendSameSiteCookies();
-		}
-	}
-
-	public static function init(): void {
-		// First handle PHP configuration and copy auth headers to the expected
-		// $_SERVER variable before doing anything Server object related
-		self::setRequiredIniValues();
-		self::handleAuthHeaders();
-
-		// prevent any XML processing from loading external entities
-		libxml_set_external_entity_loader(static function () {
-			return null;
-		});
-
-		// Set default timezone before the Server object is booted
-		if (!date_default_timezone_set('UTC')) {
-			throw new \RuntimeException('Could not set timezone to UTC');
-		}
-
-		// calculate the root directories
-		OC::$SERVERROOT = str_replace('\\', '/', substr(__DIR__, 0, -4));
-
-		// register autoloader
-		$loaderStart = microtime(true);
-
-		self::$CLI = (php_sapi_name() == 'cli');
-
-		// Add default composer PSR-4 autoloader, ensure apcu to be disabled
-		self::$composerAutoloader = require_once OC::$SERVERROOT . '/lib/composer/autoload.php';
-		self::$composerAutoloader->setApcuPrefix(null);
-
-
-		try {
-			self::initPaths();
-			// setup 3rdparty autoloader
-			$vendorAutoLoad = OC::$SERVERROOT . '/3rdparty/autoload.php';
-			if (!file_exists($vendorAutoLoad)) {
-				throw new \RuntimeException('Composer autoloader not found, unable to continue. Check the folder "3rdparty". Running "git submodule update --init" will initialize the git submodule that handles the subfolder "3rdparty".');
-			}
-			require_once $vendorAutoLoad;
-		} catch (\RuntimeException $e) {
-			if (!self::$CLI) {
-				http_response_code(503);
-			}
-			// we can't use the template error page here, because this needs the
-			// DI container which isn't available yet
-			print($e->getMessage());
-			exit();
-		}
-		$loaderEnd = microtime(true);
-
-		// Enable lazy loading if activated
-		\OC\AppFramework\Utility\SimpleContainer::$useLazyObjects = (bool)self::$config->getValue('enable_lazy_objects', true);
-
-		// setup the basic server
-		self::$server = new \OC\Server(\OC::$WEBROOT, self::$config);
-		self::$server->boot();
-
-		try {
-			$profiler = new BuiltInProfiler(
-				Server::get(IConfig::class),
-				Server::get(IRequest::class),
-			);
-			$profiler->start();
-		} catch (\Throwable $e) {
-			logger('core')->error('Failed to start profiler: ' . $e->getMessage(), ['app' => 'base']);
-		}
-
-		if (self::$CLI && in_array('--' . \OCP\Console\ReservedOptions::DEBUG_LOG, $_SERVER['argv'])) {
-			\OC\Core\Listener\BeforeMessageLoggedEventListener::setup();
-		}
-
-		$eventLogger = Server::get(\OCP\Diagnostics\IEventLogger::class);
-		$eventLogger->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);
-		$eventLogger->start('boot', 'Initialize');
-
-		// Override php.ini and log everything if we're troubleshooting
-		if (self::$config->getValue('loglevel') === ILogger::DEBUG) {
-			error_reporting(E_ALL);
-		}
-
-		// initialize intl fallback if necessary
-		OC_Util::isSetLocaleWorking();
-
-		$config = Server::get(IConfig::class);
-		if (!defined('PHPUNIT_RUN')) {
-			$errorHandler = new OC\Log\ErrorHandler(
-				\OCP\Server::get(\Psr\Log\LoggerInterface::class),
-			);
-			$exceptionHandler = [$errorHandler, 'onException'];
-			if ($config->getSystemValueBool('debug', false)) {
-				set_error_handler([$errorHandler, 'onAll'], E_ALL);
-				if (\OC::$CLI) {
-					$exceptionHandler = [Server::get(ITemplateManager::class), 'printExceptionErrorPage'];
-				}
-			} else {
-				set_error_handler([$errorHandler, 'onError']);
-			}
-			register_shutdown_function([$errorHandler, 'onShutdown']);
-			set_exception_handler($exceptionHandler);
-		}
-
-		/** @var \OC\AppFramework\Bootstrap\Coordinator $bootstrapCoordinator */
-		$bootstrapCoordinator = Server::get(\OC\AppFramework\Bootstrap\Coordinator::class);
-		$bootstrapCoordinator->runInitialRegistration();
-
-		$eventLogger->start('init_session', 'Initialize session');
-
-		// Check for PHP SimpleXML extension earlier since we need it before our other checks and want to provide a useful hint for web users
-		// see https://github.com/nextcloud/server/pull/2619
-		if (!function_exists('simplexml_load_file')) {
-			throw new \OCP\HintException('The PHP SimpleXML/PHP-XML extension is not installed.', 'Install the extension or make sure it is enabled.');
-		}
-
-		$systemConfig = Server::get(\OC\SystemConfig::class);
-		$appManager = Server::get(\OCP\App\IAppManager::class);
-		if ($systemConfig->getValue('installed', false)) {
-			$appManager->loadApps(['session']);
-		}
-		if (!self::$CLI) {
-			self::initSession();
-		}
-		$eventLogger->end('init_session');
-		self::checkConfig();
-		self::checkInstalled($systemConfig);
-
-		OC_Response::addSecurityHeaders();
-
-		self::performSameSiteCookieProtection($config);
-
-		if (!defined('OC_CONSOLE')) {
-			$eventLogger->start('check_server', 'Run a few configuration checks');
-			$errors = OC_Util::checkServer($systemConfig);
-			if (count($errors) > 0) {
-				if (!self::$CLI) {
-					http_response_code(503);
-					Util::addStyle('guest');
-					try {
-						Server::get(ITemplateManager::class)->printGuestPage('', 'error', ['errors' => $errors]);
-						exit;
-					} catch (\Exception $e) {
-						// In case any error happens when showing the error page, we simply fall back to posting the text.
-						// This might be the case when e.g. the data directory is broken and we can not load/write SCSS to/from it.
-					}
-				}
-
-				// Convert l10n string into regular string for usage in database
-				$staticErrors = [];
-				foreach ($errors as $error) {
-					echo $error['error'] . "\n";
-					echo $error['hint'] . "\n\n";
-					$staticErrors[] = [
-						'error' => (string)$error['error'],
-						'hint' => (string)$error['hint'],
-					];
-				}
-
-				try {
-					$config->setAppValue('core', 'cronErrors', json_encode($staticErrors));
-				} catch (\Exception $e) {
-					echo('Writing to database failed');
-				}
-				exit(1);
-			} elseif (self::$CLI && $config->getSystemValueBool('installed', false)) {
-				$config->deleteAppValue('core', 'cronErrors');
-			}
-			$eventLogger->end('check_server');
-		}
-
-		// User and Groups
-		if (!$systemConfig->getValue('installed', false)) {
-			self::$server->getSession()->set('user_id', '');
-		}
-
-		$eventLogger->start('setup_backends', 'Setup group and user backends');
-		Server::get(\OCP\IUserManager::class)->registerBackend(new \OC\User\Database());
-		Server::get(\OCP\IGroupManager::class)->addBackend(new \OC\Group\Database());
-
-		// Subscribe to the hook
-		\OCP\Util::connectHook(
-			'\OCA\Files_Sharing\API\Server2Server',
-			'preLoginNameUsedAsUserName',
-			'\OC\User\Database',
-			'preLoginNameUsedAsUserName'
-		);
-
-		//setup extra user backends
-		if (!\OCP\Util::needUpgrade()) {
-			OC_User::setupBackends();
-		} else {
-			// Run upgrades in incognito mode
-			OC_User::setIncognitoMode(true);
-		}
-		$eventLogger->end('setup_backends');
-
-		self::registerCleanupHooks($systemConfig);
-		self::registerShareHooks($systemConfig);
-		self::registerEncryptionWrapperAndHooks();
-		self::registerAccountHooks();
-		self::registerResourceCollectionHooks();
-		self::registerFileReferenceEventListener();
-		self::registerRenderReferenceEventListener();
-		self::registerAppRestrictionsHooks();
-
-		// Make sure that the application class is not loaded before the database is setup
-		if ($systemConfig->getValue('installed', false)) {
-			$appManager->loadApp('settings');
-			/* Run core application registration */
-			$bootstrapCoordinator->runLazyRegistration('core');
-		}
-
-		//make sure temporary files are cleaned up
-		$tmpManager = Server::get(\OCP\ITempManager::class);
-		register_shutdown_function([$tmpManager, 'clean']);
-		$lockProvider = Server::get(\OCP\Lock\ILockingProvider::class);
-		register_shutdown_function([$lockProvider, 'releaseAll']);
-
-		// Check whether the sample configuration has been copied
-		if ($systemConfig->getValue('copied_sample_config', false)) {
-			$l = Server::get(\OCP\L10N\IFactory::class)->get('lib');
-			Server::get(ITemplateManager::class)->printErrorPage(
-				$l->t('Sample configuration detected'),
-				$l->t('It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php'),
-				503
-			);
-			return;
-		}
-
-		$request = Server::get(IRequest::class);
-		$host = $request->getInsecureServerHost();
-		/**
-		 * if the host passed in headers isn't trusted
-		 * FIXME: Should not be in here at all :see_no_evil:
-		 */
-		if (!OC::$CLI
-			&& !Server::get(\OC\Security\TrustedDomainHelper::class)->isTrustedDomain($host)
-			&& $config->getSystemValueBool('installed', false)
-		) {
-			// Allow access to CSS resources
-			$isScssRequest = false;
-			if (strpos($request->getPathInfo() ?: '', '/css/') === 0) {
-				$isScssRequest = true;
-			}
-
-			if (substr($request->getRequestUri(), -11) === '/status.php') {
-				http_response_code(400);
-				header('Content-Type: application/json');
-				echo '{"error": "Trusted domain error.", "code": 15}';
-				exit();
-			}
-
-			if (!$isScssRequest) {
-				http_response_code(400);
-				Server::get(LoggerInterface::class)->info(
-					'Trusted domain error. "{remoteAddress}" tried to access using "{host}" as host.',
-					[
-						'app' => 'core',
-						'remoteAddress' => $request->getRemoteAddress(),
-						'host' => $host,
-					]
-				);
-
-				$tmpl = Server::get(ITemplateManager::class)->getTemplate('core', 'untrustedDomain', 'guest');
-				$tmpl->assign('docUrl', Server::get(IURLGenerator::class)->linkToDocs('admin-trusted-domains'));
-				$tmpl->printPage();
-
-				exit();
-			}
-		}
-		$eventLogger->end('boot');
-		$eventLogger->log('init', 'OC::init', $loaderStart, microtime(true));
-		$eventLogger->start('runtime', 'Runtime');
-		$eventLogger->start('request', 'Full request after boot');
-		register_shutdown_function(function () use ($eventLogger) {
-			$eventLogger->end('request');
-		});
-
-		register_shutdown_function(function () {
-			$memoryPeak = memory_get_peak_usage();
-			$logLevel = match (true) {
-				$memoryPeak > 500_000_000 => ILogger::FATAL,
-				$memoryPeak > 400_000_000 => ILogger::ERROR,
-				$memoryPeak > 300_000_000 => ILogger::WARN,
-				default => null,
-			};
-			if ($logLevel !== null) {
-				$message = 'Request used more than 300 MB of RAM: ' . Util::humanFileSize($memoryPeak);
-				$logger = Server::get(LoggerInterface::class);
-				$logger->log($logLevel, $message, ['app' => 'core']);
-			}
-		});
-	}
-
-	/**
-	 * register hooks for the cleanup of cache and bruteforce protection
-	 */
-	public static function registerCleanupHooks(\OC\SystemConfig $systemConfig): void {
-		//don't try to do this before we are properly setup
-		if ($systemConfig->getValue('installed', false) && !\OCP\Util::needUpgrade()) {
-			// NOTE: This will be replaced to use OCP
-			$userSession = Server::get(\OC\User\Session::class);
-			$userSession->listen('\OC\User', 'postLogin', function () use ($userSession) {
-				if (!defined('PHPUNIT_RUN') && $userSession->isLoggedIn()) {
-					// reset brute force delay for this IP address and username
-					$uid = $userSession->getUser()->getUID();
-					$request = Server::get(IRequest::class);
-					$throttler = Server::get(IThrottler::class);
-					$throttler->resetDelay($request->getRemoteAddress(), 'login', ['user' => $uid]);
-				}
-			});
-		}
-	}
-
-	private static function registerEncryptionWrapperAndHooks(): void {
-		/** @var \OC\Encryption\Manager */
-		$manager = Server::get(\OCP\Encryption\IManager::class);
-		Server::get(IEventDispatcher::class)->addListener(
-			BeforeFileSystemSetupEvent::class,
-			$manager->setupStorage(...),
-		);
-
-		$enabled = $manager->isEnabled();
-		if ($enabled) {
-			\OC\Encryption\EncryptionEventListener::register(Server::get(IEventDispatcher::class));
-		}
-	}
-
-	private static function registerAccountHooks(): void {
-		/** @var IEventDispatcher $dispatcher */
-		$dispatcher = Server::get(IEventDispatcher::class);
-		$dispatcher->addServiceListener(UserChangedEvent::class, \OC\Accounts\Hooks::class);
-	}
-
-	private static function registerAppRestrictionsHooks(): void {
-		/** @var \OC\Group\Manager $groupManager */
-		$groupManager = Server::get(\OCP\IGroupManager::class);
-		$groupManager->listen('\OC\Group', 'postDelete', function (\OCP\IGroup $group) {
-			$appManager = Server::get(\OCP\App\IAppManager::class);
-			$apps = $appManager->getEnabledAppsForGroup($group);
-			foreach ($apps as $appId) {
-				$restrictions = $appManager->getAppRestriction($appId);
-				if (empty($restrictions)) {
-					continue;
-				}
-				$key = array_search($group->getGID(), $restrictions);
-				unset($restrictions[$key]);
-				$restrictions = array_values($restrictions);
-				if (empty($restrictions)) {
-					$appManager->disableApp($appId);
-				} else {
-					$appManager->enableAppForGroups($appId, $restrictions);
-				}
-			}
-		});
-	}
-
-	private static function registerResourceCollectionHooks(): void {
-		\OC\Collaboration\Resources\Listener::register(Server::get(IEventDispatcher::class));
-	}
-
-	private static function registerFileReferenceEventListener(): void {
-		\OC\Collaboration\Reference\File\FileReferenceEventListener::register(Server::get(IEventDispatcher::class));
-	}
-
-	private static function registerRenderReferenceEventListener() {
-		\OC\Collaboration\Reference\RenderReferenceEventListener::register(Server::get(IEventDispatcher::class));
-	}
-
-	/**
-	 * register hooks for sharing
-	 */
-	public static function registerShareHooks(\OC\SystemConfig $systemConfig): void {
-		if ($systemConfig->getValue('installed')) {
-
-			$dispatcher = Server::get(IEventDispatcher::class);
-			$dispatcher->addServiceListener(UserRemovedEvent::class, UserRemovedListener::class);
-			$dispatcher->addServiceListener(GroupDeletedEvent::class, GroupDeletedListener::class);
-			$dispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedListener::class);
-		}
-	}
-
-	/**
-	 * Handle the request
-	 */
-	public static function handleRequest(): void {
-		Server::get(\OCP\Diagnostics\IEventLogger::class)->start('handle_request', 'Handle request');
-		$systemConfig = Server::get(\OC\SystemConfig::class);
-
-		// Check if Nextcloud is installed or in maintenance (update) mode
-		if (!$systemConfig->getValue('installed', false)) {
-			\OC::$server->getSession()->clear();
-			$controller = Server::get(\OC\Core\Controller\SetupController::class);
-			$controller->run($_POST);
-			exit();
-		}
-
-		$request = Server::get(IRequest::class);
-		$request->throwDecodingExceptionIfAny();
-		$requestPath = $request->getRawPathInfo();
-		if ($requestPath === '/heartbeat') {
-			return;
-		}
-		if (substr($requestPath, -3) !== '.js') { // we need these files during the upgrade
-			self::checkMaintenanceMode($systemConfig);
-
-			if (\OCP\Util::needUpgrade()) {
-				if (function_exists('opcache_reset')) {
-					opcache_reset();
-				}
-				if (!((bool)$systemConfig->getValue('maintenance', false))) {
-					self::printUpgradePage($systemConfig);
-					exit();
-				}
-			}
-		}
-
-		$appManager = Server::get(\OCP\App\IAppManager::class);
-
-		// Always load authentication apps
-		$appManager->loadApps(['authentication']);
-		$appManager->loadApps(['extended_authentication']);
-
-		// Load minimum set of apps
-		if (!\OCP\Util::needUpgrade()
-			&& !((bool)$systemConfig->getValue('maintenance', false))) {
-			// For logged-in users: Load everything
-			if (Server::get(IUserSession::class)->isLoggedIn()) {
-				$appManager->loadApps();
-			} else {
-				// For guests: Load only filesystem and logging
-				$appManager->loadApps(['filesystem', 'logging']);
-
-				// Don't try to login when a client is trying to get a OAuth token.
-				// OAuth needs to support basic auth too, so the login is not valid
-				// inside Nextcloud and the Login exception would ruin it.
-				if ($request->getRawPathInfo() !== '/apps/oauth2/api/v1/token') {
-					try {
-						self::handleLogin($request);
-					} catch (DisabledUserException $e) {
-						// Disabled users would not be seen as logged in and
-						// trying to log them in would fail, so the login
-						// exception is ignored for the themed stylesheets and
-						// images.
-						if ($request->getRawPathInfo() !== '/apps/theming/theme/default.css'
-							&& $request->getRawPathInfo() !== '/apps/theming/theme/light.css'
-							&& $request->getRawPathInfo() !== '/apps/theming/theme/dark.css'
-							&& $request->getRawPathInfo() !== '/apps/theming/theme/light-highcontrast.css'
-							&& $request->getRawPathInfo() !== '/apps/theming/theme/dark-highcontrast.css'
-							&& $request->getRawPathInfo() !== '/apps/theming/theme/opendyslexic.css'
-							&& $request->getRawPathInfo() !== '/apps/theming/image/background'
-							&& $request->getRawPathInfo() !== '/apps/theming/image/logo'
-							&& $request->getRawPathInfo() !== '/apps/theming/image/logoheader'
-							&& !str_starts_with($request->getRawPathInfo(), '/apps/theming/favicon')
-							&& !str_starts_with($request->getRawPathInfo(), '/apps/theming/icon')) {
-							throw $e;
-						}
-					}
-				}
-			}
-		}
-
-		if (!self::$CLI) {
-			try {
-				if (!\OCP\Util::needUpgrade()) {
-					$appManager->loadApps(['filesystem', 'logging']);
-					$appManager->loadApps();
-				}
-				Server::get(\OC\Route\Router::class)->match($request->getRawPathInfo());
-				return;
-			} catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
-				//header('HTTP/1.0 404 Not Found');
-			} catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) {
-				http_response_code(405);
-				return;
-			}
-		}
-
-		// Handle WebDAV
-		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PROPFIND') {
-			// not allowed any more to prevent people
-			// mounting this root directly.
-			// Users need to mount remote.php/webdav instead.
-			http_response_code(405);
-			return;
-		}
-
-		// Handle requests for JSON or XML
-		$acceptHeader = $request->getHeader('Accept');
-		if (in_array($acceptHeader, ['application/json', 'application/xml'], true)) {
-			http_response_code(404);
-			return;
-		}
-
-		// Handle resources that can't be found
-		// This prevents browsers from redirecting to the default page and then
-		// attempting to parse HTML as CSS and similar.
-		$destinationHeader = $request->getHeader('Sec-Fetch-Dest');
-		if (in_array($destinationHeader, ['font', 'script', 'style'])) {
-			http_response_code(404);
-			return;
-		}
-
-		// Redirect to the default app or login only as an entry point
-		if ($requestPath === '') {
-			// Someone is logged in
-			if (Server::get(IUserSession::class)->isLoggedIn()) {
-				header('Location: ' . Server::get(IURLGenerator::class)->linkToDefaultPageUrl());
-			} else {
-				// Not handled and not logged in
-				header('Location: ' . Server::get(IURLGenerator::class)->linkToRouteAbsolute('core.login.showLoginForm'));
-			}
-			return;
-		}
-
-		try {
-			Server::get(\OC\Route\Router::class)->match('/error/404');
-		} catch (\Exception $e) {
-			if (!$e instanceof MethodNotAllowedException) {
-				logger('core')->emergency($e->getMessage(), ['exception' => $e]);
-			}
-			$l = Server::get(\OCP\L10N\IFactory::class)->get('lib');
-			Server::get(ITemplateManager::class)->printErrorPage(
-				'404',
-				$l->t('The page could not be found on the server.'),
-				404
-			);
-		}
-	}
-
-	/**
-	 * Check login: apache auth, auth token, basic auth
-	 */
-	public static function handleLogin(OCP\IRequest $request): bool {
-		if ($request->getHeader('X-Nextcloud-Federation')) {
-			return false;
-		}
-		$userSession = Server::get(\OC\User\Session::class);
-		if (OC_User::handleApacheAuth()) {
-			return true;
-		}
-		if (self::tryAppAPILogin($request)) {
-			return true;
-		}
-		if ($userSession->tryTokenLogin($request)) {
-			return true;
-		}
-		if (isset($_COOKIE['nc_username'])
-			&& isset($_COOKIE['nc_token'])
-			&& isset($_COOKIE['nc_session_id'])
-			&& $userSession->loginWithCookie($_COOKIE['nc_username'], $_COOKIE['nc_token'], $_COOKIE['nc_session_id'])) {
-			return true;
-		}
-		if ($userSession->tryBasicAuthLogin($request, Server::get(IThrottler::class))) {
-			return true;
-		}
-		return false;
-	}
-
-	protected static function handleAuthHeaders(): void {
-		//copy http auth headers for apache+php-fcgid work around
-		if (isset($_SERVER['HTTP_XAUTHORIZATION']) && !isset($_SERVER['HTTP_AUTHORIZATION'])) {
-			$_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['HTTP_XAUTHORIZATION'];
-		}
-
-		// Extract PHP_AUTH_USER/PHP_AUTH_PW from other headers if necessary.
-		$vars = [
-			'HTTP_AUTHORIZATION', // apache+php-cgi work around
-			'REDIRECT_HTTP_AUTHORIZATION', // apache+php-cgi alternative
-		];
-		foreach ($vars as $var) {
-			if (isset($_SERVER[$var]) && is_string($_SERVER[$var]) && preg_match('/Basic\s+(.*)$/i', $_SERVER[$var], $matches)) {
-				$credentials = explode(':', base64_decode($matches[1]), 2);
-				if (count($credentials) === 2) {
-					$_SERVER['PHP_AUTH_USER'] = $credentials[0];
-					$_SERVER['PHP_AUTH_PW'] = $credentials[1];
-					break;
-				}
-			}
-		}
-	}
-
-	protected static function tryAppAPILogin(OCP\IRequest $request): bool {
-		if (!$request->getHeader('AUTHORIZATION-APP-API')) {
-			return false;
-		}
-		$appManager = Server::get(OCP\App\IAppManager::class);
-		if (!$appManager->isEnabledForAnyone('app_api')) {
-			return false;
-		}
-		try {
-			$appAPIService = Server::get(OCA\AppAPI\Service\AppAPIService::class);
-			return $appAPIService->validateExAppRequestToNC($request);
-		} catch (\Psr\Container\NotFoundExceptionInterface|\Psr\Container\ContainerExceptionInterface $e) {
-			return false;
-		}
-	}
+    /**
+     * The installation path for Nextcloud  on the server (e.g. /srv/http/nextcloud)
+     */
+    public static string $SERVERROOT = '';
+    /**
+     * the current request path relative to the Nextcloud root (e.g. files/index.php)
+     */
+    private static string $SUBURI = '';
+    /**
+     * the Nextcloud root path for http requests (e.g. /nextcloud)
+     */
+    public static string $WEBROOT = '';
+    /**
+     * The installation path array of the apps folder on the server (e.g. /srv/http/nextcloud) 'path' and
+     * web path in 'url'
+     */
+    public static array $APPSROOTS = [];
+
+    public static string $configDir;
+
+    /**
+     * requested app
+     */
+    public static string $REQUESTEDAPP = '';
+
+    /**
+     * check if Nextcloud runs in cli mode
+     */
+    public static bool $CLI = false;
+
+    public static \Composer\Autoload\ClassLoader $composerAutoloader;
+
+    public static \OC\Server $server;
+
+    private static \OC\Config $config;
+
+    /**
+     * @throws \RuntimeException when the 3rdparty directory is missing or
+     *                           the app path list is empty or contains an invalid path
+     */
+    public static function initPaths(): void {
+        if (defined('PHPUNIT_CONFIG_DIR')) {
+            self::$configDir = OC::$SERVERROOT . '/' . PHPUNIT_CONFIG_DIR . '/';
+        } elseif (defined('PHPUNIT_RUN') and PHPUNIT_RUN and is_dir(OC::$SERVERROOT . '/tests/config/')) {
+            self::$configDir = OC::$SERVERROOT . '/tests/config/';
+        } elseif ($dir = getenv('NEXTCLOUD_CONFIG_DIR')) {
+            self::$configDir = rtrim($dir, '/') . '/';
+        } else {
+            self::$configDir = OC::$SERVERROOT . '/config/';
+        }
+        self::$config = new \OC\Config(self::$configDir);
+
+        OC::$SUBURI = str_replace('\\', '/', substr(realpath($_SERVER['SCRIPT_FILENAME'] ?? ''), strlen(OC::$SERVERROOT)));
+        /**
+         * FIXME: The following lines are required because we can't yet instantiate
+         *        Server::get(\OCP\IRequest::class) since \OC::$server does not yet exist.
+         */
+        $params = [
+            'server' => [
+                'SCRIPT_NAME' => $_SERVER['SCRIPT_NAME'] ?? null,
+                'SCRIPT_FILENAME' => $_SERVER['SCRIPT_FILENAME'] ?? null,
+            ],
+        ];
+        if (isset($_SERVER['REMOTE_ADDR'])) {
+            $params['server']['REMOTE_ADDR'] = $_SERVER['REMOTE_ADDR'];
+        }
+        $fakeRequest = new \OC\AppFramework\Http\Request(
+            $params,
+            new \OC\AppFramework\Http\RequestId($_SERVER['UNIQUE_ID'] ?? '', new \OC\Security\SecureRandom()),
+            new \OC\AllConfig(new \OC\SystemConfig(self::$config))
+        );
+        $scriptName = $fakeRequest->getScriptName();
+        if (substr($scriptName, -1) == '/') {
+            $scriptName .= 'index.php';
+            //make sure suburi follows the same rules as scriptName
+            if (substr(OC::$SUBURI, -9) != 'index.php') {
+                if (substr(OC::$SUBURI, -1) != '/') {
+                    OC::$SUBURI = OC::$SUBURI . '/';
+                }
+                OC::$SUBURI = OC::$SUBURI . 'index.php';
+            }
+        }
+
+        if (OC::$CLI) {
+            OC::$WEBROOT = self::$config->getValue('overwritewebroot', '');
+        } else {
+            if (substr($scriptName, 0 - strlen(OC::$SUBURI)) === OC::$SUBURI) {
+                OC::$WEBROOT = substr($scriptName, 0, 0 - strlen(OC::$SUBURI));
+
+                if (OC::$WEBROOT != '' && OC::$WEBROOT[0] !== '/') {
+                    OC::$WEBROOT = '/' . OC::$WEBROOT;
+                }
+            } else {
+                // The scriptName is not ending with OC::$SUBURI
+                // This most likely means that we are calling from CLI.
+                // However some cron jobs still need to generate
+                // a web URL, so we use overwritewebroot as a fallback.
+                OC::$WEBROOT = self::$config->getValue('overwritewebroot', '');
+            }
+
+            // Resolve /nextcloud to /nextcloud/ to ensure to always have a trailing
+            // slash which is required by URL generation.
+            if (isset($_SERVER['REQUEST_URI']) && $_SERVER['REQUEST_URI'] === \OC::$WEBROOT
+                    && substr($_SERVER['REQUEST_URI'], -1) !== '/') {
+                header('Location: ' . \OC::$WEBROOT . '/');
+                exit();
+            }
+        }
+
+        // search the apps folder
+        $config_paths = self::$config->getValue('apps_paths', []);
+        if (!empty($config_paths)) {
+            foreach ($config_paths as $paths) {
+                if (isset($paths['url']) && isset($paths['path'])) {
+                    $paths['url'] = rtrim($paths['url'], '/');
+                    $paths['path'] = rtrim($paths['path'], '/');
+                    OC::$APPSROOTS[] = $paths;
+                }
+            }
+        } elseif (file_exists(OC::$SERVERROOT . '/apps')) {
+            OC::$APPSROOTS[] = ['path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => true];
+        }
+
+        if (empty(OC::$APPSROOTS)) {
+            throw new \RuntimeException('apps directory not found! Please put the Nextcloud apps folder in the Nextcloud folder'
+                . '. You can also configure the location in the config.php file.');
+        }
+        $paths = [];
+        foreach (OC::$APPSROOTS as $path) {
+            $paths[] = $path['path'];
+            if (!is_dir($path['path'])) {
+                throw new \RuntimeException(sprintf('App directory "%s" not found! Please put the Nextcloud apps folder in the'
+                    . ' Nextcloud folder. You can also configure the location in the config.php file.', $path['path']));
+            }
+        }
+
+        // set the right include path
+        set_include_path(
+            implode(PATH_SEPARATOR, $paths)
+        );
+    }
+
+    public static function checkConfig(): void {
+        // Create config if it does not already exist
+        $configFilePath = self::$configDir . '/config.php';
+        if (!file_exists($configFilePath)) {
+            @touch($configFilePath);
+        }
+
+        // Check if config is writable
+        $configFileWritable = is_writable($configFilePath);
+        $configReadOnly = Server::get(IConfig::class)->getSystemValueBool('config_is_read_only');
+        if (!$configFileWritable && !$configReadOnly
+            || !$configFileWritable && \OCP\Util::needUpgrade()) {
+            $urlGenerator = Server::get(IURLGenerator::class);
+            $l = Server::get(\OCP\L10N\IFactory::class)->get('lib');
+
+            if (self::$CLI) {
+                echo $l->t('Cannot write into "config" directory!') . "\n";
+                echo $l->t('This can usually be fixed by giving the web server write access to the config directory.') . "\n";
+                echo "\n";
+                echo $l->t('But, if you prefer to keep config.php file read only, set the option "config_is_read_only" to true in it.') . "\n";
+                echo $l->t('See %s', [ $urlGenerator->linkToDocs('admin-config') ]) . "\n";
+                exit;
+            } else {
+                Server::get(ITemplateManager::class)->printErrorPage(
+                    $l->t('Cannot write into "config" directory!'),
+                    $l->t('This can usually be fixed by giving the web server write access to the config directory.') . ' '
+                    . $l->t('But, if you prefer to keep config.php file read only, set the option "config_is_read_only" to true in it.') . ' '
+                    . $l->t('See %s', [ $urlGenerator->linkToDocs('admin-config') ]),
+                    503
+                );
+            }
+        }
+    }
+
+    public static function checkInstalled(\OC\SystemConfig $systemConfig): void {
+        if (defined('OC_CONSOLE')) {
+            return;
+        }
+        // Redirect to installer if not installed
+        if (!$systemConfig->getValue('installed', false) && OC::$SUBURI !== '/index.php' && OC::$SUBURI !== '/status.php') {
+            if (OC::$CLI) {
+                throw new Exception('Not installed');
+            } else {
+                $url = OC::$WEBROOT . '/index.php';
+                header('Location: ' . $url);
+            }
+            exit();
+        }
+    }
+
+    public static function checkMaintenanceMode(\OC\SystemConfig $systemConfig): void {
+        // Allow ajax update script to execute without being stopped
+        if (((bool)$systemConfig->getValue('maintenance', false)) && OC::$SUBURI != '/core/ajax/update.php') {
+            // send http status 503
+            http_response_code(503);
+            header('X-Nextcloud-Maintenance-Mode: 1');
+            header('Retry-After: 120');
+
+            // render error page
+            $template = Server::get(ITemplateManager::class)->getTemplate('', 'update.user', 'guest');
+            \OCP\Util::addScript('core', 'maintenance');
+            \OCP\Util::addStyle('core', 'guest');
+            $template->printPage();
+            die();
+        }
+    }
+
+    /**
+     * Prints the upgrade page
+     */
+    private static function printUpgradePage(\OC\SystemConfig $systemConfig): void {
+        $cliUpgradeLink = $systemConfig->getValue('upgrade.cli-upgrade-link', '');
+        $disableWebUpdater = $systemConfig->getValue('upgrade.disable-web', false);
+        $tooBig = false;
+        if (!$disableWebUpdater) {
+            $apps = Server::get(\OCP\App\IAppManager::class);
+            if ($apps->isEnabledForAnyone('user_ldap')) {
+                $qb = Server::get(\OCP\IDBConnection::class)->getQueryBuilder();
+
+                $result = $qb->select($qb->func()->count('*', 'user_count'))
+                    ->from('ldap_user_mapping')
+                    ->executeQuery();
+                $row = $result->fetch();
+                $result->closeCursor();
+
+                $tooBig = ($row['user_count'] > 50);
+            }
+            if (!$tooBig && $apps->isEnabledForAnyone('user_saml')) {
+                $qb = Server::get(\OCP\IDBConnection::class)->getQueryBuilder();
+
+                $result = $qb->select($qb->func()->count('*', 'user_count'))
+                    ->from('user_saml_users')
+                    ->executeQuery();
+                $row = $result->fetch();
+                $result->closeCursor();
+
+                $tooBig = ($row['user_count'] > 50);
+            }
+            if (!$tooBig) {
+                // count users
+                $totalUsers = Server::get(\OCP\IUserManager::class)->countUsersTotal(51);
+                $tooBig = ($totalUsers > 50);
+            }
+        }
+        $ignoreTooBigWarning = isset($_GET['IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup'])
+            && $_GET['IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup'] === 'IAmSuperSureToDoThis';
+
+        if ($disableWebUpdater || ($tooBig && !$ignoreTooBigWarning)) {
+            // send http status 503
+            http_response_code(503);
+            header('Retry-After: 120');
+
+            $serverVersion = \OCP\Server::get(\OCP\ServerVersion::class);
+
+            // render error page
+            $template = Server::get(ITemplateManager::class)->getTemplate('', 'update.use-cli', 'guest');
+            $template->assign('productName', 'nextcloud'); // for now
+            $template->assign('version', $serverVersion->getVersionString());
+            $template->assign('tooBig', $tooBig);
+            $template->assign('cliUpgradeLink', $cliUpgradeLink);
+
+            $template->printPage();
+            die();
+        }
+
+        // check whether this is a core update or apps update
+        $installedVersion = $systemConfig->getValue('version', '0.0.0');
+        $currentVersion = implode('.', \OCP\Util::getVersion());
+
+        // if not a core upgrade, then it's apps upgrade
+        $isAppsOnlyUpgrade = version_compare($currentVersion, $installedVersion, '=');
+
+        $oldTheme = $systemConfig->getValue('theme');
+        $systemConfig->setValue('theme', '');
+        \OCP\Util::addScript('core', 'common');
+        \OCP\Util::addScript('core', 'main');
+        \OCP\Util::addTranslations('core');
+        \OCP\Util::addScript('core', 'update');
+
+        /** @var \OC\App\AppManager $appManager */
+        $appManager = Server::get(\OCP\App\IAppManager::class);
+
+        $tmpl = Server::get(ITemplateManager::class)->getTemplate('', 'update.admin', 'guest');
+        $tmpl->assign('version', \OCP\Server::get(\OCP\ServerVersion::class)->getVersionString());
+        $tmpl->assign('isAppsOnlyUpgrade', $isAppsOnlyUpgrade);
+
+        // get third party apps
+        $ocVersion = \OCP\Util::getVersion();
+        $ocVersion = implode('.', $ocVersion);
+        $incompatibleApps = $appManager->getIncompatibleApps($ocVersion);
+        $incompatibleOverwrites = $systemConfig->getValue('app_install_overwrite', []);
+        $incompatibleShippedApps = [];
+        $incompatibleDisabledApps = [];
+        foreach ($incompatibleApps as $appInfo) {
+            if ($appManager->isShipped($appInfo['id'])) {
+                $incompatibleShippedApps[] = $appInfo['name'] . ' (' . $appInfo['id'] . ')';
+            }
+            if (!in_array($appInfo['id'], $incompatibleOverwrites)) {
+                $incompatibleDisabledApps[] = $appInfo;
+            }
+        }
+
+        if (!empty($incompatibleShippedApps)) {
+            $l = Server::get(\OCP\L10N\IFactory::class)->get('core');
+            $hint = $l->t('Application %1$s is not present or has a non-compatible version with this server. Please check the apps directory.', [implode(', ', $incompatibleShippedApps)]);
+            throw new \OCP\HintException('Application ' . implode(', ', $incompatibleShippedApps) . ' is not present or has a non-compatible version with this server. Please check the apps directory.', $hint);
+        }
+
+        $tmpl->assign('appsToUpgrade', $appManager->getAppsNeedingUpgrade($ocVersion));
+        $tmpl->assign('incompatibleAppsList', $incompatibleDisabledApps);
+        try {
+            $defaults = new \OC_Defaults();
+            $tmpl->assign('productName', $defaults->getName());
+        } catch (Throwable $error) {
+            $tmpl->assign('productName', 'Nextcloud');
+        }
+        $tmpl->assign('oldTheme', $oldTheme);
+        $tmpl->printPage();
+    }
+
+    public static function initSession(): void {
+        $request = Server::get(IRequest::class);
+
+        // TODO: Temporary disabled again to solve issues with CalDAV/CardDAV clients like DAVx5 that use cookies
+        // TODO: See https://github.com/nextcloud/server/issues/37277#issuecomment-1476366147 and the other comments
+        // TODO: for further information.
+        // $isDavRequest = strpos($request->getRequestUri(), '/remote.php/dav') === 0 || strpos($request->getRequestUri(), '/remote.php/webdav') === 0;
+        // if ($request->getHeader('Authorization') !== '' && is_null($request->getCookie('cookie_test')) && $isDavRequest && !isset($_COOKIE['nc_session_id'])) {
+        // setcookie('cookie_test', 'test', time() + 3600);
+        // // Do not initialize the session if a request is authenticated directly
+        // // unless there is a session cookie already sent along
+        // return;
+        // }
+
+        if ($request->getServerProtocol() === 'https') {
+            ini_set('session.cookie_secure', 'true');
+        }
+
+        // prevents javascript from accessing php session cookies
+        ini_set('session.cookie_httponly', 'true');
+
+        // Do not initialize sessions for 'status.php' requests
+        // Monitoring endpoints can quickly flood session handlers
+        // and 'status.php' doesn't require sessions anyway
+        if (str_ends_with($request->getScriptName(), '/status.php')) {
+            return;
+        }
+
+        // set the cookie path to the Nextcloud directory
+        $cookie_path = OC::$WEBROOT ? : '/';
+        ini_set('session.cookie_path', $cookie_path);
+
+        // set the cookie domain to the Nextcloud domain
+        $cookie_domain = self::$config->getValue('cookie_domain', '');
+        if ($cookie_domain) {
+            ini_set('session.cookie_domain', $cookie_domain);
+        }
+
+        // Let the session name be changed in the initSession Hook
+        $sessionName = OC_Util::getInstanceId();
+
+        try {
+            $logger = null;
+            if (Server::get(\OC\SystemConfig::class)->getValue('installed', false)) {
+                $logger = logger('core');
+            }
+
+            // set the session name to the instance id - which is unique
+            $session = new \OC\Session\Internal(
+                $sessionName,
+                $logger,
+            );
+
+            $cryptoWrapper = Server::get(\OC\Session\CryptoWrapper::class);
+            $session = $cryptoWrapper->wrapSession($session);
+            self::$server->setSession($session);
+
+            // if session can't be started break with http 500 error
+        } catch (Exception $e) {
+            Server::get(LoggerInterface::class)->error($e->getMessage(), ['app' => 'base','exception' => $e]);
+            //show the user a detailed error page
+            Server::get(ITemplateManager::class)->printExceptionErrorPage($e, 500);
+            die();
+        }
+
+        //try to set the session lifetime
+        $sessionLifeTime = self::getSessionLifeTime();
+
+        // session timeout
+        if ($session->exists('LAST_ACTIVITY') && (time() - $session->get('LAST_ACTIVITY') > $sessionLifeTime)) {
+            if (isset($_COOKIE[session_name()])) {
+                setcookie(session_name(), '', -1, self::$WEBROOT ? : '/');
+            }
+            Server::get(IUserSession::class)->logout();
+        }
+
+        if (!self::hasSessionRelaxedExpiry()) {
+            $session->set('LAST_ACTIVITY', time());
+        }
+        $session->close();
+    }
+
+    private static function getSessionLifeTime(): int {
+        return Server::get(\OC\AllConfig::class)->getSystemValueInt('session_lifetime', 60 * 60 * 24);
+    }
+
+    /**
+     * @return bool true if the session expiry should only be done by gc instead of an explicit timeout
+     */
+    public static function hasSessionRelaxedExpiry(): bool {
+        return Server::get(\OC\AllConfig::class)->getSystemValueBool('session_relaxed_expiry', false);
+    }
+
+    /**
+     * Try to set some values to the required Nextcloud default
+     */
+    public static function setRequiredIniValues(): void {
+        // Don't display errors and log them
+        @ini_set('display_errors', '0');
+        @ini_set('log_errors', '1');
+
+        // Try to configure php to enable big file uploads.
+        // This doesn't work always depending on the webserver and php configuration.
+        // Let's try to overwrite some defaults if they are smaller than 1 hour
+
+        if (intval(@ini_get('max_execution_time') ?: 0) < 3600) {
+            @ini_set('max_execution_time', strval(3600));
+        }
+
+        if (intval(@ini_get('max_input_time') ?: 0) < 3600) {
+            @ini_set('max_input_time', strval(3600));
+        }
+
+        // Try to set the maximum execution time to the largest time limit we have
+        if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+            @set_time_limit(max(intval(@ini_get('max_execution_time')), intval(@ini_get('max_input_time'))));
+        }
+
+        @ini_set('default_charset', 'UTF-8');
+        @ini_set('gd.jpeg_ignore_warning', '1');
+    }
+
+    /**
+     * Send the same site cookies
+     */
+    private static function sendSameSiteCookies(): void {
+        $cookieParams = session_get_cookie_params();
+        $secureCookie = ($cookieParams['secure'] === true) ? 'secure; ' : '';
+        $policies = [
+            'lax',
+            'strict',
+        ];
+
+        // Append __Host to the cookie if it meets the requirements
+        $cookiePrefix = '';
+        if ($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
+            $cookiePrefix = '__Host-';
+        }
+
+        foreach ($policies as $policy) {
+            header(
+                sprintf(
+                    'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
+                    $cookiePrefix,
+                    $policy,
+                    $cookieParams['path'],
+                    $policy
+                ),
+                false
+            );
+        }
+    }
+
+    /**
+     * Same Site cookie to further mitigate CSRF attacks. This cookie has to
+     * be set in every request if cookies are sent to add a second level of
+     * defense against CSRF.
+     *
+     * If the cookie is not sent this will set the cookie and reload the page.
+     * We use an additional cookie since we want to protect logout CSRF and
+     * also we can't directly interfere with PHP's session mechanism.
+     */
+    private static function performSameSiteCookieProtection(IConfig $config): void {
+        $request = Server::get(IRequest::class);
+
+        // Some user agents are notorious and don't really properly follow HTTP
+        // specifications. For those, have an automated opt-out. Since the protection
+        // for remote.php is applied in base.php as starting point we need to opt out
+        // here.
+        $incompatibleUserAgents = $config->getSystemValue('csrf.optout');
+
+        // Fallback, if csrf.optout is unset
+        if (!is_array($incompatibleUserAgents)) {
+            $incompatibleUserAgents = [
+                // OS X Finder
+                '/^WebDAVFS/',
+                // Windows webdav drive
+                '/^Microsoft-WebDAV-MiniRedir/',
+            ];
+        }
+
+        if ($request->isUserAgent($incompatibleUserAgents)) {
+            return;
+        }
+
+        if (count($_COOKIE) > 0) {
+            $requestUri = $request->getScriptName();
+            $processingScript = explode('/', $requestUri);
+            $processingScript = $processingScript[count($processingScript) - 1];
+
+            if ($processingScript === 'index.php' // index.php routes are handled in the middleware
+                || $processingScript === 'cron.php' // and cron.php does not need any authentication at all
+                || $processingScript === 'public.php' // For public.php, auth for password protected shares is done in the PublicAuth plugin
+            ) {
+                return;
+            }
+
+            // All other endpoints require the lax and the strict cookie
+            if (!$request->passesStrictCookieCheck()) {
+                logger('core')->warning('Request does not pass strict cookie check');
+                self::sendSameSiteCookies();
+                // Debug mode gets access to the resources without strict cookie
+                // due to the fact that the SabreDAV browser also lives there.
+                if (!$config->getSystemValueBool('debug', false)) {
+                    http_response_code(\OCP\AppFramework\Http::STATUS_PRECONDITION_FAILED);
+                    header('Content-Type: application/json');
+                    echo json_encode(['error' => 'Strict Cookie has not been found in request']);
+                    exit();
+                }
+            }
+        } elseif (!isset($_COOKIE['nc_sameSiteCookielax']) || !isset($_COOKIE['nc_sameSiteCookiestrict'])) {
+            self::sendSameSiteCookies();
+        }
+    }
+
+    public static function init(): void {
+        // First handle PHP configuration and copy auth headers to the expected
+        // $_SERVER variable before doing anything Server object related
+        self::setRequiredIniValues();
+        self::handleAuthHeaders();
+
+        // prevent any XML processing from loading external entities
+        libxml_set_external_entity_loader(static function () {
+            return null;
+        });
+
+        // Set default timezone before the Server object is booted
+        if (!date_default_timezone_set('UTC')) {
+            throw new \RuntimeException('Could not set timezone to UTC');
+        }
+
+        // calculate the root directories
+        OC::$SERVERROOT = str_replace('\\', '/', substr(__DIR__, 0, -4));
+
+        // register autoloader
+        $loaderStart = microtime(true);
+
+        self::$CLI = (php_sapi_name() == 'cli');
+
+        // Add default composer PSR-4 autoloader, ensure apcu to be disabled
+        self::$composerAutoloader = require_once OC::$SERVERROOT . '/lib/composer/autoload.php';
+        self::$composerAutoloader->setApcuPrefix(null);
+
+
+        try {
+            self::initPaths();
+            // setup 3rdparty autoloader
+            $vendorAutoLoad = OC::$SERVERROOT . '/3rdparty/autoload.php';
+            if (!file_exists($vendorAutoLoad)) {
+                throw new \RuntimeException('Composer autoloader not found, unable to continue. Check the folder "3rdparty". Running "git submodule update --init" will initialize the git submodule that handles the subfolder "3rdparty".');
+            }
+            require_once $vendorAutoLoad;
+        } catch (\RuntimeException $e) {
+            if (!self::$CLI) {
+                http_response_code(503);
+            }
+            // we can't use the template error page here, because this needs the
+            // DI container which isn't available yet
+            print($e->getMessage());
+            exit();
+        }
+        $loaderEnd = microtime(true);
+
+        // Enable lazy loading if activated
+        \OC\AppFramework\Utility\SimpleContainer::$useLazyObjects = (bool)self::$config->getValue('enable_lazy_objects', true);
+
+        // setup the basic server
+        self::$server = new \OC\Server(\OC::$WEBROOT, self::$config);
+        self::$server->boot();
+
+        try {
+            $profiler = new BuiltInProfiler(
+                Server::get(IConfig::class),
+                Server::get(IRequest::class),
+            );
+            $profiler->start();
+        } catch (\Throwable $e) {
+            logger('core')->error('Failed to start profiler: ' . $e->getMessage(), ['app' => 'base']);
+        }
+
+        if (self::$CLI && in_array('--' . \OCP\Console\ReservedOptions::DEBUG_LOG, $_SERVER['argv'])) {
+            \OC\Core\Listener\BeforeMessageLoggedEventListener::setup();
+        }
+
+        $eventLogger = Server::get(\OCP\Diagnostics\IEventLogger::class);
+        $eventLogger->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);
+        $eventLogger->start('boot', 'Initialize');
+
+        // Override php.ini and log everything if we're troubleshooting
+        if (self::$config->getValue('loglevel') === ILogger::DEBUG) {
+            error_reporting(E_ALL);
+        }
+
+        // initialize intl fallback if necessary
+        OC_Util::isSetLocaleWorking();
+
+        $config = Server::get(IConfig::class);
+        if (!defined('PHPUNIT_RUN')) {
+            $errorHandler = new OC\Log\ErrorHandler(
+                \OCP\Server::get(\Psr\Log\LoggerInterface::class),
+            );
+            $exceptionHandler = [$errorHandler, 'onException'];
+            if ($config->getSystemValueBool('debug', false)) {
+                set_error_handler([$errorHandler, 'onAll'], E_ALL);
+                if (\OC::$CLI) {
+                    $exceptionHandler = [Server::get(ITemplateManager::class), 'printExceptionErrorPage'];
+                }
+            } else {
+                set_error_handler([$errorHandler, 'onError']);
+            }
+            register_shutdown_function([$errorHandler, 'onShutdown']);
+            set_exception_handler($exceptionHandler);
+        }
+
+        /** @var \OC\AppFramework\Bootstrap\Coordinator $bootstrapCoordinator */
+        $bootstrapCoordinator = Server::get(\OC\AppFramework\Bootstrap\Coordinator::class);
+        $bootstrapCoordinator->runInitialRegistration();
+
+        $eventLogger->start('init_session', 'Initialize session');
+
+        // Check for PHP SimpleXML extension earlier since we need it before our other checks and want to provide a useful hint for web users
+        // see https://github.com/nextcloud/server/pull/2619
+        if (!function_exists('simplexml_load_file')) {
+            throw new \OCP\HintException('The PHP SimpleXML/PHP-XML extension is not installed.', 'Install the extension or make sure it is enabled.');
+        }
+
+        $systemConfig = Server::get(\OC\SystemConfig::class);
+        $appManager = Server::get(\OCP\App\IAppManager::class);
+        if ($systemConfig->getValue('installed', false)) {
+            $appManager->loadApps(['session']);
+        }
+        if (!self::$CLI) {
+            self::initSession();
+        }
+        $eventLogger->end('init_session');
+        self::checkConfig();
+        self::checkInstalled($systemConfig);
+
+        OC_Response::addSecurityHeaders();
+
+        self::performSameSiteCookieProtection($config);
+
+        if (!defined('OC_CONSOLE')) {
+            $eventLogger->start('check_server', 'Run a few configuration checks');
+            $errors = OC_Util::checkServer($systemConfig);
+            if (count($errors) > 0) {
+                if (!self::$CLI) {
+                    http_response_code(503);
+                    Util::addStyle('guest');
+                    try {
+                        Server::get(ITemplateManager::class)->printGuestPage('', 'error', ['errors' => $errors]);
+                        exit;
+                    } catch (\Exception $e) {
+                        // In case any error happens when showing the error page, we simply fall back to posting the text.
+                        // This might be the case when e.g. the data directory is broken and we can not load/write SCSS to/from it.
+                    }
+                }
+
+                // Convert l10n string into regular string for usage in database
+                $staticErrors = [];
+                foreach ($errors as $error) {
+                    echo $error['error'] . "\n";
+                    echo $error['hint'] . "\n\n";
+                    $staticErrors[] = [
+                        'error' => (string)$error['error'],
+                        'hint' => (string)$error['hint'],
+                    ];
+                }
+
+                try {
+                    $config->setAppValue('core', 'cronErrors', json_encode($staticErrors));
+                } catch (\Exception $e) {
+                    echo('Writing to database failed');
+                }
+                exit(1);
+            } elseif (self::$CLI && $config->getSystemValueBool('installed', false)) {
+                $config->deleteAppValue('core', 'cronErrors');
+            }
+            $eventLogger->end('check_server');
+        }
+
+        // User and Groups
+        if (!$systemConfig->getValue('installed', false)) {
+            self::$server->getSession()->set('user_id', '');
+        }
+
+        $eventLogger->start('setup_backends', 'Setup group and user backends');
+        Server::get(\OCP\IUserManager::class)->registerBackend(new \OC\User\Database());
+        Server::get(\OCP\IGroupManager::class)->addBackend(new \OC\Group\Database());
+
+        // Subscribe to the hook
+        \OCP\Util::connectHook(
+            '\OCA\Files_Sharing\API\Server2Server',
+            'preLoginNameUsedAsUserName',
+            '\OC\User\Database',
+            'preLoginNameUsedAsUserName'
+        );
+
+        //setup extra user backends
+        if (!\OCP\Util::needUpgrade()) {
+            OC_User::setupBackends();
+        } else {
+            // Run upgrades in incognito mode
+            OC_User::setIncognitoMode(true);
+        }
+        $eventLogger->end('setup_backends');
+
+        self::registerCleanupHooks($systemConfig);
+        self::registerShareHooks($systemConfig);
+        self::registerEncryptionWrapperAndHooks();
+        self::registerAccountHooks();
+        self::registerResourceCollectionHooks();
+        self::registerFileReferenceEventListener();
+        self::registerRenderReferenceEventListener();
+        self::registerAppRestrictionsHooks();
+
+        // Make sure that the application class is not loaded before the database is setup
+        if ($systemConfig->getValue('installed', false)) {
+            $appManager->loadApp('settings');
+            /* Run core application registration */
+            $bootstrapCoordinator->runLazyRegistration('core');
+        }
+
+        //make sure temporary files are cleaned up
+        $tmpManager = Server::get(\OCP\ITempManager::class);
+        register_shutdown_function([$tmpManager, 'clean']);
+        $lockProvider = Server::get(\OCP\Lock\ILockingProvider::class);
+        register_shutdown_function([$lockProvider, 'releaseAll']);
+
+        // Check whether the sample configuration has been copied
+        if ($systemConfig->getValue('copied_sample_config', false)) {
+            $l = Server::get(\OCP\L10N\IFactory::class)->get('lib');
+            Server::get(ITemplateManager::class)->printErrorPage(
+                $l->t('Sample configuration detected'),
+                $l->t('It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php'),
+                503
+            );
+            return;
+        }
+
+        $request = Server::get(IRequest::class);
+        $host = $request->getInsecureServerHost();
+        /**
+         * if the host passed in headers isn't trusted
+         * FIXME: Should not be in here at all :see_no_evil:
+         */
+        if (!OC::$CLI
+            && !Server::get(\OC\Security\TrustedDomainHelper::class)->isTrustedDomain($host)
+            && $config->getSystemValueBool('installed', false)
+        ) {
+            // Allow access to CSS resources
+            $isScssRequest = false;
+            if (strpos($request->getPathInfo() ?: '', '/css/') === 0) {
+                $isScssRequest = true;
+            }
+
+            if (substr($request->getRequestUri(), -11) === '/status.php') {
+                http_response_code(400);
+                header('Content-Type: application/json');
+                echo '{"error": "Trusted domain error.", "code": 15}';
+                exit();
+            }
+
+            if (!$isScssRequest) {
+                http_response_code(400);
+                Server::get(LoggerInterface::class)->info(
+                    'Trusted domain error. "{remoteAddress}" tried to access using "{host}" as host.',
+                    [
+                        'app' => 'core',
+                        'remoteAddress' => $request->getRemoteAddress(),
+                        'host' => $host,
+                    ]
+                );
+
+                $tmpl = Server::get(ITemplateManager::class)->getTemplate('core', 'untrustedDomain', 'guest');
+                $tmpl->assign('docUrl', Server::get(IURLGenerator::class)->linkToDocs('admin-trusted-domains'));
+                $tmpl->printPage();
+
+                exit();
+            }
+        }
+        $eventLogger->end('boot');
+        $eventLogger->log('init', 'OC::init', $loaderStart, microtime(true));
+        $eventLogger->start('runtime', 'Runtime');
+        $eventLogger->start('request', 'Full request after boot');
+        register_shutdown_function(function () use ($eventLogger) {
+            $eventLogger->end('request');
+        });
+
+        register_shutdown_function(function () {
+            $memoryPeak = memory_get_peak_usage();
+            $logLevel = match (true) {
+                $memoryPeak > 500_000_000 => ILogger::FATAL,
+                $memoryPeak > 400_000_000 => ILogger::ERROR,
+                $memoryPeak > 300_000_000 => ILogger::WARN,
+                default => null,
+            };
+            if ($logLevel !== null) {
+                $message = 'Request used more than 300 MB of RAM: ' . Util::humanFileSize($memoryPeak);
+                $logger = Server::get(LoggerInterface::class);
+                $logger->log($logLevel, $message, ['app' => 'core']);
+            }
+        });
+    }
+
+    /**
+     * register hooks for the cleanup of cache and bruteforce protection
+     */
+    public static function registerCleanupHooks(\OC\SystemConfig $systemConfig): void {
+        //don't try to do this before we are properly setup
+        if ($systemConfig->getValue('installed', false) && !\OCP\Util::needUpgrade()) {
+            // NOTE: This will be replaced to use OCP
+            $userSession = Server::get(\OC\User\Session::class);
+            $userSession->listen('\OC\User', 'postLogin', function () use ($userSession) {
+                if (!defined('PHPUNIT_RUN') && $userSession->isLoggedIn()) {
+                    // reset brute force delay for this IP address and username
+                    $uid = $userSession->getUser()->getUID();
+                    $request = Server::get(IRequest::class);
+                    $throttler = Server::get(IThrottler::class);
+                    $throttler->resetDelay($request->getRemoteAddress(), 'login', ['user' => $uid]);
+                }
+            });
+        }
+    }
+
+    private static function registerEncryptionWrapperAndHooks(): void {
+        /** @var \OC\Encryption\Manager */
+        $manager = Server::get(\OCP\Encryption\IManager::class);
+        Server::get(IEventDispatcher::class)->addListener(
+            BeforeFileSystemSetupEvent::class,
+            $manager->setupStorage(...),
+        );
+
+        $enabled = $manager->isEnabled();
+        if ($enabled) {
+            \OC\Encryption\EncryptionEventListener::register(Server::get(IEventDispatcher::class));
+        }
+    }
+
+    private static function registerAccountHooks(): void {
+        /** @var IEventDispatcher $dispatcher */
+        $dispatcher = Server::get(IEventDispatcher::class);
+        $dispatcher->addServiceListener(UserChangedEvent::class, \OC\Accounts\Hooks::class);
+    }
+
+    private static function registerAppRestrictionsHooks(): void {
+        /** @var \OC\Group\Manager $groupManager */
+        $groupManager = Server::get(\OCP\IGroupManager::class);
+        $groupManager->listen('\OC\Group', 'postDelete', function (\OCP\IGroup $group) {
+            $appManager = Server::get(\OCP\App\IAppManager::class);
+            $apps = $appManager->getEnabledAppsForGroup($group);
+            foreach ($apps as $appId) {
+                $restrictions = $appManager->getAppRestriction($appId);
+                if (empty($restrictions)) {
+                    continue;
+                }
+                $key = array_search($group->getGID(), $restrictions);
+                unset($restrictions[$key]);
+                $restrictions = array_values($restrictions);
+                if (empty($restrictions)) {
+                    $appManager->disableApp($appId);
+                } else {
+                    $appManager->enableAppForGroups($appId, $restrictions);
+                }
+            }
+        });
+    }
+
+    private static function registerResourceCollectionHooks(): void {
+        \OC\Collaboration\Resources\Listener::register(Server::get(IEventDispatcher::class));
+    }
+
+    private static function registerFileReferenceEventListener(): void {
+        \OC\Collaboration\Reference\File\FileReferenceEventListener::register(Server::get(IEventDispatcher::class));
+    }
+
+    private static function registerRenderReferenceEventListener() {
+        \OC\Collaboration\Reference\RenderReferenceEventListener::register(Server::get(IEventDispatcher::class));
+    }
+
+    /**
+     * register hooks for sharing
+     */
+    public static function registerShareHooks(\OC\SystemConfig $systemConfig): void {
+        if ($systemConfig->getValue('installed')) {
+
+            $dispatcher = Server::get(IEventDispatcher::class);
+            $dispatcher->addServiceListener(UserRemovedEvent::class, UserRemovedListener::class);
+            $dispatcher->addServiceListener(GroupDeletedEvent::class, GroupDeletedListener::class);
+            $dispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedListener::class);
+        }
+    }
+
+    /**
+     * Handle the request
+     */
+    public static function handleRequest(): void {
+        Server::get(\OCP\Diagnostics\IEventLogger::class)->start('handle_request', 'Handle request');
+        $systemConfig = Server::get(\OC\SystemConfig::class);
+
+        // Check if Nextcloud is installed or in maintenance (update) mode
+        if (!$systemConfig->getValue('installed', false)) {
+            \OC::$server->getSession()->clear();
+            $controller = Server::get(\OC\Core\Controller\SetupController::class);
+            $controller->run($_POST);
+            exit();
+        }
+
+        $request = Server::get(IRequest::class);
+        $request->throwDecodingExceptionIfAny();
+        $requestPath = $request->getRawPathInfo();
+        if ($requestPath === '/heartbeat') {
+            return;
+        }
+        if (substr($requestPath, -3) !== '.js') { // we need these files during the upgrade
+            self::checkMaintenanceMode($systemConfig);
+
+            if (\OCP\Util::needUpgrade()) {
+                if (function_exists('opcache_reset')) {
+                    opcache_reset();
+                }
+                if (!((bool)$systemConfig->getValue('maintenance', false))) {
+                    self::printUpgradePage($systemConfig);
+                    exit();
+                }
+            }
+        }
+
+        $appManager = Server::get(\OCP\App\IAppManager::class);
+
+        // Always load authentication apps
+        $appManager->loadApps(['authentication']);
+        $appManager->loadApps(['extended_authentication']);
+
+        // Load minimum set of apps
+        if (!\OCP\Util::needUpgrade()
+            && !((bool)$systemConfig->getValue('maintenance', false))) {
+            // For logged-in users: Load everything
+            if (Server::get(IUserSession::class)->isLoggedIn()) {
+                $appManager->loadApps();
+            } else {
+                // For guests: Load only filesystem and logging
+                $appManager->loadApps(['filesystem', 'logging']);
+
+                // Don't try to login when a client is trying to get a OAuth token.
+                // OAuth needs to support basic auth too, so the login is not valid
+                // inside Nextcloud and the Login exception would ruin it.
+                if ($request->getRawPathInfo() !== '/apps/oauth2/api/v1/token') {
+                    try {
+                        self::handleLogin($request);
+                    } catch (DisabledUserException $e) {
+                        // Disabled users would not be seen as logged in and
+                        // trying to log them in would fail, so the login
+                        // exception is ignored for the themed stylesheets and
+                        // images.
+                        if ($request->getRawPathInfo() !== '/apps/theming/theme/default.css'
+                            && $request->getRawPathInfo() !== '/apps/theming/theme/light.css'
+                            && $request->getRawPathInfo() !== '/apps/theming/theme/dark.css'
+                            && $request->getRawPathInfo() !== '/apps/theming/theme/light-highcontrast.css'
+                            && $request->getRawPathInfo() !== '/apps/theming/theme/dark-highcontrast.css'
+                            && $request->getRawPathInfo() !== '/apps/theming/theme/opendyslexic.css'
+                            && $request->getRawPathInfo() !== '/apps/theming/image/background'
+                            && $request->getRawPathInfo() !== '/apps/theming/image/logo'
+                            && $request->getRawPathInfo() !== '/apps/theming/image/logoheader'
+                            && !str_starts_with($request->getRawPathInfo(), '/apps/theming/favicon')
+                            && !str_starts_with($request->getRawPathInfo(), '/apps/theming/icon')) {
+                            throw $e;
+                        }
+                    }
+                }
+            }
+        }
+
+        if (!self::$CLI) {
+            try {
+                if (!\OCP\Util::needUpgrade()) {
+                    $appManager->loadApps(['filesystem', 'logging']);
+                    $appManager->loadApps();
+                }
+                Server::get(\OC\Route\Router::class)->match($request->getRawPathInfo());
+                return;
+            } catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
+                //header('HTTP/1.0 404 Not Found');
+            } catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) {
+                http_response_code(405);
+                return;
+            }
+        }
+
+        // Handle WebDAV
+        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PROPFIND') {
+            // not allowed any more to prevent people
+            // mounting this root directly.
+            // Users need to mount remote.php/webdav instead.
+            http_response_code(405);
+            return;
+        }
+
+        // Handle requests for JSON or XML
+        $acceptHeader = $request->getHeader('Accept');
+        if (in_array($acceptHeader, ['application/json', 'application/xml'], true)) {
+            http_response_code(404);
+            return;
+        }
+
+        // Handle resources that can't be found
+        // This prevents browsers from redirecting to the default page and then
+        // attempting to parse HTML as CSS and similar.
+        $destinationHeader = $request->getHeader('Sec-Fetch-Dest');
+        if (in_array($destinationHeader, ['font', 'script', 'style'])) {
+            http_response_code(404);
+            return;
+        }
+
+        // Redirect to the default app or login only as an entry point
+        if ($requestPath === '') {
+            // Someone is logged in
+            if (Server::get(IUserSession::class)->isLoggedIn()) {
+                header('Location: ' . Server::get(IURLGenerator::class)->linkToDefaultPageUrl());
+            } else {
+                // Not handled and not logged in
+                header('Location: ' . Server::get(IURLGenerator::class)->linkToRouteAbsolute('core.login.showLoginForm'));
+            }
+            return;
+        }
+
+        try {
+            Server::get(\OC\Route\Router::class)->match('/error/404');
+        } catch (\Exception $e) {
+            if (!$e instanceof MethodNotAllowedException) {
+                logger('core')->emergency($e->getMessage(), ['exception' => $e]);
+            }
+            $l = Server::get(\OCP\L10N\IFactory::class)->get('lib');
+            Server::get(ITemplateManager::class)->printErrorPage(
+                '404',
+                $l->t('The page could not be found on the server.'),
+                404
+            );
+        }
+    }
+
+    /**
+     * Check login: apache auth, auth token, basic auth
+     */
+    public static function handleLogin(OCP\IRequest $request): bool {
+        if ($request->getHeader('X-Nextcloud-Federation')) {
+            return false;
+        }
+        $userSession = Server::get(\OC\User\Session::class);
+        if (OC_User::handleApacheAuth()) {
+            return true;
+        }
+        if (self::tryAppAPILogin($request)) {
+            return true;
+        }
+        if ($userSession->tryTokenLogin($request)) {
+            return true;
+        }
+        if (isset($_COOKIE['nc_username'])
+            && isset($_COOKIE['nc_token'])
+            && isset($_COOKIE['nc_session_id'])
+            && $userSession->loginWithCookie($_COOKIE['nc_username'], $_COOKIE['nc_token'], $_COOKIE['nc_session_id'])) {
+            return true;
+        }
+        if ($userSession->tryBasicAuthLogin($request, Server::get(IThrottler::class))) {
+            return true;
+        }
+        return false;
+    }
+
+    protected static function handleAuthHeaders(): void {
+        //copy http auth headers for apache+php-fcgid work around
+        if (isset($_SERVER['HTTP_XAUTHORIZATION']) && !isset($_SERVER['HTTP_AUTHORIZATION'])) {
+            $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['HTTP_XAUTHORIZATION'];
+        }
+
+        // Extract PHP_AUTH_USER/PHP_AUTH_PW from other headers if necessary.
+        $vars = [
+            'HTTP_AUTHORIZATION', // apache+php-cgi work around
+            'REDIRECT_HTTP_AUTHORIZATION', // apache+php-cgi alternative
+        ];
+        foreach ($vars as $var) {
+            if (isset($_SERVER[$var]) && is_string($_SERVER[$var]) && preg_match('/Basic\s+(.*)$/i', $_SERVER[$var], $matches)) {
+                $credentials = explode(':', base64_decode($matches[1]), 2);
+                if (count($credentials) === 2) {
+                    $_SERVER['PHP_AUTH_USER'] = $credentials[0];
+                    $_SERVER['PHP_AUTH_PW'] = $credentials[1];
+                    break;
+                }
+            }
+        }
+    }
+
+    protected static function tryAppAPILogin(OCP\IRequest $request): bool {
+        if (!$request->getHeader('AUTHORIZATION-APP-API')) {
+            return false;
+        }
+        $appManager = Server::get(OCP\App\IAppManager::class);
+        if (!$appManager->isEnabledForAnyone('app_api')) {
+            return false;
+        }
+        try {
+            $appAPIService = Server::get(OCA\AppAPI\Service\AppAPIService::class);
+            return $appAPIService->validateExAppRequestToNC($request);
+        } catch (\Psr\Container\NotFoundExceptionInterface|\Psr\Container\ContainerExceptionInterface $e) {
+            return false;
+        }
+    }
 }
 
 OC::init();

core/Controller/AvatarController.php

Indentation +230 added lines, -230 removed lines

@@ -34,250 +34,250 @@
  * @package OC\Core\Controller
  */
 class AvatarController extends Controller {
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		protected IAvatarManager $avatarManager,
-		protected IL10N $l10n,
-		protected IUserManager $userManager,
-		protected IRootFolder $rootFolder,
-		protected LoggerInterface $logger,
-		protected ?string $userId,
-		protected TimeFactory $timeFactory,
-		protected GuestAvatarController $guestAvatarController,
-	) {
-		parent::__construct($appName, $request);
-	}
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        protected IAvatarManager $avatarManager,
+        protected IL10N $l10n,
+        protected IUserManager $userManager,
+        protected IRootFolder $rootFolder,
+        protected LoggerInterface $logger,
+        protected ?string $userId,
+        protected TimeFactory $timeFactory,
+        protected GuestAvatarController $guestAvatarController,
+    ) {
+        parent::__construct($appName, $request);
+    }
 
-	/**
-	 * @NoSameSiteCookieRequired
-	 *
-	 * Get the dark avatar
-	 *
-	 * @param string $userId ID of the user
-	 * @param 64|512 $size Size of the avatar
-	 * @param bool $guestFallback Fallback to guest avatar if not found
-	 * @return FileDisplayResponse<Http::STATUS_OK|Http::STATUS_CREATED, array{Content-Type: string, X-NC-IsCustomAvatar: int}>|JSONResponse<Http::STATUS_NOT_FOUND, list<empty>, array{}>|Response<Http::STATUS_INTERNAL_SERVER_ERROR, array{}>
-	 *
-	 * 200: Avatar returned
-	 * 201: Avatar returned
-	 * 404: Avatar not found
-	 */
-	#[NoCSRFRequired]
-	#[PublicPage]
-	#[FrontpageRoute(verb: 'GET', url: '/avatar/{userId}/{size}/dark')]
-	#[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
-	public function getAvatarDark(string $userId, int $size, bool $guestFallback = false) {
-		if ($size <= 64) {
-			if ($size !== 64) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
-			}
-			$size = 64;
-		} else {
-			if ($size !== 512) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
-			}
-			$size = 512;
-		}
+    /**
+     * @NoSameSiteCookieRequired
+     *
+     * Get the dark avatar
+     *
+     * @param string $userId ID of the user
+     * @param 64|512 $size Size of the avatar
+     * @param bool $guestFallback Fallback to guest avatar if not found
+     * @return FileDisplayResponse<Http::STATUS_OK|Http::STATUS_CREATED, array{Content-Type: string, X-NC-IsCustomAvatar: int}>|JSONResponse<Http::STATUS_NOT_FOUND, list<empty>, array{}>|Response<Http::STATUS_INTERNAL_SERVER_ERROR, array{}>
+     *
+     * 200: Avatar returned
+     * 201: Avatar returned
+     * 404: Avatar not found
+     */
+    #[NoCSRFRequired]
+    #[PublicPage]
+    #[FrontpageRoute(verb: 'GET', url: '/avatar/{userId}/{size}/dark')]
+    #[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
+    public function getAvatarDark(string $userId, int $size, bool $guestFallback = false) {
+        if ($size <= 64) {
+            if ($size !== 64) {
+                $this->logger->debug('Avatar requested in deprecated size ' . $size);
+            }
+            $size = 64;
+        } else {
+            if ($size !== 512) {
+                $this->logger->debug('Avatar requested in deprecated size ' . $size);
+            }
+            $size = 512;
+        }
 
-		try {
-			$avatar = $this->avatarManager->getAvatar($userId);
-			$avatarFile = $avatar->getFile($size, true);
-			$response = new FileDisplayResponse(
-				$avatarFile,
-				Http::STATUS_OK,
-				['Content-Type' => $avatarFile->getMimeType(), 'X-NC-IsCustomAvatar' => (int)$avatar->isCustomAvatar()]
-			);
-		} catch (\Exception $e) {
-			if ($guestFallback) {
-				return $this->guestAvatarController->getAvatarDark($userId, $size);
-			}
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
+        try {
+            $avatar = $this->avatarManager->getAvatar($userId);
+            $avatarFile = $avatar->getFile($size, true);
+            $response = new FileDisplayResponse(
+                $avatarFile,
+                Http::STATUS_OK,
+                ['Content-Type' => $avatarFile->getMimeType(), 'X-NC-IsCustomAvatar' => (int)$avatar->isCustomAvatar()]
+            );
+        } catch (\Exception $e) {
+            if ($guestFallback) {
+                return $this->guestAvatarController->getAvatarDark($userId, $size);
+            }
+            return new JSONResponse([], Http::STATUS_NOT_FOUND);
+        }
 
-		// Cache for 1 day
-		$response->cacheFor(60 * 60 * 24, false, true);
-		return $response;
-	}
+        // Cache for 1 day
+        $response->cacheFor(60 * 60 * 24, false, true);
+        return $response;
+    }
 
 
-	/**
-	 * @NoSameSiteCookieRequired
-	 *
-	 * Get the avatar
-	 *
-	 * @param string $userId ID of the user
-	 * @param 64|512 $size Size of the avatar
-	 * @param bool $guestFallback Fallback to guest avatar if not found
-	 * @return FileDisplayResponse<Http::STATUS_OK|Http::STATUS_CREATED, array{Content-Type: string, X-NC-IsCustomAvatar: int}>|JSONResponse<Http::STATUS_NOT_FOUND, list<empty>, array{}>|Response<Http::STATUS_INTERNAL_SERVER_ERROR, array{}>
-	 *
-	 * 200: Avatar returned
-	 * 201: Avatar returned
-	 * 404: Avatar not found
-	 */
-	#[NoCSRFRequired]
-	#[PublicPage]
-	#[FrontpageRoute(verb: 'GET', url: '/avatar/{userId}/{size}')]
-	#[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
-	public function getAvatar(string $userId, int $size, bool $guestFallback = false) {
-		if ($size <= 64) {
-			if ($size !== 64) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
-			}
-			$size = 64;
-		} else {
-			if ($size !== 512) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
-			}
-			$size = 512;
-		}
+    /**
+     * @NoSameSiteCookieRequired
+     *
+     * Get the avatar
+     *
+     * @param string $userId ID of the user
+     * @param 64|512 $size Size of the avatar
+     * @param bool $guestFallback Fallback to guest avatar if not found
+     * @return FileDisplayResponse<Http::STATUS_OK|Http::STATUS_CREATED, array{Content-Type: string, X-NC-IsCustomAvatar: int}>|JSONResponse<Http::STATUS_NOT_FOUND, list<empty>, array{}>|Response<Http::STATUS_INTERNAL_SERVER_ERROR, array{}>
+     *
+     * 200: Avatar returned
+     * 201: Avatar returned
+     * 404: Avatar not found
+     */
+    #[NoCSRFRequired]
+    #[PublicPage]
+    #[FrontpageRoute(verb: 'GET', url: '/avatar/{userId}/{size}')]
+    #[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
+    public function getAvatar(string $userId, int $size, bool $guestFallback = false) {
+        if ($size <= 64) {
+            if ($size !== 64) {
+                $this->logger->debug('Avatar requested in deprecated size ' . $size);
+            }
+            $size = 64;
+        } else {
+            if ($size !== 512) {
+                $this->logger->debug('Avatar requested in deprecated size ' . $size);
+            }
+            $size = 512;
+        }
 
-		try {
-			$avatar = $this->avatarManager->getAvatar($userId);
-			$avatarFile = $avatar->getFile($size);
-			$response = new FileDisplayResponse(
-				$avatarFile,
-				Http::STATUS_OK,
-				['Content-Type' => $avatarFile->getMimeType(), 'X-NC-IsCustomAvatar' => (int)$avatar->isCustomAvatar()]
-			);
-		} catch (\Exception $e) {
-			if ($guestFallback) {
-				return $this->guestAvatarController->getAvatar($userId, $size);
-			}
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
+        try {
+            $avatar = $this->avatarManager->getAvatar($userId);
+            $avatarFile = $avatar->getFile($size);
+            $response = new FileDisplayResponse(
+                $avatarFile,
+                Http::STATUS_OK,
+                ['Content-Type' => $avatarFile->getMimeType(), 'X-NC-IsCustomAvatar' => (int)$avatar->isCustomAvatar()]
+            );
+        } catch (\Exception $e) {
+            if ($guestFallback) {
+                return $this->guestAvatarController->getAvatar($userId, $size);
+            }
+            return new JSONResponse([], Http::STATUS_NOT_FOUND);
+        }
 
-		// Cache for 1 day
-		$response->cacheFor(60 * 60 * 24, false, true);
-		return $response;
-	}
+        // Cache for 1 day
+        $response->cacheFor(60 * 60 * 24, false, true);
+        return $response;
+    }
 
-	#[NoAdminRequired]
-	#[FrontpageRoute(verb: 'POST', url: '/avatar/')]
-	public function postAvatar(?string $path = null): JSONResponse {
-		$files = $this->request->getUploadedFile('files');
+    #[NoAdminRequired]
+    #[FrontpageRoute(verb: 'POST', url: '/avatar/')]
+    public function postAvatar(?string $path = null): JSONResponse {
+        $files = $this->request->getUploadedFile('files');
 
-		if (isset($path)) {
-			$path = stripslashes($path);
-			$userFolder = $this->rootFolder->getUserFolder($this->userId);
-			/** @var File $node */
-			$node = $userFolder->get($path);
-			if (!($node instanceof File)) {
-				return new JSONResponse(['data' => ['message' => $this->l10n->t('Please select a file.')]]);
-			}
-			if ($node->getSize() > 20 * 1024 * 1024) {
-				return new JSONResponse(
-					['data' => ['message' => $this->l10n->t('File is too big')]],
-					Http::STATUS_BAD_REQUEST
-				);
-			}
+        if (isset($path)) {
+            $path = stripslashes($path);
+            $userFolder = $this->rootFolder->getUserFolder($this->userId);
+            /** @var File $node */
+            $node = $userFolder->get($path);
+            if (!($node instanceof File)) {
+                return new JSONResponse(['data' => ['message' => $this->l10n->t('Please select a file.')]]);
+            }
+            if ($node->getSize() > 20 * 1024 * 1024) {
+                return new JSONResponse(
+                    ['data' => ['message' => $this->l10n->t('File is too big')]],
+                    Http::STATUS_BAD_REQUEST
+                );
+            }
 
-			if ($node->getMimeType() !== 'image/jpeg' && $node->getMimeType() !== 'image/png') {
-				return new JSONResponse(
-					['data' => ['message' => $this->l10n->t('The selected file is not an image.')]],
-					Http::STATUS_BAD_REQUEST
-				);
-			}
+            if ($node->getMimeType() !== 'image/jpeg' && $node->getMimeType() !== 'image/png') {
+                return new JSONResponse(
+                    ['data' => ['message' => $this->l10n->t('The selected file is not an image.')]],
+                    Http::STATUS_BAD_REQUEST
+                );
+            }
 
-			try {
-				$content = $node->getContent();
-			} catch (NotPermittedException $e) {
-				return new JSONResponse(
-					['data' => ['message' => $this->l10n->t('The selected file cannot be read.')]],
-					Http::STATUS_BAD_REQUEST
-				);
-			}
-		} elseif (!is_null($files)) {
-			if (
-				$files['error'][0] === 0
-				 && is_uploaded_file($files['tmp_name'][0])
-			) {
-				if ($files['size'][0] > 20 * 1024 * 1024) {
-					return new JSONResponse(
-						['data' => ['message' => $this->l10n->t('File is too big')]],
-						Http::STATUS_BAD_REQUEST
-					);
-				}
-				$content = file_get_contents($files['tmp_name'][0]);
-				unlink($files['tmp_name'][0]);
-			} else {
-				$phpFileUploadErrors = [
-					UPLOAD_ERR_OK => $this->l10n->t('The file was uploaded'),
-					UPLOAD_ERR_INI_SIZE => $this->l10n->t('The uploaded file exceeds the upload_max_filesize directive in php.ini'),
-					UPLOAD_ERR_FORM_SIZE => $this->l10n->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
-					UPLOAD_ERR_PARTIAL => $this->l10n->t('The file was only partially uploaded'),
-					UPLOAD_ERR_NO_FILE => $this->l10n->t('No file was uploaded'),
-					UPLOAD_ERR_NO_TMP_DIR => $this->l10n->t('Missing a temporary folder'),
-					UPLOAD_ERR_CANT_WRITE => $this->l10n->t('Could not write file to disk'),
-					UPLOAD_ERR_EXTENSION => $this->l10n->t('A PHP extension stopped the file upload'),
-				];
-				$message = $phpFileUploadErrors[$files['error'][0]] ?? $this->l10n->t('Invalid file provided');
-				$this->logger->warning($message, ['app' => 'core']);
-				return new JSONResponse(
-					['data' => ['message' => $message]],
-					Http::STATUS_BAD_REQUEST
-				);
-			}
-		} else {
-			//Add imgfile
-			return new JSONResponse(
-				['data' => ['message' => $this->l10n->t('No image or file provided')]],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
+            try {
+                $content = $node->getContent();
+            } catch (NotPermittedException $e) {
+                return new JSONResponse(
+                    ['data' => ['message' => $this->l10n->t('The selected file cannot be read.')]],
+                    Http::STATUS_BAD_REQUEST
+                );
+            }
+        } elseif (!is_null($files)) {
+            if (
+                $files['error'][0] === 0
+                 && is_uploaded_file($files['tmp_name'][0])
+            ) {
+                if ($files['size'][0] > 20 * 1024 * 1024) {
+                    return new JSONResponse(
+                        ['data' => ['message' => $this->l10n->t('File is too big')]],
+                        Http::STATUS_BAD_REQUEST
+                    );
+                }
+                $content = file_get_contents($files['tmp_name'][0]);
+                unlink($files['tmp_name'][0]);
+            } else {
+                $phpFileUploadErrors = [
+                    UPLOAD_ERR_OK => $this->l10n->t('The file was uploaded'),
+                    UPLOAD_ERR_INI_SIZE => $this->l10n->t('The uploaded file exceeds the upload_max_filesize directive in php.ini'),
+                    UPLOAD_ERR_FORM_SIZE => $this->l10n->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
+                    UPLOAD_ERR_PARTIAL => $this->l10n->t('The file was only partially uploaded'),
+                    UPLOAD_ERR_NO_FILE => $this->l10n->t('No file was uploaded'),
+                    UPLOAD_ERR_NO_TMP_DIR => $this->l10n->t('Missing a temporary folder'),
+                    UPLOAD_ERR_CANT_WRITE => $this->l10n->t('Could not write file to disk'),
+                    UPLOAD_ERR_EXTENSION => $this->l10n->t('A PHP extension stopped the file upload'),
+                ];
+                $message = $phpFileUploadErrors[$files['error'][0]] ?? $this->l10n->t('Invalid file provided');
+                $this->logger->warning($message, ['app' => 'core']);
+                return new JSONResponse(
+                    ['data' => ['message' => $message]],
+                    Http::STATUS_BAD_REQUEST
+                );
+            }
+        } else {
+            //Add imgfile
+            return new JSONResponse(
+                ['data' => ['message' => $this->l10n->t('No image or file provided')]],
+                Http::STATUS_BAD_REQUEST
+            );
+        }
 
-		try {
-			$image = new Image();
-			$image->loadFromData($content);
-			$image->readExif($content);
-			$image->fixOrientation();
+        try {
+            $image = new Image();
+            $image->loadFromData($content);
+            $image->readExif($content);
+            $image->fixOrientation();
 
-			if ($image->valid()) {
-				$mimeType = $image->mimeType();
-				if ($mimeType !== 'image/jpeg' && $mimeType !== 'image/png') {
-					return new JSONResponse(
-						['data' => ['message' => $this->l10n->t('Unknown filetype')]],
-						Http::STATUS_OK
-					);
-				}
+            if ($image->valid()) {
+                $mimeType = $image->mimeType();
+                if ($mimeType !== 'image/jpeg' && $mimeType !== 'image/png') {
+                    return new JSONResponse(
+                        ['data' => ['message' => $this->l10n->t('Unknown filetype')]],
+                        Http::STATUS_OK
+                    );
+                }
 
-				if ($image->width() === $image->height()) {
-					try {
-						$avatar = $this->avatarManager->getAvatar($this->userId);
-						$avatar->set($image);
-						return new JSONResponse(['status' => 'success']);
-					} catch (\Throwable $e) {
-						$this->logger->error($e->getMessage(), ['exception' => $e, 'app' => 'core']);
-						return new JSONResponse(['data' => ['message' => $this->l10n->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST);
-					}
-				}
+                if ($image->width() === $image->height()) {
+                    try {
+                        $avatar = $this->avatarManager->getAvatar($this->userId);
+                        $avatar->set($image);
+                        return new JSONResponse(['status' => 'success']);
+                    } catch (\Throwable $e) {
+                        $this->logger->error($e->getMessage(), ['exception' => $e, 'app' => 'core']);
+                        return new JSONResponse(['data' => ['message' => $this->l10n->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST);
+                    }
+                }
 
-				return new JSONResponse(
-					['data' => 'notsquare', 'image' => 'data:' . $mimeType . ';base64,' . base64_encode($image->data())],
-					Http::STATUS_OK
-				);
-			} else {
-				return new JSONResponse(
-					['data' => ['message' => $this->l10n->t('Invalid image')]],
-					Http::STATUS_OK
-				);
-			}
-		} catch (\Exception $e) {
-			$this->logger->error($e->getMessage(), ['exception' => $e, 'app' => 'core']);
-			return new JSONResponse(['data' => ['message' => $this->l10n->t('An error occurred. Please contact your admin.')]], Http::STATUS_OK);
-		}
-	}
+                return new JSONResponse(
+                    ['data' => 'notsquare', 'image' => 'data:' . $mimeType . ';base64,' . base64_encode($image->data())],
+                    Http::STATUS_OK
+                );
+            } else {
+                return new JSONResponse(
+                    ['data' => ['message' => $this->l10n->t('Invalid image')]],
+                    Http::STATUS_OK
+                );
+            }
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage(), ['exception' => $e, 'app' => 'core']);
+            return new JSONResponse(['data' => ['message' => $this->l10n->t('An error occurred. Please contact your admin.')]], Http::STATUS_OK);
+        }
+    }
 
-	#[NoAdminRequired]
-	#[FrontpageRoute(verb: 'DELETE', url: '/avatar/')]
-	public function deleteAvatar(): JSONResponse {
-		try {
-			$avatar = $this->avatarManager->getAvatar($this->userId);
-			$avatar->remove();
-			return new JSONResponse();
-		} catch (\Exception $e) {
-			$this->logger->error($e->getMessage(), ['exception' => $e, 'app' => 'core']);
-			return new JSONResponse(['data' => ['message' => $this->l10n->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST);
-		}
-	}
+    #[NoAdminRequired]
+    #[FrontpageRoute(verb: 'DELETE', url: '/avatar/')]
+    public function deleteAvatar(): JSONResponse {
+        try {
+            $avatar = $this->avatarManager->getAvatar($this->userId);
+            $avatar->remove();
+            return new JSONResponse();
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage(), ['exception' => $e, 'app' => 'core']);
+            return new JSONResponse(['data' => ['message' => $this->l10n->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST);
+        }
+    }
 }

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

Indentation +185 added lines, -185 removed lines

@@ -29,189 +29,189 @@
 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,
-		private SetupManager $setupManager,
-		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();
-				$this->setupManager->setupForUser($user);
-
-				$uid = $user->getUID();
-				$this->currentUser = $uid;
-				$this->session->close();
-				return [true, $this->principalPrefix . $uid];
-			}
-		}
-
-		$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');
-		}
-
-		$user = $this->userSession->getUser();
-		if ($user !== null) {
-			$this->setupManager->setupForUser($user);
-		}
-
-		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,
+        private SetupManager $setupManager,
+        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();
+                $this->setupManager->setupForUser($user);
+
+                $uid = $user->getUID();
+                $this->currentUser = $uid;
+                $this->session->close();
+                return [true, $this->principalPrefix . $uid];
+            }
+        }
+
+        $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');
+        }
+
+        $user = $this->userSession->getUser();
+        if ($user !== null) {
+            $this->setupManager->setupForUser($user);
+        }
+
+        return $data;
+    }
 }

apps/dav/lib/Server.php

Indentation +327 added lines, -327 removed lines

@@ -102,332 +102,332 @@
 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),
-			\OCP\Server::get(SetupManager::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),
+            \OCP\Server::get(SetupManager::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/appinfo/v1/webdav.php

Indentation +24 added lines, -24 removed lines

@@ -27,7 +27,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);
 
@@ -37,42 +37,42 @@ 
 $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),
-	Server::get(SetupManager::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),
+    Server::get(SetupManager::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 +26 added lines, -26 removed lines

@@ -37,34 +37,34 @@ 
 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),
-	Server::get(SetupManager::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),
+    Server::get(SetupManager::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);
@@ -78,8 +78,8 @@ 
 $addressBookRoot->disableListing = !$debugging; // Disable listing
 
 $nodes = [
-	$principalCollection,
-	$addressBookRoot,
+    $principalCollection,
+    $addressBookRoot,
 ];
 
 // Fire up server
@@ -94,7 +94,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());

apps/dav/appinfo/v1/caldav.php

Indentation +31 added lines, -31 removed lines

@@ -36,26 +36,26 @@ 
 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),
-	Server::get(SetupManager::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),
+    Server::get(SetupManager::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);
@@ -65,15 +65,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);
@@ -87,8 +87,8 @@ 
 $addressBookRoot->disableListing = !$debugging; // Disable listing
 
 $nodes = [
-	$principalCollection,
-	$addressBookRoot,
+    $principalCollection,
+    $addressBookRoot,
 ];
 
 // Fire up server
@@ -104,7 +104,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());
@@ -112,7 +112,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));