mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #818 from nextcloud/jail-root-stable9 

getJailedPath expects  to have a trailing /
This commit is contained in:
Lukas Reschke 2016-08-10 16:03:55 +02:00 committed by GitHub
parent d1b7f50716 6f3d9ec024
commit f222d6ea5f
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/private/files/cache/wrapper/cachejail.php vendored
View File

@ -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 '';

13
tests/lib/files/cache/wrapper/cachejail.php vendored
View File

@ -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() {