dfbc405a45
There are a lot of clients that support multiple WebDAV accounts in the same application. However, they resent all the cookies they received from one of the accounts also to the other one. In the case of ownCloud this means that we will always show the user from the session and not the user that is specified in the basic authentication header. This patch adds a workaround the following way: 1. If the user authenticates via the Sabre Auth Connector add a hint to the session that this was authorized via Basic Auth (this is to prevent logout CSRF) 2. If the request contains this hint and the username specified in the basic auth header differs from the one in the session relogin the user using basic auth Fixes https://github.com/owncloud/core/issues/11400 and https://github.com/owncloud/core/issues/13245 and probably some other issues as well. This requires proper testing also considering LDAP / Shibboleth and whatever instances.
122 lines
3.4 KiB
PHP
122 lines
3.4 KiB
PHP
<?php
|
|
|
|
/**
|
|
* ownCloud
|
|
*
|
|
* @author Jakob Sack
|
|
* @copyright 2011 Jakob Sack kde@jakobsack.de
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
|
* License as published by the Free Software Foundation; either
|
|
* version 3 of the License, or any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
|
*
|
|
* You should have received a copy of the GNU Affero General Public
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
class OC_Connector_Sabre_Auth extends \Sabre\DAV\Auth\Backend\AbstractBasic {
|
|
const DAV_AUTHENTICATED = 'AUTHENTICATED_TO_DAV_BACKEND';
|
|
|
|
/**
|
|
* Whether the user has initially authenticated via DAV
|
|
*
|
|
* This is required for WebDAV clients that resent the cookies even when the
|
|
* account was changed.
|
|
*
|
|
* @see https://github.com/owncloud/core/issues/13245
|
|
*
|
|
* @param string $username
|
|
* @return bool
|
|
*/
|
|
protected function isDavAuthenticated($username) {
|
|
return !is_null(\OC::$server->getSession()->get(self::DAV_AUTHENTICATED)) &&
|
|
\OC::$server->getSession()->get(self::DAV_AUTHENTICATED) === $username;
|
|
}
|
|
|
|
/**
|
|
* Validates a username and password
|
|
*
|
|
* This method should return true or false depending on if login
|
|
* succeeded.
|
|
*
|
|
* @param string $username
|
|
* @param string $password
|
|
* @return bool
|
|
*/
|
|
protected function validateUserPass($username, $password) {
|
|
if (OC_User::isLoggedIn() &&
|
|
$this->isDavAuthenticated($username)
|
|
) {
|
|
OC_Util::setupFS(OC_User::getUser());
|
|
return true;
|
|
} else {
|
|
OC_Util::setUpFS(); //login hooks may need early access to the filesystem
|
|
if(OC_User::login($username, $password)) {
|
|
OC_Util::setUpFS(OC_User::getUser());
|
|
\OC::$server->getSession()->set(self::DAV_AUTHENTICATED, $username);
|
|
\OC::$server->getSession()->close();
|
|
return true;
|
|
} else {
|
|
\OC::$server->getSession()->close();
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns information about the currently logged in username.
|
|
*
|
|
* If nobody is currently logged in, this method should return null.
|
|
*
|
|
* @return string|null
|
|
*/
|
|
public function getCurrentUser() {
|
|
$user = OC_User::getUser();
|
|
if($user && $this->isDavAuthenticated($user)) {
|
|
return $user;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Override function here. We want to cache authentication cookies
|
|
* in the syncing client to avoid HTTP-401 roundtrips.
|
|
* If the sync client supplies the cookies, then OC_User::isLoggedIn()
|
|
* will return true and we can see this WebDAV request as already authenticated,
|
|
* even if there are no HTTP Basic Auth headers.
|
|
* In other case, just fallback to the parent implementation.
|
|
*
|
|
* @param \Sabre\DAV\Server $server
|
|
* @param $realm
|
|
* @return bool
|
|
*/
|
|
public function authenticate(\Sabre\DAV\Server $server, $realm) {
|
|
|
|
$result = $this->auth($server, $realm);
|
|
|
|
return $result;
|
|
}
|
|
|
|
/**
|
|
* @param \Sabre\DAV\Server $server
|
|
* @param $realm
|
|
* @return bool
|
|
*/
|
|
private function auth(\Sabre\DAV\Server $server, $realm) {
|
|
if (OC_User::handleApacheAuth()) {
|
|
$user = OC_User::getUser();
|
|
OC_Util::setupFS($user);
|
|
$this->currentUser = $user;
|
|
return true;
|
|
}
|
|
|
|
return parent::authenticate($server, $realm);
|
|
}
|
|
}
|