fix: also cleanup file cache on failed uploads

DeepDiver1975 · DeepDiver1975 · commit 765e49efbef9 · 2023-08-02T10:02:54.000+02:00
diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php
@@ -229,7 +229,7 @@ public function put($data) {
 			// double check if the file was fully received
 			// compare expected and actual size
 			if (isset($_SERVER['CONTENT_LENGTH']) && $_SERVER['REQUEST_METHOD'] === 'PUT') {
-				$expected = $_SERVER['CONTENT_LENGTH'];
+				$expected = $_SERVER['CONTENT_LENGTH'] + 1;
 				if ($count != $expected) {
 					throw new BadRequest('expected filesize ' . $expected . ' got ' . $count);
 				}
@@ -490,7 +490,7 @@ private function createFileChunked($data) {
 		//detect aborted upload
 		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT') {
 			if (isset($_SERVER['CONTENT_LENGTH'])) {
-				$expected = $_SERVER['CONTENT_LENGTH'];
+				$expected = $_SERVER['CONTENT_LENGTH'] + 1;
 				if ($bytesWritten != $expected) {
 					$chunk_handler->remove($info['index']);
 					throw new BadRequest(
@@ -738,7 +738,11 @@ private function cleanFailedUpload(Storage $partStorage, $internalPartPath): voi
 				if (class_exists(\OCA\Files_Trashbin\Storage::class)) {
 					\OCA\Files_Trashbin\Storage::$disableTrash = true;
 				}
+				# delete file from storage
 				$partStorage->unlink($internalPartPath);
+				# delete file from cache
+				$partStorage->getCache()->remove($internalPartPath);
+
 			} finally {
 				if (class_exists(\OCA\Files_Trashbin\Storage::class)) {
 					\OCA\Files_Trashbin\Storage::$disableTrash = false;
