summaryrefslogtreecommitdiffstats
path: root/apps/dav/lib/Connector
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2021-06-22 19:54:13 +0200
committerLukas Reschke <lukas@statuscode.ch>2021-06-22 19:54:13 +0200
commitd6a2f00befda97f25f13dae8c11be75077a358a2 (patch)
tree5709e207533f0dcdeda18541dee21ec4eb4ba7a6 /apps/dav/lib/Connector
parent1c8f5cbc8275606d290d0ce56fb329f3106ee7f6 (diff)
downloadnextcloud-server-d6a2f00befda97f25f13dae8c11be75077a358a2.tar.gz
nextcloud-server-d6a2f00befda97f25f13dae8c11be75077a358a2.zip
Throttle on public DAV endpoint
We should throttle whenever an invalid request is sent to the public WebDAV endpoint. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Diffstat (limited to 'apps/dav/lib/Connector')
-rw-r--r--apps/dav/lib/Connector/PublicAuth.php16
1 files changed, 15 insertions, 1 deletions
diff --git a/apps/dav/lib/Connector/PublicAuth.php b/apps/dav/lib/Connector/PublicAuth.php
index 55d2de72228..426cbf871d7 100644
--- a/apps/dav/lib/Connector/PublicAuth.php
+++ b/apps/dav/lib/Connector/PublicAuth.php
@@ -29,6 +29,7 @@
*/
namespace OCA\DAV\Connector;
+use OC\Security\Bruteforce\Throttler;
use OCP\IRequest;
use OCP\ISession;
use OCP\Share\Exceptions\ShareNotFound;
@@ -42,6 +43,7 @@ use Sabre\DAV\Auth\Backend\AbstractBasic;
* @package OCA\DAV\Connector
*/
class PublicAuth extends AbstractBasic {
+ private const BRUTEFORCE_ACTION = 'public_webdav_auth';
/** @var \OCP\Share\IShare */
private $share;
@@ -55,17 +57,23 @@ class PublicAuth extends AbstractBasic {
/** @var IRequest */
private $request;
+ /** @var Throttler */
+ private $throttler;
+
/**
* @param IRequest $request
* @param IManager $shareManager
* @param ISession $session
+ * @param Throttler $throttler
*/
public function __construct(IRequest $request,
IManager $shareManager,
- ISession $session) {
+ ISession $session,
+ Throttler $throttler) {
$this->request = $request;
$this->shareManager = $shareManager;
$this->session = $session;
+ $this->throttler = $throttler;
// setup realm
$defaults = new \OCP\Defaults();
@@ -85,9 +93,12 @@ class PublicAuth extends AbstractBasic {
* @throws \Sabre\DAV\Exception\NotAuthenticated
*/
protected function validateUserPass($username, $password) {
+ $this->throttler->sleepDelayOrThrowOnMax($this->request->getRemoteAddress(), self::BRUTEFORCE_ACTION);
+
try {
$share = $this->shareManager->getShareByToken($username);
} catch (ShareNotFound $e) {
+ $this->throttler->registerAttempt(self::BRUTEFORCE_ACTION, $this->request->getRemoteAddress());
return false;
}
@@ -112,11 +123,14 @@ class PublicAuth extends AbstractBasic {
header('WWW-Authenticate: DummyBasic realm="' . $this->realm . '"');
throw new \Sabre\DAV\Exception\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;
} else {
+ $this->throttler->registerAttempt(self::BRUTEFORCE_ACTION, $this->request->getRemoteAddress());
return false;
}
} else {