Merge pull request #28235 from nextcloud/jail-search-root-21

[21] dont apply jail search filter is on the root

Author: PVince81

lib/private/Files/Cache/Wrapper/CacheJail.php

@@ -244,6 +244,10 @@ private function formatSearchResults($results) {
 	 * @return array an array of file data
 	 */
 	public function search($pattern) {
+		if ($this->getGetUnjailedRoot() === '' || $this->getGetUnjailedRoot() === '/') {
+			return parent::search($pattern);
+		}
+
 		// normalize pattern
 		$pattern = $this->normalize($pattern);
 
@@ -277,6 +281,10 @@ public function search($pattern) {
 	 * @return array
 	 */
 	public function searchByMime($mimetype) {
+		if ($this->getGetUnjailedRoot() === '' || $this->getGetUnjailedRoot() === '/') {
+			return parent::searchByMime($mimetype);
+		}
+
 		$mimeId = $this->mimetypeLoader->getId($mimetype);
 
 		$query = $this->getQueryBuilder();
@@ -304,6 +312,10 @@ public function searchByMime($mimetype) {
 	}
 
 	public function searchQuery(ISearchQuery $query) {
+		if ($this->getGetUnjailedRoot() === '' || $this->getGetUnjailedRoot() === '/') {
+			return parent::searchQuery($query);
+		}
+
 		$prefixFilter = new SearchComparison(
 			ISearchComparison::COMPARE_LIKE,
 			'path',

tests/lib/Files/Cache/Wrapper/CacheJailTest.php

@@ -200,4 +200,22 @@ public function testSearchNested() {
 		$this->assertCount(1, $result);
 		$this->assertEquals('asd', $result[0]['path']);
 	}
+
+	public function testRootJail() {
+		$this->storage->getScanner()->scan('');
+		$file1 = 'foo';
+		$file2 = 'foo/bar';
+		$file3 = 'foo/bar/asd';
+		$data1 = ['size' => 100, 'mtime' => 50, 'mimetype' => 'foo/folder'];
+
+		$this->sourceCache->put($file1, $data1);
+		$this->sourceCache->put($file2, $data1);
+		$this->sourceCache->put($file3, $data1);
+
+		$nested = new \OC\Files\Cache\Wrapper\CacheJail($this->sourceCache, '');
+
+		$result = $nested->search('%asd%');
+		$this->assertCount(1, $result);
+		$this->assertEquals('foo/bar/asd', $result[0]['path']);
+	}
 }