Merge pull request #1972 from nextcloud/invalid-files-from-scanner

Make sure we don't scan files that can not be accessed

2 files changed, 27 insertions, 1 deletions

diff --git a/tests/lib/Files/Cache/ScannerTest.php b/tests/lib/Files/Cache/ScannerTest.php
index b44b6f5d0f5..075716f8033 100644
--- a/tests/lib/Files/Cache/ScannerTest.php
+++ b/tests/lib/Files/Cache/ScannerTest.php
@@ -70,6 +70,32 @@ class ScannerTest extends \Test\TestCase {
 		$this->assertEquals($cachedData['mimetype'], 'image/png');
 	}
 
+	function testFile4Byte() {
+		$data = "dummy file data\n";
+		$this->storage->file_put_contents('foo🙈.txt', $data);
+
+		if (\OC::$server->getDatabaseConnection()->supports4ByteText()) {
+			$this->assertNotNull($this->scanner->scanFile('foo🙈.txt'));
+			$this->assertTrue($this->cache->inCache('foo🙈.txt'), true);
+
+			$cachedData = $this->cache->get('foo🙈.txt');
+			$this->assertEquals(strlen($data), $cachedData['size']);
+			$this->assertEquals('text/plain', $cachedData['mimetype']);
+			$this->assertNotEquals(-1, $cachedData['parent']); //parent folders should be scanned automatically
+		} else {
+			$this->assertNull($this->scanner->scanFile('foo🙈.txt'));
+			$this->assertFalse($this->cache->inCache('foo🙈.txt'), true);
+		}
+	}
+
+	function testFileInvalidChars() {
+		$data = "dummy file data\n";
+		$this->storage->file_put_contents("foo\nbar.txt", $data);
+
+		$this->assertNull($this->scanner->scanFile("foo\nbar.txt"));
+		$this->assertFalse($this->cache->inCache("foo\nbar.txt"), true);
+	}
+
 	private function fillTestFolders() {
 		$textData = "dummy file data\n";
 		$imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png');
diff --git a/tests/lib/Files/PathVerificationTest.php b/tests/lib/Files/PathVerificationTest.php
index 12285bb7acd..c1cebe975fd 100644
--- a/tests/lib/Files/PathVerificationTest.php
+++ b/tests/lib/Files/PathVerificationTest.php
@@ -86,7 +86,7 @@ class PathVerificationTest extends \Test\TestCase {
 
 		if (!$connection->supports4ByteText()) {
 			$this->expectException(InvalidPathException::class);
-			$this->expectExceptionMessage('4-byte characters are not supported in file names');
+			$this->expectExceptionMessage('File name contains at least one invalid character');
 		}
 
 		$this->view->verifyPath('', $fileName);