Delete chunks if the move on an upload failed

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/apps/dav/lib/Upload/ChunkingPlugin.php b/apps/dav/lib/Upload/ChunkingPlugin.php
index 0a89b144ae1bffbbbae54abfaaef65406c402ceb..d9b4ee44d3944d8ad3d7615d0a6c583103c85e54 100644 (file)
--- a/apps/dav/lib/Upload/ChunkingPlugin.php
+++ b/apps/dav/lib/Upload/ChunkingPlugin.php
@@ -26,6 +26,7 @@
 namespace OCA\DAV\Upload;
 
 use OCA\DAV\Connector\Sabre\Directory;
+use OCA\DAV\Connector\Sabre\Exception\Forbidden;
 use Sabre\DAV\Exception\BadRequest;
 use Sabre\DAV\Exception\NotFound;
 use Sabre\DAV\INode;
@@ -87,13 +88,16 @@ class ChunkingPlugin extends ServerPlugin {
         * @return bool|void false to stop handling, void to skip this handler
         */
        public function performMove($path, $destination) {
-               if (!$this->server->tree->nodeExists($destination)) {
-                       // skip and let the default handler do its work
-                       return;
-               }
-
                // do a move manually, skipping Sabre's default "delete" for existing nodes
-               $this->server->tree->move($path, $destination);
+               try {
+                       $this->server->tree->move($path, $destination);
+               } catch (Forbidden $e) {
+                       $sourceNode = $this->server->tree->getNodeForPath($path);
+                       if ($sourceNode instanceof FutureFile) {
+                               $sourceNode->delete();
+                       }
+                       throw $e;
+               }
 
                // trigger all default events (copied from CorePlugin::move)
                $this->server->emit('afterMove', [$path, $destination]);