diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-23 14:46:35 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-23 14:46:35 +0100 |
| commit | 673c8a753140635c24f32388c77c3e8e286a9e0c (patch) | |
| tree | d5a5f8ff1ab254fd6e3fec5e42a5c52cc0fa6e8e | |
| parent | 089ad7c2429905e6b025096a74509d34007e5770 (diff) | |
| parent | 3c51f5ff38ae071a1116b6fa67b94df5c493261f (diff) | |
| download | nextcloud-server-673c8a753140635c24f32388c77c3e8e286a9e0c.tar.gz nextcloud-server-673c8a753140635c24f32388c77c3e8e286a9e0c.zip | |
Merge pull request #14423 from owncloud/backport/14275
Backport/14275
| -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 { |