Quota checking

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

Author: juliusknorr

apps/dav/lib/Upload/ChunkingV2Plugin.php

@@ -137,8 +137,27 @@ public function beforePut(RequestInterface $request, ResponseInterface $response
 		}
 
 		$targetFile = $this->getTargetFile($targetPath);
+		$tempTargetFile = $this->uploadFolder->getChild(self::TEMP_TARGET);
+		$cacheEntry = $storage->getCache()->get($tempTargetFile->getInternalPath());
+
+		[$destinationDir, $destinationName] = Uri\split($targetPath);
+		/** @var Directory $destinationParent */
+		$destinationParent = $this->server->tree->getNodeForPath($destinationDir);
+		$free = $storage->free_space($destinationParent->getInternalPath());
+		$additionalSize = (int)$request->getHeader('Content-Length');
+		$newSize = $cacheEntry->getSize() + $additionalSize;
+		if ($free >= 0 && ($cacheEntry->getSize() > $free || $newSize > $free)) {
+			// FIXME: check if needed but might be in responsibility of the clients
+			// $this->uploadFolder->delete();
+			throw new InsufficientStorage("Insufficient space in $targetPath");
+		}
+
 		$stream = $request->getBodyAsStream();
-		$storage->putChunkedFilePart($targetFile->getInternalPath(), $uploadId, (string)$partId, $stream, (int)$request->getHeader('Content-Length'));
+		$storage->putChunkedFilePart($targetFile->getInternalPath(), $uploadId, (string)$partId, $stream, $additionalSize);
+		// FIXME add return value to putChunkedFilePart to validate against size
+
+		$storage->getCache()->update($cacheEntry->getId(), ['size' => $cacheEntry->getSize() + $additionalSize]);
+		$storage->getPropagator()->propagateChange($tempTargetFile->getInternalPath(), time(), $additionalSize);
 
 		$response->setStatus(201);
 		return false;
@@ -155,6 +174,8 @@ public function beforeMove($sourcePath, $destination): bool {
 		$properties = $this->server->getProperties(dirname($sourcePath) . '/', [ self::OBJECT_UPLOAD_CHUNKTOKEN, self::OBJECT_UPLOAD_TARGET ]);
 		$targetPath = $properties[self::OBJECT_UPLOAD_TARGET];
 		$uploadId = $properties[self::OBJECT_UPLOAD_CHUNKTOKEN];
+
+		// FIXME: check if $destination === TARGET
 		if (empty($targetPath) || empty($uploadId)) {
 			throw new PreconditionFailed('Missing metadata for chunked upload');
 		}
@@ -172,11 +193,14 @@ public function beforeMove($sourcePath, $destination): bool {
 
 		$rootView = new View();
 		if ($storage->instanceOfStorage(ObjectStoreStorage::class)) {
-			$storage->processingCallback('writeChunkedFile', function() {
-				sleep(1);
-				\OC_Util::obEnd();
-				echo ' ';
-				flush();
+			$lastTick = time();
+			$storage->processingCallback('writeChunkedFile', function() use ($lastTick){
+				if ($lastTick < time()) {
+					\OC_Util::obEnd();
+					echo ' ';
+					flush();
+				}
+				$lastTick = time();
 			});
 		}
 

lib/private/Files/ObjectStore/ObjectStoreStorage.php

@@ -674,9 +674,11 @@ public function writeChunkedFile(string $targetPath, string $writeToken): int {
 		$urn = $this->getURN($cacheEntry->getId());
 		$uploadId = $this->uploadCache->get($this->getUploadCacheKey($urn, $writeToken, 'uploadId'));
 		$parts = $this->uploadCache->get($this->getUploadCacheKey($urn, $uploadId, 'parts'));
+		$sortedParts = array_values($parts);
+		sort($sortedParts);
 		try {
 			if ($this->objectStore instanceof S3) {
-				$size = $this->objectStore->completeMultipartUpload($urn, $uploadId, array_values($parts), function () {
+				$size = $this->objectStore->completeMultipartUpload($urn, $uploadId, $sortedParts, function () {
 					foreach ($this->processingCallbacks['writeChunkedFile'] as $callback) {
 						$callback();
 					}