Merge pull request #28175 from nextcloud/jail-search-root

nextcloud · Jul 29, 2021 · db7ffb0 · db7ffb0
2 parents 9a9df23 + 4d5e8bc
commit db7ffb0
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 11 deletions.
diff --git a/lib/private/Files/Cache/Wrapper/CacheJail.php b/lib/private/Files/Cache/Wrapper/CacheJail.php
@@ -306,17 +306,21 @@ public function moveFromCache(\OCP\Files\Cache\ICache $sourceCache, $sourcePath,
 	}
 
 	public function getQueryFilterForStorage(): ISearchOperator {
-		return new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_AND,
-			[
-				$this->getCache()->getQueryFilterForStorage(),
-				new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_OR,
-					[
-						new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'path', $this->getGetUnjailedRoot()),
-						new SearchComparison(ISearchComparison::COMPARE_LIKE, 'path', $this->getGetUnjailedRoot() . '/%'),
-					],
-				)
-			]
-		);
+		if ($this->root !== '' && $this->root !== '/') {
+			return new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_AND,
+				[
+					$this->getCache()->getQueryFilterForStorage(),
+					new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_OR,
+						[
+							new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'path', $this->getGetUnjailedRoot()),
+							new SearchComparison(ISearchComparison::COMPARE_LIKE, 'path', $this->getGetUnjailedRoot() . '/%'),
+						],
+					)
+				]
+			);
+		} else {
+			return $this->getCache()->getQueryFilterForStorage();
+		}
 	}
 
 	public function getCacheEntryFromSearchResult(ICacheEntry $rawEntry): ?ICacheEntry {

diff --git a/tests/lib/Files/Cache/Wrapper/CacheJailTest.php b/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']);
+	}
 }