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

Merge pull request #746 from nextcloud/jail-root 

getJailedPath expects $path to have a trailing /
This commit is contained in:
Lukas Reschke 2016-08-09 11:04:11 +02:00 committed by GitHub
parent 4277051442 f1cd68d713
commit b4ed4e152e
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/private/Files/Cache/Wrapper/CacheJail.php
View File

@ -59,6 +59,9 @@ class CacheJail extends CacheWrapper {
* @return null|string the jailed path or null if the path is outside the jail * @return null|string the jailed path or null if the path is outside the jail
*/ */
protected function getJailedPath($path) { protected function getJailedPath($path) {
if ($this->root === '') {
return $path;
}
$rootLength = strlen($this->root) + 1; $rootLength = strlen($this->root) + 1;
if ($path === $this->root) { if ($path === $this->root) {
return ''; return '';

13
tests/lib/Files/Cache/Wrapper/CacheJailTest.php
View File

@ -63,8 +63,17 @@ class CacheJailTest extends CacheTest {
} }
function testGetById() { function testGetById() {
//not supported $data1 = array('size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory');
$this->assertTrue(true); $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() { function testGetIncomplete() {