summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-09-17 16:04:12 +0200
committerLukas Reschke <lukas@owncloud.com>2014-09-18 14:41:43 +0200
commit749c51975943bd3ecf86e193884032e3042e6d40 (patch)
tree5a58263190de6a0a5f8a572ee5e37ba4f1fe655b /lib
parent35cb14c95f30e20e22633fdfa8a252de0205cb96 (diff)
downloadnextcloud-server-749c51975943bd3ecf86e193884032e3042e6d40.tar.gz
nextcloud-server-749c51975943bd3ecf86e193884032e3042e6d40.zip
Move basic auth check
At the previous point not all apps were initialized. Now the basic auth check happens together at the same location as all others. Fixes https://github.com/owncloud/core/issues/11129
Diffstat (limited to 'lib')
-rw-r--r--lib/base.php16
1 files changed, 4 insertions, 12 deletions
diff --git a/lib/base.php b/lib/base.php
index b1535ff5a47..971ed003dc3 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -684,15 +684,6 @@ class OC {
self::checkUpgrade();
}
- if (!OC_User::isLoggedIn()) {
- // Test it the user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
- if (!OC_Config::getValue('maintenance', false) && !self::checkUpgrade(false)) {
- OC_App::loadApps(array('authentication'));
- }
- OC::tryBasicAuthLogin();
- }
-
-
if (!self::$CLI and (!isset($_GET["logout"]) or ($_GET["logout"] !== 'true'))) {
try {
if (!OC_Config::getValue('maintenance', false) && !\OCP\Util::needUpgrade()) {
@@ -840,8 +831,9 @@ class OC {
} // remember was checked after last login
elseif (OC::tryRememberLogin()) {
$error[] = 'invalidcookie';
- } // logon via web form
- elseif (OC::tryFormLogin()) {
+ } // logon via web form or WebDAV
+ elseif (OC::tryFormLogin()) {}
+ elseif (OC::tryBasicAuthLogin()) {
$error[] = 'invalidpassword';
}
@@ -972,10 +964,10 @@ class OC {
}
if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
- //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
OC_User::unsetMagicInCookie();
$_SERVER['HTTP_REQUESTTOKEN'] = OC_Util::callRegister();
}
+
return true;
}