From f5befbeac64ee21ff12ba12ee8e25c743979714b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 23 Feb 2015 14:36:51 +0100
Subject: [PATCH 1/2] Check if we have a proper fileinfo

---
 lib/private/files/node/node.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/lib/private/files/node/node.php b/lib/private/files/node/node.php
index 4c7d32cbd0..2d46596a08 100644
--- a/lib/private/files/node/node.php
+++ b/lib/private/files/node/node.php
@@ -23,6 +23,10 @@
  */
 namespace OC\Files\Node;
 
+use OC\Files\Filesystem;
+use OCP\Files\FileInfo;
+use OCP\Files\InvalidPathException;
+use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
 
 class Node implements \OCP\Files\Node {
@@ -60,11 +64,21 @@ class Node implements \OCP\Files\Node {
 	/**
 	 * Returns the matching file info
 	 *
-	 * @return \OCP\Files\FileInfo
+	 * @return FileInfo
+	 * @throws InvalidPathException
+	 * @throws NotFoundException
 	 */
 	public function getFileInfo() {
+		if (!Filesystem::isValidPath($this->path)) {
+			throw new InvalidPathException();
+		}
 		if (!$this->fileInfo) {
-			$this->fileInfo = $this->view->getFileInfo($this->path);
+			$fileInfo = $this->view->getFileInfo($this->path);
+			if ($fileInfo instanceof FileInfo) {
+				$this->fileInfo = $fileInfo;
+			} else {
+				throw new NotFoundException();
+			}
 		}
 		return $this->fileInfo;
 	}

From 541c8c092db947814a25f452a78a38f2cd2ff791 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 26 Feb 2015 12:20:20 +0100
Subject: [PATCH 2/2] Add unit test

---
 tests/lib/files/node/node.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tests/lib/files/node/node.php b/tests/lib/files/node/node.php
index 49a2006c76..01ed84c4a0 100644
--- a/tests/lib/files/node/node.php
+++ b/tests/lib/files/node/node.php
@@ -340,4 +340,19 @@ class Node extends \Test\TestCase {
 		$node = new \OC\Files\Node\Node($root, $view, '/bar/foo');
 		$node->touch(100);
 	}
+
+	/**
+	 * @expectedException \OCP\Files\InvalidPathException
+	 */
+	public function testInvalidPath() {
+		$manager = $this->getMock('\OC\Files\Mount\Manager');
+		/**
+		 * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+		 */
+		$view = $this->getMock('\OC\Files\View');
+		$root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+		$node = new \OC\Files\Node\Node($root, $view, '/../foo');
+		$node->getFileInfo();
+	}
 }