Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-08-31 05:58:34 +02:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

Merge pull request #5247 from owncloud/hooks-view-same-start

Browse Source 
ensure the view's root is a subfolder of the the default root, not only ...
This commit is contained in:
icewind1991 2013-10-10 06:27:07 -07:00
commit 4c166fa361
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/private/files/view.php
View File

@ -710,7 +710,10 @@ class View {
return false;
}
$defaultRoot = Filesystem::getRoot();
return (strlen($this->fakeRoot) >= strlen($defaultRoot)) && (substr($this->fakeRoot, 0, strlen($defaultRoot)) === $defaultRoot);
if($this->fakeRoot === $defaultRoot){
return true;
}
return (strlen($this->fakeRoot) > strlen($defaultRoot)) && (substr($this->fakeRoot, 0, strlen($defaultRoot) + 1) === $defaultRoot . '/');
}
private function runHooks($hooks, $path, $post = false) {

18
tests/lib/files/view.php
View File

@ -398,6 +398,24 @@ class View extends \PHPUnit_Framework_TestCase {
$this->createHookPath = $params['path'];
}
/**
* @medium
*/
function testViewHooksIfRootStartsTheSame() {
$storage1 = $this->getTestStorage();
$storage2 = $this->getTestStorage();
$defaultRoot = \OC\Files\Filesystem::getRoot();
\OC\Files\Filesystem::mount($storage1, array(), '/');
\OC\Files\Filesystem::mount($storage2, array(), $defaultRoot . '_substorage');
\OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHook');
$subView = new \OC\Files\View($defaultRoot . '_substorage');
$this->hookPath = null;
$subView->file_put_contents('/foo.txt', 'asd');
$this->assertNull($this->hookPath);
}
public function testEditNoCreateHook() {
$storage1 = $this->getTestStorage();
$storage2 = $this->getTestStorage();