Merge pull request nextcloud#52824 from nextcloud/backport/52775/stable30

[stable30] fix unjailedroot of nested jails if there are other wrappers in between

Author: icewind1991

apps/files_sharing/lib/Cache.php

@@ -76,7 +76,7 @@ protected function getRoot() {
 		return $this->root;
 	}
 
-	protected function getGetUnjailedRoot() {
+	public function getGetUnjailedRoot() {
 		return $this->sourceRootInfo->getPath();
 	}
 

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

@@ -35,10 +35,13 @@ public function __construct(
 		parent::__construct($cache, $dependencies);
 		$this->root = $root;
 
-		if ($cache instanceof CacheJail) {
-			$this->unjailedRoot = $cache->getSourcePath($root);
-		} else {
-			$this->unjailedRoot = $root;
+		$this->unjailedRoot = $root;
+		$parent = $cache;
+		while ($parent instanceof CacheWrapper) {
+			if ($parent instanceof CacheJail) {
+				$this->unjailedRoot = $parent->getSourcePath($this->unjailedRoot);
+			}
+			$parent = $parent->getCache();
 		}
 	}
 
@@ -51,7 +54,7 @@ protected function getRoot() {
 	 *
 	 * @return string
 	 */
-	protected function getGetUnjailedRoot() {
+	public function getGetUnjailedRoot() {
 		return $this->unjailedRoot;
 	}
 

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

@@ -9,6 +9,7 @@
 namespace Test\Files\Cache\Wrapper;
 
 use OC\Files\Cache\Wrapper\CacheJail;
+use OC\Files\Cache\Wrapper\CacheWrapper;
 use OC\Files\Search\SearchComparison;
 use OC\Files\Search\SearchQuery;
 use OC\Files\Storage\Wrapper\Jail;
@@ -253,4 +254,14 @@ public function testWatcherAfterInnerWatcher() {
 		$storage->getWatcher()->update('bar', ['mimetype' => 'text/plain']);
 		$this->assertTrue($this->cache->inCache('bar'));
 	}
+
+	public function testUnJailedRoot(): void {
+		$jail1 = new CacheJail($this->sourceCache, 'foo');
+		$jail2 = new CacheJail($jail1, 'bar');
+		$this->assertEquals('foo/bar', $jail2->getGetUnjailedRoot());
+
+		$middleWrapper = new CacheWrapper($jail1);
+		$jail3 = new CacheJail($middleWrapper, 'bar');
+		$this->assertEquals('foo/bar', $jail3->getGetUnjailedRoot());
+	}
 }