mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modify loadApps to always load all protected apps (Fixes #20756) 

Adds a new AppManager method which identifies when all app types
are protected, loads all apps (without checking user filters).

This has the intended benefit of avoiding calls to
User\Session:getUser() for these app types, and likely
invalidating the session before user backends are loaded.

Signed-off-by: Scott Shambarger <devel@shambarger.net>
This commit is contained in:
Scott Shambarger 2020-05-04 14:03:27 -07:00
parent 1885d41460
commit ff8695fdb4
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/private/App/AppManager.php
View File

@ -350,6 +350,21 @@ class AppManager implements IAppManager {
return !empty($protectedTypes);
}
/**
* Whether a list of types contains only protected app types
*
* @param string[] $types
* @return bool
*/
public function hasOnlyProtectedAppTypes($types) {
if (empty($types)) {
return false;
}
$unprotectedTypes = array_diff($types, $this->protectedAppTypes);
return empty($unprotectedTypes);
}
/**
* Enable an app only for specific groups
*

6
lib/private/legacy/OC_App.php
View File

@ -110,8 +110,12 @@ class OC_App {
if ((bool) \OC::$server->getSystemConfig()->getValue('maintenance', false)) {
return false;
}
// If only protected types, don't filter by user (prevents
// session invalidation when loading prelogin/authentication
// types).
$all = \OC::$server->getAppManager()->hasOnlyProtectedAppTypes($types);
// Load the enabled apps here
$apps = self::getEnabledApps();
$apps = self::getEnabledApps(false, $all);
// Add each apps' folder as allowed class path
foreach ($apps as $app) {