Skip session validation during app load (Fixes nextcloud#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 <[email protected]>
sshambar · Apr 30, 2020 · 581d300 · 581d300
1 parent b2b8be8
commit 581d300
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
@@ -223,9 +223,10 @@ public function setUser($user) {
 	/**
 	 * get the current active user
 	 *
+	 * @param bool $validate whether to validate session
 	 * @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
 		// described at https://github.com/owncloud/core/pull/12912#issuecomment-67391155
 		if (OC_User::isIncognitoMode()) {
@@ -236,11 +237,16 @@ public function getUser() {
 			if (is_null($uid)) {
 				return null;
 			}
-			$this->activeUser = $this->manager->get($uid);
-			if (is_null($this->activeUser)) {
+			// UserManager will cache user for later validation...
+			$user = $this->manager->get($uid);
+			if (is_null($user)) {
 				return null;
 			}
-			$this->validateSession();
+			if ($validate === true) {
+				// only set activeUser when validating...
+				$this->activeUser = $user;
+				$this->validateSession();
+			}
 		}
 		return $this->activeUser;
 	}

diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php
@@ -348,7 +348,8 @@ public static function getEnabledApps(bool $forceRefresh = false, bool $all = fa
 		if ($all) {
 			$user = null;
 		} else {
-			$user = \OC::$server->getUserSession()->getUser();
+			// getUser but don't validate session yet
+			$user = \OC::$server->getUserSession()->getUser(false);
 		}
 
 		if (is_null($user)) {