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

Skip session validation during app load (Fixes #20756) 

Adds parameter to User\Session:getUser() to skip validation, and
modifies OC_App::getEnabledApps() to use this parameter to skip
session validation when loading apps.

Signed-off-by: Scott Shambarger <devel@shambarger.net>
This commit is contained in:
Scott Shambarger 2020-04-30 16:32:35 -07:00
parent b2b8be83f8
commit 581d3007fb
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/private/User/Session.php
View File

@ -223,9 +223,10 @@ class Session implements IUserSession, Emitter {
/** /**
* get the current active user * get the current active user
* *
* @param bool $validate whether to validate session
* @return IUser|null Current user, otherwise null * @return IUser|null Current user, otherwise null
*/ */
public function getUser() { public function getUser($validate = true) {
// FIXME: This is a quick'n dirty work-around for the incognito mode as // FIXME: This is a quick'n dirty work-around for the incognito mode as
// described at https://github.com/owncloud/core/pull/12912#issuecomment-67391155 // described at https://github.com/owncloud/core/pull/12912#issuecomment-67391155
if (OC_User::isIncognitoMode()) { if (OC_User::isIncognitoMode()) {
@ -236,12 +237,17 @@ class Session implements IUserSession, Emitter {
if (is_null($uid)) { if (is_null($uid)) {
return null; return null;
} }
$this->activeUser = $this->manager->get($uid); // UserManager will cache user for later validation...
if (is_null($this->activeUser)) { $user = $this->manager->get($uid);
if (is_null($user)) {
return null; return null;
} }
if ($validate === true) {
// only set activeUser when validating...
$this->activeUser = $user;
$this->validateSession(); $this->validateSession();
} }
}
return $this->activeUser; return $this->activeUser;
} }

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

@ -348,7 +348,8 @@ class OC_App {
if ($all) { if ($all) {
$user = null; $user = null;
} else { } else {
$user = \OC::$server->getUserSession()->getUser(); // getUser but don't validate session yet
$user = \OC::$server->getUserSession()->getUser(false);
} }
if (is_null($user)) { if (is_null($user)) {