Use a proper upload file so propfinds return 404

Fixes #20235

By using an UploadFile we make sure that we don't need to have another
check everywhere for the path. But we just have ot check (which we have
to anyway) if it is a proper Connector/File (or directory).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

diff --git a/apps/dav/composer/composer/autoload_classmap.php b/apps/dav/composer/composer/autoload_classmap.php
index ab0c7ee63bd9568cdd122de3b645d999e6eb5db9..9b6108a80521889f0d17ab84df4fda76b7f2e3ed 100644 (file)
--- a/apps/dav/composer/composer/autoload_classmap.php
+++ b/apps/dav/composer/composer/autoload_classmap.php
@@ -223,6 +223,7 @@ return array(
     'OCA\\DAV\\Upload\\CleanupService' => $baseDir . '/../lib/Upload/CleanupService.php',
     'OCA\\DAV\\Upload\\FutureFile' => $baseDir . '/../lib/Upload/FutureFile.php',
     'OCA\\DAV\\Upload\\RootCollection' => $baseDir . '/../lib/Upload/RootCollection.php',
+    'OCA\\DAV\\Upload\\UploadFile' => $baseDir . '/../lib/Upload/UploadFile.php',
     'OCA\\DAV\\Upload\\UploadFolder' => $baseDir . '/../lib/Upload/UploadFolder.php',
     'OCA\\DAV\\Upload\\UploadHome' => $baseDir . '/../lib/Upload/UploadHome.php',
 );

diff --git a/apps/dav/composer/composer/autoload_static.php b/apps/dav/composer/composer/autoload_static.php
index b142b93d7932bcaf095780ddd5f63f37d160b974..fa57e9406e4ac5331574157b8cb0492dcb4be5cd 100644 (file)
--- a/apps/dav/composer/composer/autoload_static.php
+++ b/apps/dav/composer/composer/autoload_static.php
@@ -238,6 +238,7 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\Upload\\CleanupService' => __DIR__ . '/..' . '/../lib/Upload/CleanupService.php',
         'OCA\\DAV\\Upload\\FutureFile' => __DIR__ . '/..' . '/../lib/Upload/FutureFile.php',
         'OCA\\DAV\\Upload\\RootCollection' => __DIR__ . '/..' . '/../lib/Upload/RootCollection.php',
+        'OCA\\DAV\\Upload\\UploadFile' => __DIR__ . '/..' . '/../lib/Upload/UploadFile.php',
         'OCA\\DAV\\Upload\\UploadFolder' => __DIR__ . '/..' . '/../lib/Upload/UploadFolder.php',
         'OCA\\DAV\\Upload\\UploadHome' => __DIR__ . '/..' . '/../lib/Upload/UploadHome.php',
     );

diff --git a/apps/dav/lib/Upload/UploadFile.php b/apps/dav/lib/Upload/UploadFile.php
new file mode 100644 (file)
index 0000000..600cc24
--- /dev/null
+++ b/apps/dav/lib/Upload/UploadFile.php
@@ -0,0 +1,75 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2020, 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/>.
+ *
+ */
+
+namespace OCA\DAV\Upload;
+
+use OCA\DAV\Connector\Sabre\File;
+use Sabre\DAV\IFile;
+
+class UploadFile implements IFile {
+
+       /**  @var File */
+       private $file;
+
+       public function __construct(File $file) {
+               $this->file = $file;
+       }
+
+       public function put($data) {
+               return $this->file->put($data);
+       }
+
+       public function get() {
+               return $this->file->get();
+       }
+
+       public function getContentType() {
+               return $this->file->getContentType();
+       }
+
+       public function getETag() {
+               return $this->file->getETag();
+       }
+
+       public function getSize() {
+               return $this->file->getSize();
+       }
+
+       public function delete() {
+               $this->file->delete();
+       }
+
+       public function getName() {
+               return $this->file->getName();
+       }
+
+       public function setName($name) {
+               $this->file->setName($name);
+       }
+
+       public function getLastModified() {
+               return $this->file->getLastModified();
+       }
+}

diff --git a/apps/dav/lib/Upload/UploadFolder.php b/apps/dav/lib/Upload/UploadFolder.php
index d74154c6ac9d423e497a3037b371117ff1f1e47b..b3df7383ac1dfd5e36215f5250156f642183972d 100644 (file)
--- a/apps/dav/lib/Upload/UploadFolder.php
+++ b/apps/dav/lib/Upload/UploadFolder.php
@@ -53,12 +53,19 @@ class UploadFolder implements ICollection {
                if ($name === '.file') {
                        return new FutureFile($this->node, '.file');
                }
-               return $this->node->getChild($name);
+               return new UploadFile($this->node->getChild($name));
        }
 
        public function getChildren() {
-               $children = $this->node->getChildren();
+               $tmpChildren = $this->node->getChildren();
+
+               $children = [];
                $children[] = new FutureFile($this->node, '.file');
+
+               foreach ($tmpChildren as $child) {
+                       $children[] = new UploadFile($child);
+               }
+
                return $children;
        }