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

Merge pull request #13497 from owncloud/fix-basic-auth-for-session 

Fix WebDAV auth for session authentication only
This commit is contained in:
Lukas Reschke 2015-01-20 13:38:36 +01:00
parent 2fe6513557 476579b9c6
commit fedc7c6f34
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/connector/sabre/auth.php
View File

@ -101,7 +101,6 @@ class OC_Connector_Sabre_Auth extends \Sabre\DAV\Auth\Backend\AbstractBasic {
public function authenticate(\Sabre\DAV\Server $server, $realm) { public function authenticate(\Sabre\DAV\Server $server, $realm) {
$result = $this->auth($server, $realm); $result = $this->auth($server, $realm);
return $result; return $result;
} }
@ -111,10 +110,13 @@ class OC_Connector_Sabre_Auth extends \Sabre\DAV\Auth\Backend\AbstractBasic {
* @return bool * @return bool
*/ */
private function auth(\Sabre\DAV\Server $server, $realm) { private function auth(\Sabre\DAV\Server $server, $realm) {
if (OC_User::handleApacheAuth()) { if (OC_User::handleApacheAuth() ||
(OC_User::isLoggedIn() && is_null(\OC::$server->getSession()->get(self::DAV_AUTHENTICATED)))
) {
$user = OC_User::getUser(); $user = OC_User::getUser();
OC_Util::setupFS($user); OC_Util::setupFS($user);
$this->currentUser = $user; $this->currentUser = $user;
\OC::$server->getSession()->close();
return true; return true;
} }

2
lib/private/user.php
View File

@ -320,7 +320,7 @@ class OC_User {
* Tries to login the user with HTTP Basic Authentication * Tries to login the user with HTTP Basic Authentication
*/ */
public static function tryBasicAuthLogin() { public static function tryBasicAuthLogin() {
if(!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_USER'])) { if(!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) {
\OC_User::login($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']); \OC_User::login($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
} }
} }