aboutsummaryrefslogtreecommitdiffstats
path: root/apps/dav/lib
diff options
context:
space:
mode:
Diffstat (limited to 'apps/dav/lib')
-rw-r--r--apps/dav/lib/Connector/LegacyPublicAuth.php (renamed from apps/dav/lib/Connector/PublicAuth.php)11
-rw-r--r--apps/dav/lib/Connector/Sabre/PublicAuth.php231
2 files changed, 238 insertions, 4 deletions
diff --git a/apps/dav/lib/Connector/PublicAuth.php b/apps/dav/lib/Connector/LegacyPublicAuth.php
index d613a5a188f..c2cc81103bd 100644
--- a/apps/dav/lib/Connector/PublicAuth.php
+++ b/apps/dav/lib/Connector/LegacyPublicAuth.php
@@ -29,6 +29,7 @@
*/
namespace OCA\DAV\Connector;
+use OCA\DAV\Connector\Sabre\PublicAuth;
use OCP\IRequest;
use OCP\ISession;
use OCP\Security\Bruteforce\IThrottler;
@@ -42,8 +43,9 @@ use Sabre\DAV\Auth\Backend\AbstractBasic;
*
* @package OCA\DAV\Connector
*/
-class PublicAuth extends AbstractBasic {
- private const BRUTEFORCE_ACTION = 'public_webdav_auth';
+class LegacyPublicAuth extends AbstractBasic {
+ private const BRUTEFORCE_ACTION = 'legacy_public_webdav_auth';
+
private ?IShare $share = null;
private IManager $shareManager;
private ISession $session;
@@ -72,6 +74,7 @@ class PublicAuth extends AbstractBasic {
*
* @param string $username
* @param string $password
+ *
* @return bool
* @throws \Sabre\DAV\Exception\NotAuthenticated
*/
@@ -96,8 +99,8 @@ class PublicAuth extends AbstractBasic {
|| $share->getShareType() === IShare::TYPE_CIRCLE) {
if ($this->shareManager->checkPassword($share, $password)) {
return true;
- } elseif ($this->session->exists('public_link_authenticated')
- && $this->session->get('public_link_authenticated') === (string)$share->getId()) {
+ } elseif ($this->session->exists(PublicAuth::DAV_AUTHENTICATED)
+ && $this->session->get(PublicAuth::DAV_AUTHENTICATED) === $share->getId()) {
return true;
} else {
if (in_array('XMLHttpRequest', explode(',', $this->request->getHeader('X-Requested-With')))) {
diff --git a/apps/dav/lib/Connector/Sabre/PublicAuth.php b/apps/dav/lib/Connector/Sabre/PublicAuth.php
new file mode 100644
index 00000000000..5c71d2b47dc
--- /dev/null
+++ b/apps/dav/lib/Connector/Sabre/PublicAuth.php
@@ -0,0 +1,231 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ *
+ * @author Björn Schießle <bjoern@schiessle.org>
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @author Joas Schilling <coding@schilljs.com>
+ * @author Lukas Reschke <lukas@statuscode.ch>
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @author Robin Appelman <robin@icewind.nl>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Vincent Petry <vincent@nextcloud.com>
+ *
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\DAV\Connector\Sabre;
+
+use OCP\IRequest;
+use OCP\ISession;
+use OCP\Security\Bruteforce\IThrottler;
+use OCP\Share\Exceptions\ShareNotFound;
+use OCP\Share\IManager;
+use OCP\Share\IShare;
+use Psr\Log\LoggerInterface;
+use Sabre\DAV\Auth\Backend\AbstractBasic;
+use Sabre\DAV\Exception\NotAuthenticated;
+use Sabre\DAV\Exception\NotFound;
+use Sabre\DAV\Exception\ServiceUnavailable;
+use Sabre\HTTP;
+use Sabre\HTTP\RequestInterface;
+use Sabre\HTTP\ResponseInterface;
+
+/**
+ * Class PublicAuth
+ *
+ * @package OCA\DAV\Connector
+ */
+class PublicAuth extends AbstractBasic {
+ private const BRUTEFORCE_ACTION = 'public_dav_auth';
+ public const DAV_AUTHENTICATED = 'public_link_authenticated';
+
+ private IShare $share;
+ private IManager $shareManager;
+ private ISession $session;
+ private IRequest $request;
+ private IThrottler $throttler;
+
+
+ public function __construct(IRequest $request,
+ IManager $shareManager,
+ ISession $session,
+ IThrottler $throttler) {
+ $this->request = $request;
+ $this->shareManager = $shareManager;
+ $this->session = $session;
+ $this->throttler = $throttler;
+
+ // setup realm
+ $defaults = new \OCP\Defaults();
+ $this->realm = $defaults->getName();
+ }
+
+ /**
+ * @param RequestInterface $request
+ * @param ResponseInterface $response
+ *
+ * @return array
+ * @throws NotAuthenticated
+ * @throws ServiceUnavailable
+ */
+ public function check(RequestInterface $request, ResponseInterface $response): array {
+ try {
+ $this->throttler->sleepDelayOrThrowOnMax($this->request->getRemoteAddress(), self::BRUTEFORCE_ACTION);
+
+ $auth = new HTTP\Auth\Basic(
+ $this->realm,
+ $request,
+ $response
+ );
+
+ $userpass = $auth->getCredentials();
+ // If authentication provided, checking its validity
+ if ($userpass && !$this->validateUserPass($userpass[0], $userpass[1])) {
+ return [false, 'Username or password was incorrect'];
+ }
+
+ return $this->checkToken();
+ } catch (NotAuthenticated $e) {
+ throw $e;
+ } catch (\Exception $e) {
+ $class = get_class($e);
+ $msg = $e->getMessage();
+ \OC::$server->get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
+ throw new ServiceUnavailable("$class: $msg");
+ }
+ }
+
+ /**
+ * Extract token from request url
+ * @return string
+ * @throws NotFound
+ */
+ private function getToken(): string {
+ $path = $this->request->getPathInfo();
+ // ['', 'dav', 'files', 'token']
+ $splittedPath = explode('/', $path);
+
+ if (count($splittedPath) < 4 || $splittedPath[3] === '') {
+ throw new NotFound();
+ }
+
+ return $splittedPath[3];
+ }
+
+ /**
+ * Check token validity
+ * @return array
+ * @throws NotFound
+ * @throws NotAuthenticated
+ */
+ private function checkToken(): array {
+ $token = $this->getToken();
+
+ try {
+ $share = $this->shareManager->getShareByToken($token);
+ } catch (ShareNotFound $e) {
+ $this->throttler->registerAttempt(self::BRUTEFORCE_ACTION, $this->request->getRemoteAddress());
+ throw new NotFound();
+ }
+
+ $this->share = $share;
+ \OC_User::setIncognitoMode(true);
+
+ // If already authenticated
+ if ($this->session->exists(self::DAV_AUTHENTICATED)
+ && $this->session->get(self::DAV_AUTHENTICATED) === $share->getId()) {
+ return [true, $this->principalPrefix . $token];
+ }
+
+ // If the share is protected but user is not authenticated
+ if ($share->getPassword() !== null) {
+ $this->throttler->registerAttempt(self::BRUTEFORCE_ACTION, $this->request->getRemoteAddress());
+ throw new NotAuthenticated();
+ }
+
+ return [true, $this->principalPrefix . $token];
+ }
+
+ /**
+ * Validates a username and password
+ *
+ * This method should return true or false depending on if login
+ * succeeded.
+ *
+ * @param string $username
+ * @param string $password
+ *
+ * @return bool
+ * @throws NotAuthenticated
+ */
+ protected function validateUserPass($username, $password): bool {
+ $this->throttler->sleepDelayOrThrowOnMax($this->request->getRemoteAddress(), self::BRUTEFORCE_ACTION);
+
+ $token = $this->getToken();
+ try {
+ $share = $this->shareManager->getShareByToken($token);
+ } catch (ShareNotFound $e) {
+ $this->throttler->registerAttempt(self::BRUTEFORCE_ACTION, $this->request->getRemoteAddress());
+ return false;
+ }
+
+ $this->share = $share;
+ \OC_User::setIncognitoMode(true);
+
+ // check if the share is password protected
+ if ($share->getPassword() !== null) {
+ if ($share->getShareType() === IShare::TYPE_LINK
+ || $share->getShareType() === IShare::TYPE_EMAIL
+ || $share->getShareType() === IShare::TYPE_CIRCLE) {
+ if ($this->shareManager->checkPassword($share, $password)) {
+ // If not set, set authenticated session cookie
+ if (!$this->session->exists(self::DAV_AUTHENTICATED)
+ || $this->session->get(self::DAV_AUTHENTICATED) !== $share->getId()) {
+ $this->session->set(self::DAV_AUTHENTICATED, $share->getId());
+ }
+ return true;
+ }
+
+ if (in_array('XMLHttpRequest', explode(',', $this->request->getHeader('X-Requested-With')))) {
+ // do not re-authenticate over ajax, use dummy auth name to prevent browser popup
+ http_response_code(401);
+ header('WWW-Authenticate: DummyBasic realm="' . $this->realm . '"');
+ throw new NotAuthenticated('Cannot authenticate over ajax calls');
+ }
+
+ $this->throttler->registerAttempt(self::BRUTEFORCE_ACTION, $this->request->getRemoteAddress());
+ return false;
+ } elseif ($share->getShareType() === IShare::TYPE_REMOTE) {
+ return true;
+ }
+
+ $this->throttler->registerAttempt(self::BRUTEFORCE_ACTION, $this->request->getRemoteAddress());
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ public function getShare(): IShare {
+ assert($this->share !== null);
+ return $this->share;
+ }
+}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-05 11:42:24 +0000