diff options
author | Mario Vavti <mario@mariovavti.com> | 2016-06-15 08:42:51 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2016-06-15 08:42:51 +0200 |
commit | 9a0dff08bc488646602424fbd030bfd097e8cda9 (patch) | |
tree | e32a25fe7a570573ffee617592678a420bb7ee4c /Zotlabs/Storage | |
parent | 24569a18dbb423f47429905cb38282813b0a6462 (diff) | |
parent | 77dedf664846c9740cb66bf2a95c95c6522c0497 (diff) | |
download | volse-hubzilla-9a0dff08bc488646602424fbd030bfd097e8cda9.tar.gz volse-hubzilla-9a0dff08bc488646602424fbd030bfd097e8cda9.tar.bz2 volse-hubzilla-9a0dff08bc488646602424fbd030bfd097e8cda9.zip |
Merge branch 'dev' into sabre32
Diffstat (limited to 'Zotlabs/Storage')
-rw-r--r-- | Zotlabs/Storage/BasicAuth.php | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/Zotlabs/Storage/BasicAuth.php b/Zotlabs/Storage/BasicAuth.php index 121a9c3a1..60fc2c988 100644 --- a/Zotlabs/Storage/BasicAuth.php +++ b/Zotlabs/Storage/BasicAuth.php @@ -3,6 +3,8 @@ namespace Zotlabs\Storage; use Sabre\DAV; +use Sabre\HTTP\RequestInterface; +use Sabre\HTTP\ResponseInterface; /** * @brief Authentication backend class for DAV. @@ -145,6 +147,57 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic { return true; } + /** + * When this method is called, the backend must check if authentication was + * successful. + * + * The returned value must be one of the following + * + * [true, "principals/username"] + * [false, "reason for failure"] + * + * If authentication was successful, it's expected that the authentication + * backend returns a so-called principal url. + * + * Examples of a principal url: + * + * principals/admin + * principals/user1 + * principals/users/joe + * principals/uid/123457 + * + * If you don't use WebDAV ACL (RFC3744) we recommend that you simply + * return a string such as: + * + * principals/users/[username] + * + * @param RequestInterface $request + * @param ResponseInterface $response + * @return array + */ + function check(RequestInterface $request, ResponseInterface $response) { + + if(local_channel()) { + return [ true, $this->principalPrefix . $this->channel_name ]; + } + + $auth = new \Sabre\HTTP\Auth\Basic( + $this->realm, + $request, + $response + ); + + $userpass = $auth->getCredentials(); + if (!$userpass) { + return [false, "No 'Authorization: Basic' header found. Either the client didn't send one, or the server is misconfigured"]; + } + if (!$this->validateUserPass($userpass[0], $userpass[1])) { + return [false, "Username or password was incorrect"]; + } + return [true, $this->principalPrefix . $userpass[0]]; + + } + protected function check_module_access($channel_id) { if($channel_id && \App::$module === 'cdav') { $x = get_pconfig($channel_id,'cdav','enabled'); |