Validate session only if we are not in a basic auth request

owncloud · Mar 23, 2017 · f1dc2d9 · f1dc2d9
1 parent a253b56
commit f1dc2d9
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
@@ -124,7 +124,10 @@ public static function loadApps($types = null) {
 		// once all authentication apps are loaded we can validate the session
 		if (is_null($types) || in_array('authentication', $types)) {
 			if (\OC::$server->getUserSession()) {
-				\OC::$server->getUserSession()->validateSession();
+				$davUser = \OC::$server->getUserSession()->getSession()->get(\OCA\DAV\Connector\Sabre\Auth::DAV_AUTHENTICATED);
+				if (is_null($davUser)) {
+					\OC::$server->getUserSession()->validateSession();
+				}
 			}
 		}