1 files changed, 11 insertions, 51 deletions

diff --git a/apps/dav/lib/Direct/DirectHome.php b/apps/dav/lib/Direct/DirectHome.php
index f5f9a2e24a8..ac411c9b52f 100644
--- a/apps/dav/lib/Direct/DirectHome.php
+++ b/apps/dav/lib/Direct/DirectHome.php
@@ -3,36 +3,18 @@
 declare(strict_types=1);
 
 /**
- * @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * 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
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-
 namespace OCA\DAV\Direct;
 
-use OC\Security\Bruteforce\Throttler;
 use OCA\DAV\Db\DirectMapper;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\IRootFolder;
 use OCP\IRequest;
+use OCP\Security\Bruteforce\IThrottler;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\Exception\MethodNotAllowed;
 use Sabre\DAV\Exception\NotFound;
@@ -40,36 +22,14 @@ use Sabre\DAV\ICollection;
 
 class DirectHome implements ICollection {
 
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var DirectMapper */
-	private $mapper;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/** @var Throttler */
-	private $throttler;
-
-	/** @var IRequest */
-	private $request;
-	private $eventDispatcher;
-
 	public function __construct(
-		IRootFolder $rootFolder,
-		DirectMapper $mapper,
-		ITimeFactory $timeFactory,
-		Throttler $throttler,
-		IRequest $request,
-		IEventDispatcher $eventDispatcher
+		private IRootFolder $rootFolder,
+		private DirectMapper $mapper,
+		private ITimeFactory $timeFactory,
+		private IThrottler $throttler,
+		private IRequest $request,
+		private IEventDispatcher $eventDispatcher,
 	) {
-		$this->rootFolder = $rootFolder;
-		$this->mapper = $mapper;
-		$this->timeFactory = $timeFactory;
-		$this->throttler = $throttler;
-		$this->request = $request;
-		$this->eventDispatcher = $eventDispatcher;
 	}
 
 	public function createFile($name, $data = null) {
@@ -91,9 +51,9 @@ class DirectHome implements ICollection {
 
 			return new DirectFile($direct, $this->rootFolder, $this->eventDispatcher);
 		} catch (DoesNotExistException $e) {
-			// Since the token space is so huge only throttle on non exsisting token
+			// Since the token space is so huge only throttle on non-existing token
 			$this->throttler->registerAttempt('directlink', $this->request->getRemoteAddress());
-			$this->throttler->sleepDelay($this->request->getRemoteAddress(), 'directlink');
+			$this->throttler->sleepDelayOrThrowOnMax($this->request->getRemoteAddress(), 'directlink');
 
 			throw new NotFound();
 		}