fixing copyright and add class documentation

diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index 9b114ca2e37209ddc8fd739ff99c5456c6341f23..0c1f2e6580c778f4fc995236b3c5c3929906db03 100644 (file)
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -48,6 +48,7 @@ $defaults = new OC_Defaults();
 $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, $defaults->getName()));
 $server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend));
 $server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
+$server->addPlugin(new OC_Connector_Sabre_AbortedUploadDetectionPlugin());
 $server->addPlugin(new OC_Connector_Sabre_QuotaPlugin());
 $server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin());
 

diff --git a/lib/connector/sabre/aborteduploaddetectionplugin.php b/lib/connector/sabre/aborteduploaddetectionplugin.php
new file mode 100644 (file)
index 0000000..745c4a9
--- /dev/null
+++ b/lib/connector/sabre/aborteduploaddetectionplugin.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas Müller <thomas.mueller@tmit.eu>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * Class OC_Connector_Sabre_AbortedUploadDetectionPlugin
+ *
+ * This plugin will verify if the uploaded data has been stored completely.
+ * This is done by comparing the content length of the request with the file size on storage.
+ */
+class OC_Connector_Sabre_AbortedUploadDetectionPlugin extends Sabre_DAV_ServerPlugin {
+
+       /**
+        * Reference to main server object
+        *
+        * @var Sabre_DAV_Server
+        */
+       private $server;
+
+       /**
+        * is kept public to allow overwrite for unit testing
+        *
+        * @var \OC\Files\View
+        */
+       public $fileView;
+
+       /**
+        * This initializes the plugin.
+        *
+        * This function is called by Sabre_DAV_Server, after
+        * addPlugin is called.
+        *
+        * This method should set up the requires event subscriptions.
+        *
+        * @param Sabre_DAV_Server $server
+        * @return void
+        */
+       public function initialize(Sabre_DAV_Server $server) {
+
+               $this->server = $server;
+
+               $server->subscribeEvent('afterCreateFile', array($this, 'afterCreateFile'), 10);
+               $server->subscribeEvent('afterWriteContent', array($this, 'afterWriteContent'), 10);
+       }
+
+       function afterCreateFile($path, Sabre_DAV_ICollection $parent) {
+
+               $this->verifyContentLength($path);
+
+       }
+
+       function afterWriteContent($path, Sabre_DAV_IFile $node) {
+               $path = $path .'/'.$node->getName();
+               $this->verifyContentLength($path);
+       }
+
+       function verifyContentLength($filePath) {
+
+               // ownCloud chunked upload will be handled in it's own plugin
+               $chunkHeader = $this->server->httpRequest->getHeader('OC-Chunked');
+               if ($chunkHeader) {
+                       return;
+               }
+
+               // compare expected and actual size
+               $expected = $this->getLength();
+               $actual = $this->getFileView()->filesize($filePath);
+               if ($actual != $expected) {
+                       $this->getFileView()->unlink($filePath);
+                       throw new Sabre_DAV_Exception_BadRequest('expected filesize ' . $expected . ' got ' . $actual);
+               }
+
+       }
+
+       /**
+        * @return string
+        */
+       public function getLength()
+       {
+               $req = $this->server->httpRequest;
+               $length = $req->getHeader('X-Expected-Entity-Length');
+               if (!$length) {
+                       $length = $req->getHeader('Content-Length');
+               }
+
+               return $length;
+       }
+
+       /**
+        * @return \OC\Files\View
+        */
+       public function getFileView()
+       {
+               if (is_null($this->fileView)) {
+                       // initialize fileView
+                       $this->fileView = \OC\Files\Filesystem::getView();
+               }
+
+               return $this->fileView;
+       }
+}

diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index 3181a4b310f06515a1504ff14708f16c1c6fcbb2..29374f7a6cf44d9dd1be36b3feda2b87c0746b96 100644 (file)
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -74,19 +74,6 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 
                        \OC\Files\Filesystem::file_put_contents($partpath, $data);
 
-                       //detect aborted upload
-                       if (isset ($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT' ) {
-                               if (isset($_SERVER['CONTENT_LENGTH'])) {
-                                       $expected = $_SERVER['CONTENT_LENGTH'];
-                                       $actual = \OC\Files\Filesystem::filesize($partpath);
-                                       if ($actual != $expected) {
-                                               \OC\Files\Filesystem::unlink($partpath);
-                                               throw new Sabre_DAV_Exception_BadRequest(
-                                                               'expected filesize ' . $expected . ' got ' . $actual);
-                                       }
-                               }
-                       }
-
                        // rename to correct path
                        \OC\Files\Filesystem::rename($partpath, $newPath);