Merge pull request #19081 from owncloud/prevent0bytedownloads

prevent 0 byte downloads when storage returns false

2 files changed, 22 insertions, 2 deletions

diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index 17659c96b07..f4acc8290bc 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -261,10 +261,13 @@ class File extends Node implements IFile {
 	 * @throws ServiceUnavailable
 	 */
 	public function get() {
-
 		//throw exception if encryption is disabled but files are still encrypted
 		try {
-			return $this->fileView->fopen(ltrim($this->path, '/'), 'rb');
+			$res = $this->fileView->fopen(ltrim($this->path, '/'), 'rb');
+			if ($res === false) {
+				throw new ServiceUnavailable("Could not open file");
+			}
+			return $res;
 		} catch (GenericEncryptionException $e) {
 			// returning 503 will allow retry of the operation at a later point in time
 			throw new ServiceUnavailable("Encryption not ready: " . $e->getMessage());
diff --git a/tests/lib/connector/sabre/file.php b/tests/lib/connector/sabre/file.php
index e5605dd7cc5..fe4c5ec7c29 100644
--- a/tests/lib/connector/sabre/file.php
+++ b/tests/lib/connector/sabre/file.php
@@ -809,4 +809,21 @@ class File extends \Test\TestCase {
 		return $files;
 	}
 
+	/**
+	 * @expectedException \Sabre\DAV\Exception\ServiceUnavailable
+	 */
+	public function testGetFopenFails() {
+		$view = $this->getMock('\OC\Files\View', ['fopen'], array());
+		$view->expects($this->atLeastOnce())
+			->method('fopen')
+			->will($this->returnValue(false));
+
+		$info = new \OC\Files\FileInfo('/test.txt', null, null, array(
+			'permissions' => \OCP\Constants::PERMISSION_ALL
+		), null);
+
+		$file = new \OC\Connector\Sabre\File($view, $info);
+
+		$file->get();
+	}
 }