Merge pull request #20118 from owncloud/chunked-upload-dav

Initial implementation of the new chunked upload

apps/dav/bin/chunkperf.php

@@ -0,0 +1,76 @@
+<?php
+/**
+ * @author Thomas Müller <[email protected]>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+require '../../../../3rdparty/autoload.php';
+
+if ($argc !== 6) {
+	echo "Invalid number of arguments" . PHP_EOL;
+	exit;
+}
+
+/**
+ * @param \Sabre\DAV\Client $client
+ * @param $uploadUrl
+ * @return mixed
+ */
+function request($client, $method, $uploadUrl, $data = null, $headers = []) {
+	echo "$method $uploadUrl ... ";
+	$t0 = microtime(true);
+	$result = $client->request($method, $uploadUrl, $data, $headers);
+	$t1 = microtime(true);
+	echo $result['statusCode'] . " - " . ($t1 - $t0) . ' seconds' . PHP_EOL;
+	if (!in_array($result['statusCode'],  [200, 201])) {
+		echo $result['body'] . PHP_EOL;
+	}
+	return $result;
+}
+
+$baseUri = $argv[1];
+$userName = $argv[2];
+$password = $argv[3];
+$file = $argv[4];
+$chunkSize = $argv[5] * 1024 * 1024;
+
+$client = new \Sabre\DAV\Client([
+	'baseUri' => $baseUri,
+	'userName' => $userName,
+	'password' => $password
+]);
+
+$transfer = uniqid('transfer', true);
+$uploadUrl = "$baseUri/uploads/$userName/$transfer";
+
+request($client, 'MKCOL', $uploadUrl);
+
+$size = filesize($file);
+$stream = fopen($file, 'r');
+
+$index = 0;
+while(!feof($stream)) {
+	request($client, 'PUT', "$uploadUrl/$index", fread($stream, $chunkSize));
+	$index++;
+}
+
+$destination = pathinfo($file, PATHINFO_BASENAME);
+//echo "Moving $uploadUrl/.file to it's final destination $baseUri/files/$userName/$destination" . PHP_EOL;
+request($client, 'MOVE', "$uploadUrl/.file", null, [
+	'Destination' => "$baseUri/files/$userName/$destination"
+]);

apps/dav/lib/connector/sabre/file.php

@@ -143,7 +143,7 @@ public function put($data) {
 			// if content length is sent by client:
 			// double check if the file was fully received
 			// compare expected and actual size
-			if (isset($_SERVER['CONTENT_LENGTH']) && $_SERVER['REQUEST_METHOD'] !== 'LOCK') {
+			if (isset($_SERVER['CONTENT_LENGTH']) && $_SERVER['REQUEST_METHOD'] === 'PUT') {
 				$expected = $_SERVER['CONTENT_LENGTH'];
 				if ($count != $expected) {
 					throw new BadRequest('expected filesize ' . $expected . ' got ' . $count);

apps/dav/lib/connector/sabre/filesplugin.php

@@ -28,17 +28,19 @@
 namespace OCA\DAV\Connector\Sabre;
 
 use OC\Files\View;
+use OCA\DAV\Upload\FutureFile;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\Exception\NotFound;
 use Sabre\DAV\IFile;
 use \Sabre\DAV\PropFind;
 use \Sabre\DAV\PropPatch;
+use Sabre\DAV\ServerPlugin;
 use Sabre\DAV\Tree;
 use \Sabre\HTTP\RequestInterface;
 use \Sabre\HTTP\ResponseInterface;
 use OCP\Files\StorageNotAvailableException;
 
-class FilesPlugin extends \Sabre\DAV\ServerPlugin {
+class FilesPlugin extends ServerPlugin {
 
 	// namespace
 	const NS_OWNCLOUD = 'http://owncloud.org/ns';
@@ -146,11 +148,17 @@ public function initialize(\Sabre\DAV\Server $server) {
 
 	/**
 	 * Plugin that checks if a move can actually be performed.
+	 *
 	 * @param string $source source path
 	 * @param string $destination destination path
 	 * @throws Forbidden
+	 * @throws NotFound
 	 */
 	function checkMove($source, $destination) {
+		$sourceNode = $this->tree->getNodeForPath($source);
+		if ($sourceNode instanceof FutureFile) {
+			return;
+		}
 		list($sourceDir,) = \Sabre\HTTP\URLUtil::splitPath($source);
 		list($destinationDir,) = \Sabre\HTTP\URLUtil::splitPath($destination);
 

apps/dav/lib/rootcollection.php

@@ -89,6 +89,9 @@ public function __construct() {
 		$systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, 'principals/system');
 		$systemAddressBookRoot->disableListing = $disableListing;
 
+		$uploadCollection = new Upload\RootCollection($userPrincipalBackend, 'principals/users');
+		$uploadCollection->disableListing = $disableListing;
+
 		$children = [
 				new SimpleCollection('principals', [
 						$userPrincipals,
@@ -102,6 +105,7 @@ public function __construct() {
 				$systemTagCollection,
 				$systemTagRelationsCollection,
 				$commentsCollection,
+				$uploadCollection,
 		];
 
 		parent::__construct('root', $children);

apps/dav/lib/upload/assemblystream.php

@@ -0,0 +1,234 @@
+<?php
+
+namespace OCA\DAV\Upload;
+
+use Sabre\DAV\IFile;
+
+/**
+ * Class AssemblyStream
+ *
+ * The assembly stream is a virtual stream that wraps multiple chunks.
+ * Reading from the stream transparently accessed the underlying chunks and
+ * give a representation as if they were already merged together.
+ *
+ * @package OCA\DAV\Upload
+ */
+class AssemblyStream implements \Icewind\Streams\File {
+
+	/** @var resource */
+	private $context;
+
+	/** @var IFile[] */
+	private $nodes;
+
+	/** @var int */
+	private $pos = 0;
+
+	/** @var array */
+	private $sortedNodes;
+
+	/** @var int */
+	private $size;
+
+	/**
+	 * @param string $path
+	 * @param string $mode
+	 * @param int $options
+	 * @param string &$opened_path
+	 * @return bool
+	 */
+	public function stream_open($path, $mode, $options, &$opened_path) {
+		$this->loadContext('assembly');
+
+		// sort the nodes
+		$nodes = $this->nodes;
+		// http://stackoverflow.com/a/10985500
+		@usort($nodes, function(IFile $a, IFile $b) {
+			return strcmp($a->getName(), $b->getName());
+		});
+		$this->nodes = $nodes;
+
+		// build additional information
+		$this->sortedNodes = [];
+		$start = 0;
+		foreach($this->nodes as $node) {
+			$size = $node->getSize();
+			$name = $node->getName();
+			$this->sortedNodes[$name] = ['node' => $node, 'start' => $start, 'end' => $start + $size];
+			$start += $size;
+			$this->size = $start;
+		}
+		return true;
+	}
+
+	/**
+	 * @param string $offset
+	 * @param int $whence
+	 * @return bool
+	 */
+	public function stream_seek($offset, $whence = SEEK_SET) {
+		return false;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function stream_tell() {
+		return $this->pos;
+	}
+
+	/**
+	 * @param int $count
+	 * @return string
+	 */
+	public function stream_read($count) {
+
+		list($node, $posInNode) = $this->getNodeForPosition($this->pos);
+		if (is_null($node)) {
+			return null;
+		}
+		$stream = $this->getStream($node);
+
+		fseek($stream, $posInNode);
+		$data = fread($stream, $count);
+		$read = strlen($data);
+
+		// update position
+		$this->pos += $read;
+		return $data;
+	}
+
+	/**
+	 * @param string $data
+	 * @return int
+	 */
+	public function stream_write($data) {
+		return false;
+	}
+
+	/**
+	 * @param int $option
+	 * @param int $arg1
+	 * @param int $arg2
+	 * @return bool
+	 */
+	public function stream_set_option($option, $arg1, $arg2) {
+		return false;
+	}
+
+	/**
+	 * @param int $size
+	 * @return bool
+	 */
+	public function stream_truncate($size) {
+		return false;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function stream_stat() {
+		return [];
+	}
+
+	/**
+	 * @param int $operation
+	 * @return bool
+	 */
+	public function stream_lock($operation) {
+		return false;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function stream_flush() {
+		return false;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function stream_eof() {
+		return $this->pos >= $this->size;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function stream_close() {
+		return true;
+	}
+
+
+	/**
+	 * Load the source from the stream context and return the context options
+	 *
+	 * @param string $name
+	 * @return array
+	 * @throws \Exception
+	 */
+	protected function loadContext($name) {
+		$context = stream_context_get_options($this->context);
+		if (isset($context[$name])) {
+			$context = $context[$name];
+		} else {
+			throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
+		}
+		if (isset($context['nodes']) and is_array($context['nodes'])) {
+			$this->nodes = $context['nodes'];
+		} else {
+			throw new \BadMethodCallException('Invalid context, nodes not set');
+		}
+		return $context;
+	}
+
+	/**
+	 * @param IFile[] $nodes
+	 * @return resource
+	 *
+	 * @throws \BadMethodCallException
+	 */
+	public static function wrap(array $nodes) {
+		$context = stream_context_create([
+			'assembly' => [
+				'nodes' => $nodes]
+		]);
+		stream_wrapper_register('assembly', '\OCA\DAV\Upload\AssemblyStream');
+		try {
+			$wrapped = fopen('assembly://', 'r', null, $context);
+		} catch (\BadMethodCallException $e) {
+			stream_wrapper_unregister('assembly');
+			throw $e;
+		}
+		stream_wrapper_unregister('assembly');
+		return $wrapped;
+	}
+
+	/**
+	 * @param $pos
+	 * @return IFile | null
+	 */
+	private function getNodeForPosition($pos) {
+		foreach($this->sortedNodes as $node) {
+			if ($pos >= $node['start'] && $pos < $node['end']) {
+				return [$node['node'], $pos - $node['start']];
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * @param IFile $node
+	 * @return resource
+	 */
+	private function getStream(IFile $node) {
+		$data = $node->get();
+		if (is_resource($data)) {
+			return $data;
+		}
+
+		return fopen('data://text/plain,' . $data,'r');
+	}
+
+}