diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-02-23 10:25:13 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-02-23 10:25:13 +0100 |
| commit | 9a08c7ecb966414475d5a37da44119b7b0794c48 (patch) | |
| tree | c4e0b5804db5ab26c931c4242c31e2ac13c9c09c /lib | |
| parent | f63b09facae0e70010cc675aee960d4a0f826078 (diff) | |
| parent | 535757bc427d91a6b96b7b3a145d83e1fefef43a (diff) | |
| download | nextcloud-server-9a08c7ecb966414475d5a37da44119b7b0794c48.tar.gz nextcloud-server-9a08c7ecb966414475d5a37da44119b7b0794c48.zip | |
Merge pull request #14275 from chris-se/master
DAV authentication: use Owncloud's internal user instead of HTTP auth one
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/connector/sabre/auth.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/private/connector/sabre/auth.php b/lib/private/connector/sabre/auth.php index 533d250d68e..ba2e7d6327b 100644 --- a/lib/private/connector/sabre/auth.php +++ b/lib/private/connector/sabre/auth.php @@ -52,7 +52,7 @@ class OC_Connector_Sabre_Auth extends \Sabre\DAV\Auth\Backend\AbstractBasic { */ protected function validateUserPass($username, $password) { if (OC_User::isLoggedIn() && - $this->isDavAuthenticated($username) + $this->isDavAuthenticated(OC_User::getUser()) ) { OC_Util::setupFS(OC_User::getUser()); \OC::$server->getSession()->close(); @@ -60,8 +60,11 @@ class OC_Connector_Sabre_Auth extends \Sabre\DAV\Auth\Backend\AbstractBasic { } 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); + // make sure we use owncloud's internal username here + // and not the HTTP auth supplied one, see issue #14048 + $ocUser = OC_User::getUser(); + OC_Util::setUpFS($ocUser); + \OC::$server->getSession()->set(self::DAV_AUTHENTICATED, $ocUser); \OC::$server->getSession()->close(); return true; } else { |