nextcloud / server

apps/files_external/lib/Service/UserGlobalStoragesService.php

Indentation +167 added lines, -167 removed lines

@@ -35,171 +35,171 @@
  * Read-only access available, attempting to write will throw DomainException
  */
 class UserGlobalStoragesService extends GlobalStoragesService {
-	use UserTrait;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/**
-	 * @param BackendService $backendService
-	 * @param DBConfigService $dbConfig
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 * @param IUserMountCache $userMountCache
-	 */
-	public function __construct(
-		BackendService $backendService,
-		DBConfigService $dbConfig,
-		IUserSession $userSession,
-		IGroupManager $groupManager,
-		IUserMountCache $userMountCache
-	) {
-		parent::__construct($backendService, $dbConfig, $userMountCache);
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-	}
-
-	/**
-	 * Replace config hash ID with real IDs, for migrating legacy storages
-	 *
-	 * @param StorageConfig[] $storages Storages with real IDs
-	 * @param StorageConfig[] $storagesWithConfigHash Storages with config hash IDs
-	 */
-	protected function setRealStorageIds(array &$storages, array $storagesWithConfigHash) {
-		// as a read-only view, storage IDs don't need to be real
-		foreach ($storagesWithConfigHash as $storage) {
-			$storages[$storage->getId()] = $storage;
-		}
-	}
-
-	protected function readDBConfig() {
-		$userMounts = $this->dbConfig->getAdminMountsFor(DBConfigService::APPLICABLE_TYPE_USER, $this->getUser()->getUID());
-		$globalMounts = $this->dbConfig->getAdminMountsFor(DBConfigService::APPLICABLE_TYPE_GLOBAL, null);
-		$groups = $this->groupManager->getUserGroupIds($this->getUser());
-		if (count($groups) !== 0) {
-			$groupMounts = $this->dbConfig->getAdminMountsForMultiple(DBConfigService::APPLICABLE_TYPE_GROUP, $groups);
-		} else {
-			$groupMounts = [];
-		}
-		return array_merge($userMounts, $groupMounts, $globalMounts);
-	}
-
-	public function addStorage(StorageConfig $newStorage) {
-		throw new \DomainException('UserGlobalStoragesService writing disallowed');
-	}
-
-	public function updateStorage(StorageConfig $updatedStorage) {
-		throw new \DomainException('UserGlobalStoragesService writing disallowed');
-	}
-
-	/**
-	 * @param integer $id
-	 */
-	public function removeStorage($id) {
-		throw new \DomainException('UserGlobalStoragesService writing disallowed');
-	}
-
-	/**
-	 * Get unique storages, in case two are defined with the same mountpoint
-	 * Higher priority storages take precedence
-	 *
-	 * @return StorageConfig[]
-	 */
-	public function getUniqueStorages() {
-		$storages = $this->getStorages();
-
-		$storagesByMountpoint = [];
-		foreach ($storages as $storage) {
-			$storagesByMountpoint[$storage->getMountPoint()][] = $storage;
-		}
-
-		$result = [];
-		foreach ($storagesByMountpoint as $storageList) {
-			$storage = array_reduce($storageList, function ($carry, $item) {
-				if (isset($carry)) {
-					$carryPriorityType = $this->getPriorityType($carry);
-					$itemPriorityType = $this->getPriorityType($item);
-					if ($carryPriorityType > $itemPriorityType) {
-						return $carry;
-					} elseif ($carryPriorityType === $itemPriorityType) {
-						if ($carry->getPriority() > $item->getPriority()) {
-							return $carry;
-						}
-					}
-				}
-				return $item;
-			});
-			$result[$storage->getID()] = $storage;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Get a priority 'type', where a bigger number means higher priority
-	 * user applicable > group applicable > 'all'
-	 *
-	 * @param StorageConfig $storage
-	 * @return int
-	 */
-	protected function getPriorityType(StorageConfig $storage) {
-		$applicableUsers = $storage->getApplicableUsers();
-		$applicableGroups = $storage->getApplicableGroups();
-
-		if ($applicableUsers && $applicableUsers[0] !== 'all') {
-			return 2;
-		}
-		if ($applicableGroups) {
-			return 1;
-		}
-		return 0;
-	}
-
-	protected function isApplicable(StorageConfig $config) {
-		$applicableUsers = $config->getApplicableUsers();
-		$applicableGroups = $config->getApplicableGroups();
-
-		if (count($applicableUsers) === 0 && count($applicableGroups) === 0) {
-			return true;
-		}
-		if (in_array($this->getUser()->getUID(), $applicableUsers, true)) {
-			return true;
-		}
-		$groupIds = $this->groupManager->getUserGroupIds($this->getUser());
-		foreach ($groupIds as $groupId) {
-			if (in_array($groupId, $applicableGroups, true)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-
-	/**
-	 * Gets all storages for the user, admin, personal, global, etc
-	 *
-	 * @param IUser|null $user user to get the storages for, if not set the currently logged in user will be used
-	 * @return StorageConfig[] array of storage configs
-	 */
-	public function getAllStoragesForUser(IUser $user = null) {
-		if (is_null($user)) {
-			$user = $this->getUser();
-		}
-		if (is_null($user)) {
-			return [];
-		}
-		$groupIds = $this->groupManager->getUserGroupIds($user);
-		$mounts = $this->dbConfig->getMountsForUser($user->getUID(), $groupIds);
-		$configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts);
-		$configs = array_filter($configs, function ($config) {
-			return $config instanceof StorageConfig;
-		});
-
-		$keys = array_map(function (StorageConfig $config) {
-			return $config->getId();
-		}, $configs);
-
-		$storages = array_combine($keys, $configs);
-		return array_filter($storages, [$this, 'validateStorage']);
-	}
+    use UserTrait;
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /**
+     * @param BackendService $backendService
+     * @param DBConfigService $dbConfig
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     * @param IUserMountCache $userMountCache
+     */
+    public function __construct(
+        BackendService $backendService,
+        DBConfigService $dbConfig,
+        IUserSession $userSession,
+        IGroupManager $groupManager,
+        IUserMountCache $userMountCache
+    ) {
+        parent::__construct($backendService, $dbConfig, $userMountCache);
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+    }
+
+    /**
+     * Replace config hash ID with real IDs, for migrating legacy storages
+     *
+     * @param StorageConfig[] $storages Storages with real IDs
+     * @param StorageConfig[] $storagesWithConfigHash Storages with config hash IDs
+     */
+    protected function setRealStorageIds(array &$storages, array $storagesWithConfigHash) {
+        // as a read-only view, storage IDs don't need to be real
+        foreach ($storagesWithConfigHash as $storage) {
+            $storages[$storage->getId()] = $storage;
+        }
+    }
+
+    protected function readDBConfig() {
+        $userMounts = $this->dbConfig->getAdminMountsFor(DBConfigService::APPLICABLE_TYPE_USER, $this->getUser()->getUID());
+        $globalMounts = $this->dbConfig->getAdminMountsFor(DBConfigService::APPLICABLE_TYPE_GLOBAL, null);
+        $groups = $this->groupManager->getUserGroupIds($this->getUser());
+        if (count($groups) !== 0) {
+            $groupMounts = $this->dbConfig->getAdminMountsForMultiple(DBConfigService::APPLICABLE_TYPE_GROUP, $groups);
+        } else {
+            $groupMounts = [];
+        }
+        return array_merge($userMounts, $groupMounts, $globalMounts);
+    }
+
+    public function addStorage(StorageConfig $newStorage) {
+        throw new \DomainException('UserGlobalStoragesService writing disallowed');
+    }
+
+    public function updateStorage(StorageConfig $updatedStorage) {
+        throw new \DomainException('UserGlobalStoragesService writing disallowed');
+    }
+
+    /**
+     * @param integer $id
+     */
+    public function removeStorage($id) {
+        throw new \DomainException('UserGlobalStoragesService writing disallowed');
+    }
+
+    /**
+     * Get unique storages, in case two are defined with the same mountpoint
+     * Higher priority storages take precedence
+     *
+     * @return StorageConfig[]
+     */
+    public function getUniqueStorages() {
+        $storages = $this->getStorages();
+
+        $storagesByMountpoint = [];
+        foreach ($storages as $storage) {
+            $storagesByMountpoint[$storage->getMountPoint()][] = $storage;
+        }
+
+        $result = [];
+        foreach ($storagesByMountpoint as $storageList) {
+            $storage = array_reduce($storageList, function ($carry, $item) {
+                if (isset($carry)) {
+                    $carryPriorityType = $this->getPriorityType($carry);
+                    $itemPriorityType = $this->getPriorityType($item);
+                    if ($carryPriorityType > $itemPriorityType) {
+                        return $carry;
+                    } elseif ($carryPriorityType === $itemPriorityType) {
+                        if ($carry->getPriority() > $item->getPriority()) {
+                            return $carry;
+                        }
+                    }
+                }
+                return $item;
+            });
+            $result[$storage->getID()] = $storage;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get a priority 'type', where a bigger number means higher priority
+     * user applicable > group applicable > 'all'
+     *
+     * @param StorageConfig $storage
+     * @return int
+     */
+    protected function getPriorityType(StorageConfig $storage) {
+        $applicableUsers = $storage->getApplicableUsers();
+        $applicableGroups = $storage->getApplicableGroups();
+
+        if ($applicableUsers && $applicableUsers[0] !== 'all') {
+            return 2;
+        }
+        if ($applicableGroups) {
+            return 1;
+        }
+        return 0;
+    }
+
+    protected function isApplicable(StorageConfig $config) {
+        $applicableUsers = $config->getApplicableUsers();
+        $applicableGroups = $config->getApplicableGroups();
+
+        if (count($applicableUsers) === 0 && count($applicableGroups) === 0) {
+            return true;
+        }
+        if (in_array($this->getUser()->getUID(), $applicableUsers, true)) {
+            return true;
+        }
+        $groupIds = $this->groupManager->getUserGroupIds($this->getUser());
+        foreach ($groupIds as $groupId) {
+            if (in_array($groupId, $applicableGroups, true)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    /**
+     * Gets all storages for the user, admin, personal, global, etc
+     *
+     * @param IUser|null $user user to get the storages for, if not set the currently logged in user will be used
+     * @return StorageConfig[] array of storage configs
+     */
+    public function getAllStoragesForUser(IUser $user = null) {
+        if (is_null($user)) {
+            $user = $this->getUser();
+        }
+        if (is_null($user)) {
+            return [];
+        }
+        $groupIds = $this->groupManager->getUserGroupIds($user);
+        $mounts = $this->dbConfig->getMountsForUser($user->getUID(), $groupIds);
+        $configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts);
+        $configs = array_filter($configs, function ($config) {
+            return $config instanceof StorageConfig;
+        });
+
+        $keys = array_map(function (StorageConfig $config) {
+            return $config->getId();
+        }, $configs);
+
+        $storages = array_combine($keys, $configs);
+        return array_filter($storages, [$this, 'validateStorage']);
+    }
 }

lib/public/IGroupManager.php

Indentation +87 added lines, -87 removed lines

@@ -46,103 +46,103 @@
  * @since 8.0.0
  */
 interface IGroupManager {
-	/**
-	 * Checks whether a given backend is used
-	 *
-	 * @param string $backendClass Full classname including complete namespace
-	 * @return bool
-	 * @since 8.1.0
-	 */
-	public function isBackendUsed($backendClass);
+    /**
+     * Checks whether a given backend is used
+     *
+     * @param string $backendClass Full classname including complete namespace
+     * @return bool
+     * @since 8.1.0
+     */
+    public function isBackendUsed($backendClass);
 
-	/**
-	 * @param \OCP\GroupInterface $backend
-	 * @since 8.0.0
-	 */
-	public function addBackend($backend);
+    /**
+     * @param \OCP\GroupInterface $backend
+     * @since 8.0.0
+     */
+    public function addBackend($backend);
 
-	/**
-	 * @since 8.0.0
-	 */
-	public function clearBackends();
+    /**
+     * @since 8.0.0
+     */
+    public function clearBackends();
 
-	/**
-	 * Get the active backends
-	 * @return \OCP\GroupInterface[]
-	 * @since 13.0.0
-	 */
-	public function getBackends();
+    /**
+     * Get the active backends
+     * @return \OCP\GroupInterface[]
+     * @since 13.0.0
+     */
+    public function getBackends();
 
-	/**
-	 * @param string $gid
-	 * @return \OCP\IGroup|null
-	 * @since 8.0.0
-	 */
-	public function get($gid);
+    /**
+     * @param string $gid
+     * @return \OCP\IGroup|null
+     * @since 8.0.0
+     */
+    public function get($gid);
 
-	/**
-	 * @param string $gid
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function groupExists($gid);
+    /**
+     * @param string $gid
+     * @return bool
+     * @since 8.0.0
+     */
+    public function groupExists($gid);
 
-	/**
-	 * @param string $gid
-	 * @return \OCP\IGroup|null
-	 * @since 8.0.0
-	 */
-	public function createGroup($gid);
+    /**
+     * @param string $gid
+     * @return \OCP\IGroup|null
+     * @since 8.0.0
+     */
+    public function createGroup($gid);
 
-	/**
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return \OCP\IGroup[]
-	 * @since 8.0.0
-	 */
-	public function search($search, $limit = null, $offset = null);
+    /**
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return \OCP\IGroup[]
+     * @since 8.0.0
+     */
+    public function search($search, $limit = null, $offset = null);
 
-	/**
-	 * @param \OCP\IUser|null $user
-	 * @return \OCP\IGroup[]
-	 * @since 8.0.0
-	 */
-	public function getUserGroups(IUser $user = null);
+    /**
+     * @param \OCP\IUser|null $user
+     * @return \OCP\IGroup[]
+     * @since 8.0.0
+     */
+    public function getUserGroups(IUser $user = null);
 
-	/**
-	 * @param \OCP\IUser $user
-	 * @return string[] with group names
-	 * @since 8.0.0
-	 */
-	public function getUserGroupIds(IUser $user): array;
+    /**
+     * @param \OCP\IUser $user
+     * @return string[] with group names
+     * @since 8.0.0
+     */
+    public function getUserGroupIds(IUser $user): array;
 
-	/**
-	 * get a list of all display names in a group
-	 *
-	 * @param string $gid
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array an array of display names (value) and user ids (key)
-	 * @since 8.0.0
-	 */
-	public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0);
+    /**
+     * get a list of all display names in a group
+     *
+     * @param string $gid
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return array an array of display names (value) and user ids (key)
+     * @since 8.0.0
+     */
+    public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0);
 
-	/**
-	 * Checks if a userId is in the admin group
-	 * @param string $userId
-	 * @return bool if admin
-	 * @since 8.0.0
-	 */
-	public function isAdmin($userId);
+    /**
+     * Checks if a userId is in the admin group
+     * @param string $userId
+     * @return bool if admin
+     * @since 8.0.0
+     */
+    public function isAdmin($userId);
 
-	/**
-	 * Checks if a userId is in a group
-	 * @param string $userId
-	 * @param string $group
-	 * @return bool if in group
-	 * @since 8.0.0
-	 */
-	public function isInGroup($userId, $group);
+    /**
+     * Checks if a userId is in a group
+     * @param string $userId
+     * @param string $group
+     * @return bool if in group
+     * @since 8.0.0
+     */
+    public function isInGroup($userId, $group);
 }

lib/private/Template/JSConfigHelper.php

Indentation +273 added lines, -273 removed lines

@@ -47,277 +47,277 @@
 
 class JSConfigHelper {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var Defaults */
-	private $defaults;
-
-	/** @var IAppManager */
-	private $appManager;
-
-	/** @var ISession */
-	private $session;
-
-	/** @var IUser|null */
-	private $currentUser;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var IniGetWrapper */
-	private $iniWrapper;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var CapabilitiesManager */
-	private $capabilitiesManager;
-
-	/** @var IInitialStateService */
-	private $initialStateService;
-
-	/** @var array user back-ends excluded from password verification */
-	private $excludedUserBackEnds = ['user_saml' => true, 'user_globalsiteselector' => true];
-
-	/**
-	 * @param IL10N $l
-	 * @param Defaults $defaults
-	 * @param IAppManager $appManager
-	 * @param ISession $session
-	 * @param IUser|null $currentUser
-	 * @param IConfig $config
-	 * @param IGroupManager $groupManager
-	 * @param IniGetWrapper $iniWrapper
-	 * @param IURLGenerator $urlGenerator
-	 * @param CapabilitiesManager $capabilitiesManager
-	 */
-	public function __construct(IL10N $l,
-								Defaults $defaults,
-								IAppManager $appManager,
-								ISession $session,
-								$currentUser,
-								IConfig $config,
-								IGroupManager $groupManager,
-								IniGetWrapper $iniWrapper,
-								IURLGenerator $urlGenerator,
-								CapabilitiesManager $capabilitiesManager,
-								IInitialStateService $initialStateService) {
-		$this->l = $l;
-		$this->defaults = $defaults;
-		$this->appManager = $appManager;
-		$this->session = $session;
-		$this->currentUser = $currentUser;
-		$this->config = $config;
-		$this->groupManager = $groupManager;
-		$this->iniWrapper = $iniWrapper;
-		$this->urlGenerator = $urlGenerator;
-		$this->capabilitiesManager = $capabilitiesManager;
-		$this->initialStateService = $initialStateService;
-	}
-
-	public function getConfig() {
-		$userBackendAllowsPasswordConfirmation = true;
-		if ($this->currentUser !== null) {
-			$uid = $this->currentUser->getUID();
-
-			$backend = $this->currentUser->getBackend();
-			if ($backend instanceof IPasswordConfirmationBackend) {
-				$userBackendAllowsPasswordConfirmation = $backend->canConfirmPassword($uid);
-			} elseif (isset($this->excludedUserBackEnds[$this->currentUser->getBackendClassName()])) {
-				$userBackendAllowsPasswordConfirmation = false;
-			}
-		} else {
-			$uid = null;
-		}
-
-		// Get the config
-		$apps_paths = [];
-
-		if ($this->currentUser === null) {
-			$apps = $this->appManager->getInstalledApps();
-		} else {
-			$apps = $this->appManager->getEnabledAppsForUser($this->currentUser);
-		}
-
-		foreach ($apps as $app) {
-			$apps_paths[$app] = \OC_App::getAppWebPath($app);
-		}
-
-
-		$enableLinkPasswordByDefault = $this->config->getAppValue('core', 'shareapi_enable_link_password_by_default', 'no');
-		$enableLinkPasswordByDefault = $enableLinkPasswordByDefault === 'yes';
-		$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';
-		}
-
-		$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) {
-			$lastConfirmTimestamp = $this->session->get('last-password-confirm');
-			if (!is_int($lastConfirmTimestamp)) {
-				$lastConfirmTimestamp = 0;
-			}
-		} else {
-			$lastConfirmTimestamp = 0;
-		}
-
-		$capabilities = $this->capabilitiesManager->getCapabilities();
-
-		$config = [
-			'session_lifetime' => min($this->config->getSystemValue('session_lifetime', $this->iniWrapper->getNumeric('session.gc_maxlifetime')), $this->iniWrapper->getNumeric('session.gc_maxlifetime')),
-			'session_keepalive' => $this->config->getSystemValue('session_keepalive', true),
-			'auto_logout' => $this->config->getSystemValue('auto_logout', false),
-			'version' => implode('.', \OCP\Util::getVersion()),
-			'versionstring' => \OC_Util::getVersionString(),
-			'enable_avatars' => true, // here for legacy reasons - to not crash existing code that relies on this value
-			'lost_password_link' => $this->config->getSystemValue('lost_password_link', null),
-			'modRewriteWorking' => $this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true',
-			'sharing.maxAutocompleteResults' => max(0, $this->config->getSystemValueInt('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT)),
-			'sharing.minSearchStringLength' => $this->config->getSystemValueInt('sharing.minSearchStringLength', 0),
-			'blacklist_files_regex' => \OCP\Files\FileInfo::BLACKLIST_FILES_REGEX,
-		];
-
-		$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($this->l->l('firstday', null)),
-			"_oc_config" => json_encode($config),
-			"oc_appconfig" => json_encode([
-				'core' => [
-					'defaultExpireDateEnabled' => $defaultExpireDateEnabled,
-					'defaultExpireDate' => $defaultExpireDate,
-					'defaultExpireDateEnforced' => $enforceDefaultExpireDate,
-					'enforcePasswordForPublicLink' => \OCP\Util::isPublicLinkPasswordRequired(),
-					'enableLinkPasswordByDefault' => $enableLinkPasswordByDefault,
-					'sharingDisabledForUser' => \OCP\Util::isSharingDisabledForUser(),
-					'resharingAllowed' => \OC\Share\Share::isResharingAllowed(),
-					'remoteShareAllowed' => $outgoingServer2serverShareEnabled,
-					'federatedCloudShareDoc' => $this->urlGenerator->linkToDocs('user-sharing-federated'),
-					'allowGroupSharing' => \OC::$server->getShareManager()->allowGroupSharing(),
-					'defaultInternalExpireDateEnabled' => $defaultInternalExpireDateEnabled,
-					'defaultInternalExpireDate' => $defaultInternalExpireDate,
-					'defaultInternalExpireDateEnforced' => $defaultInternalExpireDateEnforced,
-				]
-			]),
-			"_theme" => json_encode([
-				'entity' => $this->defaults->getEntity(),
-				'name' => $this->defaults->getName(),
-				'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' => '',
-				'shortFooter' => $this->defaults->getShortFooter(),
-				'longFooter' => $this->defaults->getLongFooter(),
-				'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',
-				]
-			]);
-		}
-
-		$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]);
-
-		$result = '';
-
-		// Echo it
-		foreach ($array as  $setting => $value) {
-			$result .= 'var '. $setting . '='. $value . ';' . PHP_EOL;
-		}
-
-		return $result;
-	}
+    /** @var IL10N */
+    private $l;
+
+    /** @var Defaults */
+    private $defaults;
+
+    /** @var IAppManager */
+    private $appManager;
+
+    /** @var ISession */
+    private $session;
+
+    /** @var IUser|null */
+    private $currentUser;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /** @var IniGetWrapper */
+    private $iniWrapper;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var CapabilitiesManager */
+    private $capabilitiesManager;
+
+    /** @var IInitialStateService */
+    private $initialStateService;
+
+    /** @var array user back-ends excluded from password verification */
+    private $excludedUserBackEnds = ['user_saml' => true, 'user_globalsiteselector' => true];
+
+    /**
+     * @param IL10N $l
+     * @param Defaults $defaults
+     * @param IAppManager $appManager
+     * @param ISession $session
+     * @param IUser|null $currentUser
+     * @param IConfig $config
+     * @param IGroupManager $groupManager
+     * @param IniGetWrapper $iniWrapper
+     * @param IURLGenerator $urlGenerator
+     * @param CapabilitiesManager $capabilitiesManager
+     */
+    public function __construct(IL10N $l,
+                                Defaults $defaults,
+                                IAppManager $appManager,
+                                ISession $session,
+                                $currentUser,
+                                IConfig $config,
+                                IGroupManager $groupManager,
+                                IniGetWrapper $iniWrapper,
+                                IURLGenerator $urlGenerator,
+                                CapabilitiesManager $capabilitiesManager,
+                                IInitialStateService $initialStateService) {
+        $this->l = $l;
+        $this->defaults = $defaults;
+        $this->appManager = $appManager;
+        $this->session = $session;
+        $this->currentUser = $currentUser;
+        $this->config = $config;
+        $this->groupManager = $groupManager;
+        $this->iniWrapper = $iniWrapper;
+        $this->urlGenerator = $urlGenerator;
+        $this->capabilitiesManager = $capabilitiesManager;
+        $this->initialStateService = $initialStateService;
+    }
+
+    public function getConfig() {
+        $userBackendAllowsPasswordConfirmation = true;
+        if ($this->currentUser !== null) {
+            $uid = $this->currentUser->getUID();
+
+            $backend = $this->currentUser->getBackend();
+            if ($backend instanceof IPasswordConfirmationBackend) {
+                $userBackendAllowsPasswordConfirmation = $backend->canConfirmPassword($uid);
+            } elseif (isset($this->excludedUserBackEnds[$this->currentUser->getBackendClassName()])) {
+                $userBackendAllowsPasswordConfirmation = false;
+            }
+        } else {
+            $uid = null;
+        }
+
+        // Get the config
+        $apps_paths = [];
+
+        if ($this->currentUser === null) {
+            $apps = $this->appManager->getInstalledApps();
+        } else {
+            $apps = $this->appManager->getEnabledAppsForUser($this->currentUser);
+        }
+
+        foreach ($apps as $app) {
+            $apps_paths[$app] = \OC_App::getAppWebPath($app);
+        }
+
+
+        $enableLinkPasswordByDefault = $this->config->getAppValue('core', 'shareapi_enable_link_password_by_default', 'no');
+        $enableLinkPasswordByDefault = $enableLinkPasswordByDefault === 'yes';
+        $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';
+        }
+
+        $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) {
+            $lastConfirmTimestamp = $this->session->get('last-password-confirm');
+            if (!is_int($lastConfirmTimestamp)) {
+                $lastConfirmTimestamp = 0;
+            }
+        } else {
+            $lastConfirmTimestamp = 0;
+        }
+
+        $capabilities = $this->capabilitiesManager->getCapabilities();
+
+        $config = [
+            'session_lifetime' => min($this->config->getSystemValue('session_lifetime', $this->iniWrapper->getNumeric('session.gc_maxlifetime')), $this->iniWrapper->getNumeric('session.gc_maxlifetime')),
+            'session_keepalive' => $this->config->getSystemValue('session_keepalive', true),
+            'auto_logout' => $this->config->getSystemValue('auto_logout', false),
+            'version' => implode('.', \OCP\Util::getVersion()),
+            'versionstring' => \OC_Util::getVersionString(),
+            'enable_avatars' => true, // here for legacy reasons - to not crash existing code that relies on this value
+            'lost_password_link' => $this->config->getSystemValue('lost_password_link', null),
+            'modRewriteWorking' => $this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true',
+            'sharing.maxAutocompleteResults' => max(0, $this->config->getSystemValueInt('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT)),
+            'sharing.minSearchStringLength' => $this->config->getSystemValueInt('sharing.minSearchStringLength', 0),
+            'blacklist_files_regex' => \OCP\Files\FileInfo::BLACKLIST_FILES_REGEX,
+        ];
+
+        $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($this->l->l('firstday', null)),
+            "_oc_config" => json_encode($config),
+            "oc_appconfig" => json_encode([
+                'core' => [
+                    'defaultExpireDateEnabled' => $defaultExpireDateEnabled,
+                    'defaultExpireDate' => $defaultExpireDate,
+                    'defaultExpireDateEnforced' => $enforceDefaultExpireDate,
+                    'enforcePasswordForPublicLink' => \OCP\Util::isPublicLinkPasswordRequired(),
+                    'enableLinkPasswordByDefault' => $enableLinkPasswordByDefault,
+                    'sharingDisabledForUser' => \OCP\Util::isSharingDisabledForUser(),
+                    'resharingAllowed' => \OC\Share\Share::isResharingAllowed(),
+                    'remoteShareAllowed' => $outgoingServer2serverShareEnabled,
+                    'federatedCloudShareDoc' => $this->urlGenerator->linkToDocs('user-sharing-federated'),
+                    'allowGroupSharing' => \OC::$server->getShareManager()->allowGroupSharing(),
+                    'defaultInternalExpireDateEnabled' => $defaultInternalExpireDateEnabled,
+                    'defaultInternalExpireDate' => $defaultInternalExpireDate,
+                    'defaultInternalExpireDateEnforced' => $defaultInternalExpireDateEnforced,
+                ]
+            ]),
+            "_theme" => json_encode([
+                'entity' => $this->defaults->getEntity(),
+                'name' => $this->defaults->getName(),
+                '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' => '',
+                'shortFooter' => $this->defaults->getShortFooter(),
+                'longFooter' => $this->defaults->getLongFooter(),
+                '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',
+                ]
+            ]);
+        }
+
+        $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]);
+
+        $result = '';
+
+        // Echo it
+        foreach ($array as  $setting => $value) {
+            $result .= 'var '. $setting . '='. $value . ';' . PHP_EOL;
+        }
+
+        return $result;
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -153,7 +153,7 @@ 
 		$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');
+			$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';
@@ -161,12 +161,12 @@ 
 		$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');
+			$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';
 		}
 
 		$countOfDataLocation = 0;
-		$dataLocation = str_replace(\OC::$SERVERROOT . '/', '', $this->config->getSystemValue('datadirectory', ''), $countOfDataLocation);
+		$dataLocation = str_replace(\OC::$SERVERROOT.'/', '', $this->config->getSystemValue('datadirectory', ''), $countOfDataLocation);
 		if ($countOfDataLocation !== 1 || $uid === null || !$this->groupManager->isAdmin($uid)) {
 			$dataLocation = false;
 		}
@@ -200,8 +200,8 @@ 
 			"_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_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,
@@ -299,7 +299,7 @@ 
 		if ($this->currentUser !== null) {
 			$array['oc_userconfig'] = json_encode([
 				'avatar' => [
-					'version' => (int)$this->config->getUserValue($uid, 'avatar', 'version', 0),
+					'version' => (int) $this->config->getUserValue($uid, 'avatar', 'version', 0),
 					'generated' => $this->config->getUserValue($uid, 'avatar', 'generated', 'true') === 'true',
 				]
 			]);
@@ -315,7 +315,7 @@ 
 
 		// Echo it
 		foreach ($array as  $setting => $value) {
-			$result .= 'var '. $setting . '='. $value . ';' . PHP_EOL;
+			$result .= 'var '.$setting.'='.$value.';'.PHP_EOL;
 		}
 
 		return $result;

lib/private/Group/Manager.php

Indentation +359 added lines, -359 removed lines

@@ -65,363 +65,363 @@
  * @package OC\Group
  */
 class Manager extends PublicEmitter implements IGroupManager {
-	/** @var GroupInterface[] */
-	private $backends = [];
-
-	/** @var \OC\User\Manager */
-	private $userManager;
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-	/** @var ILogger */
-	private $logger;
-
-	/** @var \OC\Group\Group[] */
-	private $cachedGroups = [];
-
-	/** @var (string[])[] */
-	private $cachedUserGroups = [];
-
-	/** @var \OC\SubAdmin */
-	private $subAdmin = null;
-
-	/**
-	 * @param \OC\User\Manager $userManager
-	 * @param EventDispatcherInterface $dispatcher
-	 * @param ILogger $logger
-	 */
-	public function __construct(\OC\User\Manager $userManager,
-								EventDispatcherInterface $dispatcher,
-								ILogger $logger) {
-		$this->userManager = $userManager;
-		$this->dispatcher = $dispatcher;
-		$this->logger = $logger;
-
-		$cachedGroups = &$this->cachedGroups;
-		$cachedUserGroups = &$this->cachedUserGroups;
-		$this->listen('\OC\Group', 'postDelete', function ($group) use (&$cachedGroups, &$cachedUserGroups) {
-			/**
-			 * @var \OC\Group\Group $group
-			 */
-			unset($cachedGroups[$group->getGID()]);
-			$cachedUserGroups = [];
-		});
-		$this->listen('\OC\Group', 'postAddUser', function ($group) use (&$cachedUserGroups) {
-			/**
-			 * @var \OC\Group\Group $group
-			 */
-			$cachedUserGroups = [];
-		});
-		$this->listen('\OC\Group', 'postRemoveUser', function ($group) use (&$cachedUserGroups) {
-			/**
-			 * @var \OC\Group\Group $group
-			 */
-			$cachedUserGroups = [];
-		});
-	}
-
-	/**
-	 * Checks whether a given backend is used
-	 *
-	 * @param string $backendClass Full classname including complete namespace
-	 * @return bool
-	 */
-	public function isBackendUsed($backendClass) {
-		$backendClass = strtolower(ltrim($backendClass, '\\'));
-
-		foreach ($this->backends as $backend) {
-			if (strtolower(get_class($backend)) === $backendClass) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * @param \OCP\GroupInterface $backend
-	 */
-	public function addBackend($backend) {
-		$this->backends[] = $backend;
-		$this->clearCaches();
-	}
-
-	public function clearBackends() {
-		$this->backends = [];
-		$this->clearCaches();
-	}
-
-	/**
-	 * Get the active backends
-	 *
-	 * @return \OCP\GroupInterface[]
-	 */
-	public function getBackends() {
-		return $this->backends;
-	}
-
-
-	protected function clearCaches() {
-		$this->cachedGroups = [];
-		$this->cachedUserGroups = [];
-	}
-
-	/**
-	 * @param string $gid
-	 * @return IGroup|null
-	 */
-	public function get($gid) {
-		if (isset($this->cachedGroups[$gid])) {
-			return $this->cachedGroups[$gid];
-		}
-		return $this->getGroupObject($gid);
-	}
-
-	/**
-	 * @param string $gid
-	 * @param string $displayName
-	 * @return \OCP\IGroup|null
-	 */
-	protected function getGroupObject($gid, $displayName = null) {
-		$backends = [];
-		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(Backend::GROUP_DETAILS)) {
-				$groupData = $backend->getGroupDetails($gid);
-				if (is_array($groupData) && !empty($groupData)) {
-					// take the display name from the first backend that has a non-null one
-					if (is_null($displayName) && isset($groupData['displayName'])) {
-						$displayName = $groupData['displayName'];
-					}
-					$backends[] = $backend;
-				}
-			} elseif ($backend->groupExists($gid)) {
-				$backends[] = $backend;
-			}
-		}
-		if (count($backends) === 0) {
-			return null;
-		}
-		$this->cachedGroups[$gid] = new Group($gid, $backends, $this->dispatcher, $this->userManager, $this, $displayName);
-		return $this->cachedGroups[$gid];
-	}
-
-	/**
-	 * @param string $gid
-	 * @return bool
-	 */
-	public function groupExists($gid) {
-		return $this->get($gid) instanceof IGroup;
-	}
-
-	/**
-	 * @param string $gid
-	 * @return IGroup|null
-	 */
-	public function createGroup($gid) {
-		if ($gid === '' || $gid === null) {
-			return null;
-		} elseif ($group = $this->get($gid)) {
-			return $group;
-		} else {
-			$this->emit('\OC\Group', 'preCreate', [$gid]);
-			foreach ($this->backends as $backend) {
-				if ($backend->implementsActions(Backend::CREATE_GROUP)) {
-					if ($backend->createGroup($gid)) {
-						$group = $this->getGroupObject($gid);
-						$this->emit('\OC\Group', 'postCreate', [$group]);
-						return $group;
-					}
-				}
-			}
-			return null;
-		}
-	}
-
-	/**
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return \OC\Group\Group[]
-	 */
-	public function search($search, $limit = null, $offset = null) {
-		$groups = [];
-		foreach ($this->backends as $backend) {
-			$groupIds = $backend->getGroups($search, $limit, $offset);
-			foreach ($groupIds as $groupId) {
-				$aGroup = $this->get($groupId);
-				if ($aGroup instanceof IGroup) {
-					$groups[$groupId] = $aGroup;
-				} else {
-					$this->logger->debug('Group "' . $groupId . '" was returned by search but not found through direct access', ['app' => 'core']);
-				}
-			}
-			if (!is_null($limit) and $limit <= 0) {
-				return array_values($groups);
-			}
-		}
-		return array_values($groups);
-	}
-
-	/**
-	 * @param IUser|null $user
-	 * @return \OC\Group\Group[]
-	 */
-	public function getUserGroups(IUser $user = null) {
-		if (!$user instanceof IUser) {
-			return [];
-		}
-		return $this->getUserIdGroups($user->getUID());
-	}
-
-	/**
-	 * @param string $uid the user id
-	 * @return \OC\Group\Group[]
-	 */
-	public function getUserIdGroups(string $uid): array {
-		$groups = [];
-
-		foreach ($this->getUserIdGroupIds($uid) as $groupId) {
-			$aGroup = $this->get($groupId);
-			if ($aGroup instanceof IGroup) {
-				$groups[$groupId] = $aGroup;
-			} else {
-				$this->logger->debug('User "' . $uid . '" belongs to deleted group: "' . $groupId . '"', ['app' => 'core']);
-			}
-		}
-
-		return $groups;
-	}
-
-	/**
-	 * Checks if a userId is in the admin group
-	 *
-	 * @param string $userId
-	 * @return bool if admin
-	 */
-	public function isAdmin($userId) {
-		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(Backend::IS_ADMIN) && $backend->isAdmin($userId)) {
-				return true;
-			}
-		}
-		return $this->isInGroup($userId, 'admin');
-	}
-
-	/**
-	 * Checks if a userId is in a group
-	 *
-	 * @param string $userId
-	 * @param string $group
-	 * @return bool if in group
-	 */
-	public function isInGroup($userId, $group) {
-		return array_search($group, $this->getUserIdGroupIds($userId)) !== false;
-	}
-
-	/**
-	 * get a list of group ids for a user
-	 *
-	 * @param IUser $user
-	 * @return string[] with group ids
-	 */
-	public function getUserGroupIds(IUser $user): array {
-		return $this->getUserIdGroupIds($user->getUID());
-	}
-
-	/**
-	 * @param string $uid the user id
-	 * @return string[]
-	 */
-	private function getUserIdGroupIds(string $uid): array {
-		if (!isset($this->cachedUserGroups[$uid])) {
-			$groups = [];
-			foreach ($this->backends as $backend) {
-				if ($groupIds = $backend->getUserGroups($uid)) {
-					$groups = array_merge($groups, $groupIds);
-				}
-			}
-			$this->cachedUserGroups[$uid] = $groups;
-		}
-
-		return $this->cachedUserGroups[$uid];
-	}
-
-	/**
-	 * get an array of groupid and displayName for a user
-	 *
-	 * @param IUser $user
-	 * @return array ['displayName' => displayname]
-	 */
-	public function getUserGroupNames(IUser $user) {
-		return array_map(function ($group) {
-			return ['displayName' => $group->getDisplayName()];
-		}, $this->getUserGroups($user));
-	}
-
-	/**
-	 * get a list of all display names in a group
-	 *
-	 * @param string $gid
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array an array of display names (value) and user ids (key)
-	 */
-	public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
-		$group = $this->get($gid);
-		if (is_null($group)) {
-			return [];
-		}
-
-		$search = trim($search);
-		$groupUsers = [];
-
-		if (!empty($search)) {
-			// only user backends have the capability to do a complex search for users
-			$searchOffset = 0;
-			$searchLimit = $limit * 100;
-			if ($limit === -1) {
-				$searchLimit = 500;
-			}
-
-			do {
-				$filteredUsers = $this->userManager->searchDisplayName($search, $searchLimit, $searchOffset);
-				foreach ($filteredUsers as $filteredUser) {
-					if ($group->inGroup($filteredUser)) {
-						$groupUsers[] = $filteredUser;
-					}
-				}
-				$searchOffset += $searchLimit;
-			} while (count($groupUsers) < $searchLimit + $offset && count($filteredUsers) >= $searchLimit);
-
-			if ($limit === -1) {
-				$groupUsers = array_slice($groupUsers, $offset);
-			} else {
-				$groupUsers = array_slice($groupUsers, $offset, $limit);
-			}
-		} else {
-			$groupUsers = $group->searchUsers('', $limit, $offset);
-		}
-
-		$matchingUsers = [];
-		foreach ($groupUsers as $groupUser) {
-			$matchingUsers[(string) $groupUser->getUID()] = $groupUser->getDisplayName();
-		}
-		return $matchingUsers;
-	}
-
-	/**
-	 * @return \OC\SubAdmin
-	 */
-	public function getSubAdmin() {
-		if (!$this->subAdmin) {
-			$this->subAdmin = new \OC\SubAdmin(
-				$this->userManager,
-				$this,
-				\OC::$server->getDatabaseConnection(),
-				\OC::$server->get(IEventDispatcher::class)
-			);
-		}
-
-		return $this->subAdmin;
-	}
+    /** @var GroupInterface[] */
+    private $backends = [];
+
+    /** @var \OC\User\Manager */
+    private $userManager;
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+    /** @var ILogger */
+    private $logger;
+
+    /** @var \OC\Group\Group[] */
+    private $cachedGroups = [];
+
+    /** @var (string[])[] */
+    private $cachedUserGroups = [];
+
+    /** @var \OC\SubAdmin */
+    private $subAdmin = null;
+
+    /**
+     * @param \OC\User\Manager $userManager
+     * @param EventDispatcherInterface $dispatcher
+     * @param ILogger $logger
+     */
+    public function __construct(\OC\User\Manager $userManager,
+                                EventDispatcherInterface $dispatcher,
+                                ILogger $logger) {
+        $this->userManager = $userManager;
+        $this->dispatcher = $dispatcher;
+        $this->logger = $logger;
+
+        $cachedGroups = &$this->cachedGroups;
+        $cachedUserGroups = &$this->cachedUserGroups;
+        $this->listen('\OC\Group', 'postDelete', function ($group) use (&$cachedGroups, &$cachedUserGroups) {
+            /**
+             * @var \OC\Group\Group $group
+             */
+            unset($cachedGroups[$group->getGID()]);
+            $cachedUserGroups = [];
+        });
+        $this->listen('\OC\Group', 'postAddUser', function ($group) use (&$cachedUserGroups) {
+            /**
+             * @var \OC\Group\Group $group
+             */
+            $cachedUserGroups = [];
+        });
+        $this->listen('\OC\Group', 'postRemoveUser', function ($group) use (&$cachedUserGroups) {
+            /**
+             * @var \OC\Group\Group $group
+             */
+            $cachedUserGroups = [];
+        });
+    }
+
+    /**
+     * Checks whether a given backend is used
+     *
+     * @param string $backendClass Full classname including complete namespace
+     * @return bool
+     */
+    public function isBackendUsed($backendClass) {
+        $backendClass = strtolower(ltrim($backendClass, '\\'));
+
+        foreach ($this->backends as $backend) {
+            if (strtolower(get_class($backend)) === $backendClass) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param \OCP\GroupInterface $backend
+     */
+    public function addBackend($backend) {
+        $this->backends[] = $backend;
+        $this->clearCaches();
+    }
+
+    public function clearBackends() {
+        $this->backends = [];
+        $this->clearCaches();
+    }
+
+    /**
+     * Get the active backends
+     *
+     * @return \OCP\GroupInterface[]
+     */
+    public function getBackends() {
+        return $this->backends;
+    }
+
+
+    protected function clearCaches() {
+        $this->cachedGroups = [];
+        $this->cachedUserGroups = [];
+    }
+
+    /**
+     * @param string $gid
+     * @return IGroup|null
+     */
+    public function get($gid) {
+        if (isset($this->cachedGroups[$gid])) {
+            return $this->cachedGroups[$gid];
+        }
+        return $this->getGroupObject($gid);
+    }
+
+    /**
+     * @param string $gid
+     * @param string $displayName
+     * @return \OCP\IGroup|null
+     */
+    protected function getGroupObject($gid, $displayName = null) {
+        $backends = [];
+        foreach ($this->backends as $backend) {
+            if ($backend->implementsActions(Backend::GROUP_DETAILS)) {
+                $groupData = $backend->getGroupDetails($gid);
+                if (is_array($groupData) && !empty($groupData)) {
+                    // take the display name from the first backend that has a non-null one
+                    if (is_null($displayName) && isset($groupData['displayName'])) {
+                        $displayName = $groupData['displayName'];
+                    }
+                    $backends[] = $backend;
+                }
+            } elseif ($backend->groupExists($gid)) {
+                $backends[] = $backend;
+            }
+        }
+        if (count($backends) === 0) {
+            return null;
+        }
+        $this->cachedGroups[$gid] = new Group($gid, $backends, $this->dispatcher, $this->userManager, $this, $displayName);
+        return $this->cachedGroups[$gid];
+    }
+
+    /**
+     * @param string $gid
+     * @return bool
+     */
+    public function groupExists($gid) {
+        return $this->get($gid) instanceof IGroup;
+    }
+
+    /**
+     * @param string $gid
+     * @return IGroup|null
+     */
+    public function createGroup($gid) {
+        if ($gid === '' || $gid === null) {
+            return null;
+        } elseif ($group = $this->get($gid)) {
+            return $group;
+        } else {
+            $this->emit('\OC\Group', 'preCreate', [$gid]);
+            foreach ($this->backends as $backend) {
+                if ($backend->implementsActions(Backend::CREATE_GROUP)) {
+                    if ($backend->createGroup($gid)) {
+                        $group = $this->getGroupObject($gid);
+                        $this->emit('\OC\Group', 'postCreate', [$group]);
+                        return $group;
+                    }
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return \OC\Group\Group[]
+     */
+    public function search($search, $limit = null, $offset = null) {
+        $groups = [];
+        foreach ($this->backends as $backend) {
+            $groupIds = $backend->getGroups($search, $limit, $offset);
+            foreach ($groupIds as $groupId) {
+                $aGroup = $this->get($groupId);
+                if ($aGroup instanceof IGroup) {
+                    $groups[$groupId] = $aGroup;
+                } else {
+                    $this->logger->debug('Group "' . $groupId . '" was returned by search but not found through direct access', ['app' => 'core']);
+                }
+            }
+            if (!is_null($limit) and $limit <= 0) {
+                return array_values($groups);
+            }
+        }
+        return array_values($groups);
+    }
+
+    /**
+     * @param IUser|null $user
+     * @return \OC\Group\Group[]
+     */
+    public function getUserGroups(IUser $user = null) {
+        if (!$user instanceof IUser) {
+            return [];
+        }
+        return $this->getUserIdGroups($user->getUID());
+    }
+
+    /**
+     * @param string $uid the user id
+     * @return \OC\Group\Group[]
+     */
+    public function getUserIdGroups(string $uid): array {
+        $groups = [];
+
+        foreach ($this->getUserIdGroupIds($uid) as $groupId) {
+            $aGroup = $this->get($groupId);
+            if ($aGroup instanceof IGroup) {
+                $groups[$groupId] = $aGroup;
+            } else {
+                $this->logger->debug('User "' . $uid . '" belongs to deleted group: "' . $groupId . '"', ['app' => 'core']);
+            }
+        }
+
+        return $groups;
+    }
+
+    /**
+     * Checks if a userId is in the admin group
+     *
+     * @param string $userId
+     * @return bool if admin
+     */
+    public function isAdmin($userId) {
+        foreach ($this->backends as $backend) {
+            if ($backend->implementsActions(Backend::IS_ADMIN) && $backend->isAdmin($userId)) {
+                return true;
+            }
+        }
+        return $this->isInGroup($userId, 'admin');
+    }
+
+    /**
+     * Checks if a userId is in a group
+     *
+     * @param string $userId
+     * @param string $group
+     * @return bool if in group
+     */
+    public function isInGroup($userId, $group) {
+        return array_search($group, $this->getUserIdGroupIds($userId)) !== false;
+    }
+
+    /**
+     * get a list of group ids for a user
+     *
+     * @param IUser $user
+     * @return string[] with group ids
+     */
+    public function getUserGroupIds(IUser $user): array {
+        return $this->getUserIdGroupIds($user->getUID());
+    }
+
+    /**
+     * @param string $uid the user id
+     * @return string[]
+     */
+    private function getUserIdGroupIds(string $uid): array {
+        if (!isset($this->cachedUserGroups[$uid])) {
+            $groups = [];
+            foreach ($this->backends as $backend) {
+                if ($groupIds = $backend->getUserGroups($uid)) {
+                    $groups = array_merge($groups, $groupIds);
+                }
+            }
+            $this->cachedUserGroups[$uid] = $groups;
+        }
+
+        return $this->cachedUserGroups[$uid];
+    }
+
+    /**
+     * get an array of groupid and displayName for a user
+     *
+     * @param IUser $user
+     * @return array ['displayName' => displayname]
+     */
+    public function getUserGroupNames(IUser $user) {
+        return array_map(function ($group) {
+            return ['displayName' => $group->getDisplayName()];
+        }, $this->getUserGroups($user));
+    }
+
+    /**
+     * get a list of all display names in a group
+     *
+     * @param string $gid
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return array an array of display names (value) and user ids (key)
+     */
+    public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
+        $group = $this->get($gid);
+        if (is_null($group)) {
+            return [];
+        }
+
+        $search = trim($search);
+        $groupUsers = [];
+
+        if (!empty($search)) {
+            // only user backends have the capability to do a complex search for users
+            $searchOffset = 0;
+            $searchLimit = $limit * 100;
+            if ($limit === -1) {
+                $searchLimit = 500;
+            }
+
+            do {
+                $filteredUsers = $this->userManager->searchDisplayName($search, $searchLimit, $searchOffset);
+                foreach ($filteredUsers as $filteredUser) {
+                    if ($group->inGroup($filteredUser)) {
+                        $groupUsers[] = $filteredUser;
+                    }
+                }
+                $searchOffset += $searchLimit;
+            } while (count($groupUsers) < $searchLimit + $offset && count($filteredUsers) >= $searchLimit);
+
+            if ($limit === -1) {
+                $groupUsers = array_slice($groupUsers, $offset);
+            } else {
+                $groupUsers = array_slice($groupUsers, $offset, $limit);
+            }
+        } else {
+            $groupUsers = $group->searchUsers('', $limit, $offset);
+        }
+
+        $matchingUsers = [];
+        foreach ($groupUsers as $groupUser) {
+            $matchingUsers[(string) $groupUser->getUID()] = $groupUser->getDisplayName();
+        }
+        return $matchingUsers;
+    }
+
+    /**
+     * @return \OC\SubAdmin
+     */
+    public function getSubAdmin() {
+        if (!$this->subAdmin) {
+            $this->subAdmin = new \OC\SubAdmin(
+                $this->userManager,
+                $this,
+                \OC::$server->getDatabaseConnection(),
+                \OC::$server->get(IEventDispatcher::class)
+            );
+        }
+
+        return $this->subAdmin;
+    }
 }

lib/private/AppFramework/DependencyInjection/DIContainer.php

Indentation +385 added lines, -385 removed lines

@@ -79,389 +79,389 @@
  */
 class DIContainer extends SimpleContainer implements IAppContainer {
 
-	/**
-	 * @var array
-	 */
-	private $middleWares = [];
-
-	/** @var ServerContainer */
-	private $server;
-
-	/**
-	 * Put your class dependencies in here
-	 * @param string $appName the name of the app
-	 * @param array $urlParams
-	 * @param ServerContainer|null $server
-	 */
-	public function __construct($appName, $urlParams = [], ServerContainer $server = null) {
-		parent::__construct();
-		$this['AppName'] = $appName;
-		$this['urlParams'] = $urlParams;
-
-		$this->registerAlias('Request', IRequest::class);
-
-		/** @var \OC\ServerContainer $server */
-		if ($server === null) {
-			$server = \OC::$server;
-		}
-		$this->server = $server;
-		$this->server->registerAppContainer($appName, $this);
-
-		// aliases
-		$this->registerAlias('appName', 'AppName');
-		$this->registerAlias('webRoot', 'WebRoot');
-		$this->registerAlias('userId', 'UserId');
-
-		/**
-		 * Core services
-		 */
-		$this->registerService(IOutput::class, function () {
-			return new Output($this->getServer()->getWebRoot());
-		});
-
-		$this->registerService(Folder::class, function () {
-			return $this->getServer()->getUserFolder();
-		});
-
-		$this->registerService(IAppData::class, function (ContainerInterface $c) {
-			return $this->getServer()->getAppDataDir($c->get('AppName'));
-		});
-
-		$this->registerService(IL10N::class, function (ContainerInterface $c) {
-			return $this->getServer()->getL10N($c->get('AppName'));
-		});
-
-		// Log wrappers
-		$this->registerService(LoggerInterface::class, function (ContainerInterface $c) {
-			return new ScopedPsrLogger(
-				$c->get(PsrLoggerAdapter::class),
-				$c->get('AppName')
-			);
-		});
-		$this->registerService(ILogger::class, function (ContainerInterface $c) {
-			return new OC\AppFramework\Logger($this->server->query(ILogger::class), $c->get('AppName'));
-		});
-
-		$this->registerService(IServerContainer::class, function () {
-			return $this->getServer();
-		});
-		$this->registerAlias('ServerContainer', IServerContainer::class);
-
-		$this->registerService(\OCP\WorkflowEngine\IManager::class, function (ContainerInterface $c) {
-			return $c->get(Manager::class);
-		});
-
-		$this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
-			return $c;
-		});
-		$this->registerAlias(IAppContainer::class, ContainerInterface::class);
-
-		// commonly used attributes
-		$this->registerService('UserId', function (ContainerInterface $c) {
-			return $c->get(IUserSession::class)->getSession()->get('user_id');
-		});
-
-		$this->registerService('WebRoot', function (ContainerInterface $c) {
-			return $c->get(IServerContainer::class)->getWebRoot();
-		});
-
-		$this->registerService('OC_Defaults', function (ContainerInterface $c) {
-			return $c->get(IServerContainer::class)->getThemingDefaults();
-		});
-
-		$this->registerService('Protocol', function (ContainerInterface $c) {
-			/** @var \OC\Server $server */
-			$server = $c->get(IServerContainer::class);
-			$protocol = $server->getRequest()->getHttpProtocol();
-			return new Http($_SERVER, $protocol);
-		});
-
-		$this->registerService('Dispatcher', function (ContainerInterface $c) {
-			return new Dispatcher(
-				$c->get('Protocol'),
-				$c->get(MiddlewareDispatcher::class),
-				$c->get(IControllerMethodReflector::class),
-				$c->get(IRequest::class),
-				$c->get(IConfig::class),
-				$c->get(IDBConnection::class),
-				$c->get(LoggerInterface::class)
-			);
-		});
-
-		/**
-		 * App Framework default arguments
-		 */
-		$this->registerParameter('corsMethods', 'PUT, POST, GET, DELETE, PATCH');
-		$this->registerParameter('corsAllowedHeaders', 'Authorization, Content-Type, Accept');
-		$this->registerParameter('corsMaxAge', 1728000);
-
-		/**
-		 * Middleware
-		 */
-		$this->registerAlias('MiddlewareDispatcher', MiddlewareDispatcher::class);
-		$this->registerService(MiddlewareDispatcher::class, function (ContainerInterface $c) {
-			$server = $this->getServer();
-
-			$dispatcher = new MiddlewareDispatcher();
-
-			$dispatcher->registerMiddleware(
-				$c->get(OC\AppFramework\Middleware\CompressionMiddleware::class)
-			);
-
-			$dispatcher->registerMiddleware($c->get(OC\AppFramework\Middleware\NotModifiedMiddleware::class));
-
-			$dispatcher->registerMiddleware(
-				$c->get(OC\AppFramework\Middleware\Security\ReloadExecutionMiddleware::class)
-			);
-
-			$dispatcher->registerMiddleware(
-				new OC\AppFramework\Middleware\Security\SameSiteCookieMiddleware(
-					$c->get(IRequest::class),
-					$c->get(IControllerMethodReflector::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				new CORSMiddleware(
-					$c->get(IRequest::class),
-					$c->get(IControllerMethodReflector::class),
-					$c->get(IUserSession::class),
-					$c->get(OC\Security\Bruteforce\Throttler::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				new OCSMiddleware(
-					$c->get(IRequest::class)
-				)
-			);
-
-
-
-			$securityMiddleware = new SecurityMiddleware(
-				$c->get(IRequest::class),
-				$c->get(IControllerMethodReflector::class),
-				$c->get(INavigationManager::class),
-				$c->get(IURLGenerator::class),
-				$server->query(ILogger::class),
-				$c->get('AppName'),
-				$server->getUserSession()->isLoggedIn(),
-				$this->getUserId() !== null && $server->getGroupManager()->isAdmin($this->getUserId()),
-				$server->getUserSession()->getUser() !== null && $server->query(ISubAdmin::class)->isSubAdmin($server->getUserSession()->getUser()),
-				$server->getAppManager(),
-				$server->getL10N('lib')
-			);
-			$dispatcher->registerMiddleware($securityMiddleware);
-			$dispatcher->registerMiddleware(
-				new OC\AppFramework\Middleware\Security\CSPMiddleware(
-					$server->query(OC\Security\CSP\ContentSecurityPolicyManager::class),
-					$server->query(OC\Security\CSP\ContentSecurityPolicyNonceManager::class),
-					$server->query(OC\Security\CSRF\CsrfTokenManager::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				$server->query(OC\AppFramework\Middleware\Security\FeaturePolicyMiddleware::class)
-			);
-			$dispatcher->registerMiddleware(
-				new OC\AppFramework\Middleware\Security\PasswordConfirmationMiddleware(
-					$c->get(IControllerMethodReflector::class),
-					$c->get(ISession::class),
-					$c->get(IUserSession::class),
-					$c->get(ITimeFactory::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				new TwoFactorMiddleware(
-					$c->get(OC\Authentication\TwoFactorAuth\Manager::class),
-					$c->get(IUserSession::class),
-					$c->get(ISession::class),
-					$c->get(IURLGenerator::class),
-					$c->get(IControllerMethodReflector::class),
-					$c->get(IRequest::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				new OC\AppFramework\Middleware\Security\BruteForceMiddleware(
-					$c->get(IControllerMethodReflector::class),
-					$c->get(OC\Security\Bruteforce\Throttler::class),
-					$c->get(IRequest::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				new RateLimitingMiddleware(
-					$c->get(IRequest::class),
-					$c->get(IUserSession::class),
-					$c->get(IControllerMethodReflector::class),
-					$c->get(OC\Security\RateLimiting\Limiter::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				new OC\AppFramework\Middleware\PublicShare\PublicShareMiddleware(
-					$c->get(IRequest::class),
-					$c->get(ISession::class),
-					$c->get(\OCP\IConfig::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				$c->get(\OC\AppFramework\Middleware\AdditionalScriptsMiddleware::class)
-			);
-
-			foreach ($this->middleWares as $middleWare) {
-				$dispatcher->registerMiddleware($c->get($middleWare));
-			}
-
-			$dispatcher->registerMiddleware(
-				new SessionMiddleware(
-					$c->get(IControllerMethodReflector::class),
-					$c->get(ISession::class)
-				)
-			);
-			return $dispatcher;
-		});
-
-		$this->registerService(IAppConfig::class, function (ContainerInterface $c) {
-			return new OC\AppFramework\Services\AppConfig(
-				$c->get(IConfig::class),
-				$c->get('AppName')
-			);
-		});
-		$this->registerService(IInitialState::class, function (ContainerInterface $c) {
-			return new OC\AppFramework\Services\InitialState(
-				$c->get(IInitialStateService::class),
-				$c->get('AppName')
-			);
-		});
-	}
-
-	/**
-	 * @return \OCP\IServerContainer
-	 */
-	public function getServer() {
-		return $this->server;
-	}
-
-	/**
-	 * @param string $middleWare
-	 * @return boolean|null
-	 */
-	public function registerMiddleWare($middleWare) {
-		if (in_array($middleWare, $this->middleWares, true) !== false) {
-			return false;
-		}
-		$this->middleWares[] = $middleWare;
-	}
-
-	/**
-	 * used to return the appname of the set application
-	 * @return string the name of your application
-	 */
-	public function getAppName() {
-		return $this->query('AppName');
-	}
-
-	/**
-	 * @deprecated use IUserSession->isLoggedIn()
-	 * @return boolean
-	 */
-	public function isLoggedIn() {
-		return \OC::$server->getUserSession()->isLoggedIn();
-	}
-
-	/**
-	 * @deprecated use IGroupManager->isAdmin($userId)
-	 * @return boolean
-	 */
-	public function isAdminUser() {
-		$uid = $this->getUserId();
-		return \OC_User::isAdminUser($uid);
-	}
-
-	private function getUserId() {
-		return $this->getServer()->getSession()->get('user_id');
-	}
-
-	/**
-	 * @deprecated use the ILogger instead
-	 * @param string $message
-	 * @param string $level
-	 * @return mixed
-	 */
-	public function log($message, $level) {
-		switch ($level) {
-			case 'debug':
-				$level = ILogger::DEBUG;
-				break;
-			case 'info':
-				$level = ILogger::INFO;
-				break;
-			case 'warn':
-				$level = ILogger::WARN;
-				break;
-			case 'fatal':
-				$level = ILogger::FATAL;
-				break;
-			default:
-				$level = ILogger::ERROR;
-				break;
-		}
-		\OCP\Util::writeLog($this->getAppName(), $message, $level);
-	}
-
-	/**
-	 * Register a capability
-	 *
-	 * @param string $serviceName e.g. 'OCA\Files\Capabilities'
-	 */
-	public function registerCapability($serviceName) {
-		$this->query('OC\CapabilitiesManager')->registerCapability(function () use ($serviceName) {
-			return $this->query($serviceName);
-		});
-	}
-
-	public function has($id): bool {
-		if (parent::has($id)) {
-			return true;
-		}
-
-		if ($this->server->has($id, true)) {
-			return true;
-		}
-
-		return false;
-	}
-
-	public function query(string $name, bool $autoload = true) {
-		try {
-			return $this->queryNoFallback($name);
-		} catch (QueryException $firstException) {
-			try {
-				return $this->getServer()->query($name, $autoload);
-			} catch (QueryException $secondException) {
-				if ($firstException->getCode() === 1) {
-					throw $secondException;
-				}
-				throw $firstException;
-			}
-		}
-	}
-
-	/**
-	 * @param string $name
-	 * @return mixed
-	 * @throws QueryException if the query could not be resolved
-	 */
-	public function queryNoFallback($name) {
-		$name = $this->sanitizeName($name);
-
-		if ($this->offsetExists($name)) {
-			return parent::query($name);
-		} elseif ($this['AppName'] === 'settings' && strpos($name, 'OC\\Settings\\') === 0) {
-			return parent::query($name);
-		} elseif ($this['AppName'] === 'core' && strpos($name, 'OC\\Core\\') === 0) {
-			return parent::query($name);
-		} elseif (strpos($name, \OC\AppFramework\App::buildAppNamespace($this['AppName']) . '\\') === 0) {
-			return parent::query($name);
-		}
-
-		throw new QueryException('Could not resolve ' . $name . '!' .
-			' Class can not be instantiated', 1);
-	}
+    /**
+     * @var array
+     */
+    private $middleWares = [];
+
+    /** @var ServerContainer */
+    private $server;
+
+    /**
+     * Put your class dependencies in here
+     * @param string $appName the name of the app
+     * @param array $urlParams
+     * @param ServerContainer|null $server
+     */
+    public function __construct($appName, $urlParams = [], ServerContainer $server = null) {
+        parent::__construct();
+        $this['AppName'] = $appName;
+        $this['urlParams'] = $urlParams;
+
+        $this->registerAlias('Request', IRequest::class);
+
+        /** @var \OC\ServerContainer $server */
+        if ($server === null) {
+            $server = \OC::$server;
+        }
+        $this->server = $server;
+        $this->server->registerAppContainer($appName, $this);
+
+        // aliases
+        $this->registerAlias('appName', 'AppName');
+        $this->registerAlias('webRoot', 'WebRoot');
+        $this->registerAlias('userId', 'UserId');
+
+        /**
+         * Core services
+         */
+        $this->registerService(IOutput::class, function () {
+            return new Output($this->getServer()->getWebRoot());
+        });
+
+        $this->registerService(Folder::class, function () {
+            return $this->getServer()->getUserFolder();
+        });
+
+        $this->registerService(IAppData::class, function (ContainerInterface $c) {
+            return $this->getServer()->getAppDataDir($c->get('AppName'));
+        });
+
+        $this->registerService(IL10N::class, function (ContainerInterface $c) {
+            return $this->getServer()->getL10N($c->get('AppName'));
+        });
+
+        // Log wrappers
+        $this->registerService(LoggerInterface::class, function (ContainerInterface $c) {
+            return new ScopedPsrLogger(
+                $c->get(PsrLoggerAdapter::class),
+                $c->get('AppName')
+            );
+        });
+        $this->registerService(ILogger::class, function (ContainerInterface $c) {
+            return new OC\AppFramework\Logger($this->server->query(ILogger::class), $c->get('AppName'));
+        });
+
+        $this->registerService(IServerContainer::class, function () {
+            return $this->getServer();
+        });
+        $this->registerAlias('ServerContainer', IServerContainer::class);
+
+        $this->registerService(\OCP\WorkflowEngine\IManager::class, function (ContainerInterface $c) {
+            return $c->get(Manager::class);
+        });
+
+        $this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
+            return $c;
+        });
+        $this->registerAlias(IAppContainer::class, ContainerInterface::class);
+
+        // commonly used attributes
+        $this->registerService('UserId', function (ContainerInterface $c) {
+            return $c->get(IUserSession::class)->getSession()->get('user_id');
+        });
+
+        $this->registerService('WebRoot', function (ContainerInterface $c) {
+            return $c->get(IServerContainer::class)->getWebRoot();
+        });
+
+        $this->registerService('OC_Defaults', function (ContainerInterface $c) {
+            return $c->get(IServerContainer::class)->getThemingDefaults();
+        });
+
+        $this->registerService('Protocol', function (ContainerInterface $c) {
+            /** @var \OC\Server $server */
+            $server = $c->get(IServerContainer::class);
+            $protocol = $server->getRequest()->getHttpProtocol();
+            return new Http($_SERVER, $protocol);
+        });
+
+        $this->registerService('Dispatcher', function (ContainerInterface $c) {
+            return new Dispatcher(
+                $c->get('Protocol'),
+                $c->get(MiddlewareDispatcher::class),
+                $c->get(IControllerMethodReflector::class),
+                $c->get(IRequest::class),
+                $c->get(IConfig::class),
+                $c->get(IDBConnection::class),
+                $c->get(LoggerInterface::class)
+            );
+        });
+
+        /**
+         * App Framework default arguments
+         */
+        $this->registerParameter('corsMethods', 'PUT, POST, GET, DELETE, PATCH');
+        $this->registerParameter('corsAllowedHeaders', 'Authorization, Content-Type, Accept');
+        $this->registerParameter('corsMaxAge', 1728000);
+
+        /**
+         * Middleware
+         */
+        $this->registerAlias('MiddlewareDispatcher', MiddlewareDispatcher::class);
+        $this->registerService(MiddlewareDispatcher::class, function (ContainerInterface $c) {
+            $server = $this->getServer();
+
+            $dispatcher = new MiddlewareDispatcher();
+
+            $dispatcher->registerMiddleware(
+                $c->get(OC\AppFramework\Middleware\CompressionMiddleware::class)
+            );
+
+            $dispatcher->registerMiddleware($c->get(OC\AppFramework\Middleware\NotModifiedMiddleware::class));
+
+            $dispatcher->registerMiddleware(
+                $c->get(OC\AppFramework\Middleware\Security\ReloadExecutionMiddleware::class)
+            );
+
+            $dispatcher->registerMiddleware(
+                new OC\AppFramework\Middleware\Security\SameSiteCookieMiddleware(
+                    $c->get(IRequest::class),
+                    $c->get(IControllerMethodReflector::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                new CORSMiddleware(
+                    $c->get(IRequest::class),
+                    $c->get(IControllerMethodReflector::class),
+                    $c->get(IUserSession::class),
+                    $c->get(OC\Security\Bruteforce\Throttler::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                new OCSMiddleware(
+                    $c->get(IRequest::class)
+                )
+            );
+
+
+
+            $securityMiddleware = new SecurityMiddleware(
+                $c->get(IRequest::class),
+                $c->get(IControllerMethodReflector::class),
+                $c->get(INavigationManager::class),
+                $c->get(IURLGenerator::class),
+                $server->query(ILogger::class),
+                $c->get('AppName'),
+                $server->getUserSession()->isLoggedIn(),
+                $this->getUserId() !== null && $server->getGroupManager()->isAdmin($this->getUserId()),
+                $server->getUserSession()->getUser() !== null && $server->query(ISubAdmin::class)->isSubAdmin($server->getUserSession()->getUser()),
+                $server->getAppManager(),
+                $server->getL10N('lib')
+            );
+            $dispatcher->registerMiddleware($securityMiddleware);
+            $dispatcher->registerMiddleware(
+                new OC\AppFramework\Middleware\Security\CSPMiddleware(
+                    $server->query(OC\Security\CSP\ContentSecurityPolicyManager::class),
+                    $server->query(OC\Security\CSP\ContentSecurityPolicyNonceManager::class),
+                    $server->query(OC\Security\CSRF\CsrfTokenManager::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                $server->query(OC\AppFramework\Middleware\Security\FeaturePolicyMiddleware::class)
+            );
+            $dispatcher->registerMiddleware(
+                new OC\AppFramework\Middleware\Security\PasswordConfirmationMiddleware(
+                    $c->get(IControllerMethodReflector::class),
+                    $c->get(ISession::class),
+                    $c->get(IUserSession::class),
+                    $c->get(ITimeFactory::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                new TwoFactorMiddleware(
+                    $c->get(OC\Authentication\TwoFactorAuth\Manager::class),
+                    $c->get(IUserSession::class),
+                    $c->get(ISession::class),
+                    $c->get(IURLGenerator::class),
+                    $c->get(IControllerMethodReflector::class),
+                    $c->get(IRequest::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                new OC\AppFramework\Middleware\Security\BruteForceMiddleware(
+                    $c->get(IControllerMethodReflector::class),
+                    $c->get(OC\Security\Bruteforce\Throttler::class),
+                    $c->get(IRequest::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                new RateLimitingMiddleware(
+                    $c->get(IRequest::class),
+                    $c->get(IUserSession::class),
+                    $c->get(IControllerMethodReflector::class),
+                    $c->get(OC\Security\RateLimiting\Limiter::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                new OC\AppFramework\Middleware\PublicShare\PublicShareMiddleware(
+                    $c->get(IRequest::class),
+                    $c->get(ISession::class),
+                    $c->get(\OCP\IConfig::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                $c->get(\OC\AppFramework\Middleware\AdditionalScriptsMiddleware::class)
+            );
+
+            foreach ($this->middleWares as $middleWare) {
+                $dispatcher->registerMiddleware($c->get($middleWare));
+            }
+
+            $dispatcher->registerMiddleware(
+                new SessionMiddleware(
+                    $c->get(IControllerMethodReflector::class),
+                    $c->get(ISession::class)
+                )
+            );
+            return $dispatcher;
+        });
+
+        $this->registerService(IAppConfig::class, function (ContainerInterface $c) {
+            return new OC\AppFramework\Services\AppConfig(
+                $c->get(IConfig::class),
+                $c->get('AppName')
+            );
+        });
+        $this->registerService(IInitialState::class, function (ContainerInterface $c) {
+            return new OC\AppFramework\Services\InitialState(
+                $c->get(IInitialStateService::class),
+                $c->get('AppName')
+            );
+        });
+    }
+
+    /**
+     * @return \OCP\IServerContainer
+     */
+    public function getServer() {
+        return $this->server;
+    }
+
+    /**
+     * @param string $middleWare
+     * @return boolean|null
+     */
+    public function registerMiddleWare($middleWare) {
+        if (in_array($middleWare, $this->middleWares, true) !== false) {
+            return false;
+        }
+        $this->middleWares[] = $middleWare;
+    }
+
+    /**
+     * used to return the appname of the set application
+     * @return string the name of your application
+     */
+    public function getAppName() {
+        return $this->query('AppName');
+    }
+
+    /**
+     * @deprecated use IUserSession->isLoggedIn()
+     * @return boolean
+     */
+    public function isLoggedIn() {
+        return \OC::$server->getUserSession()->isLoggedIn();
+    }
+
+    /**
+     * @deprecated use IGroupManager->isAdmin($userId)
+     * @return boolean
+     */
+    public function isAdminUser() {
+        $uid = $this->getUserId();
+        return \OC_User::isAdminUser($uid);
+    }
+
+    private function getUserId() {
+        return $this->getServer()->getSession()->get('user_id');
+    }
+
+    /**
+     * @deprecated use the ILogger instead
+     * @param string $message
+     * @param string $level
+     * @return mixed
+     */
+    public function log($message, $level) {
+        switch ($level) {
+            case 'debug':
+                $level = ILogger::DEBUG;
+                break;
+            case 'info':
+                $level = ILogger::INFO;
+                break;
+            case 'warn':
+                $level = ILogger::WARN;
+                break;
+            case 'fatal':
+                $level = ILogger::FATAL;
+                break;
+            default:
+                $level = ILogger::ERROR;
+                break;
+        }
+        \OCP\Util::writeLog($this->getAppName(), $message, $level);
+    }
+
+    /**
+     * Register a capability
+     *
+     * @param string $serviceName e.g. 'OCA\Files\Capabilities'
+     */
+    public function registerCapability($serviceName) {
+        $this->query('OC\CapabilitiesManager')->registerCapability(function () use ($serviceName) {
+            return $this->query($serviceName);
+        });
+    }
+
+    public function has($id): bool {
+        if (parent::has($id)) {
+            return true;
+        }
+
+        if ($this->server->has($id, true)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function query(string $name, bool $autoload = true) {
+        try {
+            return $this->queryNoFallback($name);
+        } catch (QueryException $firstException) {
+            try {
+                return $this->getServer()->query($name, $autoload);
+            } catch (QueryException $secondException) {
+                if ($firstException->getCode() === 1) {
+                    throw $secondException;
+                }
+                throw $firstException;
+            }
+        }
+    }
+
+    /**
+     * @param string $name
+     * @return mixed
+     * @throws QueryException if the query could not be resolved
+     */
+    public function queryNoFallback($name) {
+        $name = $this->sanitizeName($name);
+
+        if ($this->offsetExists($name)) {
+            return parent::query($name);
+        } elseif ($this['AppName'] === 'settings' && strpos($name, 'OC\\Settings\\') === 0) {
+            return parent::query($name);
+        } elseif ($this['AppName'] === 'core' && strpos($name, 'OC\\Core\\') === 0) {
+            return parent::query($name);
+        } elseif (strpos($name, \OC\AppFramework\App::buildAppNamespace($this['AppName']) . '\\') === 0) {
+            return parent::query($name);
+        }
+
+        throw new QueryException('Could not resolve ' . $name . '!' .
+            ' Class can not be instantiated', 1);
+    }
 }