1 files changed, 13 insertions, 35 deletions

diff --git a/apps/dav/lib/Direct/DirectFile.php b/apps/dav/lib/Direct/DirectFile.php
index 45c2114747e..7f41dd65f41 100644
--- a/apps/dav/lib/Direct/DirectFile.php
+++ b/apps/dav/lib/Direct/DirectFile.php
@@ -3,26 +3,8 @@
 declare(strict_types=1);
 
 /**
- * @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @author Robin Appelman <robin@icewind.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;
 
@@ -36,21 +18,14 @@ use Sabre\DAV\Exception\NotFound;
 use Sabre\DAV\IFile;
 
 class DirectFile implements IFile {
-	/** @var Direct */
-	private $direct;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
 	/** @var File */
 	private $file;
 
-	private $eventDispatcher;
-
-	public function __construct(Direct $direct, IRootFolder $rootFolder, IEventDispatcher $eventDispatcher) {
-		$this->direct = $direct;
-		$this->rootFolder = $rootFolder;
-		$this->eventDispatcher = $eventDispatcher;
+	public function __construct(
+		private Direct $direct,
+		private IRootFolder $rootFolder,
+		private IEventDispatcher $eventDispatcher,
+	) {
 	}
 
 	public function put($data) {
@@ -108,13 +83,16 @@ class DirectFile implements IFile {
 	private function getFile() {
 		if ($this->file === null) {
 			$userFolder = $this->rootFolder->getUserFolder($this->direct->getUserId());
-			$files = $userFolder->getById($this->direct->getFileId());
+			$file = $userFolder->getFirstNodeById($this->direct->getFileId());
 
-			if ($files === []) {
+			if (!$file) {
 				throw new NotFound();
 			}
+			if (!$file instanceof File) {
+				throw new Forbidden('direct download not allowed on directories');
+			}
 
-			$this->file = array_shift($files);
+			$this->file = $file;
 		}
 
 		return $this->file;