diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-14 16:33:09 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-14 16:33:09 +0100 |
| commit | b25077748e98fbfd59be24beccc96386d8903826 (patch) | |
| tree | 58a771cedffb2783fd1e5bd19d89f460115344b2 /lib/private | |
| parent | 3661b47b6d7f40c72d2f9427972adeb2e2b370b1 (diff) | |
| parent | 14f932f3c78dd3b0c94b973fc03199675e67a001 (diff) | |
| download | nextcloud-server-b25077748e98fbfd59be24beccc96386d8903826.tar.gz nextcloud-server-b25077748e98fbfd59be24beccc96386d8903826.zip | |
Merge pull request #22901 from owncloud/add-dav-authenticated
Add DAV authenticated also to other scopes
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/api.php | 12 | ||||
| -rw-r--r-- | lib/private/user.php | 15 |
2 files changed, 26 insertions, 1 deletions
diff --git a/lib/private/api.php b/lib/private/api.php index 87f2aa9b118..12a78f1424b 100644 --- a/lib/private/api.php +++ b/lib/private/api.php @@ -364,6 +364,18 @@ class OC_API { \OC_Util::setUpFS(\OC_User::getUser()); self::$isLoggedIn = true; + /** + * Add DAV authenticated. This should in an ideal world not be + * necessary but the iOS App reads cookies from anywhere instead + * only the DAV endpoint. + * This makes sure that the cookies will be valid for the whole scope + * @see https://github.com/owncloud/core/issues/22893 + */ + \OC::$server->getSession()->set( + \OCA\DAV\Connector\Sabre\Auth::DAV_AUTHENTICATED, + \OC::$server->getUserSession()->getUser()->getUID() + ); + return \OC_User::getUser(); } } diff --git a/lib/private/user.php b/lib/private/user.php index b91f60e3b9b..26062f503d2 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -281,7 +281,20 @@ class OC_User { */ public static function tryBasicAuthLogin() { if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) { - \OC_User::login($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']); + $result = \OC_User::login($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']); + if($result === true) { + /** + * Add DAV authenticated. This should in an ideal world not be + * necessary but the iOS App reads cookies from anywhere instead + * only the DAV endpoint. + * This makes sure that the cookies will be valid for the whole scope + * @see https://github.com/owncloud/core/issues/22893 + */ + \OC::$server->getSession()->set( + \OCA\DAV\Connector\Sabre\Auth::DAV_AUTHENTICATED, + \OC::$server->getUserSession()->getUser()->getUID() + ); + } } } |