From: Robin Appelman <robin@icewind.nl>
Date: Wed, 1 Jul 2020 13:37:47 +0000 (+0200)
Subject: use exceptions for error signaling in writeStream
X-Git-Tag: v20.0.0beta1~182^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ad7798f9c9066b1eee6ad91526ffab34186f4a7b;p=nextcloud-server.git

use exceptions for error signaling in writeStream

this remove the ambiguity when writing zero length files

Signed-off-by: Robin Appelman <robin@icewind.nl>
---

diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
index ada037768bd..958d09832c4 100644
--- a/lib/private/Files/Storage/Common.php
+++ b/lib/private/Files/Storage/Common.php
@@ -53,6 +53,7 @@ use OC\Files\Storage\Wrapper\Jail;
 use OC\Files\Storage\Wrapper\Wrapper;
 use OCP\Files\EmptyFileNameException;
 use OCP\Files\FileNameTooLongException;
+use OCP\Files\GenericFileException;
 use OCP\Files\InvalidCharacterInPathException;
 use OCP\Files\InvalidDirectoryException;
 use OCP\Files\InvalidPathException;
@@ -620,10 +621,14 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage {
 			}
 		} else {
 			$source = $sourceStorage->fopen($sourceInternalPath, 'r');
+			$result = false;
 			if ($source) {
-				$result = $this->writeStream($targetInternalPath, $source) > 0;
-			} else {
-				$result = false;
+				try {
+					$this->writeStream($targetInternalPath, $source);
+					$result = true;
+				} catch (\Exception $e) {
+					\OC::$server->getLogger()->logException($e, ['level' => ILogger::WARN, 'message' => 'Failed to copy stream to storage']);
+				}
 			}
 
 			if ($result and $preserveMtime) {
@@ -855,10 +860,13 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage {
 	public function writeStream(string $path, $stream, int $size = null): int {
 		$target = $this->fopen($path, 'w');
 		if (!$target) {
-			return 0;
+			throw new GenericFileException("Failed to open $path for writing");
 		}
 		try {
 			[$count, $result] = \OC_Helper::streamCopy($stream, $target);
+			if (!$result) {
+				throw new GenericFileException("Failed to copy stream");
+			}
 		} finally {
 			fclose($target);
 			fclose($stream);
diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
index 4cf3ac4799f..0b636d06bde 100644
--- a/lib/private/Files/Storage/Local.php
+++ b/lib/private/Files/Storage/Local.php
@@ -44,6 +44,7 @@ use OC\Files\Filesystem;
 use OC\Files\Storage\Wrapper\Jail;
 use OCP\Constants;
 use OCP\Files\ForbiddenException;
+use OCP\Files\GenericFileException;
 use OCP\Files\Storage\IStorage;
 use OCP\ILogger;
 
@@ -553,6 +554,11 @@ class Local extends \OC\Files\Storage\Common {
 	}
 
 	public function writeStream(string $path, $stream, int $size = null): int {
-		return (int)file_put_contents($this->getSourcePath($path), $stream);
+		$result = file_put_contents($this->getSourcePath($path), $stream);
+		if ($result === false) {
+			throw new GenericFileException("Failed write steam to $path");
+		} else {
+			return $result;
+		}
 	}
 }
diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php
index ae6c4b22dec..fad2217bfdb 100644
--- a/tests/lib/Files/ViewTest.php
+++ b/tests/lib/Files/ViewTest.php
@@ -13,7 +13,6 @@ use OC\Files\Filesystem;
 use OC\Files\Mount\MountPoint;
 use OC\Files\Storage\Common;
 use OC\Files\Storage\Temporary;
-use OC\Files\Stream\Quota;
 use OC\Files\View;
 use OCP\Constants;
 use OCP\Files\Config\IMountProvider;