first check if the user is already logged in and then try to authenticate via apache...

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>

diff --git a/apps/dav/lib/Connector/Sabre/Auth.php b/apps/dav/lib/Connector/Sabre/Auth.php
index fcd1b34edbc8c3ee4d1e3140a4a9639508712638..292be61c9dcccd07afc7b2eb3eb7994b0652462f 100644 (file)
--- a/apps/dav/lib/Connector/Sabre/Auth.php
+++ b/apps/dav/lib/Connector/Sabre/Auth.php
@@ -228,11 +228,12 @@ class Auth extends AbstractBasic {
                        if($this->twoFactorManager->needsSecondFactor($this->userSession->getUser())) {
                                throw new \Sabre\DAV\Exception\NotAuthenticated('2FA challenge not passed.');
                        }
-                       if (\OC_User::handleApacheAuth() ||
+                       if (
                                //Fix for broken webdav clients
                                ($this->userSession->isLoggedIn() && is_null($this->session->get(self::DAV_AUTHENTICATED))) ||
                                //Well behaved clients that only send the cookie are allowed
-                               ($this->userSession->isLoggedIn() && $this->session->get(self::DAV_AUTHENTICATED) === $this->userSession->getUser()->getUID() && $request->getHeader('Authorization') === null)
+                               ($this->userSession->isLoggedIn() && $this->session->get(self::DAV_AUTHENTICATED) === $this->userSession->getUser()->getUID() && $request->getHeader('Authorization') === null) ||
+                               \OC_User::handleApacheAuth()
                        ) {
                                $user = $this->userSession->getUser()->getUID();
                                \OC_Util::setupFS($user);