]> source.dussan.org Git - nextcloud-server.git/commitdiff
DAV authentication: also use Owncloud's internal user for short-circuit
authorChristian Seiler <christian@iwakd.de>
Mon, 16 Feb 2015 22:47:39 +0000 (23:47 +0100)
committerChristian Seiler <christian@iwakd.de>
Mon, 16 Feb 2015 22:47:39 +0000 (23:47 +0100)
It still works otherwise, but without this, the performance optimization
of #13416 is defeated in these situations.

lib/private/connector/sabre/auth.php

index 6f7c429fd38efdc5ed0c9a6e708f0423b7c77b3d..ba2e7d6327bd86db44e9a751d29abb428b301115 100644 (file)
@@ -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();