summaryrefslogtreecommitdiffstats
path: root/apps/dav/lib
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-05-23 20:50:03 +0200
committerVincent Petry <pvince81@owncloud.com>2016-05-23 20:50:03 +0200
commit87fa86a69ae8df7aadcb882eb3a9a7f767e453a7 (patch)
tree170586f2d6a9e10e96f7102c21fb684971ac9179 /apps/dav/lib
parentaa56d42fa8aafbed96eecfb898fa5c02340493a7 (diff)
parent847bbc51b61b4222503ae089f78124c2d18d5f22 (diff)
downloadnextcloud-server-87fa86a69ae8df7aadcb882eb3a9a7f767e453a7.tar.gz
nextcloud-server-87fa86a69ae8df7aadcb882eb3a9a7f767e453a7.zip
Merge pull request #24559 from owncloud/2fa
two factor auth
Diffstat (limited to 'apps/dav/lib')
-rw-r--r--apps/dav/lib/Connector/Sabre/Auth.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/dav/lib/Connector/Sabre/Auth.php b/apps/dav/lib/Connector/Sabre/Auth.php
index b8047e779f5..69301096b49 100644
--- a/apps/dav/lib/Connector/Sabre/Auth.php
+++ b/apps/dav/lib/Connector/Sabre/Auth.php
@@ -103,6 +103,7 @@ class Auth extends AbstractBasic {
return true;
} else {
\OC_Util::setUpFS(); //login hooks may need early access to the filesystem
+ // TODO: do not allow basic auth if the user is 2FA enforced
if($this->userSession->login($username, $password)) {
$this->userSession->createSessionToken($this->request, $username, $password);
\OC_Util::setUpFS($this->userSession->getUser()->getUID());