diff options
| -rw-r--r-- | lib/private/files/cache/wrapper/cachejail.php | 5 | ||||
| -rw-r--r-- | tests/lib/files/cache/wrapper/cachejail.php | 13 |
2 files changed, 16 insertions, 2 deletions
diff --git a/lib/private/files/cache/wrapper/cachejail.php b/lib/private/files/cache/wrapper/cachejail.php index b889ace5c7d..82f62eb7fba 100644 --- a/lib/private/files/cache/wrapper/cachejail.php +++ b/lib/private/files/cache/wrapper/cachejail.php @@ -58,6 +58,11 @@ class CacheJail extends CacheWrapper { * @return null|string the jailed path or null if the path is outside the jail */ protected function getJailedPath($path) { + + if ($this->root === '') { + return $path; + } + $rootLength = strlen($this->root) + 1; if ($path === $this->root) { return ''; diff --git a/tests/lib/files/cache/wrapper/cachejail.php b/tests/lib/files/cache/wrapper/cachejail.php index 9ddf3e9c61c..9b51b494801 100644 --- a/tests/lib/files/cache/wrapper/cachejail.php +++ b/tests/lib/files/cache/wrapper/cachejail.php @@ -63,8 +63,17 @@ class CacheJail extends Cache { } function testGetById() { - //not supported - $this->assertTrue(true); + $data1 = array('size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory'); + $id = $this->sourceCache->put('foo/bar', $data1); + + // path from jailed foo of foo/bar is bar + $path = $this->cache->getPathById($id); + $this->assertEquals('bar', $path); + + // path from jailed '' of foo/bar is foo/bar + $this->cache = new \OC\Files\Cache\Wrapper\CacheJail($this->sourceCache, ''); + $path = $this->cache->getPathById($id); + $this->assertEquals('foo/bar', $path); } function testGetIncomplete() { |