nextcloud / server

lib/private/TemplateLayout.php

Indentation +371 added lines, -371 removed lines

@@ -36,375 +36,375 @@
 use OCP\Util;
 
 class TemplateLayout {
-	private static string $versionHash = '';
-	/** @var string[] */
-	private static array $cacheBusterCache = [];
-
-	public static ?CSSResourceLocator $cssLocator = null;
-	public static ?JSResourceLocator $jsLocator = null;
-
-	public function __construct(
-		private IConfig $config,
-		private readonly IAppConfig $appConfig,
-		private IAppManager $appManager,
-		private InitialStateService $initialState,
-		private INavigationManager $navigationManager,
-		private ITemplateManager $templateManager,
-		private ServerVersion $serverVersion,
-	) {
-	}
-
-	public function getPageTemplate(string $renderAs, string $appId): ITemplate {
-		// Add fallback theming variables if not rendered as user
-		if ($renderAs !== TemplateResponse::RENDER_AS_USER) {
-			// TODO cache generated default theme if enabled for fallback if server is erroring ?
-			Util::addStyle('theming', 'default');
-		}
-
-		// Decide which page we show
-		switch ($renderAs) {
-			case TemplateResponse::RENDER_AS_USER:
-				$page = $this->templateManager->getTemplate('core', 'layout.user');
-				if (in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
-					$page->assign('bodyid', 'body-settings');
-				} else {
-					$page->assign('bodyid', 'body-user');
-				}
-
-				$this->initialState->provideInitialState('core', 'active-app', $this->navigationManager->getActiveEntry());
-				$this->initialState->provideInitialState('core', 'apps', array_values($this->navigationManager->getAll()));
-
-				if ($this->config->getSystemValueBool('unified_search.enabled', false) || !$this->config->getSystemValueBool('enable_non-accessible_features', true)) {
-					$this->initialState->provideInitialState('unified-search', 'limit-default', (int)$this->config->getAppValue('core', 'unified-search.limit-default', (string)SearchQuery::LIMIT_DEFAULT));
-					$this->initialState->provideInitialState('unified-search', 'min-search-length', (int)$this->config->getAppValue('core', 'unified-search.min-search-length', (string)1));
-					$this->initialState->provideInitialState('unified-search', 'live-search', $this->config->getAppValue('core', 'unified-search.live-search', 'yes') === 'yes');
-					Util::addScript('core', 'legacy-unified-search', 'core');
-				} else {
-					Util::addScript('core', 'unified-search', 'core');
-				}
-
-				// Set logo link target
-				$logoUrl = $this->config->getSystemValueString('logo_url', '');
-				$page->assign('logoUrl', $logoUrl);
-
-				// Set default entry name
-				$defaultEntryId = $this->navigationManager->getDefaultEntryIdForUser();
-				$defaultEntry = $this->navigationManager->get($defaultEntryId);
-				$page->assign('defaultAppName', $defaultEntry['name'] ?? '');
-
-				// Add navigation entry
-				$page->assign('application', '');
-				$page->assign('appid', $appId);
-
-				$navigation = $this->navigationManager->getAll();
-				$page->assign('navigation', $navigation);
-				$settingsNavigation = $this->navigationManager->getAll('settings');
-				$this->initialState->provideInitialState('core', 'settingsNavEntries', $settingsNavigation);
-
-				foreach ($navigation as $entry) {
-					if ($entry['active']) {
-						$page->assign('application', $entry['name']);
-						break;
-					}
-				}
-
-				foreach ($settingsNavigation as $entry) {
-					if ($entry['active']) {
-						$page->assign('application', $entry['name']);
-						break;
-					}
-				}
-
-				$user = Server::get(IUserSession::class)->getUser();
-
-				if ($user === null) {
-					$page->assign('user_uid', false);
-					$page->assign('user_displayname', false);
-					$page->assign('userAvatarSet', false);
-					$page->assign('userStatus', false);
-				} else {
-					$page->assign('user_uid', $user->getUID());
-					$page->assign('user_displayname', $user->getDisplayName());
-					$page->assign('userAvatarSet', true);
-					$page->assign('userAvatarVersion', $this->config->getUserValue($user->getUID(), 'avatar', 'version', 0));
-				}
-				break;
-			case TemplateResponse::RENDER_AS_ERROR:
-				$page = $this->templateManager->getTemplate('core', 'layout.guest', '', false);
-				$page->assign('bodyid', 'body-login');
-				$page->assign('user_displayname', '');
-				$page->assign('user_uid', '');
-				break;
-			case TemplateResponse::RENDER_AS_GUEST:
-				$page = $this->templateManager->getTemplate('core', 'layout.guest');
-				Util::addStyle('guest');
-				$page->assign('bodyid', 'body-login');
-
-				$userDisplayName = false;
-				$user = Server::get(IUserSession::class)->getUser();
-				if ($user) {
-					$userDisplayName = $user->getDisplayName();
-				}
-
-				$page->assign('user_displayname', $userDisplayName);
-				$page->assign('user_uid', \OC_User::getUser());
-				break;
-			case TemplateResponse::RENDER_AS_PUBLIC:
-				$page = $this->templateManager->getTemplate('core', 'layout.public');
-				$page->assign('appid', $appId);
-				$page->assign('bodyid', 'body-public');
-
-				// Set logo link target
-				$logoUrl = $this->config->getSystemValueString('logo_url', '');
-				$page->assign('logoUrl', $logoUrl);
-
-				$subscription = Server::get(IRegistry::class);
-				$showSimpleSignup = $this->config->getSystemValueBool('simpleSignUpLink.shown', true);
-				if ($showSimpleSignup && $subscription->delegateHasValidSubscription()) {
-					$showSimpleSignup = false;
-				}
-
-				$defaultSignUpLink = 'https://nextcloud.com/signup/';
-				$signUpLink = $this->config->getSystemValueString('registration_link', $defaultSignUpLink);
-				if ($signUpLink !== $defaultSignUpLink) {
-					$showSimpleSignup = true;
-				}
-
-				if ($this->appManager->isEnabledForUser('registration')) {
-					$urlGenerator = Server::get(IURLGenerator::class);
-					$signUpLink = $urlGenerator->getAbsoluteURL('/index.php/apps/registration/');
-				}
-
-				$page->assign('showSimpleSignUpLink', $showSimpleSignup);
-				$page->assign('signUpLink', $signUpLink);
-				break;
-			default:
-				$page = $this->templateManager->getTemplate('core', 'layout.base');
-				break;
-		}
-		// Send the language, locale, and direction to our layouts
-		$l10nFactory = Server::get(IFactory::class);
-		$lang = $l10nFactory->findLanguage();
-		$locale = $l10nFactory->findLocale($lang);
-		$direction = $l10nFactory->getLanguageDirection($lang);
-
-		$lang = str_replace('_', '-', $lang);
-		$page->assign('language', $lang);
-		$page->assign('locale', $locale);
-		$page->assign('direction', $direction);
-
-		// Set body data-theme
-		try {
-			$themesService = Server::get(\OCA\Theming\Service\ThemesService::class);
-		} catch (\Exception) {
-			$themesService = null;
-		}
-		$page->assign('enabledThemes', $themesService?->getEnabledThemes() ?? []);
-
-		if ($this->config->getSystemValueBool('installed', false)) {
-			if (empty(self::$versionHash)) {
-				$v = $this->appManager->getAppInstalledVersions(true);
-				$v['core'] = implode('.', $this->serverVersion->getVersion());
-				self::$versionHash = substr(md5(implode(',', $v)), 0, 8);
-			}
-		} else {
-			self::$versionHash = md5('not installed');
-		}
-
-		// Add the js files
-		$jsFiles = self::findJavascriptFiles(Util::getScripts());
-		$page->assign('jsfiles', []);
-		if ($this->config->getSystemValueBool('installed', false) && $renderAs != TemplateResponse::RENDER_AS_ERROR) {
-			// this is on purpose outside of the if statement below so that the initial state is prefilled (done in the getConfig() call)
-			// see https://github.com/nextcloud/server/pull/22636 for details
-			$jsConfigHelper = new JSConfigHelper(
-				$this->serverVersion,
-				\OCP\Util::getL10N('lib'),
-				\OCP\Server::get(Defaults::class),
-				$this->appManager,
-				\OC::$server->getSession(),
-				\OC::$server->getUserSession()->getUser(),
-				$this->config,
-				$this->appConfig,
-				\OC::$server->getGroupManager(),
-				\OC::$server->get(IniGetWrapper::class),
-				\OC::$server->getURLGenerator(),
-				\OC::$server->get(CapabilitiesManager::class),
-				\OCP\Server::get(IInitialStateService::class),
-				\OCP\Server::get(IProvider::class),
-				\OCP\Server::get(FilenameValidator::class),
-			);
-			$config = $jsConfigHelper->getConfig();
-			if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) {
-				$page->assign('inline_ocjs', $config);
-			} else {
-				$page->append('jsfiles', \OC::$server->getURLGenerator()->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash]));
-			}
-		}
-		foreach ($jsFiles as $info) {
-			$web = $info[1];
-			$file = $info[2];
-			$page->append('jsfiles', $web . '/' . $file . $this->getVersionHashSuffix());
-		}
-
-		$request = \OCP\Server::get(IRequest::class);
-
-		try {
-			$pathInfo = $request->getPathInfo();
-		} catch (\Exception $e) {
-			$pathInfo = '';
-		}
-
-		// Do not initialise scss appdata until we have a fully installed instance
-		// Do not load scss for update, errors, installation or login page
-		if ($this->config->getSystemValueBool('installed', false)
-			&& !\OCP\Util::needUpgrade()
-			&& $pathInfo !== ''
-			&& !preg_match('/^\/login/', $pathInfo)
-			&& $renderAs !== TemplateResponse::RENDER_AS_ERROR
-		) {
-			$cssFiles = self::findStylesheetFiles(\OC_Util::$styles);
-		} else {
-			// If we ignore the scss compiler,
-			// we need to load the guest css fallback
-			Util::addStyle('guest');
-			$cssFiles = self::findStylesheetFiles(\OC_Util::$styles);
-		}
-
-		$page->assign('cssfiles', []);
-		$page->assign('printcssfiles', []);
-		$this->initialState->provideInitialState('core', 'versionHash', self::$versionHash);
-		foreach ($cssFiles as $info) {
-			$web = $info[1];
-			$file = $info[2];
-
-			if (str_ends_with($file, 'print.css')) {
-				$page->append('printcssfiles', $web . '/' . $file . $this->getVersionHashSuffix());
-			} else {
-				$suffix = $this->getVersionHashSuffix($web, $file);
-
-				if (!str_contains($file, '?v=')) {
-					$page->append('cssfiles', $web . '/' . $file . $suffix);
-				} else {
-					$page->append('cssfiles', $web . '/' . $file . '-' . substr($suffix, 3));
-				}
-			}
-		}
-
-		if ($request->isUserAgent([Request::USER_AGENT_CLIENT_IOS, Request::USER_AGENT_SAFARI, Request::USER_AGENT_SAFARI_MOBILE])) {
-			// Prevent auto zoom with iOS but still allow user zoom
-			// On chrome (and others) this does not work (will also disable user zoom)
-			$page->assign('viewport_maximum_scale', '1.0');
-		}
-
-		$page->assign('initialStates', $this->initialState->getInitialStates());
-
-		$page->assign('id-app-content', $renderAs === TemplateResponse::RENDER_AS_USER ? '#app-content' : '#content');
-		$page->assign('id-app-navigation', $renderAs === TemplateResponse::RENDER_AS_USER ? '#app-navigation' : null);
-
-		return $page;
-	}
-
-	protected function getVersionHashSuffix(string $path = '', string $file = ''): string {
-		if ($this->config->getSystemValueBool('debug', false)) {
-			// allows chrome workspace mapping in debug mode
-			return '';
-		}
-
-		if ($this->config->getSystemValueBool('installed', false) === false) {
-			// if not installed just return the version hash
-			return '?v=' . self::$versionHash;
-		}
-
-		$hash = false;
-		// Try the web-root first
-		if ($path !== '') {
-			$hash = $this->getVersionHashByPath($path);
-		}
-		// If not found try the file
-		if ($hash === false && $file !== '') {
-			$hash = $this->getVersionHashByPath($file);
-		}
-		// As a last resort we use the server version hash
-		if ($hash === false) {
-			$hash = self::$versionHash;
-		}
-
-		// The theming app is force-enabled thus the cache buster is always available
-		$themingSuffix = '-' . $this->config->getAppValue('theming', 'cachebuster', '0');
-
-		return '?v=' . $hash . $themingSuffix;
-	}
-
-	private function getVersionHashByPath(string $path): string|false {
-		if (array_key_exists($path, self::$cacheBusterCache) === false) {
-			// Not yet cached, so lets find the cache buster string
-			$appId = $this->getAppNamefromPath($path);
-			if ($appId === false) {
-				// No app Id could be guessed
-				return false;
-			}
-
-			if ($appId === 'core') {
-				// core is not a real app but the server itself
-				$hash = self::$versionHash;
-			} else {
-				$appVersion = $this->appManager->getAppVersion($appId);
-				// For shipped apps the app version is not a single source of truth, we rather also need to consider the Nextcloud version
-				if ($this->appManager->isShipped($appId)) {
-					$appVersion .= '-' . self::$versionHash;
-				}
-
-				$hash = substr(md5($appVersion), 0, 8);
-			}
-			self::$cacheBusterCache[$path] = $hash;
-		}
-
-		return self::$cacheBusterCache[$path];
-	}
-
-	public static function findStylesheetFiles(array $styles): array {
-		if (!self::$cssLocator) {
-			self::$cssLocator = \OCP\Server::get(CSSResourceLocator::class);
-		}
-		self::$cssLocator->find($styles);
-		return self::$cssLocator->getResources();
-	}
-
-	public function getAppNamefromPath(string $path): string|false {
-		if ($path !== '') {
-			$pathParts = explode('/', $path);
-			if ($pathParts[0] === 'css') {
-				// This is a scss request
-				return $pathParts[1];
-			} elseif ($pathParts[0] === 'core') {
-				return 'core';
-			}
-			return end($pathParts);
-		}
-		return false;
-	}
-
-	public static function findJavascriptFiles(array $scripts): array {
-		if (!self::$jsLocator) {
-			self::$jsLocator = \OCP\Server::get(JSResourceLocator::class);
-		}
-		self::$jsLocator->find($scripts);
-		return self::$jsLocator->getResources();
-	}
-
-	/**
-	 * Converts the absolute file path to a relative path from \OC::$SERVERROOT
-	 * @param string $filePath Absolute path
-	 * @return string Relative path
-	 * @throws \Exception If $filePath is not under \OC::$SERVERROOT
-	 */
-	public static function convertToRelativePath(string $filePath) {
-		$relativePath = explode(\OC::$SERVERROOT, $filePath);
-		if (count($relativePath) !== 2) {
-			throw new \Exception('$filePath is not under the \OC::$SERVERROOT');
-		}
-
-		return $relativePath[1];
-	}
+    private static string $versionHash = '';
+    /** @var string[] */
+    private static array $cacheBusterCache = [];
+
+    public static ?CSSResourceLocator $cssLocator = null;
+    public static ?JSResourceLocator $jsLocator = null;
+
+    public function __construct(
+        private IConfig $config,
+        private readonly IAppConfig $appConfig,
+        private IAppManager $appManager,
+        private InitialStateService $initialState,
+        private INavigationManager $navigationManager,
+        private ITemplateManager $templateManager,
+        private ServerVersion $serverVersion,
+    ) {
+    }
+
+    public function getPageTemplate(string $renderAs, string $appId): ITemplate {
+        // Add fallback theming variables if not rendered as user
+        if ($renderAs !== TemplateResponse::RENDER_AS_USER) {
+            // TODO cache generated default theme if enabled for fallback if server is erroring ?
+            Util::addStyle('theming', 'default');
+        }
+
+        // Decide which page we show
+        switch ($renderAs) {
+            case TemplateResponse::RENDER_AS_USER:
+                $page = $this->templateManager->getTemplate('core', 'layout.user');
+                if (in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
+                    $page->assign('bodyid', 'body-settings');
+                } else {
+                    $page->assign('bodyid', 'body-user');
+                }
+
+                $this->initialState->provideInitialState('core', 'active-app', $this->navigationManager->getActiveEntry());
+                $this->initialState->provideInitialState('core', 'apps', array_values($this->navigationManager->getAll()));
+
+                if ($this->config->getSystemValueBool('unified_search.enabled', false) || !$this->config->getSystemValueBool('enable_non-accessible_features', true)) {
+                    $this->initialState->provideInitialState('unified-search', 'limit-default', (int)$this->config->getAppValue('core', 'unified-search.limit-default', (string)SearchQuery::LIMIT_DEFAULT));
+                    $this->initialState->provideInitialState('unified-search', 'min-search-length', (int)$this->config->getAppValue('core', 'unified-search.min-search-length', (string)1));
+                    $this->initialState->provideInitialState('unified-search', 'live-search', $this->config->getAppValue('core', 'unified-search.live-search', 'yes') === 'yes');
+                    Util::addScript('core', 'legacy-unified-search', 'core');
+                } else {
+                    Util::addScript('core', 'unified-search', 'core');
+                }
+
+                // Set logo link target
+                $logoUrl = $this->config->getSystemValueString('logo_url', '');
+                $page->assign('logoUrl', $logoUrl);
+
+                // Set default entry name
+                $defaultEntryId = $this->navigationManager->getDefaultEntryIdForUser();
+                $defaultEntry = $this->navigationManager->get($defaultEntryId);
+                $page->assign('defaultAppName', $defaultEntry['name'] ?? '');
+
+                // Add navigation entry
+                $page->assign('application', '');
+                $page->assign('appid', $appId);
+
+                $navigation = $this->navigationManager->getAll();
+                $page->assign('navigation', $navigation);
+                $settingsNavigation = $this->navigationManager->getAll('settings');
+                $this->initialState->provideInitialState('core', 'settingsNavEntries', $settingsNavigation);
+
+                foreach ($navigation as $entry) {
+                    if ($entry['active']) {
+                        $page->assign('application', $entry['name']);
+                        break;
+                    }
+                }
+
+                foreach ($settingsNavigation as $entry) {
+                    if ($entry['active']) {
+                        $page->assign('application', $entry['name']);
+                        break;
+                    }
+                }
+
+                $user = Server::get(IUserSession::class)->getUser();
+
+                if ($user === null) {
+                    $page->assign('user_uid', false);
+                    $page->assign('user_displayname', false);
+                    $page->assign('userAvatarSet', false);
+                    $page->assign('userStatus', false);
+                } else {
+                    $page->assign('user_uid', $user->getUID());
+                    $page->assign('user_displayname', $user->getDisplayName());
+                    $page->assign('userAvatarSet', true);
+                    $page->assign('userAvatarVersion', $this->config->getUserValue($user->getUID(), 'avatar', 'version', 0));
+                }
+                break;
+            case TemplateResponse::RENDER_AS_ERROR:
+                $page = $this->templateManager->getTemplate('core', 'layout.guest', '', false);
+                $page->assign('bodyid', 'body-login');
+                $page->assign('user_displayname', '');
+                $page->assign('user_uid', '');
+                break;
+            case TemplateResponse::RENDER_AS_GUEST:
+                $page = $this->templateManager->getTemplate('core', 'layout.guest');
+                Util::addStyle('guest');
+                $page->assign('bodyid', 'body-login');
+
+                $userDisplayName = false;
+                $user = Server::get(IUserSession::class)->getUser();
+                if ($user) {
+                    $userDisplayName = $user->getDisplayName();
+                }
+
+                $page->assign('user_displayname', $userDisplayName);
+                $page->assign('user_uid', \OC_User::getUser());
+                break;
+            case TemplateResponse::RENDER_AS_PUBLIC:
+                $page = $this->templateManager->getTemplate('core', 'layout.public');
+                $page->assign('appid', $appId);
+                $page->assign('bodyid', 'body-public');
+
+                // Set logo link target
+                $logoUrl = $this->config->getSystemValueString('logo_url', '');
+                $page->assign('logoUrl', $logoUrl);
+
+                $subscription = Server::get(IRegistry::class);
+                $showSimpleSignup = $this->config->getSystemValueBool('simpleSignUpLink.shown', true);
+                if ($showSimpleSignup && $subscription->delegateHasValidSubscription()) {
+                    $showSimpleSignup = false;
+                }
+
+                $defaultSignUpLink = 'https://nextcloud.com/signup/';
+                $signUpLink = $this->config->getSystemValueString('registration_link', $defaultSignUpLink);
+                if ($signUpLink !== $defaultSignUpLink) {
+                    $showSimpleSignup = true;
+                }
+
+                if ($this->appManager->isEnabledForUser('registration')) {
+                    $urlGenerator = Server::get(IURLGenerator::class);
+                    $signUpLink = $urlGenerator->getAbsoluteURL('/index.php/apps/registration/');
+                }
+
+                $page->assign('showSimpleSignUpLink', $showSimpleSignup);
+                $page->assign('signUpLink', $signUpLink);
+                break;
+            default:
+                $page = $this->templateManager->getTemplate('core', 'layout.base');
+                break;
+        }
+        // Send the language, locale, and direction to our layouts
+        $l10nFactory = Server::get(IFactory::class);
+        $lang = $l10nFactory->findLanguage();
+        $locale = $l10nFactory->findLocale($lang);
+        $direction = $l10nFactory->getLanguageDirection($lang);
+
+        $lang = str_replace('_', '-', $lang);
+        $page->assign('language', $lang);
+        $page->assign('locale', $locale);
+        $page->assign('direction', $direction);
+
+        // Set body data-theme
+        try {
+            $themesService = Server::get(\OCA\Theming\Service\ThemesService::class);
+        } catch (\Exception) {
+            $themesService = null;
+        }
+        $page->assign('enabledThemes', $themesService?->getEnabledThemes() ?? []);
+
+        if ($this->config->getSystemValueBool('installed', false)) {
+            if (empty(self::$versionHash)) {
+                $v = $this->appManager->getAppInstalledVersions(true);
+                $v['core'] = implode('.', $this->serverVersion->getVersion());
+                self::$versionHash = substr(md5(implode(',', $v)), 0, 8);
+            }
+        } else {
+            self::$versionHash = md5('not installed');
+        }
+
+        // Add the js files
+        $jsFiles = self::findJavascriptFiles(Util::getScripts());
+        $page->assign('jsfiles', []);
+        if ($this->config->getSystemValueBool('installed', false) && $renderAs != TemplateResponse::RENDER_AS_ERROR) {
+            // this is on purpose outside of the if statement below so that the initial state is prefilled (done in the getConfig() call)
+            // see https://github.com/nextcloud/server/pull/22636 for details
+            $jsConfigHelper = new JSConfigHelper(
+                $this->serverVersion,
+                \OCP\Util::getL10N('lib'),
+                \OCP\Server::get(Defaults::class),
+                $this->appManager,
+                \OC::$server->getSession(),
+                \OC::$server->getUserSession()->getUser(),
+                $this->config,
+                $this->appConfig,
+                \OC::$server->getGroupManager(),
+                \OC::$server->get(IniGetWrapper::class),
+                \OC::$server->getURLGenerator(),
+                \OC::$server->get(CapabilitiesManager::class),
+                \OCP\Server::get(IInitialStateService::class),
+                \OCP\Server::get(IProvider::class),
+                \OCP\Server::get(FilenameValidator::class),
+            );
+            $config = $jsConfigHelper->getConfig();
+            if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) {
+                $page->assign('inline_ocjs', $config);
+            } else {
+                $page->append('jsfiles', \OC::$server->getURLGenerator()->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash]));
+            }
+        }
+        foreach ($jsFiles as $info) {
+            $web = $info[1];
+            $file = $info[2];
+            $page->append('jsfiles', $web . '/' . $file . $this->getVersionHashSuffix());
+        }
+
+        $request = \OCP\Server::get(IRequest::class);
+
+        try {
+            $pathInfo = $request->getPathInfo();
+        } catch (\Exception $e) {
+            $pathInfo = '';
+        }
+
+        // Do not initialise scss appdata until we have a fully installed instance
+        // Do not load scss for update, errors, installation or login page
+        if ($this->config->getSystemValueBool('installed', false)
+            && !\OCP\Util::needUpgrade()
+            && $pathInfo !== ''
+            && !preg_match('/^\/login/', $pathInfo)
+            && $renderAs !== TemplateResponse::RENDER_AS_ERROR
+        ) {
+            $cssFiles = self::findStylesheetFiles(\OC_Util::$styles);
+        } else {
+            // If we ignore the scss compiler,
+            // we need to load the guest css fallback
+            Util::addStyle('guest');
+            $cssFiles = self::findStylesheetFiles(\OC_Util::$styles);
+        }
+
+        $page->assign('cssfiles', []);
+        $page->assign('printcssfiles', []);
+        $this->initialState->provideInitialState('core', 'versionHash', self::$versionHash);
+        foreach ($cssFiles as $info) {
+            $web = $info[1];
+            $file = $info[2];
+
+            if (str_ends_with($file, 'print.css')) {
+                $page->append('printcssfiles', $web . '/' . $file . $this->getVersionHashSuffix());
+            } else {
+                $suffix = $this->getVersionHashSuffix($web, $file);
+
+                if (!str_contains($file, '?v=')) {
+                    $page->append('cssfiles', $web . '/' . $file . $suffix);
+                } else {
+                    $page->append('cssfiles', $web . '/' . $file . '-' . substr($suffix, 3));
+                }
+            }
+        }
+
+        if ($request->isUserAgent([Request::USER_AGENT_CLIENT_IOS, Request::USER_AGENT_SAFARI, Request::USER_AGENT_SAFARI_MOBILE])) {
+            // Prevent auto zoom with iOS but still allow user zoom
+            // On chrome (and others) this does not work (will also disable user zoom)
+            $page->assign('viewport_maximum_scale', '1.0');
+        }
+
+        $page->assign('initialStates', $this->initialState->getInitialStates());
+
+        $page->assign('id-app-content', $renderAs === TemplateResponse::RENDER_AS_USER ? '#app-content' : '#content');
+        $page->assign('id-app-navigation', $renderAs === TemplateResponse::RENDER_AS_USER ? '#app-navigation' : null);
+
+        return $page;
+    }
+
+    protected function getVersionHashSuffix(string $path = '', string $file = ''): string {
+        if ($this->config->getSystemValueBool('debug', false)) {
+            // allows chrome workspace mapping in debug mode
+            return '';
+        }
+
+        if ($this->config->getSystemValueBool('installed', false) === false) {
+            // if not installed just return the version hash
+            return '?v=' . self::$versionHash;
+        }
+
+        $hash = false;
+        // Try the web-root first
+        if ($path !== '') {
+            $hash = $this->getVersionHashByPath($path);
+        }
+        // If not found try the file
+        if ($hash === false && $file !== '') {
+            $hash = $this->getVersionHashByPath($file);
+        }
+        // As a last resort we use the server version hash
+        if ($hash === false) {
+            $hash = self::$versionHash;
+        }
+
+        // The theming app is force-enabled thus the cache buster is always available
+        $themingSuffix = '-' . $this->config->getAppValue('theming', 'cachebuster', '0');
+
+        return '?v=' . $hash . $themingSuffix;
+    }
+
+    private function getVersionHashByPath(string $path): string|false {
+        if (array_key_exists($path, self::$cacheBusterCache) === false) {
+            // Not yet cached, so lets find the cache buster string
+            $appId = $this->getAppNamefromPath($path);
+            if ($appId === false) {
+                // No app Id could be guessed
+                return false;
+            }
+
+            if ($appId === 'core') {
+                // core is not a real app but the server itself
+                $hash = self::$versionHash;
+            } else {
+                $appVersion = $this->appManager->getAppVersion($appId);
+                // For shipped apps the app version is not a single source of truth, we rather also need to consider the Nextcloud version
+                if ($this->appManager->isShipped($appId)) {
+                    $appVersion .= '-' . self::$versionHash;
+                }
+
+                $hash = substr(md5($appVersion), 0, 8);
+            }
+            self::$cacheBusterCache[$path] = $hash;
+        }
+
+        return self::$cacheBusterCache[$path];
+    }
+
+    public static function findStylesheetFiles(array $styles): array {
+        if (!self::$cssLocator) {
+            self::$cssLocator = \OCP\Server::get(CSSResourceLocator::class);
+        }
+        self::$cssLocator->find($styles);
+        return self::$cssLocator->getResources();
+    }
+
+    public function getAppNamefromPath(string $path): string|false {
+        if ($path !== '') {
+            $pathParts = explode('/', $path);
+            if ($pathParts[0] === 'css') {
+                // This is a scss request
+                return $pathParts[1];
+            } elseif ($pathParts[0] === 'core') {
+                return 'core';
+            }
+            return end($pathParts);
+        }
+        return false;
+    }
+
+    public static function findJavascriptFiles(array $scripts): array {
+        if (!self::$jsLocator) {
+            self::$jsLocator = \OCP\Server::get(JSResourceLocator::class);
+        }
+        self::$jsLocator->find($scripts);
+        return self::$jsLocator->getResources();
+    }
+
+    /**
+     * Converts the absolute file path to a relative path from \OC::$SERVERROOT
+     * @param string $filePath Absolute path
+     * @return string Relative path
+     * @throws \Exception If $filePath is not under \OC::$SERVERROOT
+     */
+    public static function convertToRelativePath(string $filePath) {
+        $relativePath = explode(\OC::$SERVERROOT, $filePath);
+        if (count($relativePath) !== 2) {
+            throw new \Exception('$filePath is not under the \OC::$SERVERROOT');
+        }
+
+        return $relativePath[1];
+    }
 }

lib/private/Share20/Manager.php

Indentation +1984 added lines, -1984 removed lines

@@ -62,2005 +62,2005 @@
  */
 class Manager implements IManager {
 
-	private ?IL10N $l;
-	private LegacyHooks $legacyHooks;
-
-	public function __construct(
-		private LoggerInterface $logger,
-		private IConfig $config,
-		private ISecureRandom $secureRandom,
-		private IHasher $hasher,
-		private IMountManager $mountManager,
-		private IGroupManager $groupManager,
-		private IFactory $l10nFactory,
-		private IProviderFactory $factory,
-		private IUserManager $userManager,
-		private IRootFolder $rootFolder,
-		private IMailer $mailer,
-		private IURLGenerator $urlGenerator,
-		private \OC_Defaults $defaults,
-		private IEventDispatcher $dispatcher,
-		private IUserSession $userSession,
-		private KnownUserService $knownUserService,
-		private ShareDisableChecker $shareDisableChecker,
-		private IDateTimeZone $dateTimeZone,
-		private IAppConfig $appConfig,
-	) {
-		$this->l = $this->l10nFactory->get('lib');
-		// The constructor of LegacyHooks registers the listeners of share events
-		// do not remove if those are not properly migrated
-		$this->legacyHooks = new LegacyHooks($this->dispatcher);
-	}
-
-	/**
-	 * Convert from a full share id to a tuple (providerId, shareId)
-	 *
-	 * @param string $id
-	 * @return string[]
-	 */
-	private function splitFullId($id) {
-		return explode(':', $id, 2);
-	}
-
-	/**
-	 * Verify if a password meets all requirements
-	 *
-	 * @param string $password
-	 * @throws HintException
-	 */
-	protected function verifyPassword($password) {
-		if ($password === null) {
-			// No password is set, check if this is allowed.
-			if ($this->shareApiLinkEnforcePassword()) {
-				throw new \InvalidArgumentException($this->l->t('Passwords are enforced for link and mail shares'));
-			}
-
-			return;
-		}
-
-		// Let others verify the password
-		try {
-			$event = new ValidatePasswordPolicyEvent($password, PasswordContext::SHARING);
-			$this->dispatcher->dispatchTyped($event);
-		} catch (HintException $e) {
-			/* Wrap in a 400 bad request error */
-			throw new HintException($e->getMessage(), $e->getHint(), 400, $e);
-		}
-	}
-
-	/**
-	 * Check for generic requirements before creating a share
-	 *
-	 * @param IShare $share
-	 * @throws \InvalidArgumentException
-	 * @throws GenericShareException
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	protected function generalCreateChecks(IShare $share, bool $isUpdate = false) {
-		if ($share->getShareType() === IShare::TYPE_USER) {
-			// We expect a valid user as sharedWith for user shares
-			if (!$this->userManager->userExists($share->getSharedWith())) {
-				throw new \InvalidArgumentException($this->l->t('Share recipient is not a valid user'));
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
-			// We expect a valid group as sharedWith for group shares
-			if (!$this->groupManager->groupExists($share->getSharedWith())) {
-				throw new \InvalidArgumentException($this->l->t('Share recipient is not a valid group'));
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_LINK) {
-			// No check for TYPE_EMAIL here as we have a recipient for them
-			if ($share->getSharedWith() !== null) {
-				throw new \InvalidArgumentException($this->l->t('Share recipient should be empty'));
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_EMAIL) {
-			if ($share->getSharedWith() === null) {
-				throw new \InvalidArgumentException($this->l->t('Share recipient should not be empty'));
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_REMOTE) {
-			if ($share->getSharedWith() === null) {
-				throw new \InvalidArgumentException($this->l->t('Share recipient should not be empty'));
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_REMOTE_GROUP) {
-			if ($share->getSharedWith() === null) {
-				throw new \InvalidArgumentException($this->l->t('Share recipient should not be empty'));
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_CIRCLE) {
-			$circle = \OCA\Circles\Api\v1\Circles::detailsCircle($share->getSharedWith());
-			if ($circle === null) {
-				throw new \InvalidArgumentException($this->l->t('Share recipient is not a valid circle'));
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_ROOM) {
-		} elseif ($share->getShareType() === IShare::TYPE_DECK) {
-		} elseif ($share->getShareType() === IShare::TYPE_SCIENCEMESH) {
-		} else {
-			// We cannot handle other types yet
-			throw new \InvalidArgumentException($this->l->t('Unknown share type'));
-		}
-
-		// Verify the initiator of the share is set
-		if ($share->getSharedBy() === null) {
-			throw new \InvalidArgumentException($this->l->t('Share initiator must be set'));
-		}
-
-		// Cannot share with yourself
-		if ($share->getShareType() === IShare::TYPE_USER
-			&& $share->getSharedWith() === $share->getSharedBy()) {
-			throw new \InvalidArgumentException($this->l->t('Cannot share with yourself'));
-		}
-
-		// The path should be set
-		if ($share->getNode() === null) {
-			throw new \InvalidArgumentException($this->l->t('Shared path must be set'));
-		}
-
-		// And it should be a file or a folder
-		if (!($share->getNode() instanceof \OCP\Files\File)
-			&& !($share->getNode() instanceof \OCP\Files\Folder)) {
-			throw new \InvalidArgumentException($this->l->t('Shared path must be either a file or a folder'));
-		}
-
-		// And you cannot share your rootfolder
-		if ($this->userManager->userExists($share->getSharedBy())) {
-			$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
-		} else {
-			$userFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
-		}
-		if ($userFolder->getId() === $share->getNode()->getId()) {
-			throw new \InvalidArgumentException($this->l->t('You cannot share your root folder'));
-		}
-
-		// Check if we actually have share permissions
-		if (!$share->getNode()->isShareable()) {
-			throw new GenericShareException($this->l->t('You are not allowed to share %s', [$share->getNode()->getName()]), code: 404);
-		}
-
-		// Permissions should be set
-		if ($share->getPermissions() === null) {
-			throw new \InvalidArgumentException($this->l->t('Valid permissions are required for sharing'));
-		}
-
-		// Permissions must be valid
-		if ($share->getPermissions() < 0 || $share->getPermissions() > \OCP\Constants::PERMISSION_ALL) {
-			throw new \InvalidArgumentException($this->l->t('Valid permissions are required for sharing'));
-		}
-
-		// Single file shares should never have delete or create permissions
-		if (($share->getNode() instanceof File)
-			&& (($share->getPermissions() & (\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_DELETE)) !== 0)) {
-			throw new \InvalidArgumentException($this->l->t('File shares cannot have create or delete permissions'));
-		}
-
-		$permissions = 0;
-		$nodesForUser = $userFolder->getById($share->getNodeId());
-		foreach ($nodesForUser as $node) {
-			if ($node->getInternalPath() === '' && !$node->getMountPoint() instanceof MoveableMount) {
-				// for the root of non-movable mount, the permissions we see if limited by the mount itself,
-				// so we instead use the "raw" permissions from the storage
-				$permissions |= $node->getStorage()->getPermissions('');
-			} else {
-				$permissions |= $node->getPermissions();
-			}
-		}
-
-		// Check that we do not share with more permissions than we have
-		if ($share->getPermissions() & ~$permissions) {
-			$path = $userFolder->getRelativePath($share->getNode()->getPath());
-			throw new GenericShareException($this->l->t('Cannot increase permissions of %s', [$path]), code: 404);
-		}
-
-		// Check that read permissions are always set
-		// Link shares are allowed to have no read permissions to allow upload to hidden folders
-		$noReadPermissionRequired = $share->getShareType() === IShare::TYPE_LINK
-			|| $share->getShareType() === IShare::TYPE_EMAIL;
-		if (!$noReadPermissionRequired
-			&& ($share->getPermissions() & \OCP\Constants::PERMISSION_READ) === 0) {
-			throw new \InvalidArgumentException($this->l->t('Shares need at least read permissions'));
-		}
-
-		if ($share->getNode() instanceof \OCP\Files\File) {
-			if ($share->getPermissions() & \OCP\Constants::PERMISSION_DELETE) {
-				throw new GenericShareException($this->l->t('Files cannot be shared with delete permissions'));
-			}
-			if ($share->getPermissions() & \OCP\Constants::PERMISSION_CREATE) {
-				throw new GenericShareException($this->l->t('Files cannot be shared with create permissions'));
-			}
-		}
-	}
-
-	/**
-	 * Validate if the expiration date fits the system settings
-	 *
-	 * @param IShare $share The share to validate the expiration date of
-	 * @return IShare The modified share object
-	 * @throws GenericShareException
-	 * @throws \InvalidArgumentException
-	 * @throws \Exception
-	 */
-	protected function validateExpirationDateInternal(IShare $share) {
-		$isRemote = $share->getShareType() === IShare::TYPE_REMOTE || $share->getShareType() === IShare::TYPE_REMOTE_GROUP;
-
-		$expirationDate = $share->getExpirationDate();
-
-		if ($isRemote) {
-			$defaultExpireDate = $this->shareApiRemoteDefaultExpireDate();
-			$defaultExpireDays = $this->shareApiRemoteDefaultExpireDays();
-			$configProp = 'remote_defaultExpDays';
-			$isEnforced = $this->shareApiRemoteDefaultExpireDateEnforced();
-		} else {
-			$defaultExpireDate = $this->shareApiInternalDefaultExpireDate();
-			$defaultExpireDays = $this->shareApiInternalDefaultExpireDays();
-			$configProp = 'internal_defaultExpDays';
-			$isEnforced = $this->shareApiInternalDefaultExpireDateEnforced();
-		}
-
-		// If $expirationDate is falsy, noExpirationDate is true and expiration not enforced
-		// Then skip expiration date validation as null is accepted
-		if (!$share->getNoExpirationDate() || $isEnforced) {
-			if ($expirationDate !== null) {
-				$expirationDate->setTimezone($this->dateTimeZone->getTimeZone());
-				$expirationDate->setTime(0, 0, 0);
-
-				$date = new \DateTime('now', $this->dateTimeZone->getTimeZone());
-				$date->setTime(0, 0, 0);
-				if ($date >= $expirationDate) {
-					throw new GenericShareException($this->l->t('Expiration date is in the past'), code: 404);
-				}
-			}
-
-			// If expiredate is empty set a default one if there is a default
-			$fullId = null;
-			try {
-				$fullId = $share->getFullId();
-			} catch (\UnexpectedValueException $e) {
-				// This is a new share
-			}
-
-			if ($fullId === null && $expirationDate === null && $defaultExpireDate) {
-				$expirationDate = new \DateTime('now', $this->dateTimeZone->getTimeZone());
-				$expirationDate->setTime(0, 0, 0);
-				$days = (int)$this->config->getAppValue('core', $configProp, (string)$defaultExpireDays);
-				if ($days > $defaultExpireDays) {
-					$days = $defaultExpireDays;
-				}
-				$expirationDate->add(new \DateInterval('P' . $days . 'D'));
-			}
-
-			// If we enforce the expiration date check that is does not exceed
-			if ($isEnforced) {
-				if (empty($expirationDate)) {
-					throw new \InvalidArgumentException($this->l->t('Expiration date is enforced'));
-				}
-
-				$date = new \DateTime('now', $this->dateTimeZone->getTimeZone());
-				$date->setTime(0, 0, 0);
-				$date->add(new \DateInterval('P' . $defaultExpireDays . 'D'));
-				if ($date < $expirationDate) {
-					throw new GenericShareException($this->l->n('Cannot set expiration date more than %n day in the future', 'Cannot set expiration date more than %n days in the future', $defaultExpireDays), code: 404);
-				}
-			}
-		}
-
-		$accepted = true;
-		$message = '';
-		\OCP\Util::emitHook('\OC\Share', 'verifyExpirationDate', [
-			'expirationDate' => &$expirationDate,
-			'accepted' => &$accepted,
-			'message' => &$message,
-			'passwordSet' => $share->getPassword() !== null,
-		]);
-
-		if (!$accepted) {
-			throw new \Exception($message);
-		}
-
-		$share->setExpirationDate($expirationDate);
-
-		return $share;
-	}
-
-	/**
-	 * Validate if the expiration date fits the system settings
-	 *
-	 * @param IShare $share The share to validate the expiration date of
-	 * @return IShare The modified share object
-	 * @throws GenericShareException
-	 * @throws \InvalidArgumentException
-	 * @throws \Exception
-	 */
-	protected function validateExpirationDateLink(IShare $share) {
-		$expirationDate = $share->getExpirationDate();
-		$isEnforced = $this->shareApiLinkDefaultExpireDateEnforced();
-
-		// If $expirationDate is falsy, noExpirationDate is true and expiration not enforced
-		// Then skip expiration date validation as null is accepted
-		if (!($share->getNoExpirationDate() && !$isEnforced)) {
-			if ($expirationDate !== null) {
-				$expirationDate->setTimezone($this->dateTimeZone->getTimeZone());
-				$expirationDate->setTime(0, 0, 0);
-
-				$date = new \DateTime('now', $this->dateTimeZone->getTimeZone());
-				$date->setTime(0, 0, 0);
-				if ($date >= $expirationDate) {
-					throw new GenericShareException($this->l->t('Expiration date is in the past'), code: 404);
-				}
-			}
-
-			// If expiredate is empty set a default one if there is a default
-			$fullId = null;
-			try {
-				$fullId = $share->getFullId();
-			} catch (\UnexpectedValueException $e) {
-				// This is a new share
-			}
-
-			if ($fullId === null && $expirationDate === null && $this->shareApiLinkDefaultExpireDate()) {
-				$expirationDate = new \DateTime('now', $this->dateTimeZone->getTimeZone());
-				$expirationDate->setTime(0, 0, 0);
-
-				$days = (int)$this->config->getAppValue('core', 'link_defaultExpDays', (string)$this->shareApiLinkDefaultExpireDays());
-				if ($days > $this->shareApiLinkDefaultExpireDays()) {
-					$days = $this->shareApiLinkDefaultExpireDays();
-				}
-				$expirationDate->add(new \DateInterval('P' . $days . 'D'));
-			}
-
-			// If we enforce the expiration date check that is does not exceed
-			if ($isEnforced) {
-				if (empty($expirationDate)) {
-					throw new \InvalidArgumentException($this->l->t('Expiration date is enforced'));
-				}
-
-				$date = new \DateTime('now', $this->dateTimeZone->getTimeZone());
-				$date->setTime(0, 0, 0);
-				$date->add(new \DateInterval('P' . $this->shareApiLinkDefaultExpireDays() . 'D'));
-				if ($date < $expirationDate) {
-					throw new GenericShareException(
-						$this->l->n('Cannot set expiration date more than %n day in the future', 'Cannot set expiration date more than %n days in the future', $this->shareApiLinkDefaultExpireDays()),
-						code: 404,
-					);
-				}
-			}
-
-		}
-
-		$accepted = true;
-		$message = '';
-		\OCP\Util::emitHook('\OC\Share', 'verifyExpirationDate', [
-			'expirationDate' => &$expirationDate,
-			'accepted' => &$accepted,
-			'message' => &$message,
-			'passwordSet' => $share->getPassword() !== null,
-		]);
-
-		if (!$accepted) {
-			throw new \Exception($message);
-		}
-
-		$share->setExpirationDate($expirationDate);
-
-		return $share;
-	}
-
-	/**
-	 * Check for pre share requirements for user shares
-	 *
-	 * @param IShare $share
-	 * @throws \Exception
-	 */
-	protected function userCreateChecks(IShare $share) {
-		// Check if we can share with group members only
-		if ($this->shareWithGroupMembersOnly()) {
-			$sharedBy = $this->userManager->get($share->getSharedBy());
-			$sharedWith = $this->userManager->get($share->getSharedWith());
-			// Verify we can share with this user
-			$groups = array_intersect(
-				$this->groupManager->getUserGroupIds($sharedBy),
-				$this->groupManager->getUserGroupIds($sharedWith)
-			);
-
-			// optional excluded groups
-			$excludedGroups = $this->shareWithGroupMembersOnlyExcludeGroupsList();
-			$groups = array_diff($groups, $excludedGroups);
-
-			if (empty($groups)) {
-				throw new \Exception($this->l->t('Sharing is only allowed with group members'));
-			}
-		}
-
-		/*
+    private ?IL10N $l;
+    private LegacyHooks $legacyHooks;
+
+    public function __construct(
+        private LoggerInterface $logger,
+        private IConfig $config,
+        private ISecureRandom $secureRandom,
+        private IHasher $hasher,
+        private IMountManager $mountManager,
+        private IGroupManager $groupManager,
+        private IFactory $l10nFactory,
+        private IProviderFactory $factory,
+        private IUserManager $userManager,
+        private IRootFolder $rootFolder,
+        private IMailer $mailer,
+        private IURLGenerator $urlGenerator,
+        private \OC_Defaults $defaults,
+        private IEventDispatcher $dispatcher,
+        private IUserSession $userSession,
+        private KnownUserService $knownUserService,
+        private ShareDisableChecker $shareDisableChecker,
+        private IDateTimeZone $dateTimeZone,
+        private IAppConfig $appConfig,
+    ) {
+        $this->l = $this->l10nFactory->get('lib');
+        // The constructor of LegacyHooks registers the listeners of share events
+        // do not remove if those are not properly migrated
+        $this->legacyHooks = new LegacyHooks($this->dispatcher);
+    }
+
+    /**
+     * Convert from a full share id to a tuple (providerId, shareId)
+     *
+     * @param string $id
+     * @return string[]
+     */
+    private function splitFullId($id) {
+        return explode(':', $id, 2);
+    }
+
+    /**
+     * Verify if a password meets all requirements
+     *
+     * @param string $password
+     * @throws HintException
+     */
+    protected function verifyPassword($password) {
+        if ($password === null) {
+            // No password is set, check if this is allowed.
+            if ($this->shareApiLinkEnforcePassword()) {
+                throw new \InvalidArgumentException($this->l->t('Passwords are enforced for link and mail shares'));
+            }
+
+            return;
+        }
+
+        // Let others verify the password
+        try {
+            $event = new ValidatePasswordPolicyEvent($password, PasswordContext::SHARING);
+            $this->dispatcher->dispatchTyped($event);
+        } catch (HintException $e) {
+            /* Wrap in a 400 bad request error */
+            throw new HintException($e->getMessage(), $e->getHint(), 400, $e);
+        }
+    }
+
+    /**
+     * Check for generic requirements before creating a share
+     *
+     * @param IShare $share
+     * @throws \InvalidArgumentException
+     * @throws GenericShareException
+     *
+     * @suppress PhanUndeclaredClassMethod
+     */
+    protected function generalCreateChecks(IShare $share, bool $isUpdate = false) {
+        if ($share->getShareType() === IShare::TYPE_USER) {
+            // We expect a valid user as sharedWith for user shares
+            if (!$this->userManager->userExists($share->getSharedWith())) {
+                throw new \InvalidArgumentException($this->l->t('Share recipient is not a valid user'));
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_GROUP) {
+            // We expect a valid group as sharedWith for group shares
+            if (!$this->groupManager->groupExists($share->getSharedWith())) {
+                throw new \InvalidArgumentException($this->l->t('Share recipient is not a valid group'));
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_LINK) {
+            // No check for TYPE_EMAIL here as we have a recipient for them
+            if ($share->getSharedWith() !== null) {
+                throw new \InvalidArgumentException($this->l->t('Share recipient should be empty'));
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_EMAIL) {
+            if ($share->getSharedWith() === null) {
+                throw new \InvalidArgumentException($this->l->t('Share recipient should not be empty'));
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_REMOTE) {
+            if ($share->getSharedWith() === null) {
+                throw new \InvalidArgumentException($this->l->t('Share recipient should not be empty'));
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_REMOTE_GROUP) {
+            if ($share->getSharedWith() === null) {
+                throw new \InvalidArgumentException($this->l->t('Share recipient should not be empty'));
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_CIRCLE) {
+            $circle = \OCA\Circles\Api\v1\Circles::detailsCircle($share->getSharedWith());
+            if ($circle === null) {
+                throw new \InvalidArgumentException($this->l->t('Share recipient is not a valid circle'));
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_ROOM) {
+        } elseif ($share->getShareType() === IShare::TYPE_DECK) {
+        } elseif ($share->getShareType() === IShare::TYPE_SCIENCEMESH) {
+        } else {
+            // We cannot handle other types yet
+            throw new \InvalidArgumentException($this->l->t('Unknown share type'));
+        }
+
+        // Verify the initiator of the share is set
+        if ($share->getSharedBy() === null) {
+            throw new \InvalidArgumentException($this->l->t('Share initiator must be set'));
+        }
+
+        // Cannot share with yourself
+        if ($share->getShareType() === IShare::TYPE_USER
+            && $share->getSharedWith() === $share->getSharedBy()) {
+            throw new \InvalidArgumentException($this->l->t('Cannot share with yourself'));
+        }
+
+        // The path should be set
+        if ($share->getNode() === null) {
+            throw new \InvalidArgumentException($this->l->t('Shared path must be set'));
+        }
+
+        // And it should be a file or a folder
+        if (!($share->getNode() instanceof \OCP\Files\File)
+            && !($share->getNode() instanceof \OCP\Files\Folder)) {
+            throw new \InvalidArgumentException($this->l->t('Shared path must be either a file or a folder'));
+        }
+
+        // And you cannot share your rootfolder
+        if ($this->userManager->userExists($share->getSharedBy())) {
+            $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
+        } else {
+            $userFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
+        }
+        if ($userFolder->getId() === $share->getNode()->getId()) {
+            throw new \InvalidArgumentException($this->l->t('You cannot share your root folder'));
+        }
+
+        // Check if we actually have share permissions
+        if (!$share->getNode()->isShareable()) {
+            throw new GenericShareException($this->l->t('You are not allowed to share %s', [$share->getNode()->getName()]), code: 404);
+        }
+
+        // Permissions should be set
+        if ($share->getPermissions() === null) {
+            throw new \InvalidArgumentException($this->l->t('Valid permissions are required for sharing'));
+        }
+
+        // Permissions must be valid
+        if ($share->getPermissions() < 0 || $share->getPermissions() > \OCP\Constants::PERMISSION_ALL) {
+            throw new \InvalidArgumentException($this->l->t('Valid permissions are required for sharing'));
+        }
+
+        // Single file shares should never have delete or create permissions
+        if (($share->getNode() instanceof File)
+            && (($share->getPermissions() & (\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_DELETE)) !== 0)) {
+            throw new \InvalidArgumentException($this->l->t('File shares cannot have create or delete permissions'));
+        }
+
+        $permissions = 0;
+        $nodesForUser = $userFolder->getById($share->getNodeId());
+        foreach ($nodesForUser as $node) {
+            if ($node->getInternalPath() === '' && !$node->getMountPoint() instanceof MoveableMount) {
+                // for the root of non-movable mount, the permissions we see if limited by the mount itself,
+                // so we instead use the "raw" permissions from the storage
+                $permissions |= $node->getStorage()->getPermissions('');
+            } else {
+                $permissions |= $node->getPermissions();
+            }
+        }
+
+        // Check that we do not share with more permissions than we have
+        if ($share->getPermissions() & ~$permissions) {
+            $path = $userFolder->getRelativePath($share->getNode()->getPath());
+            throw new GenericShareException($this->l->t('Cannot increase permissions of %s', [$path]), code: 404);
+        }
+
+        // Check that read permissions are always set
+        // Link shares are allowed to have no read permissions to allow upload to hidden folders
+        $noReadPermissionRequired = $share->getShareType() === IShare::TYPE_LINK
+            || $share->getShareType() === IShare::TYPE_EMAIL;
+        if (!$noReadPermissionRequired
+            && ($share->getPermissions() & \OCP\Constants::PERMISSION_READ) === 0) {
+            throw new \InvalidArgumentException($this->l->t('Shares need at least read permissions'));
+        }
+
+        if ($share->getNode() instanceof \OCP\Files\File) {
+            if ($share->getPermissions() & \OCP\Constants::PERMISSION_DELETE) {
+                throw new GenericShareException($this->l->t('Files cannot be shared with delete permissions'));
+            }
+            if ($share->getPermissions() & \OCP\Constants::PERMISSION_CREATE) {
+                throw new GenericShareException($this->l->t('Files cannot be shared with create permissions'));
+            }
+        }
+    }
+
+    /**
+     * Validate if the expiration date fits the system settings
+     *
+     * @param IShare $share The share to validate the expiration date of
+     * @return IShare The modified share object
+     * @throws GenericShareException
+     * @throws \InvalidArgumentException
+     * @throws \Exception
+     */
+    protected function validateExpirationDateInternal(IShare $share) {
+        $isRemote = $share->getShareType() === IShare::TYPE_REMOTE || $share->getShareType() === IShare::TYPE_REMOTE_GROUP;
+
+        $expirationDate = $share->getExpirationDate();
+
+        if ($isRemote) {
+            $defaultExpireDate = $this->shareApiRemoteDefaultExpireDate();
+            $defaultExpireDays = $this->shareApiRemoteDefaultExpireDays();
+            $configProp = 'remote_defaultExpDays';
+            $isEnforced = $this->shareApiRemoteDefaultExpireDateEnforced();
+        } else {
+            $defaultExpireDate = $this->shareApiInternalDefaultExpireDate();
+            $defaultExpireDays = $this->shareApiInternalDefaultExpireDays();
+            $configProp = 'internal_defaultExpDays';
+            $isEnforced = $this->shareApiInternalDefaultExpireDateEnforced();
+        }
+
+        // If $expirationDate is falsy, noExpirationDate is true and expiration not enforced
+        // Then skip expiration date validation as null is accepted
+        if (!$share->getNoExpirationDate() || $isEnforced) {
+            if ($expirationDate !== null) {
+                $expirationDate->setTimezone($this->dateTimeZone->getTimeZone());
+                $expirationDate->setTime(0, 0, 0);
+
+                $date = new \DateTime('now', $this->dateTimeZone->getTimeZone());
+                $date->setTime(0, 0, 0);
+                if ($date >= $expirationDate) {
+                    throw new GenericShareException($this->l->t('Expiration date is in the past'), code: 404);
+                }
+            }
+
+            // If expiredate is empty set a default one if there is a default
+            $fullId = null;
+            try {
+                $fullId = $share->getFullId();
+            } catch (\UnexpectedValueException $e) {
+                // This is a new share
+            }
+
+            if ($fullId === null && $expirationDate === null && $defaultExpireDate) {
+                $expirationDate = new \DateTime('now', $this->dateTimeZone->getTimeZone());
+                $expirationDate->setTime(0, 0, 0);
+                $days = (int)$this->config->getAppValue('core', $configProp, (string)$defaultExpireDays);
+                if ($days > $defaultExpireDays) {
+                    $days = $defaultExpireDays;
+                }
+                $expirationDate->add(new \DateInterval('P' . $days . 'D'));
+            }
+
+            // If we enforce the expiration date check that is does not exceed
+            if ($isEnforced) {
+                if (empty($expirationDate)) {
+                    throw new \InvalidArgumentException($this->l->t('Expiration date is enforced'));
+                }
+
+                $date = new \DateTime('now', $this->dateTimeZone->getTimeZone());
+                $date->setTime(0, 0, 0);
+                $date->add(new \DateInterval('P' . $defaultExpireDays . 'D'));
+                if ($date < $expirationDate) {
+                    throw new GenericShareException($this->l->n('Cannot set expiration date more than %n day in the future', 'Cannot set expiration date more than %n days in the future', $defaultExpireDays), code: 404);
+                }
+            }
+        }
+
+        $accepted = true;
+        $message = '';
+        \OCP\Util::emitHook('\OC\Share', 'verifyExpirationDate', [
+            'expirationDate' => &$expirationDate,
+            'accepted' => &$accepted,
+            'message' => &$message,
+            'passwordSet' => $share->getPassword() !== null,
+        ]);
+
+        if (!$accepted) {
+            throw new \Exception($message);
+        }
+
+        $share->setExpirationDate($expirationDate);
+
+        return $share;
+    }
+
+    /**
+     * Validate if the expiration date fits the system settings
+     *
+     * @param IShare $share The share to validate the expiration date of
+     * @return IShare The modified share object
+     * @throws GenericShareException
+     * @throws \InvalidArgumentException
+     * @throws \Exception
+     */
+    protected function validateExpirationDateLink(IShare $share) {
+        $expirationDate = $share->getExpirationDate();
+        $isEnforced = $this->shareApiLinkDefaultExpireDateEnforced();
+
+        // If $expirationDate is falsy, noExpirationDate is true and expiration not enforced
+        // Then skip expiration date validation as null is accepted
+        if (!($share->getNoExpirationDate() && !$isEnforced)) {
+            if ($expirationDate !== null) {
+                $expirationDate->setTimezone($this->dateTimeZone->getTimeZone());
+                $expirationDate->setTime(0, 0, 0);
+
+                $date = new \DateTime('now', $this->dateTimeZone->getTimeZone());
+                $date->setTime(0, 0, 0);
+                if ($date >= $expirationDate) {
+                    throw new GenericShareException($this->l->t('Expiration date is in the past'), code: 404);
+                }
+            }
+
+            // If expiredate is empty set a default one if there is a default
+            $fullId = null;
+            try {
+                $fullId = $share->getFullId();
+            } catch (\UnexpectedValueException $e) {
+                // This is a new share
+            }
+
+            if ($fullId === null && $expirationDate === null && $this->shareApiLinkDefaultExpireDate()) {
+                $expirationDate = new \DateTime('now', $this->dateTimeZone->getTimeZone());
+                $expirationDate->setTime(0, 0, 0);
+
+                $days = (int)$this->config->getAppValue('core', 'link_defaultExpDays', (string)$this->shareApiLinkDefaultExpireDays());
+                if ($days > $this->shareApiLinkDefaultExpireDays()) {
+                    $days = $this->shareApiLinkDefaultExpireDays();
+                }
+                $expirationDate->add(new \DateInterval('P' . $days . 'D'));
+            }
+
+            // If we enforce the expiration date check that is does not exceed
+            if ($isEnforced) {
+                if (empty($expirationDate)) {
+                    throw new \InvalidArgumentException($this->l->t('Expiration date is enforced'));
+                }
+
+                $date = new \DateTime('now', $this->dateTimeZone->getTimeZone());
+                $date->setTime(0, 0, 0);
+                $date->add(new \DateInterval('P' . $this->shareApiLinkDefaultExpireDays() . 'D'));
+                if ($date < $expirationDate) {
+                    throw new GenericShareException(
+                        $this->l->n('Cannot set expiration date more than %n day in the future', 'Cannot set expiration date more than %n days in the future', $this->shareApiLinkDefaultExpireDays()),
+                        code: 404,
+                    );
+                }
+            }
+
+        }
+
+        $accepted = true;
+        $message = '';
+        \OCP\Util::emitHook('\OC\Share', 'verifyExpirationDate', [
+            'expirationDate' => &$expirationDate,
+            'accepted' => &$accepted,
+            'message' => &$message,
+            'passwordSet' => $share->getPassword() !== null,
+        ]);
+
+        if (!$accepted) {
+            throw new \Exception($message);
+        }
+
+        $share->setExpirationDate($expirationDate);
+
+        return $share;
+    }
+
+    /**
+     * Check for pre share requirements for user shares
+     *
+     * @param IShare $share
+     * @throws \Exception
+     */
+    protected function userCreateChecks(IShare $share) {
+        // Check if we can share with group members only
+        if ($this->shareWithGroupMembersOnly()) {
+            $sharedBy = $this->userManager->get($share->getSharedBy());
+            $sharedWith = $this->userManager->get($share->getSharedWith());
+            // Verify we can share with this user
+            $groups = array_intersect(
+                $this->groupManager->getUserGroupIds($sharedBy),
+                $this->groupManager->getUserGroupIds($sharedWith)
+            );
+
+            // optional excluded groups
+            $excludedGroups = $this->shareWithGroupMembersOnlyExcludeGroupsList();
+            $groups = array_diff($groups, $excludedGroups);
+
+            if (empty($groups)) {
+                throw new \Exception($this->l->t('Sharing is only allowed with group members'));
+            }
+        }
+
+        /*
 		 * TODO: Could be costly, fix
 		 *
 		 * Also this is not what we want in the future.. then we want to squash identical shares.
 		 */
-		$provider = $this->factory->getProviderForType(IShare::TYPE_USER);
-		$existingShares = $provider->getSharesByPath($share->getNode());
-		foreach ($existingShares as $existingShare) {
-			// Ignore if it is the same share
-			try {
-				if ($existingShare->getFullId() === $share->getFullId()) {
-					continue;
-				}
-			} catch (\UnexpectedValueException $e) {
-				//Shares are not identical
-			}
-
-			// Identical share already exists
-			if ($existingShare->getSharedWith() === $share->getSharedWith() && $existingShare->getShareType() === $share->getShareType()) {
-				throw new AlreadySharedException($this->l->t('Sharing %s failed, because this item is already shared with the account %s', [$share->getNode()->getName(), $share->getSharedWithDisplayName()]), $existingShare);
-			}
-
-			// The share is already shared with this user via a group share
-			if ($existingShare->getShareType() === IShare::TYPE_GROUP) {
-				$group = $this->groupManager->get($existingShare->getSharedWith());
-				if (!is_null($group)) {
-					$user = $this->userManager->get($share->getSharedWith());
-
-					if ($group->inGroup($user) && $existingShare->getShareOwner() !== $share->getShareOwner()) {
-						throw new AlreadySharedException($this->l->t('Sharing %s failed, because this item is already shared with the account %s', [$share->getNode()->getName(), $share->getSharedWithDisplayName()]), $existingShare);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Check for pre share requirements for group shares
-	 *
-	 * @param IShare $share
-	 * @throws \Exception
-	 */
-	protected function groupCreateChecks(IShare $share) {
-		// Verify group shares are allowed
-		if (!$this->allowGroupSharing()) {
-			throw new \Exception($this->l->t('Group sharing is now allowed'));
-		}
-
-		// Verify if the user can share with this group
-		if ($this->shareWithGroupMembersOnly()) {
-			$sharedBy = $this->userManager->get($share->getSharedBy());
-			$sharedWith = $this->groupManager->get($share->getSharedWith());
-
-			// optional excluded groups
-			$excludedGroups = $this->shareWithGroupMembersOnlyExcludeGroupsList();
-			if (is_null($sharedWith) || in_array($share->getSharedWith(), $excludedGroups) || !$sharedWith->inGroup($sharedBy)) {
-				throw new \Exception($this->l->t('Sharing is only allowed within your own groups'));
-			}
-		}
-
-		/*
+        $provider = $this->factory->getProviderForType(IShare::TYPE_USER);
+        $existingShares = $provider->getSharesByPath($share->getNode());
+        foreach ($existingShares as $existingShare) {
+            // Ignore if it is the same share
+            try {
+                if ($existingShare->getFullId() === $share->getFullId()) {
+                    continue;
+                }
+            } catch (\UnexpectedValueException $e) {
+                //Shares are not identical
+            }
+
+            // Identical share already exists
+            if ($existingShare->getSharedWith() === $share->getSharedWith() && $existingShare->getShareType() === $share->getShareType()) {
+                throw new AlreadySharedException($this->l->t('Sharing %s failed, because this item is already shared with the account %s', [$share->getNode()->getName(), $share->getSharedWithDisplayName()]), $existingShare);
+            }
+
+            // The share is already shared with this user via a group share
+            if ($existingShare->getShareType() === IShare::TYPE_GROUP) {
+                $group = $this->groupManager->get($existingShare->getSharedWith());
+                if (!is_null($group)) {
+                    $user = $this->userManager->get($share->getSharedWith());
+
+                    if ($group->inGroup($user) && $existingShare->getShareOwner() !== $share->getShareOwner()) {
+                        throw new AlreadySharedException($this->l->t('Sharing %s failed, because this item is already shared with the account %s', [$share->getNode()->getName(), $share->getSharedWithDisplayName()]), $existingShare);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Check for pre share requirements for group shares
+     *
+     * @param IShare $share
+     * @throws \Exception
+     */
+    protected function groupCreateChecks(IShare $share) {
+        // Verify group shares are allowed
+        if (!$this->allowGroupSharing()) {
+            throw new \Exception($this->l->t('Group sharing is now allowed'));
+        }
+
+        // Verify if the user can share with this group
+        if ($this->shareWithGroupMembersOnly()) {
+            $sharedBy = $this->userManager->get($share->getSharedBy());
+            $sharedWith = $this->groupManager->get($share->getSharedWith());
+
+            // optional excluded groups
+            $excludedGroups = $this->shareWithGroupMembersOnlyExcludeGroupsList();
+            if (is_null($sharedWith) || in_array($share->getSharedWith(), $excludedGroups) || !$sharedWith->inGroup($sharedBy)) {
+                throw new \Exception($this->l->t('Sharing is only allowed within your own groups'));
+            }
+        }
+
+        /*
 		 * TODO: Could be costly, fix
 		 *
 		 * Also this is not what we want in the future.. then we want to squash identical shares.
 		 */
-		$provider = $this->factory->getProviderForType(IShare::TYPE_GROUP);
-		$existingShares = $provider->getSharesByPath($share->getNode());
-		foreach ($existingShares as $existingShare) {
-			try {
-				if ($existingShare->getFullId() === $share->getFullId()) {
-					continue;
-				}
-			} catch (\UnexpectedValueException $e) {
-				//It is a new share so just continue
-			}
-
-			if ($existingShare->getSharedWith() === $share->getSharedWith() && $existingShare->getShareType() === $share->getShareType()) {
-				throw new AlreadySharedException($this->l->t('Path is already shared with this group'), $existingShare);
-			}
-		}
-	}
-
-	/**
-	 * Check for pre share requirements for link shares
-	 *
-	 * @param IShare $share
-	 * @throws \Exception
-	 */
-	protected function linkCreateChecks(IShare $share) {
-		// Are link shares allowed?
-		if (!$this->shareApiAllowLinks()) {
-			throw new \Exception($this->l->t('Link sharing is not allowed'));
-		}
-
-		// Check if public upload is allowed
-		if ($share->getNodeType() === 'folder' && !$this->shareApiLinkAllowPublicUpload()
-			&& ($share->getPermissions() & (\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE))) {
-			throw new \InvalidArgumentException($this->l->t('Public upload is not allowed'));
-		}
-	}
-
-	/**
-	 * To make sure we don't get invisible link shares we set the parent
-	 * of a link if it is a reshare. This is a quick word around
-	 * until we can properly display multiple link shares in the UI
-	 *
-	 * See: https://github.com/owncloud/core/issues/22295
-	 *
-	 * FIXME: Remove once multiple link shares can be properly displayed
-	 *
-	 * @param IShare $share
-	 */
-	protected function setLinkParent(IShare $share) {
-		$storage = $share->getNode()->getStorage();
-		if ($storage->instanceOfStorage(SharedStorage::class)) {
-			/** @var \OCA\Files_Sharing\SharedStorage $storage */
-			$share->setParent((int)$storage->getShareId());
-		}
-	}
-
-	/**
-	 * @param File|Folder $path
-	 */
-	protected function pathCreateChecks($path) {
-		// Make sure that we do not share a path that contains a shared mountpoint
-		if ($path instanceof \OCP\Files\Folder) {
-			$mounts = $this->mountManager->findIn($path->getPath());
-			foreach ($mounts as $mount) {
-				if ($mount->getStorage()->instanceOfStorage('\OCA\Files_Sharing\ISharedStorage')) {
-					// Using a flat sharing model ensures the file owner can always see who has access.
-					// Allowing parent folder sharing would require tracking inherited access, which adds complexity
-					// and hurts performance/scalability.
-					// So we forbid sharing a parent folder of a share you received.
-					throw new \InvalidArgumentException($this->l->t('You cannot share a folder that contains other shares'));
-				}
-			}
-		}
-	}
-
-	/**
-	 * Check if the user that is sharing can actually share
-	 *
-	 * @param IShare $share
-	 * @throws \Exception
-	 */
-	protected function canShare(IShare $share) {
-		if (!$this->shareApiEnabled()) {
-			throw new \Exception($this->l->t('Sharing is disabled'));
-		}
-
-		if ($this->sharingDisabledForUser($share->getSharedBy())) {
-			throw new \Exception($this->l->t('Sharing is disabled for you'));
-		}
-	}
-
-	/**
-	 * Share a path
-	 *
-	 * @param IShare $share
-	 * @return IShare The share object
-	 * @throws \Exception
-	 *
-	 * TODO: handle link share permissions or check them
-	 */
-	public function createShare(IShare $share) {
-		$this->canShare($share);
-
-		$this->generalCreateChecks($share);
-
-		// Verify if there are any issues with the path
-		$this->pathCreateChecks($share->getNode());
-
-		/*
+        $provider = $this->factory->getProviderForType(IShare::TYPE_GROUP);
+        $existingShares = $provider->getSharesByPath($share->getNode());
+        foreach ($existingShares as $existingShare) {
+            try {
+                if ($existingShare->getFullId() === $share->getFullId()) {
+                    continue;
+                }
+            } catch (\UnexpectedValueException $e) {
+                //It is a new share so just continue
+            }
+
+            if ($existingShare->getSharedWith() === $share->getSharedWith() && $existingShare->getShareType() === $share->getShareType()) {
+                throw new AlreadySharedException($this->l->t('Path is already shared with this group'), $existingShare);
+            }
+        }
+    }
+
+    /**
+     * Check for pre share requirements for link shares
+     *
+     * @param IShare $share
+     * @throws \Exception
+     */
+    protected function linkCreateChecks(IShare $share) {
+        // Are link shares allowed?
+        if (!$this->shareApiAllowLinks()) {
+            throw new \Exception($this->l->t('Link sharing is not allowed'));
+        }
+
+        // Check if public upload is allowed
+        if ($share->getNodeType() === 'folder' && !$this->shareApiLinkAllowPublicUpload()
+            && ($share->getPermissions() & (\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE))) {
+            throw new \InvalidArgumentException($this->l->t('Public upload is not allowed'));
+        }
+    }
+
+    /**
+     * To make sure we don't get invisible link shares we set the parent
+     * of a link if it is a reshare. This is a quick word around
+     * until we can properly display multiple link shares in the UI
+     *
+     * See: https://github.com/owncloud/core/issues/22295
+     *
+     * FIXME: Remove once multiple link shares can be properly displayed
+     *
+     * @param IShare $share
+     */
+    protected function setLinkParent(IShare $share) {
+        $storage = $share->getNode()->getStorage();
+        if ($storage->instanceOfStorage(SharedStorage::class)) {
+            /** @var \OCA\Files_Sharing\SharedStorage $storage */
+            $share->setParent((int)$storage->getShareId());
+        }
+    }
+
+    /**
+     * @param File|Folder $path
+     */
+    protected function pathCreateChecks($path) {
+        // Make sure that we do not share a path that contains a shared mountpoint
+        if ($path instanceof \OCP\Files\Folder) {
+            $mounts = $this->mountManager->findIn($path->getPath());
+            foreach ($mounts as $mount) {
+                if ($mount->getStorage()->instanceOfStorage('\OCA\Files_Sharing\ISharedStorage')) {
+                    // Using a flat sharing model ensures the file owner can always see who has access.
+                    // Allowing parent folder sharing would require tracking inherited access, which adds complexity
+                    // and hurts performance/scalability.
+                    // So we forbid sharing a parent folder of a share you received.
+                    throw new \InvalidArgumentException($this->l->t('You cannot share a folder that contains other shares'));
+                }
+            }
+        }
+    }
+
+    /**
+     * Check if the user that is sharing can actually share
+     *
+     * @param IShare $share
+     * @throws \Exception
+     */
+    protected function canShare(IShare $share) {
+        if (!$this->shareApiEnabled()) {
+            throw new \Exception($this->l->t('Sharing is disabled'));
+        }
+
+        if ($this->sharingDisabledForUser($share->getSharedBy())) {
+            throw new \Exception($this->l->t('Sharing is disabled for you'));
+        }
+    }
+
+    /**
+     * Share a path
+     *
+     * @param IShare $share
+     * @return IShare The share object
+     * @throws \Exception
+     *
+     * TODO: handle link share permissions or check them
+     */
+    public function createShare(IShare $share) {
+        $this->canShare($share);
+
+        $this->generalCreateChecks($share);
+
+        // Verify if there are any issues with the path
+        $this->pathCreateChecks($share->getNode());
+
+        /*
 		 * On creation of a share the owner is always the owner of the path
 		 * Except for mounted federated shares.
 		 */
-		$storage = $share->getNode()->getStorage();
-		if ($storage->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
-			$parent = $share->getNode()->getParent();
-			while ($parent->getStorage()->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
-				$parent = $parent->getParent();
-			}
-			$share->setShareOwner($parent->getOwner()->getUID());
-		} else {
-			if ($share->getNode()->getOwner()) {
-				$share->setShareOwner($share->getNode()->getOwner()->getUID());
-			} else {
-				$share->setShareOwner($share->getSharedBy());
-			}
-		}
-
-		try {
-			// Verify share type
-			if ($share->getShareType() === IShare::TYPE_USER) {
-				$this->userCreateChecks($share);
-
-				// Verify the expiration date
-				$share = $this->validateExpirationDateInternal($share);
-			} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
-				$this->groupCreateChecks($share);
-
-				// Verify the expiration date
-				$share = $this->validateExpirationDateInternal($share);
-			} elseif ($share->getShareType() === IShare::TYPE_REMOTE || $share->getShareType() === IShare::TYPE_REMOTE_GROUP) {
-				// Verify the expiration date
-				$share = $this->validateExpirationDateInternal($share);
-			} elseif ($share->getShareType() === IShare::TYPE_LINK
-				|| $share->getShareType() === IShare::TYPE_EMAIL) {
-				$this->linkCreateChecks($share);
-				$this->setLinkParent($share);
-
-				$token = $this->generateToken();
-				// Set the unique token
-				$share->setToken($token);
-
-				// Verify the expiration date
-				$share = $this->validateExpirationDateLink($share);
-
-				// Verify the password
-				$this->verifyPassword($share->getPassword());
-
-				// If a password is set. Hash it!
-				if ($share->getShareType() === IShare::TYPE_LINK
-					&& $share->getPassword() !== null) {
-					$share->setPassword($this->hasher->hash($share->getPassword()));
-				}
-			}
-
-			// Cannot share with the owner
-			if ($share->getShareType() === IShare::TYPE_USER
-				&& $share->getSharedWith() === $share->getShareOwner()) {
-				throw new \InvalidArgumentException($this->l->t('Cannot share with the share owner'));
-			}
-
-			// Generate the target
-			$shareFolder = $this->config->getSystemValue('share_folder', '/');
-			if ($share->getShareType() === IShare::TYPE_USER) {
-				$allowCustomShareFolder = $this->config->getSystemValueBool('sharing.allow_custom_share_folder', true);
-				if ($allowCustomShareFolder) {
-					$shareFolder = $this->config->getUserValue($share->getSharedWith(), Application::APP_ID, 'share_folder', $shareFolder);
-				}
-			}
-
-			$target = $shareFolder . '/' . $share->getNode()->getName();
-			$target = \OC\Files\Filesystem::normalizePath($target);
-			$share->setTarget($target);
-
-			// Pre share event
-			$event = new Share\Events\BeforeShareCreatedEvent($share);
-			$this->dispatcher->dispatchTyped($event);
-			if ($event->isPropagationStopped() && $event->getError()) {
-				throw new \Exception($event->getError());
-			}
-
-			$oldShare = $share;
-			$provider = $this->factory->getProviderForType($share->getShareType());
-			$share = $provider->create($share);
-
-			// Reuse the node we already have
-			$share->setNode($oldShare->getNode());
-
-			// Reset the target if it is null for the new share
-			if ($share->getTarget() === '') {
-				$share->setTarget($target);
-			}
-		} catch (AlreadySharedException $e) {
-			// If a share for the same target already exists, dont create a new one,
-			// but do trigger the hooks and notifications again
-			$oldShare = $share;
-
-			// Reuse the node we already have
-			$share = $e->getExistingShare();
-			$share->setNode($oldShare->getNode());
-		}
-
-		// Post share event
-		$this->dispatcher->dispatchTyped(new ShareCreatedEvent($share));
-
-		// Send email if needed
-		if ($this->config->getSystemValueBool('sharing.enable_share_mail', true)) {
-			if ($share->getMailSend()) {
-				$provider = $this->factory->getProviderForType($share->getShareType());
-				if ($provider instanceof IShareProviderWithNotification) {
-					$provider->sendMailNotification($share);
-				} else {
-					$this->logger->debug('Share notification not sent because the provider does not support it.', ['app' => 'share']);
-				}
-			} else {
-				$this->logger->debug('Share notification not sent because mailsend is false.', ['app' => 'share']);
-			}
-		} else {
-			$this->logger->debug('Share notification not sent because sharing notification emails is disabled.', ['app' => 'share']);
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Update a share
-	 *
-	 * @param IShare $share
-	 * @return IShare The share object
-	 * @throws \InvalidArgumentException
-	 * @throws HintException
-	 */
-	public function updateShare(IShare $share, bool $onlyValid = true) {
-		$expirationDateUpdated = false;
-
-		$this->canShare($share);
-
-		try {
-			$originalShare = $this->getShareById($share->getFullId(), onlyValid: $onlyValid);
-		} catch (\UnexpectedValueException $e) {
-			throw new \InvalidArgumentException($this->l->t('Share does not have a full ID'));
-		}
-
-		// We cannot change the share type!
-		if ($share->getShareType() !== $originalShare->getShareType()) {
-			throw new \InvalidArgumentException($this->l->t('Cannot change share type'));
-		}
-
-		// We can only change the recipient on user shares
-		if ($share->getSharedWith() !== $originalShare->getSharedWith()
-			&& $share->getShareType() !== IShare::TYPE_USER) {
-			throw new \InvalidArgumentException($this->l->t('Can only update recipient on user shares'));
-		}
-
-		// Cannot share with the owner
-		if ($share->getShareType() === IShare::TYPE_USER
-			&& $share->getSharedWith() === $share->getShareOwner()) {
-			throw new \InvalidArgumentException($this->l->t('Cannot share with the share owner'));
-		}
-
-		$this->generalCreateChecks($share, true);
-
-		if ($share->getShareType() === IShare::TYPE_USER) {
-			$this->userCreateChecks($share);
-
-			if ($share->getExpirationDate() != $originalShare->getExpirationDate()) {
-				// Verify the expiration date
-				$this->validateExpirationDateInternal($share);
-				$expirationDateUpdated = true;
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
-			$this->groupCreateChecks($share);
-
-			if ($share->getExpirationDate() != $originalShare->getExpirationDate()) {
-				// Verify the expiration date
-				$this->validateExpirationDateInternal($share);
-				$expirationDateUpdated = true;
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_LINK
-			|| $share->getShareType() === IShare::TYPE_EMAIL) {
-			$this->linkCreateChecks($share);
-
-			// The new password is not set again if it is the same as the old
-			// one, unless when switching from sending by Talk to sending by
-			// mail.
-			$plainTextPassword = $share->getPassword();
-			$updatedPassword = $this->updateSharePasswordIfNeeded($share, $originalShare);
-
-			/**
-			 * Cannot enable the getSendPasswordByTalk if there is no password set
-			 */
-			if (empty($plainTextPassword) && $share->getSendPasswordByTalk()) {
-				throw new \InvalidArgumentException($this->l->t('Cannot enable sending the password by Talk with an empty password'));
-			}
-
-			/**
-			 * If we're in a mail share, we need to force a password change
-			 * as either the user is not aware of the password or is already (received by mail)
-			 * Thus the SendPasswordByTalk feature would not make sense
-			 */
-			if (!$updatedPassword && $share->getShareType() === IShare::TYPE_EMAIL) {
-				if (!$originalShare->getSendPasswordByTalk() && $share->getSendPasswordByTalk()) {
-					throw new \InvalidArgumentException($this->l->t('Cannot enable sending the password by Talk without setting a new password'));
-				}
-				if ($originalShare->getSendPasswordByTalk() && !$share->getSendPasswordByTalk()) {
-					throw new \InvalidArgumentException($this->l->t('Cannot disable sending the password by Talk without setting a new password'));
-				}
-			}
-
-			if ($share->getExpirationDate() != $originalShare->getExpirationDate()) {
-				// Verify the expiration date
-				$this->validateExpirationDateLink($share);
-				$expirationDateUpdated = true;
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_REMOTE || $share->getShareType() === IShare::TYPE_REMOTE_GROUP) {
-			if ($share->getExpirationDate() != $originalShare->getExpirationDate()) {
-				// Verify the expiration date
-				$this->validateExpirationDateInternal($share);
-				$expirationDateUpdated = true;
-			}
-		}
-
-		$this->pathCreateChecks($share->getNode());
-
-		// Now update the share!
-		$provider = $this->factory->getProviderForType($share->getShareType());
-		if ($share->getShareType() === IShare::TYPE_EMAIL) {
-			/** @var ShareByMailProvider $provider */
-			$share = $provider->update($share, $plainTextPassword);
-		} else {
-			$share = $provider->update($share);
-		}
-
-		if ($expirationDateUpdated === true) {
-			\OC_Hook::emit(Share::class, 'post_set_expiration_date', [
-				'itemType' => $share->getNode() instanceof \OCP\Files\File ? 'file' : 'folder',
-				'itemSource' => $share->getNode()->getId(),
-				'date' => $share->getExpirationDate(),
-				'uidOwner' => $share->getSharedBy(),
-			]);
-		}
-
-		if ($share->getPassword() !== $originalShare->getPassword()) {
-			\OC_Hook::emit(Share::class, 'post_update_password', [
-				'itemType' => $share->getNode() instanceof \OCP\Files\File ? 'file' : 'folder',
-				'itemSource' => $share->getNode()->getId(),
-				'uidOwner' => $share->getSharedBy(),
-				'token' => $share->getToken(),
-				'disabled' => is_null($share->getPassword()),
-			]);
-		}
-
-		if ($share->getPermissions() !== $originalShare->getPermissions()) {
-			if ($this->userManager->userExists($share->getShareOwner())) {
-				$userFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
-			} else {
-				$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
-			}
-			\OC_Hook::emit(Share::class, 'post_update_permissions', [
-				'itemType' => $share->getNode() instanceof \OCP\Files\File ? 'file' : 'folder',
-				'itemSource' => $share->getNode()->getId(),
-				'shareType' => $share->getShareType(),
-				'shareWith' => $share->getSharedWith(),
-				'uidOwner' => $share->getSharedBy(),
-				'permissions' => $share->getPermissions(),
-				'attributes' => $share->getAttributes() !== null ? $share->getAttributes()->toArray() : null,
-				'path' => $userFolder->getRelativePath($share->getNode()->getPath()),
-			]);
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Accept a share.
-	 *
-	 * @param IShare $share
-	 * @param string $recipientId
-	 * @return IShare The share object
-	 * @throws \InvalidArgumentException Thrown if the provider does not implement `IShareProviderSupportsAccept`
-	 * @since 9.0.0
-	 */
-	public function acceptShare(IShare $share, string $recipientId): IShare {
-		[$providerId,] = $this->splitFullId($share->getFullId());
-		$provider = $this->factory->getProvider($providerId);
-
-		if (!($provider instanceof IShareProviderSupportsAccept)) {
-			throw new \InvalidArgumentException($this->l->t('Share provider does not support accepting'));
-		}
-		/** @var IShareProvider&IShareProviderSupportsAccept $provider */
-		$provider->acceptShare($share, $recipientId);
-
-		$event = new ShareAcceptedEvent($share);
-		$this->dispatcher->dispatchTyped($event);
-
-		return $share;
-	}
-
-	/**
-	 * Updates the password of the given share if it is not the same as the
-	 * password of the original share.
-	 *
-	 * @param IShare $share the share to update its password.
-	 * @param IShare $originalShare the original share to compare its
-	 *                              password with.
-	 * @return boolean whether the password was updated or not.
-	 */
-	private function updateSharePasswordIfNeeded(IShare $share, IShare $originalShare) {
-		$passwordsAreDifferent = ($share->getPassword() !== $originalShare->getPassword())
-			&& (($share->getPassword() !== null && $originalShare->getPassword() === null)
-				|| ($share->getPassword() === null && $originalShare->getPassword() !== null)
-				|| ($share->getPassword() !== null && $originalShare->getPassword() !== null
-					&& !$this->hasher->verify($share->getPassword(), $originalShare->getPassword())));
-
-		// Password updated.
-		if ($passwordsAreDifferent) {
-			// Verify the password
-			$this->verifyPassword($share->getPassword());
-
-			// If a password is set. Hash it!
-			if (!empty($share->getPassword())) {
-				$share->setPassword($this->hasher->hash($share->getPassword()));
-				if ($share->getShareType() === IShare::TYPE_EMAIL) {
-					// Shares shared by email have temporary passwords
-					$this->setSharePasswordExpirationTime($share);
-				}
-
-				return true;
-			} else {
-				// Empty string and null are seen as NOT password protected
-				$share->setPassword(null);
-				if ($share->getShareType() === IShare::TYPE_EMAIL) {
-					$share->setPasswordExpirationTime(null);
-				}
-				return true;
-			}
-		} else {
-			// Reset the password to the original one, as it is either the same
-			// as the "new" password or a hashed version of it.
-			$share->setPassword($originalShare->getPassword());
-		}
-
-		return false;
-	}
-
-	/**
-	 * Set the share's password expiration time
-	 */
-	private function setSharePasswordExpirationTime(IShare $share): void {
-		if (!$this->config->getSystemValueBool('sharing.enable_mail_link_password_expiration', false)) {
-			// Sets password expiration date to NULL
-			$share->setPasswordExpirationTime();
-			return;
-		}
-		// Sets password expiration date
-		$expirationTime = null;
-		$now = new \DateTime();
-		$expirationInterval = $this->config->getSystemValue('sharing.mail_link_password_expiration_interval', 3600);
-		$expirationTime = $now->add(new \DateInterval('PT' . $expirationInterval . 'S'));
-		$share->setPasswordExpirationTime($expirationTime);
-	}
-
-
-	/**
-	 * Delete all the children of this share
-	 *
-	 * @param IShare $share
-	 * @return IShare[] List of deleted shares
-	 */
-	protected function deleteChildren(IShare $share) {
-		$deletedShares = [];
-
-		$provider = $this->factory->getProviderForType($share->getShareType());
-
-		foreach ($provider->getChildren($share) as $child) {
-			$this->dispatcher->dispatchTyped(new BeforeShareDeletedEvent($child));
-
-			$deletedChildren = $this->deleteChildren($child);
-			$deletedShares = array_merge($deletedShares, $deletedChildren);
-
-			$provider->delete($child);
-			$this->dispatcher->dispatchTyped(new ShareDeletedEvent($child));
-			$deletedShares[] = $child;
-		}
-
-		return $deletedShares;
-	}
-
-	/** Promote re-shares into direct shares so that target user keeps access */
-	protected function promoteReshares(IShare $share): void {
-		try {
-			$node = $share->getNode();
-		} catch (NotFoundException) {
-			/* Skip if node not found */
-			return;
-		}
-
-		$userIds = [];
-
-		if ($share->getShareType() === IShare::TYPE_USER) {
-			$userIds[] = $share->getSharedWith();
-		} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
-			$group = $this->groupManager->get($share->getSharedWith());
-			$users = $group?->getUsers() ?? [];
-
-			foreach ($users as $user) {
-				/* Skip share owner */
-				if ($user->getUID() === $share->getShareOwner() || $user->getUID() === $share->getSharedBy()) {
-					continue;
-				}
-				$userIds[] = $user->getUID();
-			}
-		} else {
-			/* We only support user and group shares */
-			return;
-		}
-
-		$reshareRecords = [];
-		$shareTypes = [
-			IShare::TYPE_GROUP,
-			IShare::TYPE_USER,
-			IShare::TYPE_LINK,
-			IShare::TYPE_REMOTE,
-			IShare::TYPE_EMAIL,
-		];
-
-		foreach ($userIds as $userId) {
-			foreach ($shareTypes as $shareType) {
-				try {
-					$provider = $this->factory->getProviderForType($shareType);
-				} catch (ProviderException $e) {
-					continue;
-				}
-
-				if ($node instanceof Folder) {
-					/* We need to get all shares by this user to get subshares */
-					$shares = $provider->getSharesBy($userId, $shareType, null, false, -1, 0);
-
-					foreach ($shares as $share) {
-						try {
-							$path = $share->getNode()->getPath();
-						} catch (NotFoundException) {
-							/* Ignore share of non-existing node */
-							continue;
-						}
-						if ($node->getRelativePath($path) !== null) {
-							/* If relative path is not null it means the shared node is the same or in a subfolder */
-							$reshareRecords[] = $share;
-						}
-					}
-				} else {
-					$shares = $provider->getSharesBy($userId, $shareType, $node, false, -1, 0);
-					foreach ($shares as $child) {
-						$reshareRecords[] = $child;
-					}
-				}
-			}
-		}
-
-		foreach ($reshareRecords as $child) {
-			try {
-				/* Check if the share is still valid (means the resharer still has access to the file through another mean) */
-				$this->generalCreateChecks($child);
-			} catch (GenericShareException $e) {
-				/* The check is invalid, promote it to a direct share from the sharer of parent share */
-				$this->logger->debug('Promote reshare because of exception ' . $e->getMessage(), ['exception' => $e, 'fullId' => $child->getFullId()]);
-				try {
-					$child->setSharedBy($share->getSharedBy());
-					$this->updateShare($child);
-				} catch (GenericShareException|\InvalidArgumentException $e) {
-					$this->logger->warning('Failed to promote reshare because of exception ' . $e->getMessage(), ['exception' => $e, 'fullId' => $child->getFullId()]);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Delete a share
-	 *
-	 * @param IShare $share
-	 * @throws ShareNotFound
-	 * @throws \InvalidArgumentException
-	 */
-	public function deleteShare(IShare $share) {
-		try {
-			$share->getFullId();
-		} catch (\UnexpectedValueException $e) {
-			throw new \InvalidArgumentException($this->l->t('Share does not have a full ID'));
-		}
-
-		$this->dispatcher->dispatchTyped(new BeforeShareDeletedEvent($share));
-
-		// Get all children and delete them as well
-		$this->deleteChildren($share);
-
-		// Do the actual delete
-		$provider = $this->factory->getProviderForType($share->getShareType());
-		$provider->delete($share);
-
-		$this->dispatcher->dispatchTyped(new ShareDeletedEvent($share));
-
-		// Promote reshares of the deleted share
-		$this->promoteReshares($share);
-	}
-
-
-	/**
-	 * Unshare a file as the recipient.
-	 * This can be different from a regular delete for example when one of
-	 * the users in a groups deletes that share. But the provider should
-	 * handle this.
-	 *
-	 * @param IShare $share
-	 * @param string $recipientId
-	 */
-	public function deleteFromSelf(IShare $share, $recipientId) {
-		[$providerId,] = $this->splitFullId($share->getFullId());
-		$provider = $this->factory->getProvider($providerId);
-
-		$provider->deleteFromSelf($share, $recipientId);
-		$event = new ShareDeletedFromSelfEvent($share);
-		$this->dispatcher->dispatchTyped($event);
-	}
-
-	public function restoreShare(IShare $share, string $recipientId): IShare {
-		[$providerId,] = $this->splitFullId($share->getFullId());
-		$provider = $this->factory->getProvider($providerId);
-
-		return $provider->restore($share, $recipientId);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function moveShare(IShare $share, $recipientId) {
-		if ($share->getShareType() === IShare::TYPE_LINK
-			|| $share->getShareType() === IShare::TYPE_EMAIL) {
-			throw new \InvalidArgumentException($this->l->t('Cannot change target of link share'));
-		}
-
-		if ($share->getShareType() === IShare::TYPE_USER && $share->getSharedWith() !== $recipientId) {
-			throw new \InvalidArgumentException($this->l->t('Invalid share recipient'));
-		}
-
-		if ($share->getShareType() === IShare::TYPE_GROUP) {
-			$sharedWith = $this->groupManager->get($share->getSharedWith());
-			if (is_null($sharedWith)) {
-				throw new \InvalidArgumentException($this->l->t('Group "%s" does not exist', [$share->getSharedWith()]));
-			}
-			$recipient = $this->userManager->get($recipientId);
-			if (!$sharedWith->inGroup($recipient)) {
-				throw new \InvalidArgumentException($this->l->t('Invalid share recipient'));
-			}
-		}
-
-		[$providerId,] = $this->splitFullId($share->getFullId());
-		$provider = $this->factory->getProvider($providerId);
-
-		return $provider->move($share, $recipientId);
-	}
-
-	public function getSharesInFolder($userId, Folder $node, $reshares = false, $shallow = true) {
-		$providers = $this->factory->getAllProviders();
-		if (!$shallow) {
-			throw new \Exception('non-shallow getSharesInFolder is no longer supported');
-		}
-
-		$isOwnerless = $node->getMountPoint() instanceof IShareOwnerlessMount;
-
-		$shares = [];
-		foreach ($providers as $provider) {
-			if ($isOwnerless) {
-				// If the provider does not implement the additional interface,
-				// we lack a performant way of querying all shares and therefore ignore the provider.
-				if ($provider instanceof IShareProviderSupportsAllSharesInFolder) {
-					foreach ($provider->getAllSharesInFolder($node) as $fid => $data) {
-						$shares[$fid] ??= [];
-						$shares[$fid] = array_merge($shares[$fid], $data);
-					}
-				}
-			} else {
-				foreach ($provider->getSharesInFolder($userId, $node, $reshares) as $fid => $data) {
-					$shares[$fid] ??= [];
-					$shares[$fid] = array_merge($shares[$fid], $data);
-				}
-			}
-		}
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharesBy($userId, $shareType, $path = null, $reshares = false, $limit = 50, $offset = 0, bool $onlyValid = true) {
-		if ($path !== null
-			&& !($path instanceof \OCP\Files\File)
-			&& !($path instanceof \OCP\Files\Folder)) {
-			throw new \InvalidArgumentException($this->l->t('Invalid path'));
-		}
-
-		try {
-			$provider = $this->factory->getProviderForType($shareType);
-		} catch (ProviderException $e) {
-			return [];
-		}
-
-		if ($path?->getMountPoint() instanceof IShareOwnerlessMount) {
-			$shares = array_filter($provider->getSharesByPath($path), static fn (IShare $share) => $share->getShareType() === $shareType);
-		} else {
-			$shares = $provider->getSharesBy($userId, $shareType, $path, $reshares, $limit, $offset);
-		}
-
-		/*
+        $storage = $share->getNode()->getStorage();
+        if ($storage->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
+            $parent = $share->getNode()->getParent();
+            while ($parent->getStorage()->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
+                $parent = $parent->getParent();
+            }
+            $share->setShareOwner($parent->getOwner()->getUID());
+        } else {
+            if ($share->getNode()->getOwner()) {
+                $share->setShareOwner($share->getNode()->getOwner()->getUID());
+            } else {
+                $share->setShareOwner($share->getSharedBy());
+            }
+        }
+
+        try {
+            // Verify share type
+            if ($share->getShareType() === IShare::TYPE_USER) {
+                $this->userCreateChecks($share);
+
+                // Verify the expiration date
+                $share = $this->validateExpirationDateInternal($share);
+            } elseif ($share->getShareType() === IShare::TYPE_GROUP) {
+                $this->groupCreateChecks($share);
+
+                // Verify the expiration date
+                $share = $this->validateExpirationDateInternal($share);
+            } elseif ($share->getShareType() === IShare::TYPE_REMOTE || $share->getShareType() === IShare::TYPE_REMOTE_GROUP) {
+                // Verify the expiration date
+                $share = $this->validateExpirationDateInternal($share);
+            } elseif ($share->getShareType() === IShare::TYPE_LINK
+                || $share->getShareType() === IShare::TYPE_EMAIL) {
+                $this->linkCreateChecks($share);
+                $this->setLinkParent($share);
+
+                $token = $this->generateToken();
+                // Set the unique token
+                $share->setToken($token);
+
+                // Verify the expiration date
+                $share = $this->validateExpirationDateLink($share);
+
+                // Verify the password
+                $this->verifyPassword($share->getPassword());
+
+                // If a password is set. Hash it!
+                if ($share->getShareType() === IShare::TYPE_LINK
+                    && $share->getPassword() !== null) {
+                    $share->setPassword($this->hasher->hash($share->getPassword()));
+                }
+            }
+
+            // Cannot share with the owner
+            if ($share->getShareType() === IShare::TYPE_USER
+                && $share->getSharedWith() === $share->getShareOwner()) {
+                throw new \InvalidArgumentException($this->l->t('Cannot share with the share owner'));
+            }
+
+            // Generate the target
+            $shareFolder = $this->config->getSystemValue('share_folder', '/');
+            if ($share->getShareType() === IShare::TYPE_USER) {
+                $allowCustomShareFolder = $this->config->getSystemValueBool('sharing.allow_custom_share_folder', true);
+                if ($allowCustomShareFolder) {
+                    $shareFolder = $this->config->getUserValue($share->getSharedWith(), Application::APP_ID, 'share_folder', $shareFolder);
+                }
+            }
+
+            $target = $shareFolder . '/' . $share->getNode()->getName();
+            $target = \OC\Files\Filesystem::normalizePath($target);
+            $share->setTarget($target);
+
+            // Pre share event
+            $event = new Share\Events\BeforeShareCreatedEvent($share);
+            $this->dispatcher->dispatchTyped($event);
+            if ($event->isPropagationStopped() && $event->getError()) {
+                throw new \Exception($event->getError());
+            }
+
+            $oldShare = $share;
+            $provider = $this->factory->getProviderForType($share->getShareType());
+            $share = $provider->create($share);
+
+            // Reuse the node we already have
+            $share->setNode($oldShare->getNode());
+
+            // Reset the target if it is null for the new share
+            if ($share->getTarget() === '') {
+                $share->setTarget($target);
+            }
+        } catch (AlreadySharedException $e) {
+            // If a share for the same target already exists, dont create a new one,
+            // but do trigger the hooks and notifications again
+            $oldShare = $share;
+
+            // Reuse the node we already have
+            $share = $e->getExistingShare();
+            $share->setNode($oldShare->getNode());
+        }
+
+        // Post share event
+        $this->dispatcher->dispatchTyped(new ShareCreatedEvent($share));
+
+        // Send email if needed
+        if ($this->config->getSystemValueBool('sharing.enable_share_mail', true)) {
+            if ($share->getMailSend()) {
+                $provider = $this->factory->getProviderForType($share->getShareType());
+                if ($provider instanceof IShareProviderWithNotification) {
+                    $provider->sendMailNotification($share);
+                } else {
+                    $this->logger->debug('Share notification not sent because the provider does not support it.', ['app' => 'share']);
+                }
+            } else {
+                $this->logger->debug('Share notification not sent because mailsend is false.', ['app' => 'share']);
+            }
+        } else {
+            $this->logger->debug('Share notification not sent because sharing notification emails is disabled.', ['app' => 'share']);
+        }
+
+        return $share;
+    }
+
+    /**
+     * Update a share
+     *
+     * @param IShare $share
+     * @return IShare The share object
+     * @throws \InvalidArgumentException
+     * @throws HintException
+     */
+    public function updateShare(IShare $share, bool $onlyValid = true) {
+        $expirationDateUpdated = false;
+
+        $this->canShare($share);
+
+        try {
+            $originalShare = $this->getShareById($share->getFullId(), onlyValid: $onlyValid);
+        } catch (\UnexpectedValueException $e) {
+            throw new \InvalidArgumentException($this->l->t('Share does not have a full ID'));
+        }
+
+        // We cannot change the share type!
+        if ($share->getShareType() !== $originalShare->getShareType()) {
+            throw new \InvalidArgumentException($this->l->t('Cannot change share type'));
+        }
+
+        // We can only change the recipient on user shares
+        if ($share->getSharedWith() !== $originalShare->getSharedWith()
+            && $share->getShareType() !== IShare::TYPE_USER) {
+            throw new \InvalidArgumentException($this->l->t('Can only update recipient on user shares'));
+        }
+
+        // Cannot share with the owner
+        if ($share->getShareType() === IShare::TYPE_USER
+            && $share->getSharedWith() === $share->getShareOwner()) {
+            throw new \InvalidArgumentException($this->l->t('Cannot share with the share owner'));
+        }
+
+        $this->generalCreateChecks($share, true);
+
+        if ($share->getShareType() === IShare::TYPE_USER) {
+            $this->userCreateChecks($share);
+
+            if ($share->getExpirationDate() != $originalShare->getExpirationDate()) {
+                // Verify the expiration date
+                $this->validateExpirationDateInternal($share);
+                $expirationDateUpdated = true;
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_GROUP) {
+            $this->groupCreateChecks($share);
+
+            if ($share->getExpirationDate() != $originalShare->getExpirationDate()) {
+                // Verify the expiration date
+                $this->validateExpirationDateInternal($share);
+                $expirationDateUpdated = true;
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_LINK
+            || $share->getShareType() === IShare::TYPE_EMAIL) {
+            $this->linkCreateChecks($share);
+
+            // The new password is not set again if it is the same as the old
+            // one, unless when switching from sending by Talk to sending by
+            // mail.
+            $plainTextPassword = $share->getPassword();
+            $updatedPassword = $this->updateSharePasswordIfNeeded($share, $originalShare);
+
+            /**
+             * Cannot enable the getSendPasswordByTalk if there is no password set
+             */
+            if (empty($plainTextPassword) && $share->getSendPasswordByTalk()) {
+                throw new \InvalidArgumentException($this->l->t('Cannot enable sending the password by Talk with an empty password'));
+            }
+
+            /**
+             * If we're in a mail share, we need to force a password change
+             * as either the user is not aware of the password or is already (received by mail)
+             * Thus the SendPasswordByTalk feature would not make sense
+             */
+            if (!$updatedPassword && $share->getShareType() === IShare::TYPE_EMAIL) {
+                if (!$originalShare->getSendPasswordByTalk() && $share->getSendPasswordByTalk()) {
+                    throw new \InvalidArgumentException($this->l->t('Cannot enable sending the password by Talk without setting a new password'));
+                }
+                if ($originalShare->getSendPasswordByTalk() && !$share->getSendPasswordByTalk()) {
+                    throw new \InvalidArgumentException($this->l->t('Cannot disable sending the password by Talk without setting a new password'));
+                }
+            }
+
+            if ($share->getExpirationDate() != $originalShare->getExpirationDate()) {
+                // Verify the expiration date
+                $this->validateExpirationDateLink($share);
+                $expirationDateUpdated = true;
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_REMOTE || $share->getShareType() === IShare::TYPE_REMOTE_GROUP) {
+            if ($share->getExpirationDate() != $originalShare->getExpirationDate()) {
+                // Verify the expiration date
+                $this->validateExpirationDateInternal($share);
+                $expirationDateUpdated = true;
+            }
+        }
+
+        $this->pathCreateChecks($share->getNode());
+
+        // Now update the share!
+        $provider = $this->factory->getProviderForType($share->getShareType());
+        if ($share->getShareType() === IShare::TYPE_EMAIL) {
+            /** @var ShareByMailProvider $provider */
+            $share = $provider->update($share, $plainTextPassword);
+        } else {
+            $share = $provider->update($share);
+        }
+
+        if ($expirationDateUpdated === true) {
+            \OC_Hook::emit(Share::class, 'post_set_expiration_date', [
+                'itemType' => $share->getNode() instanceof \OCP\Files\File ? 'file' : 'folder',
+                'itemSource' => $share->getNode()->getId(),
+                'date' => $share->getExpirationDate(),
+                'uidOwner' => $share->getSharedBy(),
+            ]);
+        }
+
+        if ($share->getPassword() !== $originalShare->getPassword()) {
+            \OC_Hook::emit(Share::class, 'post_update_password', [
+                'itemType' => $share->getNode() instanceof \OCP\Files\File ? 'file' : 'folder',
+                'itemSource' => $share->getNode()->getId(),
+                'uidOwner' => $share->getSharedBy(),
+                'token' => $share->getToken(),
+                'disabled' => is_null($share->getPassword()),
+            ]);
+        }
+
+        if ($share->getPermissions() !== $originalShare->getPermissions()) {
+            if ($this->userManager->userExists($share->getShareOwner())) {
+                $userFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
+            } else {
+                $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
+            }
+            \OC_Hook::emit(Share::class, 'post_update_permissions', [
+                'itemType' => $share->getNode() instanceof \OCP\Files\File ? 'file' : 'folder',
+                'itemSource' => $share->getNode()->getId(),
+                'shareType' => $share->getShareType(),
+                'shareWith' => $share->getSharedWith(),
+                'uidOwner' => $share->getSharedBy(),
+                'permissions' => $share->getPermissions(),
+                'attributes' => $share->getAttributes() !== null ? $share->getAttributes()->toArray() : null,
+                'path' => $userFolder->getRelativePath($share->getNode()->getPath()),
+            ]);
+        }
+
+        return $share;
+    }
+
+    /**
+     * Accept a share.
+     *
+     * @param IShare $share
+     * @param string $recipientId
+     * @return IShare The share object
+     * @throws \InvalidArgumentException Thrown if the provider does not implement `IShareProviderSupportsAccept`
+     * @since 9.0.0
+     */
+    public function acceptShare(IShare $share, string $recipientId): IShare {
+        [$providerId,] = $this->splitFullId($share->getFullId());
+        $provider = $this->factory->getProvider($providerId);
+
+        if (!($provider instanceof IShareProviderSupportsAccept)) {
+            throw new \InvalidArgumentException($this->l->t('Share provider does not support accepting'));
+        }
+        /** @var IShareProvider&IShareProviderSupportsAccept $provider */
+        $provider->acceptShare($share, $recipientId);
+
+        $event = new ShareAcceptedEvent($share);
+        $this->dispatcher->dispatchTyped($event);
+
+        return $share;
+    }
+
+    /**
+     * Updates the password of the given share if it is not the same as the
+     * password of the original share.
+     *
+     * @param IShare $share the share to update its password.
+     * @param IShare $originalShare the original share to compare its
+     *                              password with.
+     * @return boolean whether the password was updated or not.
+     */
+    private function updateSharePasswordIfNeeded(IShare $share, IShare $originalShare) {
+        $passwordsAreDifferent = ($share->getPassword() !== $originalShare->getPassword())
+            && (($share->getPassword() !== null && $originalShare->getPassword() === null)
+                || ($share->getPassword() === null && $originalShare->getPassword() !== null)
+                || ($share->getPassword() !== null && $originalShare->getPassword() !== null
+                    && !$this->hasher->verify($share->getPassword(), $originalShare->getPassword())));
+
+        // Password updated.
+        if ($passwordsAreDifferent) {
+            // Verify the password
+            $this->verifyPassword($share->getPassword());
+
+            // If a password is set. Hash it!
+            if (!empty($share->getPassword())) {
+                $share->setPassword($this->hasher->hash($share->getPassword()));
+                if ($share->getShareType() === IShare::TYPE_EMAIL) {
+                    // Shares shared by email have temporary passwords
+                    $this->setSharePasswordExpirationTime($share);
+                }
+
+                return true;
+            } else {
+                // Empty string and null are seen as NOT password protected
+                $share->setPassword(null);
+                if ($share->getShareType() === IShare::TYPE_EMAIL) {
+                    $share->setPasswordExpirationTime(null);
+                }
+                return true;
+            }
+        } else {
+            // Reset the password to the original one, as it is either the same
+            // as the "new" password or a hashed version of it.
+            $share->setPassword($originalShare->getPassword());
+        }
+
+        return false;
+    }
+
+    /**
+     * Set the share's password expiration time
+     */
+    private function setSharePasswordExpirationTime(IShare $share): void {
+        if (!$this->config->getSystemValueBool('sharing.enable_mail_link_password_expiration', false)) {
+            // Sets password expiration date to NULL
+            $share->setPasswordExpirationTime();
+            return;
+        }
+        // Sets password expiration date
+        $expirationTime = null;
+        $now = new \DateTime();
+        $expirationInterval = $this->config->getSystemValue('sharing.mail_link_password_expiration_interval', 3600);
+        $expirationTime = $now->add(new \DateInterval('PT' . $expirationInterval . 'S'));
+        $share->setPasswordExpirationTime($expirationTime);
+    }
+
+
+    /**
+     * Delete all the children of this share
+     *
+     * @param IShare $share
+     * @return IShare[] List of deleted shares
+     */
+    protected function deleteChildren(IShare $share) {
+        $deletedShares = [];
+
+        $provider = $this->factory->getProviderForType($share->getShareType());
+
+        foreach ($provider->getChildren($share) as $child) {
+            $this->dispatcher->dispatchTyped(new BeforeShareDeletedEvent($child));
+
+            $deletedChildren = $this->deleteChildren($child);
+            $deletedShares = array_merge($deletedShares, $deletedChildren);
+
+            $provider->delete($child);
+            $this->dispatcher->dispatchTyped(new ShareDeletedEvent($child));
+            $deletedShares[] = $child;
+        }
+
+        return $deletedShares;
+    }
+
+    /** Promote re-shares into direct shares so that target user keeps access */
+    protected function promoteReshares(IShare $share): void {
+        try {
+            $node = $share->getNode();
+        } catch (NotFoundException) {
+            /* Skip if node not found */
+            return;
+        }
+
+        $userIds = [];
+
+        if ($share->getShareType() === IShare::TYPE_USER) {
+            $userIds[] = $share->getSharedWith();
+        } elseif ($share->getShareType() === IShare::TYPE_GROUP) {
+            $group = $this->groupManager->get($share->getSharedWith());
+            $users = $group?->getUsers() ?? [];
+
+            foreach ($users as $user) {
+                /* Skip share owner */
+                if ($user->getUID() === $share->getShareOwner() || $user->getUID() === $share->getSharedBy()) {
+                    continue;
+                }
+                $userIds[] = $user->getUID();
+            }
+        } else {
+            /* We only support user and group shares */
+            return;
+        }
+
+        $reshareRecords = [];
+        $shareTypes = [
+            IShare::TYPE_GROUP,
+            IShare::TYPE_USER,
+            IShare::TYPE_LINK,
+            IShare::TYPE_REMOTE,
+            IShare::TYPE_EMAIL,
+        ];
+
+        foreach ($userIds as $userId) {
+            foreach ($shareTypes as $shareType) {
+                try {
+                    $provider = $this->factory->getProviderForType($shareType);
+                } catch (ProviderException $e) {
+                    continue;
+                }
+
+                if ($node instanceof Folder) {
+                    /* We need to get all shares by this user to get subshares */
+                    $shares = $provider->getSharesBy($userId, $shareType, null, false, -1, 0);
+
+                    foreach ($shares as $share) {
+                        try {
+                            $path = $share->getNode()->getPath();
+                        } catch (NotFoundException) {
+                            /* Ignore share of non-existing node */
+                            continue;
+                        }
+                        if ($node->getRelativePath($path) !== null) {
+                            /* If relative path is not null it means the shared node is the same or in a subfolder */
+                            $reshareRecords[] = $share;
+                        }
+                    }
+                } else {
+                    $shares = $provider->getSharesBy($userId, $shareType, $node, false, -1, 0);
+                    foreach ($shares as $child) {
+                        $reshareRecords[] = $child;
+                    }
+                }
+            }
+        }
+
+        foreach ($reshareRecords as $child) {
+            try {
+                /* Check if the share is still valid (means the resharer still has access to the file through another mean) */
+                $this->generalCreateChecks($child);
+            } catch (GenericShareException $e) {
+                /* The check is invalid, promote it to a direct share from the sharer of parent share */
+                $this->logger->debug('Promote reshare because of exception ' . $e->getMessage(), ['exception' => $e, 'fullId' => $child->getFullId()]);
+                try {
+                    $child->setSharedBy($share->getSharedBy());
+                    $this->updateShare($child);
+                } catch (GenericShareException|\InvalidArgumentException $e) {
+                    $this->logger->warning('Failed to promote reshare because of exception ' . $e->getMessage(), ['exception' => $e, 'fullId' => $child->getFullId()]);
+                }
+            }
+        }
+    }
+
+    /**
+     * Delete a share
+     *
+     * @param IShare $share
+     * @throws ShareNotFound
+     * @throws \InvalidArgumentException
+     */
+    public function deleteShare(IShare $share) {
+        try {
+            $share->getFullId();
+        } catch (\UnexpectedValueException $e) {
+            throw new \InvalidArgumentException($this->l->t('Share does not have a full ID'));
+        }
+
+        $this->dispatcher->dispatchTyped(new BeforeShareDeletedEvent($share));
+
+        // Get all children and delete them as well
+        $this->deleteChildren($share);
+
+        // Do the actual delete
+        $provider = $this->factory->getProviderForType($share->getShareType());
+        $provider->delete($share);
+
+        $this->dispatcher->dispatchTyped(new ShareDeletedEvent($share));
+
+        // Promote reshares of the deleted share
+        $this->promoteReshares($share);
+    }
+
+
+    /**
+     * Unshare a file as the recipient.
+     * This can be different from a regular delete for example when one of
+     * the users in a groups deletes that share. But the provider should
+     * handle this.
+     *
+     * @param IShare $share
+     * @param string $recipientId
+     */
+    public function deleteFromSelf(IShare $share, $recipientId) {
+        [$providerId,] = $this->splitFullId($share->getFullId());
+        $provider = $this->factory->getProvider($providerId);
+
+        $provider->deleteFromSelf($share, $recipientId);
+        $event = new ShareDeletedFromSelfEvent($share);
+        $this->dispatcher->dispatchTyped($event);
+    }
+
+    public function restoreShare(IShare $share, string $recipientId): IShare {
+        [$providerId,] = $this->splitFullId($share->getFullId());
+        $provider = $this->factory->getProvider($providerId);
+
+        return $provider->restore($share, $recipientId);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function moveShare(IShare $share, $recipientId) {
+        if ($share->getShareType() === IShare::TYPE_LINK
+            || $share->getShareType() === IShare::TYPE_EMAIL) {
+            throw new \InvalidArgumentException($this->l->t('Cannot change target of link share'));
+        }
+
+        if ($share->getShareType() === IShare::TYPE_USER && $share->getSharedWith() !== $recipientId) {
+            throw new \InvalidArgumentException($this->l->t('Invalid share recipient'));
+        }
+
+        if ($share->getShareType() === IShare::TYPE_GROUP) {
+            $sharedWith = $this->groupManager->get($share->getSharedWith());
+            if (is_null($sharedWith)) {
+                throw new \InvalidArgumentException($this->l->t('Group "%s" does not exist', [$share->getSharedWith()]));
+            }
+            $recipient = $this->userManager->get($recipientId);
+            if (!$sharedWith->inGroup($recipient)) {
+                throw new \InvalidArgumentException($this->l->t('Invalid share recipient'));
+            }
+        }
+
+        [$providerId,] = $this->splitFullId($share->getFullId());
+        $provider = $this->factory->getProvider($providerId);
+
+        return $provider->move($share, $recipientId);
+    }
+
+    public function getSharesInFolder($userId, Folder $node, $reshares = false, $shallow = true) {
+        $providers = $this->factory->getAllProviders();
+        if (!$shallow) {
+            throw new \Exception('non-shallow getSharesInFolder is no longer supported');
+        }
+
+        $isOwnerless = $node->getMountPoint() instanceof IShareOwnerlessMount;
+
+        $shares = [];
+        foreach ($providers as $provider) {
+            if ($isOwnerless) {
+                // If the provider does not implement the additional interface,
+                // we lack a performant way of querying all shares and therefore ignore the provider.
+                if ($provider instanceof IShareProviderSupportsAllSharesInFolder) {
+                    foreach ($provider->getAllSharesInFolder($node) as $fid => $data) {
+                        $shares[$fid] ??= [];
+                        $shares[$fid] = array_merge($shares[$fid], $data);
+                    }
+                }
+            } else {
+                foreach ($provider->getSharesInFolder($userId, $node, $reshares) as $fid => $data) {
+                    $shares[$fid] ??= [];
+                    $shares[$fid] = array_merge($shares[$fid], $data);
+                }
+            }
+        }
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharesBy($userId, $shareType, $path = null, $reshares = false, $limit = 50, $offset = 0, bool $onlyValid = true) {
+        if ($path !== null
+            && !($path instanceof \OCP\Files\File)
+            && !($path instanceof \OCP\Files\Folder)) {
+            throw new \InvalidArgumentException($this->l->t('Invalid path'));
+        }
+
+        try {
+            $provider = $this->factory->getProviderForType($shareType);
+        } catch (ProviderException $e) {
+            return [];
+        }
+
+        if ($path?->getMountPoint() instanceof IShareOwnerlessMount) {
+            $shares = array_filter($provider->getSharesByPath($path), static fn (IShare $share) => $share->getShareType() === $shareType);
+        } else {
+            $shares = $provider->getSharesBy($userId, $shareType, $path, $reshares, $limit, $offset);
+        }
+
+        /*
 		 * Work around so we don't return expired shares but still follow
 		 * proper pagination.
 		 */
 
-		$shares2 = [];
-
-		while (true) {
-			$added = 0;
-			foreach ($shares as $share) {
-				if ($onlyValid) {
-					try {
-						$this->checkShare($share);
-					} catch (ShareNotFound $e) {
-						// Ignore since this basically means the share is deleted
-						continue;
-					}
-				}
-
-				$added++;
-				$shares2[] = $share;
-
-				if (count($shares2) === $limit) {
-					break;
-				}
-			}
-
-			// If we did not fetch more shares than the limit then there are no more shares
-			if (count($shares) < $limit) {
-				break;
-			}
-
-			if (count($shares2) === $limit) {
-				break;
-			}
-
-			// If there was no limit on the select we are done
-			if ($limit === -1) {
-				break;
-			}
-
-			$offset += $added;
-
-			// Fetch again $limit shares
-			if ($path?->getMountPoint() instanceof IShareOwnerlessMount) {
-				// We already fetched all shares, so end here
-				$shares = [];
-			} else {
-				$shares = $provider->getSharesBy($userId, $shareType, $path, $reshares, $limit, $offset);
-			}
-
-			// No more shares means we are done
-			if (empty($shares)) {
-				break;
-			}
-		}
-
-		$shares = $shares2;
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWith($userId, $shareType, $node = null, $limit = 50, $offset = 0) {
-		try {
-			$provider = $this->factory->getProviderForType($shareType);
-		} catch (ProviderException $e) {
-			return [];
-		}
-
-		$shares = $provider->getSharedWith($userId, $shareType, $node, $limit, $offset);
-
-		// remove all shares which are already expired
-		foreach ($shares as $key => $share) {
-			try {
-				$this->checkShare($share);
-			} catch (ShareNotFound $e) {
-				unset($shares[$key]);
-			}
-		}
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getDeletedSharedWith($userId, $shareType, $node = null, $limit = 50, $offset = 0) {
-		$shares = $this->getSharedWith($userId, $shareType, $node, $limit, $offset);
-
-		// Only get deleted shares
-		$shares = array_filter($shares, function (IShare $share) {
-			return $share->getPermissions() === 0;
-		});
-
-		// Only get shares where the owner still exists
-		$shares = array_filter($shares, function (IShare $share) {
-			return $this->userManager->userExists($share->getShareOwner());
-		});
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareById($id, $recipient = null, bool $onlyValid = true) {
-		if ($id === null) {
-			throw new ShareNotFound();
-		}
-
-		[$providerId, $id] = $this->splitFullId($id);
-
-		try {
-			$provider = $this->factory->getProvider($providerId);
-		} catch (ProviderException $e) {
-			throw new ShareNotFound();
-		}
-
-		$share = $provider->getShareById($id, $recipient);
-
-		if ($onlyValid) {
-			$this->checkShare($share);
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Get all the shares for a given path
-	 *
-	 * @param \OCP\Files\Node $path
-	 * @param int $page
-	 * @param int $perPage
-	 *
-	 * @return Share[]
-	 */
-	public function getSharesByPath(\OCP\Files\Node $path, $page = 0, $perPage = 50) {
-		return [];
-	}
-
-	/**
-	 * Get the share by token possible with password
-	 *
-	 * @param string $token
-	 * @return IShare
-	 *
-	 * @throws ShareNotFound
-	 */
-	public function getShareByToken($token) {
-		// tokens cannot be valid local user names
-		if ($this->userManager->userExists($token)) {
-			throw new ShareNotFound();
-		}
-		$share = null;
-		try {
-			if ($this->shareApiAllowLinks()) {
-				$provider = $this->factory->getProviderForType(IShare::TYPE_LINK);
-				$share = $provider->getShareByToken($token);
-			}
-		} catch (ProviderException $e) {
-		} catch (ShareNotFound $e) {
-		}
-
-
-		// If it is not a link share try to fetch a federated share by token
-		if ($share === null) {
-			try {
-				$provider = $this->factory->getProviderForType(IShare::TYPE_REMOTE);
-				$share = $provider->getShareByToken($token);
-			} catch (ProviderException $e) {
-			} catch (ShareNotFound $e) {
-			}
-		}
-
-		// If it is not a link share try to fetch a mail share by token
-		if ($share === null && $this->shareProviderExists(IShare::TYPE_EMAIL)) {
-			try {
-				$provider = $this->factory->getProviderForType(IShare::TYPE_EMAIL);
-				$share = $provider->getShareByToken($token);
-			} catch (ProviderException $e) {
-			} catch (ShareNotFound $e) {
-			}
-		}
-
-		if ($share === null && $this->shareProviderExists(IShare::TYPE_CIRCLE)) {
-			try {
-				$provider = $this->factory->getProviderForType(IShare::TYPE_CIRCLE);
-				$share = $provider->getShareByToken($token);
-			} catch (ProviderException $e) {
-			} catch (ShareNotFound $e) {
-			}
-		}
-
-		if ($share === null && $this->shareProviderExists(IShare::TYPE_ROOM)) {
-			try {
-				$provider = $this->factory->getProviderForType(IShare::TYPE_ROOM);
-				$share = $provider->getShareByToken($token);
-			} catch (ProviderException $e) {
-			} catch (ShareNotFound $e) {
-			}
-		}
-
-		if ($share === null) {
-			throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
-		}
-
-		$this->checkShare($share);
-
-		/*
+        $shares2 = [];
+
+        while (true) {
+            $added = 0;
+            foreach ($shares as $share) {
+                if ($onlyValid) {
+                    try {
+                        $this->checkShare($share);
+                    } catch (ShareNotFound $e) {
+                        // Ignore since this basically means the share is deleted
+                        continue;
+                    }
+                }
+
+                $added++;
+                $shares2[] = $share;
+
+                if (count($shares2) === $limit) {
+                    break;
+                }
+            }
+
+            // If we did not fetch more shares than the limit then there are no more shares
+            if (count($shares) < $limit) {
+                break;
+            }
+
+            if (count($shares2) === $limit) {
+                break;
+            }
+
+            // If there was no limit on the select we are done
+            if ($limit === -1) {
+                break;
+            }
+
+            $offset += $added;
+
+            // Fetch again $limit shares
+            if ($path?->getMountPoint() instanceof IShareOwnerlessMount) {
+                // We already fetched all shares, so end here
+                $shares = [];
+            } else {
+                $shares = $provider->getSharesBy($userId, $shareType, $path, $reshares, $limit, $offset);
+            }
+
+            // No more shares means we are done
+            if (empty($shares)) {
+                break;
+            }
+        }
+
+        $shares = $shares2;
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWith($userId, $shareType, $node = null, $limit = 50, $offset = 0) {
+        try {
+            $provider = $this->factory->getProviderForType($shareType);
+        } catch (ProviderException $e) {
+            return [];
+        }
+
+        $shares = $provider->getSharedWith($userId, $shareType, $node, $limit, $offset);
+
+        // remove all shares which are already expired
+        foreach ($shares as $key => $share) {
+            try {
+                $this->checkShare($share);
+            } catch (ShareNotFound $e) {
+                unset($shares[$key]);
+            }
+        }
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDeletedSharedWith($userId, $shareType, $node = null, $limit = 50, $offset = 0) {
+        $shares = $this->getSharedWith($userId, $shareType, $node, $limit, $offset);
+
+        // Only get deleted shares
+        $shares = array_filter($shares, function (IShare $share) {
+            return $share->getPermissions() === 0;
+        });
+
+        // Only get shares where the owner still exists
+        $shares = array_filter($shares, function (IShare $share) {
+            return $this->userManager->userExists($share->getShareOwner());
+        });
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareById($id, $recipient = null, bool $onlyValid = true) {
+        if ($id === null) {
+            throw new ShareNotFound();
+        }
+
+        [$providerId, $id] = $this->splitFullId($id);
+
+        try {
+            $provider = $this->factory->getProvider($providerId);
+        } catch (ProviderException $e) {
+            throw new ShareNotFound();
+        }
+
+        $share = $provider->getShareById($id, $recipient);
+
+        if ($onlyValid) {
+            $this->checkShare($share);
+        }
+
+        return $share;
+    }
+
+    /**
+     * Get all the shares for a given path
+     *
+     * @param \OCP\Files\Node $path
+     * @param int $page
+     * @param int $perPage
+     *
+     * @return Share[]
+     */
+    public function getSharesByPath(\OCP\Files\Node $path, $page = 0, $perPage = 50) {
+        return [];
+    }
+
+    /**
+     * Get the share by token possible with password
+     *
+     * @param string $token
+     * @return IShare
+     *
+     * @throws ShareNotFound
+     */
+    public function getShareByToken($token) {
+        // tokens cannot be valid local user names
+        if ($this->userManager->userExists($token)) {
+            throw new ShareNotFound();
+        }
+        $share = null;
+        try {
+            if ($this->shareApiAllowLinks()) {
+                $provider = $this->factory->getProviderForType(IShare::TYPE_LINK);
+                $share = $provider->getShareByToken($token);
+            }
+        } catch (ProviderException $e) {
+        } catch (ShareNotFound $e) {
+        }
+
+
+        // If it is not a link share try to fetch a federated share by token
+        if ($share === null) {
+            try {
+                $provider = $this->factory->getProviderForType(IShare::TYPE_REMOTE);
+                $share = $provider->getShareByToken($token);
+            } catch (ProviderException $e) {
+            } catch (ShareNotFound $e) {
+            }
+        }
+
+        // If it is not a link share try to fetch a mail share by token
+        if ($share === null && $this->shareProviderExists(IShare::TYPE_EMAIL)) {
+            try {
+                $provider = $this->factory->getProviderForType(IShare::TYPE_EMAIL);
+                $share = $provider->getShareByToken($token);
+            } catch (ProviderException $e) {
+            } catch (ShareNotFound $e) {
+            }
+        }
+
+        if ($share === null && $this->shareProviderExists(IShare::TYPE_CIRCLE)) {
+            try {
+                $provider = $this->factory->getProviderForType(IShare::TYPE_CIRCLE);
+                $share = $provider->getShareByToken($token);
+            } catch (ProviderException $e) {
+            } catch (ShareNotFound $e) {
+            }
+        }
+
+        if ($share === null && $this->shareProviderExists(IShare::TYPE_ROOM)) {
+            try {
+                $provider = $this->factory->getProviderForType(IShare::TYPE_ROOM);
+                $share = $provider->getShareByToken($token);
+            } catch (ProviderException $e) {
+            } catch (ShareNotFound $e) {
+            }
+        }
+
+        if ($share === null) {
+            throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
+        }
+
+        $this->checkShare($share);
+
+        /*
 		 * Reduce the permissions for link or email shares if public upload is not enabled
 		 */
-		if (($share->getShareType() === IShare::TYPE_LINK || $share->getShareType() === IShare::TYPE_EMAIL)
-			&& $share->getNodeType() === 'folder' && !$this->shareApiLinkAllowPublicUpload()) {
-			$share->setPermissions($share->getPermissions() & ~(\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE));
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Check expire date and disabled owner
-	 *
-	 * @throws ShareNotFound
-	 */
-	protected function checkShare(IShare $share): void {
-		if ($share->isExpired()) {
-			$this->deleteShare($share);
-			throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
-		}
-		if ($this->config->getAppValue('files_sharing', 'hide_disabled_user_shares', 'no') === 'yes') {
-			$uids = array_unique([$share->getShareOwner(),$share->getSharedBy()]);
-			foreach ($uids as $uid) {
-				$user = $this->userManager->get($uid);
-				if ($user?->isEnabled() === false) {
-					throw new ShareNotFound($this->l->t('The requested share comes from a disabled user'));
-				}
-			}
-		}
-	}
-
-	/**
-	 * Verify the password of a public share
-	 *
-	 * @param IShare $share
-	 * @param ?string $password
-	 * @return bool
-	 */
-	public function checkPassword(IShare $share, $password) {
-
-		// if there is no password on the share object / passsword is null, there is nothing to check
-		if ($password === null || $share->getPassword() === null) {
-			return false;
-		}
-
-		// Makes sure password hasn't expired
-		$expirationTime = $share->getPasswordExpirationTime();
-		if ($expirationTime !== null && $expirationTime < new \DateTime()) {
-			return false;
-		}
-
-		$newHash = '';
-		if (!$this->hasher->verify($password, $share->getPassword(), $newHash)) {
-			return false;
-		}
-
-		if (!empty($newHash)) {
-			$share->setPassword($newHash);
-			$provider = $this->factory->getProviderForType($share->getShareType());
-			$provider->update($share);
-		}
-
-		return true;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function userDeleted($uid) {
-		$types = [IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_LINK, IShare::TYPE_REMOTE, IShare::TYPE_EMAIL];
-
-		foreach ($types as $type) {
-			try {
-				$provider = $this->factory->getProviderForType($type);
-			} catch (ProviderException $e) {
-				continue;
-			}
-			$provider->userDeleted($uid, $type);
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function groupDeleted($gid) {
-		foreach ([IShare::TYPE_GROUP, IShare::TYPE_REMOTE_GROUP] as $type) {
-			try {
-				$provider = $this->factory->getProviderForType($type);
-			} catch (ProviderException $e) {
-				continue;
-			}
-			$provider->groupDeleted($gid);
-		}
-
-		$excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
-		if ($excludedGroups === '') {
-			return;
-		}
-
-		$excludedGroups = json_decode($excludedGroups, true);
-		if (json_last_error() !== JSON_ERROR_NONE) {
-			return;
-		}
-
-		$excludedGroups = array_diff($excludedGroups, [$gid]);
-		$this->config->setAppValue('core', 'shareapi_exclude_groups_list', json_encode($excludedGroups));
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function userDeletedFromGroup($uid, $gid) {
-		foreach ([IShare::TYPE_GROUP, IShare::TYPE_REMOTE_GROUP] as $type) {
-			try {
-				$provider = $this->factory->getProviderForType($type);
-			} catch (ProviderException $e) {
-				continue;
-			}
-			$provider->userDeletedFromGroup($uid, $gid);
-		}
-	}
-
-	/**
-	 * Get access list to a path. This means
-	 * all the users that can access a given path.
-	 *
-	 * Consider:
-	 * -root
-	 * |-folder1 (23)
-	 *  |-folder2 (32)
-	 *   |-fileA (42)
-	 *
-	 * fileA is shared with user1 and user1@server1 and email1@maildomain1
-	 * folder2 is shared with group2 (user4 is a member of group2)
-	 * folder1 is shared with user2 (renamed to "folder (1)") and user2@server2
-	 *                        and email2@maildomain2
-	 *
-	 * Then the access list to '/folder1/folder2/fileA' with $currentAccess is:
-	 * [
-	 *  users  => [
-	 *      'user1' => ['node_id' => 42, 'node_path' => '/fileA'],
-	 *      'user4' => ['node_id' => 32, 'node_path' => '/folder2'],
-	 *      'user2' => ['node_id' => 23, 'node_path' => '/folder (1)'],
-	 *  ],
-	 *  remote => [
-	 *      'user1@server1' => ['node_id' => 42, 'token' => 'SeCr3t'],
-	 *      'user2@server2' => ['node_id' => 23, 'token' => 'FooBaR'],
-	 *  ],
-	 *  public => bool
-	 *  mail => [
-	 *      'email1@maildomain1' => ['node_id' => 42, 'token' => 'aBcDeFg'],
-	 *      'email2@maildomain2' => ['node_id' => 23, 'token' => 'hIjKlMn'],
-	 *  ]
-	 * ]
-	 *
-	 * The access list to '/folder1/folder2/fileA' **without** $currentAccess is:
-	 * [
-	 *  users  => ['user1', 'user2', 'user4'],
-	 *  remote => bool,
-	 *  public => bool
-	 *  mail => ['email1@maildomain1', 'email2@maildomain2']
-	 * ]
-	 *
-	 * This is required for encryption/activity
-	 *
-	 * @param \OCP\Files\Node $path
-	 * @param bool $recursive Should we check all parent folders as well
-	 * @param bool $currentAccess Ensure the recipient has access to the file (e.g. did not unshare it)
-	 * @return array
-	 */
-	public function getAccessList(\OCP\Files\Node $path, $recursive = true, $currentAccess = false) {
-		$owner = $path->getOwner();
-
-		if ($owner === null) {
-			return [];
-		}
-
-		$owner = $owner->getUID();
-
-		if ($currentAccess) {
-			$al = ['users' => [], 'remote' => [], 'public' => false, 'mail' => []];
-		} else {
-			$al = ['users' => [], 'remote' => false, 'public' => false, 'mail' => []];
-		}
-		if (!$this->userManager->userExists($owner)) {
-			return $al;
-		}
-
-		//Get node for the owner and correct the owner in case of external storage
-		$userFolder = $this->rootFolder->getUserFolder($owner);
-		if ($path->getId() !== $userFolder->getId() && !$userFolder->isSubNode($path)) {
-			$path = $userFolder->getFirstNodeById($path->getId());
-			if ($path === null || $path->getOwner() === null) {
-				return [];
-			}
-			$owner = $path->getOwner()->getUID();
-		}
-
-		$providers = $this->factory->getAllProviders();
-
-		/** @var Node[] $nodes */
-		$nodes = [];
-
-
-		if ($currentAccess) {
-			$ownerPath = $path->getPath();
-			$ownerPath = explode('/', $ownerPath, 4);
-			if (count($ownerPath) < 4) {
-				$ownerPath = '';
-			} else {
-				$ownerPath = $ownerPath[3];
-			}
-			$al['users'][$owner] = [
-				'node_id' => $path->getId(),
-				'node_path' => '/' . $ownerPath,
-			];
-		} else {
-			$al['users'][] = $owner;
-		}
-
-		// Collect all the shares
-		while ($path->getPath() !== $userFolder->getPath()) {
-			$nodes[] = $path;
-			if (!$recursive) {
-				break;
-			}
-			$path = $path->getParent();
-		}
-
-		foreach ($providers as $provider) {
-			$tmp = $provider->getAccessList($nodes, $currentAccess);
-
-			foreach ($tmp as $k => $v) {
-				if (isset($al[$k])) {
-					if (is_array($al[$k])) {
-						if ($currentAccess) {
-							$al[$k] += $v;
-						} else {
-							$al[$k] = array_merge($al[$k], $v);
-							$al[$k] = array_unique($al[$k]);
-							$al[$k] = array_values($al[$k]);
-						}
-					} else {
-						$al[$k] = $al[$k] || $v;
-					}
-				} else {
-					$al[$k] = $v;
-				}
-			}
-		}
-
-		return $al;
-	}
-
-	/**
-	 * Create a new share
-	 *
-	 * @return IShare
-	 */
-	public function newShare() {
-		return new \OC\Share20\Share($this->rootFolder, $this->userManager);
-	}
-
-	/**
-	 * Is the share API enabled
-	 *
-	 * @return bool
-	 */
-	public function shareApiEnabled() {
-		return $this->config->getAppValue('core', 'shareapi_enabled', 'yes') === 'yes';
-	}
-
-	/**
-	 * Is public link sharing enabled
-	 *
-	 * @return bool
-	 */
-	public function shareApiAllowLinks() {
-		if ($this->config->getAppValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
-			return false;
-		}
-
-		$user = $this->userSession->getUser();
-		if ($user) {
-			$excludedGroups = json_decode($this->config->getAppValue('core', 'shareapi_allow_links_exclude_groups', '[]'));
-			if ($excludedGroups) {
-				$userGroups = $this->groupManager->getUserGroupIds($user);
-				return !(bool)array_intersect($excludedGroups, $userGroups);
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Is password on public link requires
-	 *
-	 * @param bool Check group membership exclusion
-	 * @return bool
-	 */
-	public function shareApiLinkEnforcePassword(bool $checkGroupMembership = true) {
-		$excludedGroups = $this->config->getAppValue('core', 'shareapi_enforce_links_password_excluded_groups', '');
-		if ($excludedGroups !== '' && $checkGroupMembership) {
-			$excludedGroups = json_decode($excludedGroups);
-			$user = $this->userSession->getUser();
-			if ($user) {
-				$userGroups = $this->groupManager->getUserGroupIds($user);
-				if ((bool)array_intersect($excludedGroups, $userGroups)) {
-					return false;
-				}
-			}
-		}
-		return $this->appConfig->getValueBool('core', ConfigLexicon::SHARE_LINK_PASSWORD_ENFORCED);
-	}
-
-	/**
-	 * Is default link expire date enabled
-	 *
-	 * @return bool
-	 */
-	public function shareApiLinkDefaultExpireDate() {
-		return $this->config->getAppValue('core', 'shareapi_default_expire_date', 'no') === 'yes';
-	}
-
-	/**
-	 * Is default link expire date enforced
-	 *`
-	 *
-	 * @return bool
-	 */
-	public function shareApiLinkDefaultExpireDateEnforced() {
-		return $this->shareApiLinkDefaultExpireDate()
-			&& $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no') === 'yes';
-	}
-
-
-	/**
-	 * Number of default link expire days
-	 *
-	 * @return int
-	 */
-	public function shareApiLinkDefaultExpireDays() {
-		return (int)$this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
-	}
-
-	/**
-	 * Is default internal expire date enabled
-	 *
-	 * @return bool
-	 */
-	public function shareApiInternalDefaultExpireDate(): bool {
-		return $this->config->getAppValue('core', 'shareapi_default_internal_expire_date', 'no') === 'yes';
-	}
-
-	/**
-	 * Is default remote expire date enabled
-	 *
-	 * @return bool
-	 */
-	public function shareApiRemoteDefaultExpireDate(): bool {
-		return $this->config->getAppValue('core', 'shareapi_default_remote_expire_date', 'no') === 'yes';
-	}
-
-	/**
-	 * Is default expire date enforced
-	 *
-	 * @return bool
-	 */
-	public function shareApiInternalDefaultExpireDateEnforced(): bool {
-		return $this->shareApiInternalDefaultExpireDate()
-			&& $this->config->getAppValue('core', 'shareapi_enforce_internal_expire_date', 'no') === 'yes';
-	}
-
-	/**
-	 * Is default expire date enforced for remote shares
-	 *
-	 * @return bool
-	 */
-	public function shareApiRemoteDefaultExpireDateEnforced(): bool {
-		return $this->shareApiRemoteDefaultExpireDate()
-			&& $this->config->getAppValue('core', 'shareapi_enforce_remote_expire_date', 'no') === 'yes';
-	}
-
-	/**
-	 * Number of default expire days
-	 *
-	 * @return int
-	 */
-	public function shareApiInternalDefaultExpireDays(): int {
-		return (int)$this->config->getAppValue('core', 'shareapi_internal_expire_after_n_days', '7');
-	}
-
-	/**
-	 * Number of default expire days for remote shares
-	 *
-	 * @return int
-	 */
-	public function shareApiRemoteDefaultExpireDays(): int {
-		return (int)$this->config->getAppValue('core', 'shareapi_remote_expire_after_n_days', '7');
-	}
-
-	/**
-	 * Allow public upload on link shares
-	 *
-	 * @return bool
-	 */
-	public function shareApiLinkAllowPublicUpload() {
-		return $this->config->getAppValue('core', 'shareapi_allow_public_upload', 'yes') === 'yes';
-	}
-
-	/**
-	 * check if user can only share with group members
-	 *
-	 * @return bool
-	 */
-	public function shareWithGroupMembersOnly() {
-		return $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
-	}
-
-	/**
-	 * If shareWithGroupMembersOnly is enabled, return an optional
-	 * list of groups that must be excluded from the principle of
-	 * belonging to the same group.
-	 *
-	 * @return array
-	 */
-	public function shareWithGroupMembersOnlyExcludeGroupsList() {
-		if (!$this->shareWithGroupMembersOnly()) {
-			return [];
-		}
-		$excludeGroups = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members_exclude_group_list', '');
-		return json_decode($excludeGroups, true) ?? [];
-	}
-
-	/**
-	 * Check if users can share with groups
-	 *
-	 * @return bool
-	 */
-	public function allowGroupSharing() {
-		return $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'yes';
-	}
-
-	public function allowEnumeration(): bool {
-		return $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-	}
-
-	public function limitEnumerationToGroups(): bool {
-		return $this->allowEnumeration()
-			&& $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
-	}
-
-	public function limitEnumerationToPhone(): bool {
-		return $this->allowEnumeration()
-			&& $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_phone', 'no') === 'yes';
-	}
-
-	public function allowEnumerationFullMatch(): bool {
-		return $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match', 'yes') === 'yes';
-	}
-
-	public function matchEmail(): bool {
-		return $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes') === 'yes';
-	}
-
-	public function ignoreSecondDisplayName(): bool {
-		return $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no') === 'yes';
-	}
-
-	public function allowCustomTokens(): bool {
-		return $this->appConfig->getValueBool('core', ConfigLexicon::SHARE_CUSTOM_TOKEN);
-	}
-
-	public function allowViewWithoutDownload(): bool {
-		return $this->appConfig->getValueBool('core', 'shareapi_allow_view_without_download', true);
-	}
-
-	public function currentUserCanEnumerateTargetUser(?IUser $currentUser, IUser $targetUser): bool {
-		if ($this->allowEnumerationFullMatch()) {
-			return true;
-		}
-
-		if (!$this->allowEnumeration()) {
-			return false;
-		}
-
-		if (!$this->limitEnumerationToPhone() && !$this->limitEnumerationToGroups()) {
-			// Enumeration is enabled and not restricted: OK
-			return true;
-		}
-
-		if (!$currentUser instanceof IUser) {
-			// Enumeration restrictions require an account
-			return false;
-		}
-
-		// Enumeration is limited to phone match
-		if ($this->limitEnumerationToPhone() && $this->knownUserService->isKnownToUser($currentUser->getUID(), $targetUser->getUID())) {
-			return true;
-		}
-
-		// Enumeration is limited to groups
-		if ($this->limitEnumerationToGroups()) {
-			$currentUserGroupIds = $this->groupManager->getUserGroupIds($currentUser);
-			$targetUserGroupIds = $this->groupManager->getUserGroupIds($targetUser);
-			if (!empty(array_intersect($currentUserGroupIds, $targetUserGroupIds))) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Check if sharing is disabled for the current user
-	 */
-	public function sharingDisabledForUser(?string $userId): bool {
-		return $this->shareDisableChecker->sharingDisabledForUser($userId);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function outgoingServer2ServerSharesAllowed() {
-		return $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'yes';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function outgoingServer2ServerGroupSharesAllowed() {
-		return $this->config->getAppValue('files_sharing', 'outgoing_server2server_group_share_enabled', 'no') === 'yes';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function shareProviderExists($shareType) {
-		try {
-			$this->factory->getProviderForType($shareType);
-		} catch (ProviderException $e) {
-			return false;
-		}
-
-		return true;
-	}
-
-	public function registerShareProvider(string $shareProviderClass): void {
-		$this->factory->registerProvider($shareProviderClass);
-	}
-
-	public function getAllShares(): iterable {
-		$providers = $this->factory->getAllProviders();
-
-		foreach ($providers as $provider) {
-			yield from $provider->getAllShares();
-		}
-	}
-
-	public function generateToken(): string {
-		// Initial token length
-		$tokenLength = \OC\Share\Helper::getTokenLength();
-
-		do {
-			$tokenExists = false;
-
-			for ($i = 0; $i <= 2; $i++) {
-				// Generate a new token
-				$token = $this->secureRandom->generate(
-					$tokenLength,
-					ISecureRandom::CHAR_HUMAN_READABLE,
-				);
-
-				try {
-					// Try to fetch a share with the generated token
-					$this->getShareByToken($token);
-					$tokenExists = true; // Token exists, we need to try again
-				} catch (ShareNotFound $e) {
-					// Token is unique, exit the loop
-					$tokenExists = false;
-					break;
-				}
-			}
-
-			// If we've reached the maximum attempts and the token still exists, increase the token length
-			if ($tokenExists) {
-				$tokenLength++;
-
-				// Check if the token length exceeds the maximum allowed length
-				if ($tokenLength > \OC\Share\Constants::MAX_TOKEN_LENGTH) {
-					throw new ShareTokenException('Unable to generate a unique share token. Maximum token length exceeded.');
-				}
-			}
-		} while ($tokenExists);
-
-		return $token;
-	}
+        if (($share->getShareType() === IShare::TYPE_LINK || $share->getShareType() === IShare::TYPE_EMAIL)
+            && $share->getNodeType() === 'folder' && !$this->shareApiLinkAllowPublicUpload()) {
+            $share->setPermissions($share->getPermissions() & ~(\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE));
+        }
+
+        return $share;
+    }
+
+    /**
+     * Check expire date and disabled owner
+     *
+     * @throws ShareNotFound
+     */
+    protected function checkShare(IShare $share): void {
+        if ($share->isExpired()) {
+            $this->deleteShare($share);
+            throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
+        }
+        if ($this->config->getAppValue('files_sharing', 'hide_disabled_user_shares', 'no') === 'yes') {
+            $uids = array_unique([$share->getShareOwner(),$share->getSharedBy()]);
+            foreach ($uids as $uid) {
+                $user = $this->userManager->get($uid);
+                if ($user?->isEnabled() === false) {
+                    throw new ShareNotFound($this->l->t('The requested share comes from a disabled user'));
+                }
+            }
+        }
+    }
+
+    /**
+     * Verify the password of a public share
+     *
+     * @param IShare $share
+     * @param ?string $password
+     * @return bool
+     */
+    public function checkPassword(IShare $share, $password) {
+
+        // if there is no password on the share object / passsword is null, there is nothing to check
+        if ($password === null || $share->getPassword() === null) {
+            return false;
+        }
+
+        // Makes sure password hasn't expired
+        $expirationTime = $share->getPasswordExpirationTime();
+        if ($expirationTime !== null && $expirationTime < new \DateTime()) {
+            return false;
+        }
+
+        $newHash = '';
+        if (!$this->hasher->verify($password, $share->getPassword(), $newHash)) {
+            return false;
+        }
+
+        if (!empty($newHash)) {
+            $share->setPassword($newHash);
+            $provider = $this->factory->getProviderForType($share->getShareType());
+            $provider->update($share);
+        }
+
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function userDeleted($uid) {
+        $types = [IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_LINK, IShare::TYPE_REMOTE, IShare::TYPE_EMAIL];
+
+        foreach ($types as $type) {
+            try {
+                $provider = $this->factory->getProviderForType($type);
+            } catch (ProviderException $e) {
+                continue;
+            }
+            $provider->userDeleted($uid, $type);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function groupDeleted($gid) {
+        foreach ([IShare::TYPE_GROUP, IShare::TYPE_REMOTE_GROUP] as $type) {
+            try {
+                $provider = $this->factory->getProviderForType($type);
+            } catch (ProviderException $e) {
+                continue;
+            }
+            $provider->groupDeleted($gid);
+        }
+
+        $excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
+        if ($excludedGroups === '') {
+            return;
+        }
+
+        $excludedGroups = json_decode($excludedGroups, true);
+        if (json_last_error() !== JSON_ERROR_NONE) {
+            return;
+        }
+
+        $excludedGroups = array_diff($excludedGroups, [$gid]);
+        $this->config->setAppValue('core', 'shareapi_exclude_groups_list', json_encode($excludedGroups));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function userDeletedFromGroup($uid, $gid) {
+        foreach ([IShare::TYPE_GROUP, IShare::TYPE_REMOTE_GROUP] as $type) {
+            try {
+                $provider = $this->factory->getProviderForType($type);
+            } catch (ProviderException $e) {
+                continue;
+            }
+            $provider->userDeletedFromGroup($uid, $gid);
+        }
+    }
+
+    /**
+     * Get access list to a path. This means
+     * all the users that can access a given path.
+     *
+     * Consider:
+     * -root
+     * |-folder1 (23)
+     *  |-folder2 (32)
+     *   |-fileA (42)
+     *
+     * fileA is shared with user1 and user1@server1 and email1@maildomain1
+     * folder2 is shared with group2 (user4 is a member of group2)
+     * folder1 is shared with user2 (renamed to "folder (1)") and user2@server2
+     *                        and email2@maildomain2
+     *
+     * Then the access list to '/folder1/folder2/fileA' with $currentAccess is:
+     * [
+     *  users  => [
+     *      'user1' => ['node_id' => 42, 'node_path' => '/fileA'],
+     *      'user4' => ['node_id' => 32, 'node_path' => '/folder2'],
+     *      'user2' => ['node_id' => 23, 'node_path' => '/folder (1)'],
+     *  ],
+     *  remote => [
+     *      'user1@server1' => ['node_id' => 42, 'token' => 'SeCr3t'],
+     *      'user2@server2' => ['node_id' => 23, 'token' => 'FooBaR'],
+     *  ],
+     *  public => bool
+     *  mail => [
+     *      'email1@maildomain1' => ['node_id' => 42, 'token' => 'aBcDeFg'],
+     *      'email2@maildomain2' => ['node_id' => 23, 'token' => 'hIjKlMn'],
+     *  ]
+     * ]
+     *
+     * The access list to '/folder1/folder2/fileA' **without** $currentAccess is:
+     * [
+     *  users  => ['user1', 'user2', 'user4'],
+     *  remote => bool,
+     *  public => bool
+     *  mail => ['email1@maildomain1', 'email2@maildomain2']
+     * ]
+     *
+     * This is required for encryption/activity
+     *
+     * @param \OCP\Files\Node $path
+     * @param bool $recursive Should we check all parent folders as well
+     * @param bool $currentAccess Ensure the recipient has access to the file (e.g. did not unshare it)
+     * @return array
+     */
+    public function getAccessList(\OCP\Files\Node $path, $recursive = true, $currentAccess = false) {
+        $owner = $path->getOwner();
+
+        if ($owner === null) {
+            return [];
+        }
+
+        $owner = $owner->getUID();
+
+        if ($currentAccess) {
+            $al = ['users' => [], 'remote' => [], 'public' => false, 'mail' => []];
+        } else {
+            $al = ['users' => [], 'remote' => false, 'public' => false, 'mail' => []];
+        }
+        if (!$this->userManager->userExists($owner)) {
+            return $al;
+        }
+
+        //Get node for the owner and correct the owner in case of external storage
+        $userFolder = $this->rootFolder->getUserFolder($owner);
+        if ($path->getId() !== $userFolder->getId() && !$userFolder->isSubNode($path)) {
+            $path = $userFolder->getFirstNodeById($path->getId());
+            if ($path === null || $path->getOwner() === null) {
+                return [];
+            }
+            $owner = $path->getOwner()->getUID();
+        }
+
+        $providers = $this->factory->getAllProviders();
+
+        /** @var Node[] $nodes */
+        $nodes = [];
+
+
+        if ($currentAccess) {
+            $ownerPath = $path->getPath();
+            $ownerPath = explode('/', $ownerPath, 4);
+            if (count($ownerPath) < 4) {
+                $ownerPath = '';
+            } else {
+                $ownerPath = $ownerPath[3];
+            }
+            $al['users'][$owner] = [
+                'node_id' => $path->getId(),
+                'node_path' => '/' . $ownerPath,
+            ];
+        } else {
+            $al['users'][] = $owner;
+        }
+
+        // Collect all the shares
+        while ($path->getPath() !== $userFolder->getPath()) {
+            $nodes[] = $path;
+            if (!$recursive) {
+                break;
+            }
+            $path = $path->getParent();
+        }
+
+        foreach ($providers as $provider) {
+            $tmp = $provider->getAccessList($nodes, $currentAccess);
+
+            foreach ($tmp as $k => $v) {
+                if (isset($al[$k])) {
+                    if (is_array($al[$k])) {
+                        if ($currentAccess) {
+                            $al[$k] += $v;
+                        } else {
+                            $al[$k] = array_merge($al[$k], $v);
+                            $al[$k] = array_unique($al[$k]);
+                            $al[$k] = array_values($al[$k]);
+                        }
+                    } else {
+                        $al[$k] = $al[$k] || $v;
+                    }
+                } else {
+                    $al[$k] = $v;
+                }
+            }
+        }
+
+        return $al;
+    }
+
+    /**
+     * Create a new share
+     *
+     * @return IShare
+     */
+    public function newShare() {
+        return new \OC\Share20\Share($this->rootFolder, $this->userManager);
+    }
+
+    /**
+     * Is the share API enabled
+     *
+     * @return bool
+     */
+    public function shareApiEnabled() {
+        return $this->config->getAppValue('core', 'shareapi_enabled', 'yes') === 'yes';
+    }
+
+    /**
+     * Is public link sharing enabled
+     *
+     * @return bool
+     */
+    public function shareApiAllowLinks() {
+        if ($this->config->getAppValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
+            return false;
+        }
+
+        $user = $this->userSession->getUser();
+        if ($user) {
+            $excludedGroups = json_decode($this->config->getAppValue('core', 'shareapi_allow_links_exclude_groups', '[]'));
+            if ($excludedGroups) {
+                $userGroups = $this->groupManager->getUserGroupIds($user);
+                return !(bool)array_intersect($excludedGroups, $userGroups);
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Is password on public link requires
+     *
+     * @param bool Check group membership exclusion
+     * @return bool
+     */
+    public function shareApiLinkEnforcePassword(bool $checkGroupMembership = true) {
+        $excludedGroups = $this->config->getAppValue('core', 'shareapi_enforce_links_password_excluded_groups', '');
+        if ($excludedGroups !== '' && $checkGroupMembership) {
+            $excludedGroups = json_decode($excludedGroups);
+            $user = $this->userSession->getUser();
+            if ($user) {
+                $userGroups = $this->groupManager->getUserGroupIds($user);
+                if ((bool)array_intersect($excludedGroups, $userGroups)) {
+                    return false;
+                }
+            }
+        }
+        return $this->appConfig->getValueBool('core', ConfigLexicon::SHARE_LINK_PASSWORD_ENFORCED);
+    }
+
+    /**
+     * Is default link expire date enabled
+     *
+     * @return bool
+     */
+    public function shareApiLinkDefaultExpireDate() {
+        return $this->config->getAppValue('core', 'shareapi_default_expire_date', 'no') === 'yes';
+    }
+
+    /**
+     * Is default link expire date enforced
+     *`
+     *
+     * @return bool
+     */
+    public function shareApiLinkDefaultExpireDateEnforced() {
+        return $this->shareApiLinkDefaultExpireDate()
+            && $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no') === 'yes';
+    }
+
+
+    /**
+     * Number of default link expire days
+     *
+     * @return int
+     */
+    public function shareApiLinkDefaultExpireDays() {
+        return (int)$this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
+    }
+
+    /**
+     * Is default internal expire date enabled
+     *
+     * @return bool
+     */
+    public function shareApiInternalDefaultExpireDate(): bool {
+        return $this->config->getAppValue('core', 'shareapi_default_internal_expire_date', 'no') === 'yes';
+    }
+
+    /**
+     * Is default remote expire date enabled
+     *
+     * @return bool
+     */
+    public function shareApiRemoteDefaultExpireDate(): bool {
+        return $this->config->getAppValue('core', 'shareapi_default_remote_expire_date', 'no') === 'yes';
+    }
+
+    /**
+     * Is default expire date enforced
+     *
+     * @return bool
+     */
+    public function shareApiInternalDefaultExpireDateEnforced(): bool {
+        return $this->shareApiInternalDefaultExpireDate()
+            && $this->config->getAppValue('core', 'shareapi_enforce_internal_expire_date', 'no') === 'yes';
+    }
+
+    /**
+     * Is default expire date enforced for remote shares
+     *
+     * @return bool
+     */
+    public function shareApiRemoteDefaultExpireDateEnforced(): bool {
+        return $this->shareApiRemoteDefaultExpireDate()
+            && $this->config->getAppValue('core', 'shareapi_enforce_remote_expire_date', 'no') === 'yes';
+    }
+
+    /**
+     * Number of default expire days
+     *
+     * @return int
+     */
+    public function shareApiInternalDefaultExpireDays(): int {
+        return (int)$this->config->getAppValue('core', 'shareapi_internal_expire_after_n_days', '7');
+    }
+
+    /**
+     * Number of default expire days for remote shares
+     *
+     * @return int
+     */
+    public function shareApiRemoteDefaultExpireDays(): int {
+        return (int)$this->config->getAppValue('core', 'shareapi_remote_expire_after_n_days', '7');
+    }
+
+    /**
+     * Allow public upload on link shares
+     *
+     * @return bool
+     */
+    public function shareApiLinkAllowPublicUpload() {
+        return $this->config->getAppValue('core', 'shareapi_allow_public_upload', 'yes') === 'yes';
+    }
+
+    /**
+     * check if user can only share with group members
+     *
+     * @return bool
+     */
+    public function shareWithGroupMembersOnly() {
+        return $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+    }
+
+    /**
+     * If shareWithGroupMembersOnly is enabled, return an optional
+     * list of groups that must be excluded from the principle of
+     * belonging to the same group.
+     *
+     * @return array
+     */
+    public function shareWithGroupMembersOnlyExcludeGroupsList() {
+        if (!$this->shareWithGroupMembersOnly()) {
+            return [];
+        }
+        $excludeGroups = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members_exclude_group_list', '');
+        return json_decode($excludeGroups, true) ?? [];
+    }
+
+    /**
+     * Check if users can share with groups
+     *
+     * @return bool
+     */
+    public function allowGroupSharing() {
+        return $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'yes';
+    }
+
+    public function allowEnumeration(): bool {
+        return $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+    }
+
+    public function limitEnumerationToGroups(): bool {
+        return $this->allowEnumeration()
+            && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
+    }
+
+    public function limitEnumerationToPhone(): bool {
+        return $this->allowEnumeration()
+            && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_phone', 'no') === 'yes';
+    }
+
+    public function allowEnumerationFullMatch(): bool {
+        return $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match', 'yes') === 'yes';
+    }
+
+    public function matchEmail(): bool {
+        return $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes') === 'yes';
+    }
+
+    public function ignoreSecondDisplayName(): bool {
+        return $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no') === 'yes';
+    }
+
+    public function allowCustomTokens(): bool {
+        return $this->appConfig->getValueBool('core', ConfigLexicon::SHARE_CUSTOM_TOKEN);
+    }
+
+    public function allowViewWithoutDownload(): bool {
+        return $this->appConfig->getValueBool('core', 'shareapi_allow_view_without_download', true);
+    }
+
+    public function currentUserCanEnumerateTargetUser(?IUser $currentUser, IUser $targetUser): bool {
+        if ($this->allowEnumerationFullMatch()) {
+            return true;
+        }
+
+        if (!$this->allowEnumeration()) {
+            return false;
+        }
+
+        if (!$this->limitEnumerationToPhone() && !$this->limitEnumerationToGroups()) {
+            // Enumeration is enabled and not restricted: OK
+            return true;
+        }
+
+        if (!$currentUser instanceof IUser) {
+            // Enumeration restrictions require an account
+            return false;
+        }
+
+        // Enumeration is limited to phone match
+        if ($this->limitEnumerationToPhone() && $this->knownUserService->isKnownToUser($currentUser->getUID(), $targetUser->getUID())) {
+            return true;
+        }
+
+        // Enumeration is limited to groups
+        if ($this->limitEnumerationToGroups()) {
+            $currentUserGroupIds = $this->groupManager->getUserGroupIds($currentUser);
+            $targetUserGroupIds = $this->groupManager->getUserGroupIds($targetUser);
+            if (!empty(array_intersect($currentUserGroupIds, $targetUserGroupIds))) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if sharing is disabled for the current user
+     */
+    public function sharingDisabledForUser(?string $userId): bool {
+        return $this->shareDisableChecker->sharingDisabledForUser($userId);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function outgoingServer2ServerSharesAllowed() {
+        return $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'yes';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function outgoingServer2ServerGroupSharesAllowed() {
+        return $this->config->getAppValue('files_sharing', 'outgoing_server2server_group_share_enabled', 'no') === 'yes';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function shareProviderExists($shareType) {
+        try {
+            $this->factory->getProviderForType($shareType);
+        } catch (ProviderException $e) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function registerShareProvider(string $shareProviderClass): void {
+        $this->factory->registerProvider($shareProviderClass);
+    }
+
+    public function getAllShares(): iterable {
+        $providers = $this->factory->getAllProviders();
+
+        foreach ($providers as $provider) {
+            yield from $provider->getAllShares();
+        }
+    }
+
+    public function generateToken(): string {
+        // Initial token length
+        $tokenLength = \OC\Share\Helper::getTokenLength();
+
+        do {
+            $tokenExists = false;
+
+            for ($i = 0; $i <= 2; $i++) {
+                // Generate a new token
+                $token = $this->secureRandom->generate(
+                    $tokenLength,
+                    ISecureRandom::CHAR_HUMAN_READABLE,
+                );
+
+                try {
+                    // Try to fetch a share with the generated token
+                    $this->getShareByToken($token);
+                    $tokenExists = true; // Token exists, we need to try again
+                } catch (ShareNotFound $e) {
+                    // Token is unique, exit the loop
+                    $tokenExists = false;
+                    break;
+                }
+            }
+
+            // If we've reached the maximum attempts and the token still exists, increase the token length
+            if ($tokenExists) {
+                $tokenLength++;
+
+                // Check if the token length exceeds the maximum allowed length
+                if ($tokenLength > \OC\Share\Constants::MAX_TOKEN_LENGTH) {
+                    throw new ShareTokenException('Unable to generate a unique share token. Maximum token length exceeded.');
+                }
+            }
+        } while ($tokenExists);
+
+        return $token;
+    }
 }

lib/private/Template/JSConfigHelper.php

Indentation +241 added lines, -241 removed lines

@@ -41,270 +41,270 @@
 
 class JSConfigHelper {
 
-	/** @var array user back-ends excluded from password verification */
-	private $excludedUserBackEnds = ['user_saml' => true, 'user_globalsiteselector' => true];
+    /** @var array user back-ends excluded from password verification */
+    private $excludedUserBackEnds = ['user_saml' => true, 'user_globalsiteselector' => true];
 
-	public function __construct(
-		protected ServerVersion $serverVersion,
-		protected IL10N $l,
-		protected Defaults $defaults,
-		protected IAppManager $appManager,
-		protected ISession $session,
-		protected ?IUser $currentUser,
-		protected IConfig $config,
-		protected readonly IAppConfig $appConfig,
-		protected IGroupManager $groupManager,
-		protected IniGetWrapper $iniWrapper,
-		protected IURLGenerator $urlGenerator,
-		protected CapabilitiesManager $capabilitiesManager,
-		protected IInitialStateService $initialStateService,
-		protected IProvider $tokenProvider,
-		protected FilenameValidator $filenameValidator,
-	) {
-	}
+    public function __construct(
+        protected ServerVersion $serverVersion,
+        protected IL10N $l,
+        protected Defaults $defaults,
+        protected IAppManager $appManager,
+        protected ISession $session,
+        protected ?IUser $currentUser,
+        protected IConfig $config,
+        protected readonly IAppConfig $appConfig,
+        protected IGroupManager $groupManager,
+        protected IniGetWrapper $iniWrapper,
+        protected IURLGenerator $urlGenerator,
+        protected CapabilitiesManager $capabilitiesManager,
+        protected IInitialStateService $initialStateService,
+        protected IProvider $tokenProvider,
+        protected FilenameValidator $filenameValidator,
+    ) {
+    }
 
-	public function getConfig(): string {
-		$userBackendAllowsPasswordConfirmation = true;
-		if ($this->currentUser !== null) {
-			$uid = $this->currentUser->getUID();
+    public function getConfig(): string {
+        $userBackendAllowsPasswordConfirmation = true;
+        if ($this->currentUser !== null) {
+            $uid = $this->currentUser->getUID();
 
-			$backend = $this->currentUser->getBackend();
-			if ($backend instanceof IPasswordConfirmationBackend) {
-				$userBackendAllowsPasswordConfirmation = $backend->canConfirmPassword($uid) && $this->canUserValidatePassword();
-			} elseif (isset($this->excludedUserBackEnds[$this->currentUser->getBackendClassName()])) {
-				$userBackendAllowsPasswordConfirmation = false;
-			} else {
-				$userBackendAllowsPasswordConfirmation = $this->canUserValidatePassword();
-			}
-		} else {
-			$uid = null;
-		}
+            $backend = $this->currentUser->getBackend();
+            if ($backend instanceof IPasswordConfirmationBackend) {
+                $userBackendAllowsPasswordConfirmation = $backend->canConfirmPassword($uid) && $this->canUserValidatePassword();
+            } elseif (isset($this->excludedUserBackEnds[$this->currentUser->getBackendClassName()])) {
+                $userBackendAllowsPasswordConfirmation = false;
+            } else {
+                $userBackendAllowsPasswordConfirmation = $this->canUserValidatePassword();
+            }
+        } else {
+            $uid = null;
+        }
 
-		// Get the config
-		$apps_paths = [];
+        // Get the config
+        $apps_paths = [];
 
-		if ($this->currentUser === null) {
-			$apps = $this->appManager->getEnabledApps();
-		} else {
-			$apps = $this->appManager->getEnabledAppsForUser($this->currentUser);
-		}
+        if ($this->currentUser === null) {
+            $apps = $this->appManager->getEnabledApps();
+        } else {
+            $apps = $this->appManager->getEnabledAppsForUser($this->currentUser);
+        }
 
-		foreach ($apps as $app) {
-			try {
-				$apps_paths[$app] = $this->appManager->getAppWebPath($app);
-			} catch (AppPathNotFoundException $e) {
-				$apps_paths[$app] = false;
-			}
-		}
+        foreach ($apps as $app) {
+            try {
+                $apps_paths[$app] = $this->appManager->getAppWebPath($app);
+            } catch (AppPathNotFoundException $e) {
+                $apps_paths[$app] = false;
+            }
+        }
 
-		$enableLinkPasswordByDefault = $this->appConfig->getValueBool('core', ConfigLexicon::SHARE_LINK_PASSWORD_DEFAULT);
-		$defaultExpireDateEnabled = $this->config->getAppValue('core', 'shareapi_default_expire_date', 'no') === 'yes';
-		$defaultExpireDate = $enforceDefaultExpireDate = null;
-		if ($defaultExpireDateEnabled) {
-			$defaultExpireDate = (int)$this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
-			$enforceDefaultExpireDate = $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no') === 'yes';
-		}
-		$outgoingServer2serverShareEnabled = $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'yes';
+        $enableLinkPasswordByDefault = $this->appConfig->getValueBool('core', ConfigLexicon::SHARE_LINK_PASSWORD_DEFAULT);
+        $defaultExpireDateEnabled = $this->config->getAppValue('core', 'shareapi_default_expire_date', 'no') === 'yes';
+        $defaultExpireDate = $enforceDefaultExpireDate = null;
+        if ($defaultExpireDateEnabled) {
+            $defaultExpireDate = (int)$this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
+            $enforceDefaultExpireDate = $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no') === 'yes';
+        }
+        $outgoingServer2serverShareEnabled = $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'yes';
 
-		$defaultInternalExpireDateEnabled = $this->config->getAppValue('core', 'shareapi_default_internal_expire_date', 'no') === 'yes';
-		$defaultInternalExpireDate = $defaultInternalExpireDateEnforced = null;
-		if ($defaultInternalExpireDateEnabled) {
-			$defaultInternalExpireDate = (int)$this->config->getAppValue('core', 'shareapi_internal_expire_after_n_days', '7');
-			$defaultInternalExpireDateEnforced = $this->config->getAppValue('core', 'shareapi_enforce_internal_expire_date', 'no') === 'yes';
-		}
+        $defaultInternalExpireDateEnabled = $this->config->getAppValue('core', 'shareapi_default_internal_expire_date', 'no') === 'yes';
+        $defaultInternalExpireDate = $defaultInternalExpireDateEnforced = null;
+        if ($defaultInternalExpireDateEnabled) {
+            $defaultInternalExpireDate = (int)$this->config->getAppValue('core', 'shareapi_internal_expire_after_n_days', '7');
+            $defaultInternalExpireDateEnforced = $this->config->getAppValue('core', 'shareapi_enforce_internal_expire_date', 'no') === 'yes';
+        }
 
-		$defaultRemoteExpireDateEnabled = $this->config->getAppValue('core', 'shareapi_default_remote_expire_date', 'no') === 'yes';
-		$defaultRemoteExpireDate = $defaultRemoteExpireDateEnforced = null;
-		if ($defaultRemoteExpireDateEnabled) {
-			$defaultRemoteExpireDate = (int)$this->config->getAppValue('core', 'shareapi_remote_expire_after_n_days', '7');
-			$defaultRemoteExpireDateEnforced = $this->config->getAppValue('core', 'shareapi_enforce_remote_expire_date', 'no') === 'yes';
-		}
+        $defaultRemoteExpireDateEnabled = $this->config->getAppValue('core', 'shareapi_default_remote_expire_date', 'no') === 'yes';
+        $defaultRemoteExpireDate = $defaultRemoteExpireDateEnforced = null;
+        if ($defaultRemoteExpireDateEnabled) {
+            $defaultRemoteExpireDate = (int)$this->config->getAppValue('core', 'shareapi_remote_expire_after_n_days', '7');
+            $defaultRemoteExpireDateEnforced = $this->config->getAppValue('core', 'shareapi_enforce_remote_expire_date', 'no') === 'yes';
+        }
 
-		$countOfDataLocation = 0;
-		$dataLocation = str_replace(\OC::$SERVERROOT . '/', '', $this->config->getSystemValue('datadirectory', ''), $countOfDataLocation);
-		if ($countOfDataLocation !== 1 || $uid === null || !$this->groupManager->isAdmin($uid)) {
-			$dataLocation = false;
-		}
+        $countOfDataLocation = 0;
+        $dataLocation = str_replace(\OC::$SERVERROOT . '/', '', $this->config->getSystemValue('datadirectory', ''), $countOfDataLocation);
+        if ($countOfDataLocation !== 1 || $uid === null || !$this->groupManager->isAdmin($uid)) {
+            $dataLocation = false;
+        }
 
-		if ($this->currentUser instanceof IUser) {
-			if ($this->canUserValidatePassword()) {
-				$lastConfirmTimestamp = $this->session->get('last-password-confirm');
-				if (!is_int($lastConfirmTimestamp)) {
-					$lastConfirmTimestamp = 0;
-				}
-			} else {
-				$lastConfirmTimestamp = PHP_INT_MAX;
-			}
-		} else {
-			$lastConfirmTimestamp = 0;
-		}
+        if ($this->currentUser instanceof IUser) {
+            if ($this->canUserValidatePassword()) {
+                $lastConfirmTimestamp = $this->session->get('last-password-confirm');
+                if (!is_int($lastConfirmTimestamp)) {
+                    $lastConfirmTimestamp = 0;
+                }
+            } else {
+                $lastConfirmTimestamp = PHP_INT_MAX;
+            }
+        } else {
+            $lastConfirmTimestamp = 0;
+        }
 
-		$capabilities = $this->capabilitiesManager->getCapabilities(false, true);
+        $capabilities = $this->capabilitiesManager->getCapabilities(false, true);
 
-		$userFirstDay = $this->config->getUserValue($uid, 'core', AUserDataOCSController::USER_FIELD_FIRST_DAY_OF_WEEK, null);
-		$firstDay = (int)($userFirstDay ?? $this->l->l('firstday', null));
+        $userFirstDay = $this->config->getUserValue($uid, 'core', AUserDataOCSController::USER_FIELD_FIRST_DAY_OF_WEEK, null);
+        $firstDay = (int)($userFirstDay ?? $this->l->l('firstday', null));
 
-		$config = [
-			/** @deprecated 30.0.0 - use files capabilities instead */
-			'blacklist_files_regex' => FileInfo::BLACKLIST_FILES_REGEX,
-			/** @deprecated 30.0.0 - use files capabilities instead */
-			'forbidden_filename_characters' => $this->filenameValidator->getForbiddenCharacters(),
+        $config = [
+            /** @deprecated 30.0.0 - use files capabilities instead */
+            'blacklist_files_regex' => FileInfo::BLACKLIST_FILES_REGEX,
+            /** @deprecated 30.0.0 - use files capabilities instead */
+            'forbidden_filename_characters' => $this->filenameValidator->getForbiddenCharacters(),
 
-			'auto_logout' => $this->config->getSystemValue('auto_logout', false),
-			'loglevel' => $this->config->getSystemValue('loglevel_frontend',
-				$this->config->getSystemValue('loglevel', ILogger::WARN)
-			),
-			'lost_password_link' => $this->config->getSystemValue('lost_password_link', null),
-			'modRewriteWorking' => $this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true',
-			'no_unsupported_browser_warning' => $this->config->getSystemValue('no_unsupported_browser_warning', false),
-			'session_keepalive' => $this->config->getSystemValue('session_keepalive', true),
-			'session_lifetime' => min($this->config->getSystemValue('session_lifetime', $this->iniWrapper->getNumeric('session.gc_maxlifetime')), $this->iniWrapper->getNumeric('session.gc_maxlifetime')),
-			'sharing.maxAutocompleteResults' => max(0, $this->config->getSystemValueInt('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT)),
-			'sharing.minSearchStringLength' => $this->config->getSystemValueInt('sharing.minSearchStringLength', 0),
-			'version' => implode('.', $this->serverVersion->getVersion()),
-			'versionstring' => $this->serverVersion->getVersionString(),
-			'enable_non-accessible_features' => $this->config->getSystemValueBool('enable_non-accessible_features', true),
-		];
+            'auto_logout' => $this->config->getSystemValue('auto_logout', false),
+            'loglevel' => $this->config->getSystemValue('loglevel_frontend',
+                $this->config->getSystemValue('loglevel', ILogger::WARN)
+            ),
+            'lost_password_link' => $this->config->getSystemValue('lost_password_link', null),
+            'modRewriteWorking' => $this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true',
+            'no_unsupported_browser_warning' => $this->config->getSystemValue('no_unsupported_browser_warning', false),
+            'session_keepalive' => $this->config->getSystemValue('session_keepalive', true),
+            'session_lifetime' => min($this->config->getSystemValue('session_lifetime', $this->iniWrapper->getNumeric('session.gc_maxlifetime')), $this->iniWrapper->getNumeric('session.gc_maxlifetime')),
+            'sharing.maxAutocompleteResults' => max(0, $this->config->getSystemValueInt('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT)),
+            'sharing.minSearchStringLength' => $this->config->getSystemValueInt('sharing.minSearchStringLength', 0),
+            'version' => implode('.', $this->serverVersion->getVersion()),
+            'versionstring' => $this->serverVersion->getVersionString(),
+            'enable_non-accessible_features' => $this->config->getSystemValueBool('enable_non-accessible_features', true),
+        ];
 
-		$shareManager = Server::get(IShareManager::class);
+        $shareManager = Server::get(IShareManager::class);
 
-		$array = [
-			'_oc_debug' => $this->config->getSystemValue('debug', false) ? 'true' : 'false',
-			'_oc_isadmin' => $uid !== null && $this->groupManager->isAdmin($uid) ? 'true' : 'false',
-			'backendAllowsPasswordConfirmation' => $userBackendAllowsPasswordConfirmation ? 'true' : 'false',
-			'oc_dataURL' => is_string($dataLocation) ? '"' . $dataLocation . '"' : 'false',
-			'_oc_webroot' => '"' . \OC::$WEBROOT . '"',
-			'_oc_appswebroots' => str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution
-			'datepickerFormatDate' => json_encode($this->l->l('jsdate', null)),
-			'nc_lastLogin' => $lastConfirmTimestamp,
-			'nc_pageLoad' => time(),
-			'dayNames' => json_encode([
-				$this->l->t('Sunday'),
-				$this->l->t('Monday'),
-				$this->l->t('Tuesday'),
-				$this->l->t('Wednesday'),
-				$this->l->t('Thursday'),
-				$this->l->t('Friday'),
-				$this->l->t('Saturday')
-			]),
-			'dayNamesShort' => json_encode([
-				$this->l->t('Sun.'),
-				$this->l->t('Mon.'),
-				$this->l->t('Tue.'),
-				$this->l->t('Wed.'),
-				$this->l->t('Thu.'),
-				$this->l->t('Fri.'),
-				$this->l->t('Sat.')
-			]),
-			'dayNamesMin' => json_encode([
-				$this->l->t('Su'),
-				$this->l->t('Mo'),
-				$this->l->t('Tu'),
-				$this->l->t('We'),
-				$this->l->t('Th'),
-				$this->l->t('Fr'),
-				$this->l->t('Sa')
-			]),
-			'monthNames' => json_encode([
-				$this->l->t('January'),
-				$this->l->t('February'),
-				$this->l->t('March'),
-				$this->l->t('April'),
-				$this->l->t('May'),
-				$this->l->t('June'),
-				$this->l->t('July'),
-				$this->l->t('August'),
-				$this->l->t('September'),
-				$this->l->t('October'),
-				$this->l->t('November'),
-				$this->l->t('December')
-			]),
-			'monthNamesShort' => json_encode([
-				$this->l->t('Jan.'),
-				$this->l->t('Feb.'),
-				$this->l->t('Mar.'),
-				$this->l->t('Apr.'),
-				$this->l->t('May.'),
-				$this->l->t('Jun.'),
-				$this->l->t('Jul.'),
-				$this->l->t('Aug.'),
-				$this->l->t('Sep.'),
-				$this->l->t('Oct.'),
-				$this->l->t('Nov.'),
-				$this->l->t('Dec.')
-			]),
-			'firstDay' => json_encode($firstDay),
-			'_oc_config' => json_encode($config),
-			'oc_appconfig' => json_encode([
-				'core' => [
-					'defaultExpireDateEnabled' => $defaultExpireDateEnabled,
-					'defaultExpireDate' => $defaultExpireDate,
-					'defaultExpireDateEnforced' => $enforceDefaultExpireDate,
-					'enforcePasswordForPublicLink' => Util::isPublicLinkPasswordRequired(),
-					'enableLinkPasswordByDefault' => $enableLinkPasswordByDefault,
-					'sharingDisabledForUser' => $shareManager->sharingDisabledForUser($uid),
-					'resharingAllowed' => Share::isResharingAllowed(),
-					'remoteShareAllowed' => $outgoingServer2serverShareEnabled,
-					'federatedCloudShareDoc' => $this->urlGenerator->linkToDocs('user-sharing-federated'),
-					'allowGroupSharing' => $shareManager->allowGroupSharing(),
-					'defaultInternalExpireDateEnabled' => $defaultInternalExpireDateEnabled,
-					'defaultInternalExpireDate' => $defaultInternalExpireDate,
-					'defaultInternalExpireDateEnforced' => $defaultInternalExpireDateEnforced,
-					'defaultRemoteExpireDateEnabled' => $defaultRemoteExpireDateEnabled,
-					'defaultRemoteExpireDate' => $defaultRemoteExpireDate,
-					'defaultRemoteExpireDateEnforced' => $defaultRemoteExpireDateEnforced,
-				]
-			]),
-			'_theme' => json_encode([
-				'entity' => $this->defaults->getEntity(),
-				'name' => $this->defaults->getName(),
-				'productName' => $this->defaults->getProductName(),
-				'title' => $this->defaults->getTitle(),
-				'baseUrl' => $this->defaults->getBaseUrl(),
-				'syncClientUrl' => $this->defaults->getSyncClientUrl(),
-				'docBaseUrl' => $this->defaults->getDocBaseUrl(),
-				'docPlaceholderUrl' => $this->defaults->buildDocLinkToKey('PLACEHOLDER'),
-				'slogan' => $this->defaults->getSlogan(),
-				'logoClaim' => '',
-				'folder' => \OC_Util::getTheme(),
-			]),
-		];
+        $array = [
+            '_oc_debug' => $this->config->getSystemValue('debug', false) ? 'true' : 'false',
+            '_oc_isadmin' => $uid !== null && $this->groupManager->isAdmin($uid) ? 'true' : 'false',
+            'backendAllowsPasswordConfirmation' => $userBackendAllowsPasswordConfirmation ? 'true' : 'false',
+            'oc_dataURL' => is_string($dataLocation) ? '"' . $dataLocation . '"' : 'false',
+            '_oc_webroot' => '"' . \OC::$WEBROOT . '"',
+            '_oc_appswebroots' => str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution
+            'datepickerFormatDate' => json_encode($this->l->l('jsdate', null)),
+            'nc_lastLogin' => $lastConfirmTimestamp,
+            'nc_pageLoad' => time(),
+            'dayNames' => json_encode([
+                $this->l->t('Sunday'),
+                $this->l->t('Monday'),
+                $this->l->t('Tuesday'),
+                $this->l->t('Wednesday'),
+                $this->l->t('Thursday'),
+                $this->l->t('Friday'),
+                $this->l->t('Saturday')
+            ]),
+            'dayNamesShort' => json_encode([
+                $this->l->t('Sun.'),
+                $this->l->t('Mon.'),
+                $this->l->t('Tue.'),
+                $this->l->t('Wed.'),
+                $this->l->t('Thu.'),
+                $this->l->t('Fri.'),
+                $this->l->t('Sat.')
+            ]),
+            'dayNamesMin' => json_encode([
+                $this->l->t('Su'),
+                $this->l->t('Mo'),
+                $this->l->t('Tu'),
+                $this->l->t('We'),
+                $this->l->t('Th'),
+                $this->l->t('Fr'),
+                $this->l->t('Sa')
+            ]),
+            'monthNames' => json_encode([
+                $this->l->t('January'),
+                $this->l->t('February'),
+                $this->l->t('March'),
+                $this->l->t('April'),
+                $this->l->t('May'),
+                $this->l->t('June'),
+                $this->l->t('July'),
+                $this->l->t('August'),
+                $this->l->t('September'),
+                $this->l->t('October'),
+                $this->l->t('November'),
+                $this->l->t('December')
+            ]),
+            'monthNamesShort' => json_encode([
+                $this->l->t('Jan.'),
+                $this->l->t('Feb.'),
+                $this->l->t('Mar.'),
+                $this->l->t('Apr.'),
+                $this->l->t('May.'),
+                $this->l->t('Jun.'),
+                $this->l->t('Jul.'),
+                $this->l->t('Aug.'),
+                $this->l->t('Sep.'),
+                $this->l->t('Oct.'),
+                $this->l->t('Nov.'),
+                $this->l->t('Dec.')
+            ]),
+            'firstDay' => json_encode($firstDay),
+            '_oc_config' => json_encode($config),
+            'oc_appconfig' => json_encode([
+                'core' => [
+                    'defaultExpireDateEnabled' => $defaultExpireDateEnabled,
+                    'defaultExpireDate' => $defaultExpireDate,
+                    'defaultExpireDateEnforced' => $enforceDefaultExpireDate,
+                    'enforcePasswordForPublicLink' => Util::isPublicLinkPasswordRequired(),
+                    'enableLinkPasswordByDefault' => $enableLinkPasswordByDefault,
+                    'sharingDisabledForUser' => $shareManager->sharingDisabledForUser($uid),
+                    'resharingAllowed' => Share::isResharingAllowed(),
+                    'remoteShareAllowed' => $outgoingServer2serverShareEnabled,
+                    'federatedCloudShareDoc' => $this->urlGenerator->linkToDocs('user-sharing-federated'),
+                    'allowGroupSharing' => $shareManager->allowGroupSharing(),
+                    'defaultInternalExpireDateEnabled' => $defaultInternalExpireDateEnabled,
+                    'defaultInternalExpireDate' => $defaultInternalExpireDate,
+                    'defaultInternalExpireDateEnforced' => $defaultInternalExpireDateEnforced,
+                    'defaultRemoteExpireDateEnabled' => $defaultRemoteExpireDateEnabled,
+                    'defaultRemoteExpireDate' => $defaultRemoteExpireDate,
+                    'defaultRemoteExpireDateEnforced' => $defaultRemoteExpireDateEnforced,
+                ]
+            ]),
+            '_theme' => json_encode([
+                'entity' => $this->defaults->getEntity(),
+                'name' => $this->defaults->getName(),
+                'productName' => $this->defaults->getProductName(),
+                'title' => $this->defaults->getTitle(),
+                'baseUrl' => $this->defaults->getBaseUrl(),
+                'syncClientUrl' => $this->defaults->getSyncClientUrl(),
+                'docBaseUrl' => $this->defaults->getDocBaseUrl(),
+                'docPlaceholderUrl' => $this->defaults->buildDocLinkToKey('PLACEHOLDER'),
+                'slogan' => $this->defaults->getSlogan(),
+                'logoClaim' => '',
+                'folder' => \OC_Util::getTheme(),
+            ]),
+        ];
 
-		if ($this->currentUser !== null) {
-			$array['oc_userconfig'] = json_encode([
-				'avatar' => [
-					'version' => (int)$this->config->getUserValue($uid, 'avatar', 'version', 0),
-					'generated' => $this->config->getUserValue($uid, 'avatar', 'generated', 'true') === 'true',
-				]
-			]);
-		}
+        if ($this->currentUser !== null) {
+            $array['oc_userconfig'] = json_encode([
+                'avatar' => [
+                    'version' => (int)$this->config->getUserValue($uid, 'avatar', 'version', 0),
+                    'generated' => $this->config->getUserValue($uid, 'avatar', 'generated', 'true') === 'true',
+                ]
+            ]);
+        }
 
-		$this->initialStateService->provideInitialState('core', 'projects_enabled', $this->config->getSystemValueBool('projects.enabled', false));
+        $this->initialStateService->provideInitialState('core', 'projects_enabled', $this->config->getSystemValueBool('projects.enabled', false));
 
-		$this->initialStateService->provideInitialState('core', 'config', $config);
-		$this->initialStateService->provideInitialState('core', 'capabilities', $capabilities);
+        $this->initialStateService->provideInitialState('core', 'config', $config);
+        $this->initialStateService->provideInitialState('core', 'capabilities', $capabilities);
 
-		// Allow hooks to modify the output values
-		\OC_Hook::emit('\OCP\Config', 'js', ['array' => &$array]);
+        // Allow hooks to modify the output values
+        \OC_Hook::emit('\OCP\Config', 'js', ['array' => &$array]);
 
-		$result = '';
+        $result = '';
 
-		// Echo it
-		foreach ($array as $setting => $value) {
-			$result .= 'var ' . $setting . '=' . $value . ';' . PHP_EOL;
-		}
+        // Echo it
+        foreach ($array as $setting => $value) {
+            $result .= 'var ' . $setting . '=' . $value . ';' . PHP_EOL;
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 
-	protected function canUserValidatePassword(): bool {
-		try {
-			$token = $this->tokenProvider->getToken($this->session->getId());
-		} catch (ExpiredTokenException|WipeTokenException|InvalidTokenException|SessionNotAvailableException) {
-			// actually we do not know, so we fall back to this statement
-			return true;
-		}
-		$scope = $token->getScopeAsArray();
-		return !isset($scope[IToken::SCOPE_SKIP_PASSWORD_VALIDATION]) || $scope[IToken::SCOPE_SKIP_PASSWORD_VALIDATION] === false;
-	}
+    protected function canUserValidatePassword(): bool {
+        try {
+            $token = $this->tokenProvider->getToken($this->session->getId());
+        } catch (ExpiredTokenException|WipeTokenException|InvalidTokenException|SessionNotAvailableException) {
+            // actually we do not know, so we fall back to this statement
+            return true;
+        }
+        $scope = $token->getScopeAsArray();
+        return !isset($scope[IToken::SCOPE_SKIP_PASSWORD_VALIDATION]) || $scope[IToken::SCOPE_SKIP_PASSWORD_VALIDATION] === false;
+    }
 }

core/AppInfo/ConfigLexicon.php

Indentation +47 added lines, -47 removed lines

@@ -20,55 +20,55 @@
  * Please Add & Manage your Config Keys in that file and keep the Lexicon up to date!
  */
 class ConfigLexicon implements ILexicon {
-	public const SHAREAPI_ALLOW_FEDERATION_ON_PUBLIC_SHARES = 'shareapi_allow_federation_on_public_shares';
-	public const SHARE_CUSTOM_TOKEN = 'shareapi_allow_custom_tokens';
-	public const SHARE_LINK_PASSWORD_DEFAULT = 'shareapi_enable_link_password_by_default';
-	public const SHARE_LINK_PASSWORD_ENFORCED = 'shareapi_enforce_links_password';
+    public const SHAREAPI_ALLOW_FEDERATION_ON_PUBLIC_SHARES = 'shareapi_allow_federation_on_public_shares';
+    public const SHARE_CUSTOM_TOKEN = 'shareapi_allow_custom_tokens';
+    public const SHARE_LINK_PASSWORD_DEFAULT = 'shareapi_enable_link_password_by_default';
+    public const SHARE_LINK_PASSWORD_ENFORCED = 'shareapi_enforce_links_password';
 
-	public const USER_LANGUAGE = 'lang';
-	public const LASTCRON_TIMESTAMP = 'lastcron';
+    public const USER_LANGUAGE = 'lang';
+    public const LASTCRON_TIMESTAMP = 'lastcron';
 
-	public function getStrictness(): Strictness {
-		return Strictness::IGNORE;
-	}
+    public function getStrictness(): Strictness {
+        return Strictness::IGNORE;
+    }
 
-	public function getAppConfigs(): array {
-		return [
-			new Entry(
-				key: self::SHAREAPI_ALLOW_FEDERATION_ON_PUBLIC_SHARES,
-				type: ValueType::BOOL,
-				defaultRaw: true,
-				definition: 'adds share permission to public shares to allow adding them to your Nextcloud (federation)',
-				lazy: true,
-			),
-			new Entry(
-				key: self::SHARE_CUSTOM_TOKEN,
-				type: ValueType::BOOL,
-				defaultRaw: fn (Preset $p): bool => match ($p) {
-					Preset::FAMILY, Preset::PRIVATE => true,
-					default => false,
-				},
-				definition: 'Allow users to set custom share link tokens',
-				lazy: true,
-				note: 'Shares with guessable tokens may be accessed easily. Shares with custom tokens will continue to be accessible after this setting has been disabled.',
-			),
-			new Entry(self::SHARE_LINK_PASSWORD_DEFAULT, ValueType::BOOL, false, 'Ask for a password when sharing document by default'),
-			new Entry(
-				key: self::SHARE_LINK_PASSWORD_ENFORCED,
-				type: ValueType::BOOL,
-				defaultRaw: fn (Preset $p): bool => match ($p) {
-					Preset::SCHOOL, Preset::UNIVERSITY, Preset::SHARED, Preset::SMALL, Preset::MEDIUM, Preset::LARGE => true,
-					default => false,
-				},
-				definition: 'Enforce password protection when sharing document'
-			),
-			new Entry(self::LASTCRON_TIMESTAMP, ValueType::INT, 0, 'timestamp of last cron execution'),
-		];
-	}
+    public function getAppConfigs(): array {
+        return [
+            new Entry(
+                key: self::SHAREAPI_ALLOW_FEDERATION_ON_PUBLIC_SHARES,
+                type: ValueType::BOOL,
+                defaultRaw: true,
+                definition: 'adds share permission to public shares to allow adding them to your Nextcloud (federation)',
+                lazy: true,
+            ),
+            new Entry(
+                key: self::SHARE_CUSTOM_TOKEN,
+                type: ValueType::BOOL,
+                defaultRaw: fn (Preset $p): bool => match ($p) {
+                    Preset::FAMILY, Preset::PRIVATE => true,
+                    default => false,
+                },
+                definition: 'Allow users to set custom share link tokens',
+                lazy: true,
+                note: 'Shares with guessable tokens may be accessed easily. Shares with custom tokens will continue to be accessible after this setting has been disabled.',
+            ),
+            new Entry(self::SHARE_LINK_PASSWORD_DEFAULT, ValueType::BOOL, false, 'Ask for a password when sharing document by default'),
+            new Entry(
+                key: self::SHARE_LINK_PASSWORD_ENFORCED,
+                type: ValueType::BOOL,
+                defaultRaw: fn (Preset $p): bool => match ($p) {
+                    Preset::SCHOOL, Preset::UNIVERSITY, Preset::SHARED, Preset::SMALL, Preset::MEDIUM, Preset::LARGE => true,
+                    default => false,
+                },
+                definition: 'Enforce password protection when sharing document'
+            ),
+            new Entry(self::LASTCRON_TIMESTAMP, ValueType::INT, 0, 'timestamp of last cron execution'),
+        ];
+    }
 
-	public function getUserConfigs(): array {
-		return [
-			new Entry(self::USER_LANGUAGE, ValueType::STRING, null, 'language'),
-		];
-	}
+    public function getUserConfigs(): array {
+        return [
+            new Entry(self::USER_LANGUAGE, ValueType::STRING, null, 'language'),
+        ];
+    }
 }

core/Controller/OCJSController.php

Indentation +49 added lines, -49 removed lines

@@ -33,57 +33,57 @@
 
 #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)]
 class OCJSController extends Controller {
-	private JSConfigHelper $helper;
+    private JSConfigHelper $helper;
 
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		IFactory $l10nFactory,
-		Defaults $defaults,
-		IAppManager $appManager,
-		ISession $session,
-		IUserSession $userSession,
-		IConfig $config,
-		IAppConfig $appConfig,
-		IGroupManager $groupManager,
-		IniGetWrapper $iniWrapper,
-		IURLGenerator $urlGenerator,
-		CapabilitiesManager $capabilitiesManager,
-		IInitialStateService $initialStateService,
-		IProvider $tokenProvider,
-		FilenameValidator $filenameValidator,
-		ServerVersion $serverVersion,
-	) {
-		parent::__construct($appName, $request);
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        IFactory $l10nFactory,
+        Defaults $defaults,
+        IAppManager $appManager,
+        ISession $session,
+        IUserSession $userSession,
+        IConfig $config,
+        IAppConfig $appConfig,
+        IGroupManager $groupManager,
+        IniGetWrapper $iniWrapper,
+        IURLGenerator $urlGenerator,
+        CapabilitiesManager $capabilitiesManager,
+        IInitialStateService $initialStateService,
+        IProvider $tokenProvider,
+        FilenameValidator $filenameValidator,
+        ServerVersion $serverVersion,
+    ) {
+        parent::__construct($appName, $request);
 
-		$this->helper = new JSConfigHelper(
-			$serverVersion,
-			$l10nFactory->get('lib'),
-			$defaults,
-			$appManager,
-			$session,
-			$userSession->getUser(),
-			$config,
-			$appConfig,
-			$groupManager,
-			$iniWrapper,
-			$urlGenerator,
-			$capabilitiesManager,
-			$initialStateService,
-			$tokenProvider,
-			$filenameValidator,
-		);
-	}
+        $this->helper = new JSConfigHelper(
+            $serverVersion,
+            $l10nFactory->get('lib'),
+            $defaults,
+            $appManager,
+            $session,
+            $userSession->getUser(),
+            $config,
+            $appConfig,
+            $groupManager,
+            $iniWrapper,
+            $urlGenerator,
+            $capabilitiesManager,
+            $initialStateService,
+            $tokenProvider,
+            $filenameValidator,
+        );
+    }
 
-	/**
-	 * @NoTwoFactorRequired
-	 */
-	#[PublicPage]
-	#[NoCSRFRequired]
-	#[FrontpageRoute(verb: 'GET', url: '/core/js/oc.js')]
-	public function getConfig(): DataDisplayResponse {
-		$data = $this->helper->getConfig();
+    /**
+     * @NoTwoFactorRequired
+     */
+    #[PublicPage]
+    #[NoCSRFRequired]
+    #[FrontpageRoute(verb: 'GET', url: '/core/js/oc.js')]
+    public function getConfig(): DataDisplayResponse {
+        $data = $this->helper->getConfig();
 
-		return new DataDisplayResponse($data, Http::STATUS_OK, ['Content-type' => 'text/javascript']);
-	}
+        return new DataDisplayResponse($data, Http::STATUS_OK, ['Content-type' => 'text/javascript']);
+    }
 }

apps/settings/lib/Settings/Admin/Sharing.php

Indentation +93 added lines, -93 removed lines

@@ -20,106 +20,106 @@
 use OCP\Util;
 
 class Sharing implements IDelegatedSettings {
-	public function __construct(
-		private IConfig $config,
-		private IAppConfig $appConfig,
-		private IL10N $l,
-		private IManager $shareManager,
-		private IAppManager $appManager,
-		private IURLGenerator $urlGenerator,
-		private IInitialState $initialState,
-		private string $appName,
-	) {
-	}
+    public function __construct(
+        private IConfig $config,
+        private IAppConfig $appConfig,
+        private IL10N $l,
+        private IManager $shareManager,
+        private IAppManager $appManager,
+        private IURLGenerator $urlGenerator,
+        private IInitialState $initialState,
+        private string $appName,
+    ) {
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
-		$linksExcludedGroups = $this->config->getAppValue('core', 'shareapi_allow_links_exclude_groups', '');
-		$excludedPasswordGroups = $this->config->getAppValue('core', 'shareapi_enforce_links_password_excluded_groups', '');
-		$onlyShareWithGroupMembersExcludeGroupList = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members_exclude_group_list', '');
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
+        $linksExcludedGroups = $this->config->getAppValue('core', 'shareapi_allow_links_exclude_groups', '');
+        $excludedPasswordGroups = $this->config->getAppValue('core', 'shareapi_enforce_links_password_excluded_groups', '');
+        $onlyShareWithGroupMembersExcludeGroupList = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members_exclude_group_list', '');
 
-		$parameters = [
-			// Built-In Sharing
-			'enabled' => $this->getHumanBooleanConfig('core', 'shareapi_enabled', true),
-			'allowGroupSharing' => $this->getHumanBooleanConfig('core', 'shareapi_allow_group_sharing', true),
-			'allowLinks' => $this->getHumanBooleanConfig('core', 'shareapi_allow_links', true),
-			'allowLinksExcludeGroups' => json_decode($linksExcludedGroups, true) ?? [],
-			'allowPublicUpload' => $this->getHumanBooleanConfig('core', 'shareapi_allow_public_upload', true),
-			'allowResharing' => $this->getHumanBooleanConfig('core', 'shareapi_allow_resharing', true),
-			'allowShareDialogUserEnumeration' => $this->getHumanBooleanConfig('core', 'shareapi_allow_share_dialog_user_enumeration', true),
-			'allowFederationOnPublicShares' => $this->appConfig->getValueBool('core', ConfigLexicon::SHAREAPI_ALLOW_FEDERATION_ON_PUBLIC_SHARES),
-			'restrictUserEnumerationToGroup' => $this->getHumanBooleanConfig('core', 'shareapi_restrict_user_enumeration_to_group'),
-			'restrictUserEnumerationToPhone' => $this->getHumanBooleanConfig('core', 'shareapi_restrict_user_enumeration_to_phone'),
-			'restrictUserEnumerationFullMatch' => $this->getHumanBooleanConfig('core', 'shareapi_restrict_user_enumeration_full_match', true),
-			'restrictUserEnumerationFullMatchUserId' => $this->getHumanBooleanConfig('core', 'shareapi_restrict_user_enumeration_full_match_userid', true),
-			'restrictUserEnumerationFullMatchEmail' => $this->getHumanBooleanConfig('core', 'shareapi_restrict_user_enumeration_full_match_email', true),
-			'restrictUserEnumerationFullMatchIgnoreSecondDN' => $this->getHumanBooleanConfig('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn'),
-			'enforceLinksPassword' => Util::isPublicLinkPasswordRequired(false),
-			'enforceLinksPasswordExcludedGroups' => json_decode($excludedPasswordGroups) ?? [],
-			'enforceLinksPasswordExcludedGroupsEnabled' => $this->config->getSystemValueBool('sharing.allow_disabled_password_enforcement_groups', false),
-			'onlyShareWithGroupMembers' => $this->shareManager->shareWithGroupMembersOnly(),
-			'onlyShareWithGroupMembersExcludeGroupList' => json_decode($onlyShareWithGroupMembersExcludeGroupList) ?? [],
-			'defaultExpireDate' => $this->getHumanBooleanConfig('core', 'shareapi_default_expire_date'),
-			'expireAfterNDays' => $this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7'),
-			'enforceExpireDate' => $this->getHumanBooleanConfig('core', 'shareapi_enforce_expire_date'),
-			'excludeGroups' => $this->config->getAppValue('core', 'shareapi_exclude_groups', 'no'),
-			'excludeGroupsList' => json_decode($excludedGroups, true) ?? [],
-			'publicShareDisclaimerText' => $this->config->getAppValue('core', 'shareapi_public_link_disclaimertext'),
-			'enableLinkPasswordByDefault' => $this->appConfig->getValueBool('core', ConfigLexicon::SHARE_LINK_PASSWORD_DEFAULT),
-			'defaultPermissions' => (int)$this->config->getAppValue('core', 'shareapi_default_permissions', (string)Constants::PERMISSION_ALL),
-			'defaultInternalExpireDate' => $this->getHumanBooleanConfig('core', 'shareapi_default_internal_expire_date'),
-			'internalExpireAfterNDays' => $this->config->getAppValue('core', 'shareapi_internal_expire_after_n_days', '7'),
-			'enforceInternalExpireDate' => $this->getHumanBooleanConfig('core', 'shareapi_enforce_internal_expire_date'),
-			'defaultRemoteExpireDate' => $this->getHumanBooleanConfig('core', 'shareapi_default_remote_expire_date'),
-			'remoteExpireAfterNDays' => $this->config->getAppValue('core', 'shareapi_remote_expire_after_n_days', '7'),
-			'enforceRemoteExpireDate' => $this->getHumanBooleanConfig('core', 'shareapi_enforce_remote_expire_date'),
-			'allowCustomTokens' => $this->shareManager->allowCustomTokens(),
-			'allowViewWithoutDownload' => $this->shareManager->allowViewWithoutDownload(),
-		];
+        $parameters = [
+            // Built-In Sharing
+            'enabled' => $this->getHumanBooleanConfig('core', 'shareapi_enabled', true),
+            'allowGroupSharing' => $this->getHumanBooleanConfig('core', 'shareapi_allow_group_sharing', true),
+            'allowLinks' => $this->getHumanBooleanConfig('core', 'shareapi_allow_links', true),
+            'allowLinksExcludeGroups' => json_decode($linksExcludedGroups, true) ?? [],
+            'allowPublicUpload' => $this->getHumanBooleanConfig('core', 'shareapi_allow_public_upload', true),
+            'allowResharing' => $this->getHumanBooleanConfig('core', 'shareapi_allow_resharing', true),
+            'allowShareDialogUserEnumeration' => $this->getHumanBooleanConfig('core', 'shareapi_allow_share_dialog_user_enumeration', true),
+            'allowFederationOnPublicShares' => $this->appConfig->getValueBool('core', ConfigLexicon::SHAREAPI_ALLOW_FEDERATION_ON_PUBLIC_SHARES),
+            'restrictUserEnumerationToGroup' => $this->getHumanBooleanConfig('core', 'shareapi_restrict_user_enumeration_to_group'),
+            'restrictUserEnumerationToPhone' => $this->getHumanBooleanConfig('core', 'shareapi_restrict_user_enumeration_to_phone'),
+            'restrictUserEnumerationFullMatch' => $this->getHumanBooleanConfig('core', 'shareapi_restrict_user_enumeration_full_match', true),
+            'restrictUserEnumerationFullMatchUserId' => $this->getHumanBooleanConfig('core', 'shareapi_restrict_user_enumeration_full_match_userid', true),
+            'restrictUserEnumerationFullMatchEmail' => $this->getHumanBooleanConfig('core', 'shareapi_restrict_user_enumeration_full_match_email', true),
+            'restrictUserEnumerationFullMatchIgnoreSecondDN' => $this->getHumanBooleanConfig('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn'),
+            'enforceLinksPassword' => Util::isPublicLinkPasswordRequired(false),
+            'enforceLinksPasswordExcludedGroups' => json_decode($excludedPasswordGroups) ?? [],
+            'enforceLinksPasswordExcludedGroupsEnabled' => $this->config->getSystemValueBool('sharing.allow_disabled_password_enforcement_groups', false),
+            'onlyShareWithGroupMembers' => $this->shareManager->shareWithGroupMembersOnly(),
+            'onlyShareWithGroupMembersExcludeGroupList' => json_decode($onlyShareWithGroupMembersExcludeGroupList) ?? [],
+            'defaultExpireDate' => $this->getHumanBooleanConfig('core', 'shareapi_default_expire_date'),
+            'expireAfterNDays' => $this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7'),
+            'enforceExpireDate' => $this->getHumanBooleanConfig('core', 'shareapi_enforce_expire_date'),
+            'excludeGroups' => $this->config->getAppValue('core', 'shareapi_exclude_groups', 'no'),
+            'excludeGroupsList' => json_decode($excludedGroups, true) ?? [],
+            'publicShareDisclaimerText' => $this->config->getAppValue('core', 'shareapi_public_link_disclaimertext'),
+            'enableLinkPasswordByDefault' => $this->appConfig->getValueBool('core', ConfigLexicon::SHARE_LINK_PASSWORD_DEFAULT),
+            'defaultPermissions' => (int)$this->config->getAppValue('core', 'shareapi_default_permissions', (string)Constants::PERMISSION_ALL),
+            'defaultInternalExpireDate' => $this->getHumanBooleanConfig('core', 'shareapi_default_internal_expire_date'),
+            'internalExpireAfterNDays' => $this->config->getAppValue('core', 'shareapi_internal_expire_after_n_days', '7'),
+            'enforceInternalExpireDate' => $this->getHumanBooleanConfig('core', 'shareapi_enforce_internal_expire_date'),
+            'defaultRemoteExpireDate' => $this->getHumanBooleanConfig('core', 'shareapi_default_remote_expire_date'),
+            'remoteExpireAfterNDays' => $this->config->getAppValue('core', 'shareapi_remote_expire_after_n_days', '7'),
+            'enforceRemoteExpireDate' => $this->getHumanBooleanConfig('core', 'shareapi_enforce_remote_expire_date'),
+            'allowCustomTokens' => $this->shareManager->allowCustomTokens(),
+            'allowViewWithoutDownload' => $this->shareManager->allowViewWithoutDownload(),
+        ];
 
-		$this->initialState->provideInitialState('sharingAppEnabled', $this->appManager->isEnabledForUser('files_sharing'));
-		$this->initialState->provideInitialState('sharingDocumentation', $this->urlGenerator->linkToDocs('admin-sharing'));
-		$this->initialState->provideInitialState('sharingSettings', $parameters);
+        $this->initialState->provideInitialState('sharingAppEnabled', $this->appManager->isEnabledForUser('files_sharing'));
+        $this->initialState->provideInitialState('sharingDocumentation', $this->urlGenerator->linkToDocs('admin-sharing'));
+        $this->initialState->provideInitialState('sharingSettings', $parameters);
 
-		Util::addScript($this->appName, 'vue-settings-admin-sharing');
-		return new TemplateResponse($this->appName, 'settings/admin/sharing', [], '');
-	}
+        Util::addScript($this->appName, 'vue-settings-admin-sharing');
+        return new TemplateResponse($this->appName, 'settings/admin/sharing', [], '');
+    }
 
-	/**
-	 * Helper function to retrive boolean values from human readable strings ('yes' / 'no')
-	 */
-	private function getHumanBooleanConfig(string $app, string $key, bool $default = false): bool {
-		return $this->config->getAppValue($app, $key, $default ? 'yes' : 'no') === 'yes';
-	}
+    /**
+     * Helper function to retrive boolean values from human readable strings ('yes' / 'no')
+     */
+    private function getHumanBooleanConfig(string $app, string $key, bool $default = false): bool {
+        return $this->config->getAppValue($app, $key, $default ? 'yes' : 'no') === 'yes';
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'sharing';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'sharing';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 *             the admin section. The forms are arranged in ascending order of the
-	 *             priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 0;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     *             the admin section. The forms are arranged in ascending order of the
+     *             priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 0;
+    }
 
-	public function getAuthorizedAppConfig(): array {
-		return [
-			'core' => ['/shareapi_.*/'],
-		];
-	}
+    public function getAuthorizedAppConfig(): array {
+        return [
+            'core' => ['/shareapi_.*/'],
+        ];
+    }
 
-	public function getName(): ?string {
-		return null;
-	}
+    public function getName(): ?string {
+        return null;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 			'excludeGroupsList' => json_decode($excludedGroups, true) ?? [],
 			'publicShareDisclaimerText' => $this->config->getAppValue('core', 'shareapi_public_link_disclaimertext'),
 			'enableLinkPasswordByDefault' => $this->appConfig->getValueBool('core', ConfigLexicon::SHARE_LINK_PASSWORD_DEFAULT),
-			'defaultPermissions' => (int)$this->config->getAppValue('core', 'shareapi_default_permissions', (string)Constants::PERMISSION_ALL),
+			'defaultPermissions' => (int) $this->config->getAppValue('core', 'shareapi_default_permissions', (string) Constants::PERMISSION_ALL),
 			'defaultInternalExpireDate' => $this->getHumanBooleanConfig('core', 'shareapi_default_internal_expire_date'),
 			'internalExpireAfterNDays' => $this->config->getAppValue('core', 'shareapi_internal_expire_after_n_days', '7'),
 			'enforceInternalExpireDate' => $this->getHumanBooleanConfig('core', 'shareapi_enforce_internal_expire_date'),

apps/settings/tests/Settings/Admin/SharingTest.php

Indentation +222 added lines, -222 removed lines

@@ -20,245 +20,245 @@
 use Test\TestCase;
 
 class SharingTest extends TestCase {
-	private Sharing $admin;
+    private Sharing $admin;
 
-	private IConfig&MockObject $config;
-	private IAppConfig&MockObject $appConfig;
-	private IL10N&MockObject $l10n;
-	private IManager&MockObject $shareManager;
-	private IAppManager&MockObject $appManager;
-	private IURLGenerator&MockObject $urlGenerator;
-	private IInitialState&MockObject $initialState;
+    private IConfig&MockObject $config;
+    private IAppConfig&MockObject $appConfig;
+    private IL10N&MockObject $l10n;
+    private IManager&MockObject $shareManager;
+    private IAppManager&MockObject $appManager;
+    private IURLGenerator&MockObject $urlGenerator;
+    private IInitialState&MockObject $initialState;
 
-	protected function setUp(): void {
-		parent::setUp();
-		$this->config = $this->createMock(IConfig::class);
-		$this->appConfig = $this->createMock(IAppConfig::class);
-		$this->l10n = $this->createMock(IL10N::class);
+    protected function setUp(): void {
+        parent::setUp();
+        $this->config = $this->createMock(IConfig::class);
+        $this->appConfig = $this->createMock(IAppConfig::class);
+        $this->l10n = $this->createMock(IL10N::class);
 
-		$this->shareManager = $this->createMock(IManager::class);
-		$this->appManager = $this->createMock(IAppManager::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->initialState = $this->createMock(IInitialState::class);
+        $this->shareManager = $this->createMock(IManager::class);
+        $this->appManager = $this->createMock(IAppManager::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->initialState = $this->createMock(IInitialState::class);
 
-		$this->admin = new Sharing(
-			$this->config,
-			$this->appConfig,
-			$this->l10n,
-			$this->shareManager,
-			$this->appManager,
-			$this->urlGenerator,
-			$this->initialState,
-			'settings',
-		);
-	}
+        $this->admin = new Sharing(
+            $this->config,
+            $this->appConfig,
+            $this->l10n,
+            $this->shareManager,
+            $this->appManager,
+            $this->urlGenerator,
+            $this->initialState,
+            'settings',
+        );
+    }
 
-	public function testGetFormWithoutExcludedGroups(): void {
-		$this->appConfig
-			->method('getValueBool')
-			->willReturnMap([
-				['core', 'shareapi_allow_federation_on_public_shares', true],
-				['core', 'shareapi_enable_link_password_by_default', true],
-			]);
+    public function testGetFormWithoutExcludedGroups(): void {
+        $this->appConfig
+            ->method('getValueBool')
+            ->willReturnMap([
+                ['core', 'shareapi_allow_federation_on_public_shares', true],
+                ['core', 'shareapi_enable_link_password_by_default', true],
+            ]);
 
-		$this->config
-			->method('getAppValue')
-			->willReturnMap([
-				['core', 'shareapi_exclude_groups_list', '', ''],
-				['core', 'shareapi_allow_links_exclude_groups', '', ''],
-				['core', 'shareapi_allow_group_sharing', 'yes', 'yes'],
-				['core', 'shareapi_allow_links', 'yes', 'yes'],
-				['core', 'shareapi_allow_public_upload', 'yes', 'yes'],
-				['core', 'shareapi_allow_resharing', 'yes', 'yes'],
-				['core', 'shareapi_allow_share_dialog_user_enumeration', 'yes', 'yes'],
-				['core', 'shareapi_restrict_user_enumeration_to_group', 'no', 'no'],
-				['core', 'shareapi_restrict_user_enumeration_to_phone', 'no', 'no'],
-				['core', 'shareapi_restrict_user_enumeration_full_match', 'yes', 'yes'],
-				['core', 'shareapi_restrict_user_enumeration_full_match_userid', 'yes', 'yes'],
-				['core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes', 'yes'],
-				['core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no', 'no'],
-				['core', 'shareapi_enabled', 'yes', 'yes'],
-				['core', 'shareapi_default_expire_date', 'no', 'no'],
-				['core', 'shareapi_expire_after_n_days', '7', '7'],
-				['core', 'shareapi_enforce_expire_date', 'no', 'no'],
-				['core', 'shareapi_exclude_groups', 'no', 'no'],
-				['core', 'shareapi_public_link_disclaimertext', '', 'Lorem ipsum'],
-				['core', 'shareapi_default_permissions', (string)Constants::PERMISSION_ALL, Constants::PERMISSION_ALL],
-				['core', 'shareapi_default_internal_expire_date', 'no', 'no'],
-				['core', 'shareapi_internal_expire_after_n_days', '7', '7'],
-				['core', 'shareapi_enforce_internal_expire_date', 'no', 'no'],
-				['core', 'shareapi_default_remote_expire_date', 'no', 'no'],
-				['core', 'shareapi_remote_expire_after_n_days', '7', '7'],
-				['core', 'shareapi_enforce_remote_expire_date', 'no', 'no'],
-				['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
-				['core', 'shareapi_only_share_with_group_members_exclude_group_list', '', '[]'],
-			]);
-		$this->shareManager->method('shareWithGroupMembersOnly')
-			->willReturn(false);
+        $this->config
+            ->method('getAppValue')
+            ->willReturnMap([
+                ['core', 'shareapi_exclude_groups_list', '', ''],
+                ['core', 'shareapi_allow_links_exclude_groups', '', ''],
+                ['core', 'shareapi_allow_group_sharing', 'yes', 'yes'],
+                ['core', 'shareapi_allow_links', 'yes', 'yes'],
+                ['core', 'shareapi_allow_public_upload', 'yes', 'yes'],
+                ['core', 'shareapi_allow_resharing', 'yes', 'yes'],
+                ['core', 'shareapi_allow_share_dialog_user_enumeration', 'yes', 'yes'],
+                ['core', 'shareapi_restrict_user_enumeration_to_group', 'no', 'no'],
+                ['core', 'shareapi_restrict_user_enumeration_to_phone', 'no', 'no'],
+                ['core', 'shareapi_restrict_user_enumeration_full_match', 'yes', 'yes'],
+                ['core', 'shareapi_restrict_user_enumeration_full_match_userid', 'yes', 'yes'],
+                ['core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes', 'yes'],
+                ['core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no', 'no'],
+                ['core', 'shareapi_enabled', 'yes', 'yes'],
+                ['core', 'shareapi_default_expire_date', 'no', 'no'],
+                ['core', 'shareapi_expire_after_n_days', '7', '7'],
+                ['core', 'shareapi_enforce_expire_date', 'no', 'no'],
+                ['core', 'shareapi_exclude_groups', 'no', 'no'],
+                ['core', 'shareapi_public_link_disclaimertext', '', 'Lorem ipsum'],
+                ['core', 'shareapi_default_permissions', (string)Constants::PERMISSION_ALL, Constants::PERMISSION_ALL],
+                ['core', 'shareapi_default_internal_expire_date', 'no', 'no'],
+                ['core', 'shareapi_internal_expire_after_n_days', '7', '7'],
+                ['core', 'shareapi_enforce_internal_expire_date', 'no', 'no'],
+                ['core', 'shareapi_default_remote_expire_date', 'no', 'no'],
+                ['core', 'shareapi_remote_expire_after_n_days', '7', '7'],
+                ['core', 'shareapi_enforce_remote_expire_date', 'no', 'no'],
+                ['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
+                ['core', 'shareapi_only_share_with_group_members_exclude_group_list', '', '[]'],
+            ]);
+        $this->shareManager->method('shareWithGroupMembersOnly')
+            ->willReturn(false);
 
-		$this->appManager->method('isEnabledForUser')->with('files_sharing')->willReturn(false);
+        $this->appManager->method('isEnabledForUser')->with('files_sharing')->willReturn(false);
 
-		$initialStateCalls = [];
-		$this->initialState
-			->expects($this->exactly(3))
-			->method('provideInitialState')
-			->willReturnCallback(function (string $key) use (&$initialStateCalls): void {
-				$initialStateCalls[$key] = func_get_args();
-			});
+        $initialStateCalls = [];
+        $this->initialState
+            ->expects($this->exactly(3))
+            ->method('provideInitialState')
+            ->willReturnCallback(function (string $key) use (&$initialStateCalls): void {
+                $initialStateCalls[$key] = func_get_args();
+            });
 
-		$expectedInitialStateCalls = [
-			'sharingAppEnabled' => false,
-			'sharingDocumentation' => '',
-			'sharingSettings' => [
-				'allowGroupSharing' => true,
-				'allowLinks' => true,
-				'allowPublicUpload' => true,
-				'allowResharing' => true,
-				'allowShareDialogUserEnumeration' => true,
-				'allowFederationOnPublicShares' => true,
-				'restrictUserEnumerationToGroup' => false,
-				'restrictUserEnumerationToPhone' => false,
-				'restrictUserEnumerationFullMatch' => true,
-				'restrictUserEnumerationFullMatchUserId' => true,
-				'restrictUserEnumerationFullMatchEmail' => true,
-				'restrictUserEnumerationFullMatchIgnoreSecondDN' => false,
-				'enforceLinksPassword' => false,
-				'onlyShareWithGroupMembers' => false,
-				'enabled' => true,
-				'defaultExpireDate' => false,
-				'expireAfterNDays' => '7',
-				'enforceExpireDate' => false,
-				'excludeGroups' => 'no',
-				'excludeGroupsList' => [],
-				'publicShareDisclaimerText' => 'Lorem ipsum',
-				'enableLinkPasswordByDefault' => true,
-				'defaultPermissions' => Constants::PERMISSION_ALL,
-				'defaultInternalExpireDate' => false,
-				'internalExpireAfterNDays' => '7',
-				'enforceInternalExpireDate' => false,
-				'defaultRemoteExpireDate' => false,
-				'remoteExpireAfterNDays' => '7',
-				'enforceRemoteExpireDate' => false,
-				'allowLinksExcludeGroups' => [],
-				'onlyShareWithGroupMembersExcludeGroupList' => [],
-				'enforceLinksPasswordExcludedGroups' => [],
-				'enforceLinksPasswordExcludedGroupsEnabled' => false,
-			]
-		];
+        $expectedInitialStateCalls = [
+            'sharingAppEnabled' => false,
+            'sharingDocumentation' => '',
+            'sharingSettings' => [
+                'allowGroupSharing' => true,
+                'allowLinks' => true,
+                'allowPublicUpload' => true,
+                'allowResharing' => true,
+                'allowShareDialogUserEnumeration' => true,
+                'allowFederationOnPublicShares' => true,
+                'restrictUserEnumerationToGroup' => false,
+                'restrictUserEnumerationToPhone' => false,
+                'restrictUserEnumerationFullMatch' => true,
+                'restrictUserEnumerationFullMatchUserId' => true,
+                'restrictUserEnumerationFullMatchEmail' => true,
+                'restrictUserEnumerationFullMatchIgnoreSecondDN' => false,
+                'enforceLinksPassword' => false,
+                'onlyShareWithGroupMembers' => false,
+                'enabled' => true,
+                'defaultExpireDate' => false,
+                'expireAfterNDays' => '7',
+                'enforceExpireDate' => false,
+                'excludeGroups' => 'no',
+                'excludeGroupsList' => [],
+                'publicShareDisclaimerText' => 'Lorem ipsum',
+                'enableLinkPasswordByDefault' => true,
+                'defaultPermissions' => Constants::PERMISSION_ALL,
+                'defaultInternalExpireDate' => false,
+                'internalExpireAfterNDays' => '7',
+                'enforceInternalExpireDate' => false,
+                'defaultRemoteExpireDate' => false,
+                'remoteExpireAfterNDays' => '7',
+                'enforceRemoteExpireDate' => false,
+                'allowLinksExcludeGroups' => [],
+                'onlyShareWithGroupMembersExcludeGroupList' => [],
+                'enforceLinksPasswordExcludedGroups' => [],
+                'enforceLinksPasswordExcludedGroupsEnabled' => false,
+            ]
+        ];
 
-		$expected = new TemplateResponse(
-			'settings',
-			'settings/admin/sharing',
-			[],
-			''
-		);
+        $expected = new TemplateResponse(
+            'settings',
+            'settings/admin/sharing',
+            [],
+            ''
+        );
 
-		$this->assertEquals($expected, $this->admin->getForm());
-		$this->assertEquals(sort($expectedInitialStateCalls), sort($initialStateCalls), 'Provided initial state does not match');
-	}
+        $this->assertEquals($expected, $this->admin->getForm());
+        $this->assertEquals(sort($expectedInitialStateCalls), sort($initialStateCalls), 'Provided initial state does not match');
+    }
 
-	public function testGetFormWithExcludedGroups(): void {
-		$this->config
-			->method('getAppValue')
-			->willReturnMap([
-				['core', 'shareapi_exclude_groups_list', '', '["NoSharers","OtherNoSharers"]'],
-				['core', 'shareapi_allow_links_exclude_groups', '', ''],
-				['core', 'shareapi_allow_group_sharing', 'yes', 'yes'],
-				['core', 'shareapi_allow_links', 'yes', 'yes'],
-				['core', 'shareapi_allow_public_upload', 'yes', 'yes'],
-				['core', 'shareapi_allow_resharing', 'yes', 'yes'],
-				['core', 'shareapi_allow_share_dialog_user_enumeration', 'yes', 'yes'],
-				['core', 'shareapi_restrict_user_enumeration_to_group', 'no', 'no'],
-				['core', 'shareapi_restrict_user_enumeration_to_phone', 'no', 'no'],
-				['core', 'shareapi_restrict_user_enumeration_full_match', 'yes', 'yes'],
-				['core', 'shareapi_restrict_user_enumeration_full_match_userid', 'yes', 'yes'],
-				['core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes', 'yes'],
-				['core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no', 'no'],
-				['core', 'shareapi_enabled', 'yes', 'yes'],
-				['core', 'shareapi_default_expire_date', 'no', 'no'],
-				['core', 'shareapi_expire_after_n_days', '7', '7'],
-				['core', 'shareapi_enforce_expire_date', 'no', 'no'],
-				['core', 'shareapi_exclude_groups', 'no', 'yes'],
-				['core', 'shareapi_public_link_disclaimertext', '', 'Lorem ipsum'],
-				['core', 'shareapi_enable_link_password_by_default', 'no', 'yes'],
-				['core', 'shareapi_default_permissions', (string)Constants::PERMISSION_ALL, Constants::PERMISSION_ALL],
-				['core', 'shareapi_default_internal_expire_date', 'no', 'no'],
-				['core', 'shareapi_internal_expire_after_n_days', '7', '7'],
-				['core', 'shareapi_enforce_internal_expire_date', 'no', 'no'],
-				['core', 'shareapi_default_remote_expire_date', 'no', 'no'],
-				['core', 'shareapi_remote_expire_after_n_days', '7', '7'],
-				['core', 'shareapi_enforce_remote_expire_date', 'no', 'no'],
-				['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
-				['core', 'shareapi_only_share_with_group_members_exclude_group_list', '', '[]'],
-			]);
-		$this->shareManager->method('shareWithGroupMembersOnly')
-			->willReturn(false);
+    public function testGetFormWithExcludedGroups(): void {
+        $this->config
+            ->method('getAppValue')
+            ->willReturnMap([
+                ['core', 'shareapi_exclude_groups_list', '', '["NoSharers","OtherNoSharers"]'],
+                ['core', 'shareapi_allow_links_exclude_groups', '', ''],
+                ['core', 'shareapi_allow_group_sharing', 'yes', 'yes'],
+                ['core', 'shareapi_allow_links', 'yes', 'yes'],
+                ['core', 'shareapi_allow_public_upload', 'yes', 'yes'],
+                ['core', 'shareapi_allow_resharing', 'yes', 'yes'],
+                ['core', 'shareapi_allow_share_dialog_user_enumeration', 'yes', 'yes'],
+                ['core', 'shareapi_restrict_user_enumeration_to_group', 'no', 'no'],
+                ['core', 'shareapi_restrict_user_enumeration_to_phone', 'no', 'no'],
+                ['core', 'shareapi_restrict_user_enumeration_full_match', 'yes', 'yes'],
+                ['core', 'shareapi_restrict_user_enumeration_full_match_userid', 'yes', 'yes'],
+                ['core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes', 'yes'],
+                ['core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no', 'no'],
+                ['core', 'shareapi_enabled', 'yes', 'yes'],
+                ['core', 'shareapi_default_expire_date', 'no', 'no'],
+                ['core', 'shareapi_expire_after_n_days', '7', '7'],
+                ['core', 'shareapi_enforce_expire_date', 'no', 'no'],
+                ['core', 'shareapi_exclude_groups', 'no', 'yes'],
+                ['core', 'shareapi_public_link_disclaimertext', '', 'Lorem ipsum'],
+                ['core', 'shareapi_enable_link_password_by_default', 'no', 'yes'],
+                ['core', 'shareapi_default_permissions', (string)Constants::PERMISSION_ALL, Constants::PERMISSION_ALL],
+                ['core', 'shareapi_default_internal_expire_date', 'no', 'no'],
+                ['core', 'shareapi_internal_expire_after_n_days', '7', '7'],
+                ['core', 'shareapi_enforce_internal_expire_date', 'no', 'no'],
+                ['core', 'shareapi_default_remote_expire_date', 'no', 'no'],
+                ['core', 'shareapi_remote_expire_after_n_days', '7', '7'],
+                ['core', 'shareapi_enforce_remote_expire_date', 'no', 'no'],
+                ['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
+                ['core', 'shareapi_only_share_with_group_members_exclude_group_list', '', '[]'],
+            ]);
+        $this->shareManager->method('shareWithGroupMembersOnly')
+            ->willReturn(false);
 
-		$this->appManager->method('isEnabledForUser')->with('files_sharing')->willReturn(true);
+        $this->appManager->method('isEnabledForUser')->with('files_sharing')->willReturn(true);
 
-		$initialStateCalls = [];
-		$this->initialState
-			->expects($this->exactly(3))
-			->method('provideInitialState')
-			->willReturnCallback(function (string $key) use (&$initialStateCalls): void {
-				$initialStateCalls[$key] = func_get_args();
-			});
+        $initialStateCalls = [];
+        $this->initialState
+            ->expects($this->exactly(3))
+            ->method('provideInitialState')
+            ->willReturnCallback(function (string $key) use (&$initialStateCalls): void {
+                $initialStateCalls[$key] = func_get_args();
+            });
 
-		$expectedInitialStateCalls = [
-			'sharingAppEnabled' => true,
-			'sharingDocumentation' => '',
-			'sharingSettings' => [
-				'allowGroupSharing' => true,
-				'allowLinks' => true,
-				'allowPublicUpload' => true,
-				'allowResharing' => true,
-				'allowShareDialogUserEnumeration' => true,
-				'restrictUserEnumerationToGroup' => false,
-				'restrictUserEnumerationToPhone' => false,
-				'restrictUserEnumerationFullMatch' => true,
-				'restrictUserEnumerationFullMatchUserId' => true,
-				'restrictUserEnumerationFullMatchEmail' => true,
-				'restrictUserEnumerationFullMatchIgnoreSecondDN' => false,
-				'enforceLinksPassword' => false,
-				'onlyShareWithGroupMembers' => false,
-				'enabled' => true,
-				'defaultExpireDate' => false,
-				'expireAfterNDays' => '7',
-				'enforceExpireDate' => false,
-				'excludeGroups' => 'yes',
-				'excludeGroupsList' => ['NoSharers','OtherNoSharers'],
-				'publicShareDisclaimerText' => 'Lorem ipsum',
-				'enableLinkPasswordByDefault' => true,
-				'defaultPermissions' => Constants::PERMISSION_ALL,
-				'defaultInternalExpireDate' => false,
-				'internalExpireAfterNDays' => '7',
-				'enforceInternalExpireDate' => false,
-				'defaultRemoteExpireDate' => false,
-				'remoteExpireAfterNDays' => '7',
-				'enforceRemoteExpireDate' => false,
-				'allowLinksExcludeGroups' => [],
-				'onlyShareWithGroupMembersExcludeGroupList' => [],
-				'enforceLinksPasswordExcludedGroups' => [],
-				'enforceLinksPasswordExcludedGroupsEnabled' => false,
-			],
-		];
+        $expectedInitialStateCalls = [
+            'sharingAppEnabled' => true,
+            'sharingDocumentation' => '',
+            'sharingSettings' => [
+                'allowGroupSharing' => true,
+                'allowLinks' => true,
+                'allowPublicUpload' => true,
+                'allowResharing' => true,
+                'allowShareDialogUserEnumeration' => true,
+                'restrictUserEnumerationToGroup' => false,
+                'restrictUserEnumerationToPhone' => false,
+                'restrictUserEnumerationFullMatch' => true,
+                'restrictUserEnumerationFullMatchUserId' => true,
+                'restrictUserEnumerationFullMatchEmail' => true,
+                'restrictUserEnumerationFullMatchIgnoreSecondDN' => false,
+                'enforceLinksPassword' => false,
+                'onlyShareWithGroupMembers' => false,
+                'enabled' => true,
+                'defaultExpireDate' => false,
+                'expireAfterNDays' => '7',
+                'enforceExpireDate' => false,
+                'excludeGroups' => 'yes',
+                'excludeGroupsList' => ['NoSharers','OtherNoSharers'],
+                'publicShareDisclaimerText' => 'Lorem ipsum',
+                'enableLinkPasswordByDefault' => true,
+                'defaultPermissions' => Constants::PERMISSION_ALL,
+                'defaultInternalExpireDate' => false,
+                'internalExpireAfterNDays' => '7',
+                'enforceInternalExpireDate' => false,
+                'defaultRemoteExpireDate' => false,
+                'remoteExpireAfterNDays' => '7',
+                'enforceRemoteExpireDate' => false,
+                'allowLinksExcludeGroups' => [],
+                'onlyShareWithGroupMembersExcludeGroupList' => [],
+                'enforceLinksPasswordExcludedGroups' => [],
+                'enforceLinksPasswordExcludedGroupsEnabled' => false,
+            ],
+        ];
 
-		$expected = new TemplateResponse(
-			'settings',
-			'settings/admin/sharing',
-			[],
-			''
-		);
+        $expected = new TemplateResponse(
+            'settings',
+            'settings/admin/sharing',
+            [],
+            ''
+        );
 
-		$this->assertEquals($expected, $this->admin->getForm());
-		$this->assertEquals(sort($expectedInitialStateCalls), sort($initialStateCalls), 'Provided initial state does not match');
-	}
+        $this->assertEquals($expected, $this->admin->getForm());
+        $this->assertEquals(sort($expectedInitialStateCalls), sort($initialStateCalls), 'Provided initial state does not match');
+    }
 
-	public function testGetSection(): void {
-		$this->assertSame('sharing', $this->admin->getSection());
-	}
+    public function testGetSection(): void {
+        $this->assertSame('sharing', $this->admin->getSection());
+    }
 
-	public function testGetPriority(): void {
-		$this->assertSame(0, $this->admin->getPriority());
-	}
+    public function testGetPriority(): void {
+        $this->assertSame(0, $this->admin->getPriority());
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -83,7 +83,7 @@ 
 				['core', 'shareapi_enforce_expire_date', 'no', 'no'],
 				['core', 'shareapi_exclude_groups', 'no', 'no'],
 				['core', 'shareapi_public_link_disclaimertext', '', 'Lorem ipsum'],
-				['core', 'shareapi_default_permissions', (string)Constants::PERMISSION_ALL, Constants::PERMISSION_ALL],
+				['core', 'shareapi_default_permissions', (string) Constants::PERMISSION_ALL, Constants::PERMISSION_ALL],
 				['core', 'shareapi_default_internal_expire_date', 'no', 'no'],
 				['core', 'shareapi_internal_expire_after_n_days', '7', '7'],
 				['core', 'shareapi_enforce_internal_expire_date', 'no', 'no'],
@@ -102,7 +102,7 @@ 
 		$this->initialState
 			->expects($this->exactly(3))
 			->method('provideInitialState')
-			->willReturnCallback(function (string $key) use (&$initialStateCalls): void {
+			->willReturnCallback(function(string $key) use (&$initialStateCalls): void {
 				$initialStateCalls[$key] = func_get_args();
 			});
 
@@ -181,7 +181,7 @@ 
 				['core', 'shareapi_exclude_groups', 'no', 'yes'],
 				['core', 'shareapi_public_link_disclaimertext', '', 'Lorem ipsum'],
 				['core', 'shareapi_enable_link_password_by_default', 'no', 'yes'],
-				['core', 'shareapi_default_permissions', (string)Constants::PERMISSION_ALL, Constants::PERMISSION_ALL],
+				['core', 'shareapi_default_permissions', (string) Constants::PERMISSION_ALL, Constants::PERMISSION_ALL],
 				['core', 'shareapi_default_internal_expire_date', 'no', 'no'],
 				['core', 'shareapi_internal_expire_after_n_days', '7', '7'],
 				['core', 'shareapi_enforce_internal_expire_date', 'no', 'no'],
@@ -200,7 +200,7 @@ 
 		$this->initialState
 			->expects($this->exactly(3))
 			->method('provideInitialState')
-			->willReturnCallback(function (string $key) use (&$initialStateCalls): void {
+			->willReturnCallback(function(string $key) use (&$initialStateCalls): void {
 				$initialStateCalls[$key] = func_get_args();
 			});
 
@@ -226,7 +226,7 @@ 
 				'expireAfterNDays' => '7',
 				'enforceExpireDate' => false,
 				'excludeGroups' => 'yes',
-				'excludeGroupsList' => ['NoSharers','OtherNoSharers'],
+				'excludeGroupsList' => ['NoSharers', 'OtherNoSharers'],
 				'publicShareDisclaimerText' => 'Lorem ipsum',
 				'enableLinkPasswordByDefault' => true,
 				'defaultPermissions' => Constants::PERMISSION_ALL,

apps/files_sharing/lib/Capabilities.php

Indentation +169 added lines, -169 removed lines

@@ -21,173 +21,173 @@
  * @package OCA\Files_Sharing
  */
 class Capabilities implements ICapability {
-	public function __construct(
-		private IConfig $config,
-		private readonly IAppConfig $appConfig,
-		private IManager $shareManager,
-		private IAppManager $appManager,
-	) {
-	}
-
-	/**
-	 * Return this classes capabilities
-	 *
-	 * @return array{
-	 *     files_sharing: array{
-	 *         api_enabled: bool,
-	 *         public: array{
-	 *             enabled: bool,
-	 *             password?: array{
-	 *                 enforced: bool,
-	 *                 askForOptionalPassword: bool
-	 *             },
-	 *     		   multiple_links?: bool,
-	 *             expire_date?: array{
-	 *                 enabled: bool,
-	 *                 days?: int,
-	 *                 enforced?: bool,
-	 *             },
-	 *             expire_date_internal?: array{
-	 *                 enabled: bool,
-	 *                 days?: int,
-	 *                 enforced?: bool,
-	 *             },
-	 *             expire_date_remote?: array{
-	 *                 enabled: bool,
-	 *                 days?: int,
-	 *                 enforced?: bool,
-	 *             },
-	 *             send_mail?: bool,
-	 *             upload?: bool,
-	 *             upload_files_drop?: bool,
-	 *             custom_tokens?: bool,
-	 *         },
-	 *         user: array{
-	 *             send_mail: bool,
-	 *             expire_date?: array{
-	 *                 enabled: bool,
-	 *             },
-	 *         },
-	 *         resharing: bool,
-	 *         group_sharing?: bool,
-	 *         group?: array{
-	 *             enabled: bool,
-	 *             expire_date?: array{
-	 *                 enabled: bool,
-	 *             },
-	 *         },
-	 *         default_permissions?: int,
-	 *         federation: array{
-	 *             outgoing: bool,
-	 *             incoming: bool,
-	 *             expire_date: array{
-	 *                 enabled: bool,
-	 *             },
-	 *             expire_date_supported: array{
-	 *                 enabled: bool,
-	 *             },
-	 *         },
-	 *         sharee: array{
-	 *             query_lookup_default: bool,
-	 *             always_show_unique: bool,
-	 *         },
-	 *	   },
-	 * }
-	 */
-	public function getCapabilities() {
-		$res = [];
-
-		if (!$this->shareManager->shareApiEnabled()) {
-			$res['api_enabled'] = false;
-			$res['public'] = ['enabled' => false];
-			$res['user'] = ['send_mail' => false];
-			$res['resharing'] = false;
-		} else {
-			$res['api_enabled'] = true;
-
-			$public = [];
-			$public['enabled'] = $this->shareManager->shareApiAllowLinks();
-			if ($public['enabled']) {
-				$public['password'] = [];
-				$public['password']['enforced'] = $this->shareManager->shareApiLinkEnforcePassword();
-
-				if ($public['password']['enforced']) {
-					$public['password']['askForOptionalPassword'] = false;
-				} else {
-					$public['password']['askForOptionalPassword'] = $this->appConfig->getValueBool('core', ConfigLexicon::SHARE_LINK_PASSWORD_DEFAULT);
-				}
-
-				$public['expire_date'] = [];
-				$public['multiple_links'] = true;
-				$public['expire_date']['enabled'] = $this->shareManager->shareApiLinkDefaultExpireDate();
-				if ($public['expire_date']['enabled']) {
-					$public['expire_date']['days'] = $this->shareManager->shareApiLinkDefaultExpireDays();
-					$public['expire_date']['enforced'] = $this->shareManager->shareApiLinkDefaultExpireDateEnforced();
-				}
-
-				$public['expire_date_internal'] = [];
-				$public['expire_date_internal']['enabled'] = $this->shareManager->shareApiInternalDefaultExpireDate();
-				if ($public['expire_date_internal']['enabled']) {
-					$public['expire_date_internal']['days'] = $this->shareManager->shareApiInternalDefaultExpireDays();
-					$public['expire_date_internal']['enforced'] = $this->shareManager->shareApiInternalDefaultExpireDateEnforced();
-				}
-
-				$public['expire_date_remote'] = [];
-				$public['expire_date_remote']['enabled'] = $this->shareManager->shareApiRemoteDefaultExpireDate();
-				if ($public['expire_date_remote']['enabled']) {
-					$public['expire_date_remote']['days'] = $this->shareManager->shareApiRemoteDefaultExpireDays();
-					$public['expire_date_remote']['enforced'] = $this->shareManager->shareApiRemoteDefaultExpireDateEnforced();
-				}
-
-				$public['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_public_notification', 'no') === 'yes';
-				$public['upload'] = $this->shareManager->shareApiLinkAllowPublicUpload();
-				$public['upload_files_drop'] = $public['upload'];
-				$public['custom_tokens'] = $this->shareManager->allowCustomTokens();
-			}
-			$res['public'] = $public;
-
-			$res['resharing'] = $this->config->getAppValue('core', 'shareapi_allow_resharing', 'yes') === 'yes';
-
-			$res['user']['send_mail'] = false;
-			$res['user']['expire_date']['enabled'] = true;
-
-			// deprecated in favour of 'group', but we need to keep it for now
-			// in order to stay compatible with older clients
-			$res['group_sharing'] = $this->shareManager->allowGroupSharing();
-
-			$res['group'] = [];
-			$res['group']['enabled'] = $this->shareManager->allowGroupSharing();
-			$res['group']['expire_date']['enabled'] = true;
-			$res['default_permissions'] = (int)$this->config->getAppValue('core', 'shareapi_default_permissions', (string)Constants::PERMISSION_ALL);
-		}
-
-		//Federated sharing
-		if ($this->appManager->isEnabledForAnyone('federation')) {
-			$res['federation'] = [
-				'outgoing' => $this->shareManager->outgoingServer2ServerSharesAllowed(),
-				'incoming' => $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'yes',
-				// old bogus one, expire_date was not working before, keeping for compatibility
-				'expire_date' => ['enabled' => true],
-				// the real deal, signifies that expiration date can be set on federated shares
-				'expire_date_supported' => ['enabled' => true],
-			];
-		} else {
-			$res['federation'] = [
-				'outgoing' => false,
-				'incoming' => false,
-				'expire_date' => ['enabled' => false],
-				'expire_date_supported' => ['enabled' => false],
-			];
-		}
-
-		// Sharee searches
-		$res['sharee'] = [
-			'query_lookup_default' => $this->config->getSystemValueBool('gs.enabled', false),
-			'always_show_unique' => $this->config->getAppValue('files_sharing', 'always_show_unique', 'yes') === 'yes',
-		];
-
-		return [
-			'files_sharing' => $res,
-		];
-	}
+    public function __construct(
+        private IConfig $config,
+        private readonly IAppConfig $appConfig,
+        private IManager $shareManager,
+        private IAppManager $appManager,
+    ) {
+    }
+
+    /**
+     * Return this classes capabilities
+     *
+     * @return array{
+     *     files_sharing: array{
+     *         api_enabled: bool,
+     *         public: array{
+     *             enabled: bool,
+     *             password?: array{
+     *                 enforced: bool,
+     *                 askForOptionalPassword: bool
+     *             },
+     *     		   multiple_links?: bool,
+     *             expire_date?: array{
+     *                 enabled: bool,
+     *                 days?: int,
+     *                 enforced?: bool,
+     *             },
+     *             expire_date_internal?: array{
+     *                 enabled: bool,
+     *                 days?: int,
+     *                 enforced?: bool,
+     *             },
+     *             expire_date_remote?: array{
+     *                 enabled: bool,
+     *                 days?: int,
+     *                 enforced?: bool,
+     *             },
+     *             send_mail?: bool,
+     *             upload?: bool,
+     *             upload_files_drop?: bool,
+     *             custom_tokens?: bool,
+     *         },
+     *         user: array{
+     *             send_mail: bool,
+     *             expire_date?: array{
+     *                 enabled: bool,
+     *             },
+     *         },
+     *         resharing: bool,
+     *         group_sharing?: bool,
+     *         group?: array{
+     *             enabled: bool,
+     *             expire_date?: array{
+     *                 enabled: bool,
+     *             },
+     *         },
+     *         default_permissions?: int,
+     *         federation: array{
+     *             outgoing: bool,
+     *             incoming: bool,
+     *             expire_date: array{
+     *                 enabled: bool,
+     *             },
+     *             expire_date_supported: array{
+     *                 enabled: bool,
+     *             },
+     *         },
+     *         sharee: array{
+     *             query_lookup_default: bool,
+     *             always_show_unique: bool,
+     *         },
+     *	   },
+     * }
+     */
+    public function getCapabilities() {
+        $res = [];
+
+        if (!$this->shareManager->shareApiEnabled()) {
+            $res['api_enabled'] = false;
+            $res['public'] = ['enabled' => false];
+            $res['user'] = ['send_mail' => false];
+            $res['resharing'] = false;
+        } else {
+            $res['api_enabled'] = true;
+
+            $public = [];
+            $public['enabled'] = $this->shareManager->shareApiAllowLinks();
+            if ($public['enabled']) {
+                $public['password'] = [];
+                $public['password']['enforced'] = $this->shareManager->shareApiLinkEnforcePassword();
+
+                if ($public['password']['enforced']) {
+                    $public['password']['askForOptionalPassword'] = false;
+                } else {
+                    $public['password']['askForOptionalPassword'] = $this->appConfig->getValueBool('core', ConfigLexicon::SHARE_LINK_PASSWORD_DEFAULT);
+                }
+
+                $public['expire_date'] = [];
+                $public['multiple_links'] = true;
+                $public['expire_date']['enabled'] = $this->shareManager->shareApiLinkDefaultExpireDate();
+                if ($public['expire_date']['enabled']) {
+                    $public['expire_date']['days'] = $this->shareManager->shareApiLinkDefaultExpireDays();
+                    $public['expire_date']['enforced'] = $this->shareManager->shareApiLinkDefaultExpireDateEnforced();
+                }
+
+                $public['expire_date_internal'] = [];
+                $public['expire_date_internal']['enabled'] = $this->shareManager->shareApiInternalDefaultExpireDate();
+                if ($public['expire_date_internal']['enabled']) {
+                    $public['expire_date_internal']['days'] = $this->shareManager->shareApiInternalDefaultExpireDays();
+                    $public['expire_date_internal']['enforced'] = $this->shareManager->shareApiInternalDefaultExpireDateEnforced();
+                }
+
+                $public['expire_date_remote'] = [];
+                $public['expire_date_remote']['enabled'] = $this->shareManager->shareApiRemoteDefaultExpireDate();
+                if ($public['expire_date_remote']['enabled']) {
+                    $public['expire_date_remote']['days'] = $this->shareManager->shareApiRemoteDefaultExpireDays();
+                    $public['expire_date_remote']['enforced'] = $this->shareManager->shareApiRemoteDefaultExpireDateEnforced();
+                }
+
+                $public['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_public_notification', 'no') === 'yes';
+                $public['upload'] = $this->shareManager->shareApiLinkAllowPublicUpload();
+                $public['upload_files_drop'] = $public['upload'];
+                $public['custom_tokens'] = $this->shareManager->allowCustomTokens();
+            }
+            $res['public'] = $public;
+
+            $res['resharing'] = $this->config->getAppValue('core', 'shareapi_allow_resharing', 'yes') === 'yes';
+
+            $res['user']['send_mail'] = false;
+            $res['user']['expire_date']['enabled'] = true;
+
+            // deprecated in favour of 'group', but we need to keep it for now
+            // in order to stay compatible with older clients
+            $res['group_sharing'] = $this->shareManager->allowGroupSharing();
+
+            $res['group'] = [];
+            $res['group']['enabled'] = $this->shareManager->allowGroupSharing();
+            $res['group']['expire_date']['enabled'] = true;
+            $res['default_permissions'] = (int)$this->config->getAppValue('core', 'shareapi_default_permissions', (string)Constants::PERMISSION_ALL);
+        }
+
+        //Federated sharing
+        if ($this->appManager->isEnabledForAnyone('federation')) {
+            $res['federation'] = [
+                'outgoing' => $this->shareManager->outgoingServer2ServerSharesAllowed(),
+                'incoming' => $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'yes',
+                // old bogus one, expire_date was not working before, keeping for compatibility
+                'expire_date' => ['enabled' => true],
+                // the real deal, signifies that expiration date can be set on federated shares
+                'expire_date_supported' => ['enabled' => true],
+            ];
+        } else {
+            $res['federation'] = [
+                'outgoing' => false,
+                'incoming' => false,
+                'expire_date' => ['enabled' => false],
+                'expire_date_supported' => ['enabled' => false],
+            ];
+        }
+
+        // Sharee searches
+        $res['sharee'] = [
+            'query_lookup_default' => $this->config->getSystemValueBool('gs.enabled', false),
+            'always_show_unique' => $this->config->getAppValue('files_sharing', 'always_show_unique', 'yes') === 'yes',
+        ];
+
+        return [
+            'files_sharing' => $res,
+        ];
+    }
 }

apps/files_sharing/tests/CapabilitiesTest.php

Indentation +321 added lines, -321 removed lines

@@ -36,325 +36,325 @@
  */
 class CapabilitiesTest extends \Test\TestCase {
 
-	/**
-	 * Test for the general part in each return statement and assert.
-	 * Strip of the general part on the way.
-	 *
-	 * @param string[] $data Capabilities
-	 * @return string[]
-	 */
-	private function getFilesSharingPart(array $data) {
-		$this->assertArrayHasKey('files_sharing', $data);
-		return $data['files_sharing'];
-	}
-
-	/**
-	 * Create a mock config object and insert the values in $map to the getAppValue
-	 * function. Then obtain the capabilities and extract the first few
-	 * levels in the array
-	 *
-	 * @param (string[])[] $map Map of arguments to return types for the getAppValue function in the mock
-	 * @return string[]
-	 */
-	private function getResults(array $map, array $typedMap = [], bool $federationEnabled = true) {
-		$config = $this->getMockBuilder(IConfig::class)->disableOriginalConstructor()->getMock();
-		$appManager = $this->getMockBuilder(IAppManager::class)->disableOriginalConstructor()->getMock();
-		$config->method('getAppValue')->willReturnMap($map);
-		$appManager->method('isEnabledForAnyone')->with('federation')->willReturn($federationEnabled);
-
-		if (empty($typedMap)) {
-			$appConfig = $this->createMock(IAppConfig::class);
-		} else {
-			// hack to help transition from old IConfig to new IAppConfig
-			$appConfig = $this->getMockBuilder(IAppConfig::class)->disableOriginalConstructor()->getMock();
-			$appConfig->expects($this->any())->method('getValueBool')->willReturnCallback(function (...$args) use ($typedMap): bool {
-				foreach ($typedMap as $entry) {
-					if ($entry[0] !== $args[0] || $entry[1] !== $args[1]) {
-						continue;
-					}
-
-					return $entry[2];
-				}
-
-				return false;
-			});
-		}
-
-		$shareManager = new Manager(
-			$this->createMock(LoggerInterface::class),
-			$config,
-			$this->createMock(ISecureRandom::class),
-			$this->createMock(IHasher::class),
-			$this->createMock(IMountManager::class),
-			$this->createMock(IGroupManager::class),
-			$this->createMock(IFactory::class),
-			$this->createMock(IProviderFactory::class),
-			$this->createMock(IUserManager::class),
-			$this->createMock(IRootFolder::class),
-			$this->createMock(IMailer::class),
-			$this->createMock(IURLGenerator::class),
-			$this->createMock(\OC_Defaults::class),
-			$this->createMock(IEventDispatcher::class),
-			$this->createMock(IUserSession::class),
-			$this->createMock(KnownUserService::class),
-			$this->createMock(ShareDisableChecker::class),
-			$this->createMock(IDateTimeZone::class),
-			$appConfig,
-		);
-
-		$cap = new Capabilities($config, $appConfig, $shareManager, $appManager);
-		$result = $this->getFilesSharingPart($cap->getCapabilities());
-		return $result;
-	}
-
-	public function testEnabledSharingAPI(): void {
-		$map = [
-			['core', 'shareapi_enabled', 'yes', 'yes'],
-		];
-		$result = $this->getResults($map);
-		$this->assertTrue($result['api_enabled']);
-		$this->assertArrayHasKey('public', $result);
-		$this->assertArrayHasKey('user', $result);
-		$this->assertArrayHasKey('resharing', $result);
-	}
-
-	public function testDisabledSharingAPI(): void {
-		$map = [
-			['core', 'shareapi_enabled', 'yes', 'no'],
-		];
-		$result = $this->getResults($map);
-		$this->assertFalse($result['api_enabled']);
-		$this->assertFalse($result['public']['enabled']);
-		$this->assertFalse($result['user']['send_mail']);
-		$this->assertFalse($result['resharing']);
-	}
-
-	public function testNoLinkSharing(): void {
-		$map = [
-			['core', 'shareapi_enabled', 'yes', 'yes'],
-			['core', 'shareapi_allow_links', 'yes', 'no'],
-		];
-		$result = $this->getResults($map);
-		$this->assertIsArray($result['public']);
-		$this->assertFalse($result['public']['enabled']);
-	}
-
-	public function testOnlyLinkSharing(): void {
-		$map = [
-			['core', 'shareapi_enabled', 'yes', 'yes'],
-			['core', 'shareapi_allow_links', 'yes', 'yes'],
-			['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
-		];
-		$result = $this->getResults($map);
-		$this->assertIsArray($result['public']);
-		$this->assertTrue($result['public']['enabled']);
-	}
-
-	public function testLinkPassword(): void {
-		$map = [
-			['core', 'shareapi_enabled', 'yes', 'yes'],
-			['core', 'shareapi_allow_links', 'yes', 'yes'],
-			['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
-		];
-		$typedMap = [
-			['core', 'shareapi_enforce_links_password', true],
-		];
-		$result = $this->getResults($map, $typedMap);
-		$this->assertArrayHasKey('password', $result['public']);
-		$this->assertArrayHasKey('enforced', $result['public']['password']);
-		$this->assertTrue($result['public']['password']['enforced']);
-	}
-
-	public function testLinkNoPassword(): void {
-		$map = [
-			['core', 'shareapi_enabled', 'yes', 'yes'],
-			['core', 'shareapi_allow_links', 'yes', 'yes'],
-			['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
-			['core', 'shareapi_enforce_links_password', 'no', 'no'],
-		];
-		$result = $this->getResults($map);
-		$this->assertArrayHasKey('password', $result['public']);
-		$this->assertArrayHasKey('enforced', $result['public']['password']);
-		$this->assertFalse($result['public']['password']['enforced']);
-	}
-
-	public function testLinkNoExpireDate(): void {
-		$map = [
-			['core', 'shareapi_enabled', 'yes', 'yes'],
-			['core', 'shareapi_allow_links', 'yes', 'yes'],
-			['core', 'shareapi_default_expire_date', 'no', 'no'],
-			['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
-		];
-		$result = $this->getResults($map);
-		$this->assertArrayHasKey('expire_date', $result['public']);
-		$this->assertIsArray($result['public']['expire_date']);
-		$this->assertFalse($result['public']['expire_date']['enabled']);
-	}
-
-	public function testLinkExpireDate(): void {
-		$map = [
-			['core', 'shareapi_enabled', 'yes', 'yes'],
-			['core', 'shareapi_allow_links', 'yes', 'yes'],
-			['core', 'shareapi_default_expire_date', 'no', 'yes'],
-			['core', 'shareapi_expire_after_n_days', '7', '7'],
-			['core', 'shareapi_enforce_expire_date', 'no', 'no'],
-			['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
-		];
-		$result = $this->getResults($map);
-		$this->assertArrayHasKey('expire_date', $result['public']);
-		$this->assertIsArray($result['public']['expire_date']);
-		$this->assertTrue($result['public']['expire_date']['enabled']);
-		$this->assertArrayHasKey('days', $result['public']['expire_date']);
-		$this->assertFalse($result['public']['expire_date']['enforced']);
-	}
-
-	public function testLinkExpireDateEnforced(): void {
-		$map = [
-			['core', 'shareapi_enabled', 'yes', 'yes'],
-			['core', 'shareapi_allow_links', 'yes', 'yes'],
-			['core', 'shareapi_default_expire_date', 'no', 'yes'],
-			['core', 'shareapi_enforce_expire_date', 'no', 'yes'],
-			['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
-		];
-		$result = $this->getResults($map);
-		$this->assertArrayHasKey('expire_date', $result['public']);
-		$this->assertIsArray($result['public']['expire_date']);
-		$this->assertTrue($result['public']['expire_date']['enforced']);
-	}
-
-	public function testLinkSendMail(): void {
-		$map = [
-			['core', 'shareapi_enabled', 'yes', 'yes'],
-			['core', 'shareapi_allow_links', 'yes', 'yes'],
-			['core', 'shareapi_allow_public_notification', 'no', 'yes'],
-			['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
-		];
-		$result = $this->getResults($map);
-		$this->assertTrue($result['public']['send_mail']);
-	}
-
-	public function testLinkNoSendMail(): void {
-		$map = [
-			['core', 'shareapi_enabled', 'yes', 'yes'],
-			['core', 'shareapi_allow_links', 'yes', 'yes'],
-			['core', 'shareapi_allow_public_notification', 'no', 'no'],
-			['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
-		];
-		$result = $this->getResults($map);
-		$this->assertFalse($result['public']['send_mail']);
-	}
-
-	public function testResharing(): void {
-		$map = [
-			['core', 'shareapi_enabled', 'yes', 'yes'],
-			['core', 'shareapi_allow_resharing', 'yes', 'yes'],
-			['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
-		];
-		$result = $this->getResults($map);
-		$this->assertTrue($result['resharing']);
-	}
-
-	public function testNoResharing(): void {
-		$map = [
-			['core', 'shareapi_enabled', 'yes', 'yes'],
-			['core', 'shareapi_allow_resharing', 'yes', 'no'],
-			['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
-		];
-		$result = $this->getResults($map);
-		$this->assertFalse($result['resharing']);
-	}
-
-	public function testLinkPublicUpload(): void {
-		$map = [
-			['core', 'shareapi_enabled', 'yes', 'yes'],
-			['core', 'shareapi_allow_links', 'yes', 'yes'],
-			['core', 'shareapi_allow_public_upload', 'yes', 'yes'],
-			['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
-		];
-		$result = $this->getResults($map);
-		$this->assertTrue($result['public']['upload']);
-		$this->assertTrue($result['public']['upload_files_drop']);
-	}
-
-	public function testLinkNoPublicUpload(): void {
-		$map = [
-			['core', 'shareapi_enabled', 'yes', 'yes'],
-			['core', 'shareapi_allow_links', 'yes', 'yes'],
-			['core', 'shareapi_allow_public_upload', 'yes', 'no'],
-			['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
-		];
-		$result = $this->getResults($map);
-		$this->assertFalse($result['public']['upload']);
-		$this->assertFalse($result['public']['upload_files_drop']);
-	}
-
-	public function testNoGroupSharing(): void {
-		$map = [
-			['core', 'shareapi_enabled', 'yes', 'yes'],
-			['core', 'shareapi_allow_group_sharing', 'yes', 'no'],
-		];
-		$result = $this->getResults($map);
-		$this->assertFalse($result['group_sharing']);
-	}
-
-	public function testGroupSharing(): void {
-		$map = [
-			['core', 'shareapi_enabled', 'yes', 'yes'],
-			['core', 'shareapi_allow_group_sharing', 'yes', 'yes'],
-		];
-		$result = $this->getResults($map);
-		$this->assertTrue($result['group_sharing']);
-	}
-
-	public function testFederatedSharingIncoming(): void {
-		$map = [
-			['files_sharing', 'incoming_server2server_share_enabled', 'yes', 'yes'],
-		];
-		$result = $this->getResults($map);
-		$this->assertArrayHasKey('federation', $result);
-		$this->assertTrue($result['federation']['incoming']);
-	}
-
-	public function testFederatedSharingNoIncoming(): void {
-		$map = [
-			['files_sharing', 'incoming_server2server_share_enabled', 'yes', 'no'],
-		];
-		$result = $this->getResults($map);
-		$this->assertArrayHasKey('federation', $result);
-		$this->assertFalse($result['federation']['incoming']);
-	}
-
-	public function testFederatedSharingOutgoing(): void {
-		$map = [
-			['files_sharing', 'outgoing_server2server_share_enabled', 'yes', 'yes'],
-		];
-		$result = $this->getResults($map);
-		$this->assertArrayHasKey('federation', $result);
-		$this->assertTrue($result['federation']['outgoing']);
-	}
-
-	public function testFederatedSharingNoOutgoing(): void {
-		$map = [
-			['files_sharing', 'outgoing_server2server_share_enabled', 'yes', 'no'],
-		];
-		$result = $this->getResults($map);
-		$this->assertArrayHasKey('federation', $result);
-		$this->assertFalse($result['federation']['outgoing']);
-	}
-
-	public function testFederatedSharingExpirationDate(): void {
-		$result = $this->getResults([]);
-		$this->assertArrayHasKey('federation', $result);
-		$this->assertEquals(['enabled' => true], $result['federation']['expire_date']);
-		$this->assertEquals(['enabled' => true], $result['federation']['expire_date_supported']);
-	}
-
-	public function testFederatedSharingDisabled(): void {
-		$result = $this->getResults([], federationEnabled: false);
-		$this->assertArrayHasKey('federation', $result);
-		$this->assertFalse($result['federation']['incoming']);
-		$this->assertFalse($result['federation']['outgoing']);
-		$this->assertEquals(['enabled' => false], $result['federation']['expire_date']);
-		$this->assertEquals(['enabled' => false], $result['federation']['expire_date_supported']);
-	}
+    /**
+     * Test for the general part in each return statement and assert.
+     * Strip of the general part on the way.
+     *
+     * @param string[] $data Capabilities
+     * @return string[]
+     */
+    private function getFilesSharingPart(array $data) {
+        $this->assertArrayHasKey('files_sharing', $data);
+        return $data['files_sharing'];
+    }
+
+    /**
+     * Create a mock config object and insert the values in $map to the getAppValue
+     * function. Then obtain the capabilities and extract the first few
+     * levels in the array
+     *
+     * @param (string[])[] $map Map of arguments to return types for the getAppValue function in the mock
+     * @return string[]
+     */
+    private function getResults(array $map, array $typedMap = [], bool $federationEnabled = true) {
+        $config = $this->getMockBuilder(IConfig::class)->disableOriginalConstructor()->getMock();
+        $appManager = $this->getMockBuilder(IAppManager::class)->disableOriginalConstructor()->getMock();
+        $config->method('getAppValue')->willReturnMap($map);
+        $appManager->method('isEnabledForAnyone')->with('federation')->willReturn($federationEnabled);
+
+        if (empty($typedMap)) {
+            $appConfig = $this->createMock(IAppConfig::class);
+        } else {
+            // hack to help transition from old IConfig to new IAppConfig
+            $appConfig = $this->getMockBuilder(IAppConfig::class)->disableOriginalConstructor()->getMock();
+            $appConfig->expects($this->any())->method('getValueBool')->willReturnCallback(function (...$args) use ($typedMap): bool {
+                foreach ($typedMap as $entry) {
+                    if ($entry[0] !== $args[0] || $entry[1] !== $args[1]) {
+                        continue;
+                    }
+
+                    return $entry[2];
+                }
+
+                return false;
+            });
+        }
+
+        $shareManager = new Manager(
+            $this->createMock(LoggerInterface::class),
+            $config,
+            $this->createMock(ISecureRandom::class),
+            $this->createMock(IHasher::class),
+            $this->createMock(IMountManager::class),
+            $this->createMock(IGroupManager::class),
+            $this->createMock(IFactory::class),
+            $this->createMock(IProviderFactory::class),
+            $this->createMock(IUserManager::class),
+            $this->createMock(IRootFolder::class),
+            $this->createMock(IMailer::class),
+            $this->createMock(IURLGenerator::class),
+            $this->createMock(\OC_Defaults::class),
+            $this->createMock(IEventDispatcher::class),
+            $this->createMock(IUserSession::class),
+            $this->createMock(KnownUserService::class),
+            $this->createMock(ShareDisableChecker::class),
+            $this->createMock(IDateTimeZone::class),
+            $appConfig,
+        );
+
+        $cap = new Capabilities($config, $appConfig, $shareManager, $appManager);
+        $result = $this->getFilesSharingPart($cap->getCapabilities());
+        return $result;
+    }
+
+    public function testEnabledSharingAPI(): void {
+        $map = [
+            ['core', 'shareapi_enabled', 'yes', 'yes'],
+        ];
+        $result = $this->getResults($map);
+        $this->assertTrue($result['api_enabled']);
+        $this->assertArrayHasKey('public', $result);
+        $this->assertArrayHasKey('user', $result);
+        $this->assertArrayHasKey('resharing', $result);
+    }
+
+    public function testDisabledSharingAPI(): void {
+        $map = [
+            ['core', 'shareapi_enabled', 'yes', 'no'],
+        ];
+        $result = $this->getResults($map);
+        $this->assertFalse($result['api_enabled']);
+        $this->assertFalse($result['public']['enabled']);
+        $this->assertFalse($result['user']['send_mail']);
+        $this->assertFalse($result['resharing']);
+    }
+
+    public function testNoLinkSharing(): void {
+        $map = [
+            ['core', 'shareapi_enabled', 'yes', 'yes'],
+            ['core', 'shareapi_allow_links', 'yes', 'no'],
+        ];
+        $result = $this->getResults($map);
+        $this->assertIsArray($result['public']);
+        $this->assertFalse($result['public']['enabled']);
+    }
+
+    public function testOnlyLinkSharing(): void {
+        $map = [
+            ['core', 'shareapi_enabled', 'yes', 'yes'],
+            ['core', 'shareapi_allow_links', 'yes', 'yes'],
+            ['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
+        ];
+        $result = $this->getResults($map);
+        $this->assertIsArray($result['public']);
+        $this->assertTrue($result['public']['enabled']);
+    }
+
+    public function testLinkPassword(): void {
+        $map = [
+            ['core', 'shareapi_enabled', 'yes', 'yes'],
+            ['core', 'shareapi_allow_links', 'yes', 'yes'],
+            ['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
+        ];
+        $typedMap = [
+            ['core', 'shareapi_enforce_links_password', true],
+        ];
+        $result = $this->getResults($map, $typedMap);
+        $this->assertArrayHasKey('password', $result['public']);
+        $this->assertArrayHasKey('enforced', $result['public']['password']);
+        $this->assertTrue($result['public']['password']['enforced']);
+    }
+
+    public function testLinkNoPassword(): void {
+        $map = [
+            ['core', 'shareapi_enabled', 'yes', 'yes'],
+            ['core', 'shareapi_allow_links', 'yes', 'yes'],
+            ['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
+            ['core', 'shareapi_enforce_links_password', 'no', 'no'],
+        ];
+        $result = $this->getResults($map);
+        $this->assertArrayHasKey('password', $result['public']);
+        $this->assertArrayHasKey('enforced', $result['public']['password']);
+        $this->assertFalse($result['public']['password']['enforced']);
+    }
+
+    public function testLinkNoExpireDate(): void {
+        $map = [
+            ['core', 'shareapi_enabled', 'yes', 'yes'],
+            ['core', 'shareapi_allow_links', 'yes', 'yes'],
+            ['core', 'shareapi_default_expire_date', 'no', 'no'],
+            ['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
+        ];
+        $result = $this->getResults($map);
+        $this->assertArrayHasKey('expire_date', $result['public']);
+        $this->assertIsArray($result['public']['expire_date']);
+        $this->assertFalse($result['public']['expire_date']['enabled']);
+    }
+
+    public function testLinkExpireDate(): void {
+        $map = [
+            ['core', 'shareapi_enabled', 'yes', 'yes'],
+            ['core', 'shareapi_allow_links', 'yes', 'yes'],
+            ['core', 'shareapi_default_expire_date', 'no', 'yes'],
+            ['core', 'shareapi_expire_after_n_days', '7', '7'],
+            ['core', 'shareapi_enforce_expire_date', 'no', 'no'],
+            ['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
+        ];
+        $result = $this->getResults($map);
+        $this->assertArrayHasKey('expire_date', $result['public']);
+        $this->assertIsArray($result['public']['expire_date']);
+        $this->assertTrue($result['public']['expire_date']['enabled']);
+        $this->assertArrayHasKey('days', $result['public']['expire_date']);
+        $this->assertFalse($result['public']['expire_date']['enforced']);
+    }
+
+    public function testLinkExpireDateEnforced(): void {
+        $map = [
+            ['core', 'shareapi_enabled', 'yes', 'yes'],
+            ['core', 'shareapi_allow_links', 'yes', 'yes'],
+            ['core', 'shareapi_default_expire_date', 'no', 'yes'],
+            ['core', 'shareapi_enforce_expire_date', 'no', 'yes'],
+            ['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
+        ];
+        $result = $this->getResults($map);
+        $this->assertArrayHasKey('expire_date', $result['public']);
+        $this->assertIsArray($result['public']['expire_date']);
+        $this->assertTrue($result['public']['expire_date']['enforced']);
+    }
+
+    public function testLinkSendMail(): void {
+        $map = [
+            ['core', 'shareapi_enabled', 'yes', 'yes'],
+            ['core', 'shareapi_allow_links', 'yes', 'yes'],
+            ['core', 'shareapi_allow_public_notification', 'no', 'yes'],
+            ['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
+        ];
+        $result = $this->getResults($map);
+        $this->assertTrue($result['public']['send_mail']);
+    }
+
+    public function testLinkNoSendMail(): void {
+        $map = [
+            ['core', 'shareapi_enabled', 'yes', 'yes'],
+            ['core', 'shareapi_allow_links', 'yes', 'yes'],
+            ['core', 'shareapi_allow_public_notification', 'no', 'no'],
+            ['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
+        ];
+        $result = $this->getResults($map);
+        $this->assertFalse($result['public']['send_mail']);
+    }
+
+    public function testResharing(): void {
+        $map = [
+            ['core', 'shareapi_enabled', 'yes', 'yes'],
+            ['core', 'shareapi_allow_resharing', 'yes', 'yes'],
+            ['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
+        ];
+        $result = $this->getResults($map);
+        $this->assertTrue($result['resharing']);
+    }
+
+    public function testNoResharing(): void {
+        $map = [
+            ['core', 'shareapi_enabled', 'yes', 'yes'],
+            ['core', 'shareapi_allow_resharing', 'yes', 'no'],
+            ['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
+        ];
+        $result = $this->getResults($map);
+        $this->assertFalse($result['resharing']);
+    }
+
+    public function testLinkPublicUpload(): void {
+        $map = [
+            ['core', 'shareapi_enabled', 'yes', 'yes'],
+            ['core', 'shareapi_allow_links', 'yes', 'yes'],
+            ['core', 'shareapi_allow_public_upload', 'yes', 'yes'],
+            ['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
+        ];
+        $result = $this->getResults($map);
+        $this->assertTrue($result['public']['upload']);
+        $this->assertTrue($result['public']['upload_files_drop']);
+    }
+
+    public function testLinkNoPublicUpload(): void {
+        $map = [
+            ['core', 'shareapi_enabled', 'yes', 'yes'],
+            ['core', 'shareapi_allow_links', 'yes', 'yes'],
+            ['core', 'shareapi_allow_public_upload', 'yes', 'no'],
+            ['core', 'shareapi_enforce_links_password_excluded_groups', '', ''],
+        ];
+        $result = $this->getResults($map);
+        $this->assertFalse($result['public']['upload']);
+        $this->assertFalse($result['public']['upload_files_drop']);
+    }
+
+    public function testNoGroupSharing(): void {
+        $map = [
+            ['core', 'shareapi_enabled', 'yes', 'yes'],
+            ['core', 'shareapi_allow_group_sharing', 'yes', 'no'],
+        ];
+        $result = $this->getResults($map);
+        $this->assertFalse($result['group_sharing']);
+    }
+
+    public function testGroupSharing(): void {
+        $map = [
+            ['core', 'shareapi_enabled', 'yes', 'yes'],
+            ['core', 'shareapi_allow_group_sharing', 'yes', 'yes'],
+        ];
+        $result = $this->getResults($map);
+        $this->assertTrue($result['group_sharing']);
+    }
+
+    public function testFederatedSharingIncoming(): void {
+        $map = [
+            ['files_sharing', 'incoming_server2server_share_enabled', 'yes', 'yes'],
+        ];
+        $result = $this->getResults($map);
+        $this->assertArrayHasKey('federation', $result);
+        $this->assertTrue($result['federation']['incoming']);
+    }
+
+    public function testFederatedSharingNoIncoming(): void {
+        $map = [
+            ['files_sharing', 'incoming_server2server_share_enabled', 'yes', 'no'],
+        ];
+        $result = $this->getResults($map);
+        $this->assertArrayHasKey('federation', $result);
+        $this->assertFalse($result['federation']['incoming']);
+    }
+
+    public function testFederatedSharingOutgoing(): void {
+        $map = [
+            ['files_sharing', 'outgoing_server2server_share_enabled', 'yes', 'yes'],
+        ];
+        $result = $this->getResults($map);
+        $this->assertArrayHasKey('federation', $result);
+        $this->assertTrue($result['federation']['outgoing']);
+    }
+
+    public function testFederatedSharingNoOutgoing(): void {
+        $map = [
+            ['files_sharing', 'outgoing_server2server_share_enabled', 'yes', 'no'],
+        ];
+        $result = $this->getResults($map);
+        $this->assertArrayHasKey('federation', $result);
+        $this->assertFalse($result['federation']['outgoing']);
+    }
+
+    public function testFederatedSharingExpirationDate(): void {
+        $result = $this->getResults([]);
+        $this->assertArrayHasKey('federation', $result);
+        $this->assertEquals(['enabled' => true], $result['federation']['expire_date']);
+        $this->assertEquals(['enabled' => true], $result['federation']['expire_date_supported']);
+    }
+
+    public function testFederatedSharingDisabled(): void {
+        $result = $this->getResults([], federationEnabled: false);
+        $this->assertArrayHasKey('federation', $result);
+        $this->assertFalse($result['federation']['incoming']);
+        $this->assertFalse($result['federation']['outgoing']);
+        $this->assertEquals(['enabled' => false], $result['federation']['expire_date']);
+        $this->assertEquals(['enabled' => false], $result['federation']['expire_date_supported']);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 		} else {
 			// hack to help transition from old IConfig to new IAppConfig
 			$appConfig = $this->getMockBuilder(IAppConfig::class)->disableOriginalConstructor()->getMock();
-			$appConfig->expects($this->any())->method('getValueBool')->willReturnCallback(function (...$args) use ($typedMap): bool {
+			$appConfig->expects($this->any())->method('getValueBool')->willReturnCallback(function(...$args) use ($typedMap): bool {
 				foreach ($typedMap as $entry) {
 					if ($entry[0] !== $args[0] || $entry[1] !== $args[1]) {
 						continue;