Skip to content

Commit

Permalink
Fix getDirectoryContent implementation for Jail wrapper
Browse files Browse the repository at this point in the history
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
icewind1991 committed Apr 30, 2020
1 parent b219ead commit 3929678
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
2 changes: 1 addition & 1 deletion lib/private/Files/Storage/Wrapper/Jail.php
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,6 @@ public function writeStream(string $path, $stream, int $size = null): int {
}

public function getDirectoryContent($directory): \Traversable {
return $this->getWrapperStorage()->getDirectoryContent($this->getJailedPath($directory));
return $this->getWrapperStorage()->getDirectoryContent($this->getUnjailedPath($directory));
}
}
15 changes: 15 additions & 0 deletions tests/lib/Files/Storage/Storage.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,21 @@ public function testDirectories($directory) {
}
$this->assertEquals([$directory], $content);

$content = iterator_to_array($this->instance->getDirectoryContent('/'));

$this->assertCount(1, $content);
$dirEntry = $content[0];
unset($dirEntry['scan_permissions']);
unset($dirEntry['etag']);
$this->assertEquals([
'name' => $directory,
'mimetype' => $this->instance->getMimeType($directory),
'mtime' => $this->instance->filemtime($directory),
'size' => -1,
'storage_mtime' => $this->instance->filemtime($directory),
'permissions' => $this->instance->getPermissions($directory),
], $dirEntry);

$this->assertFalse($this->instance->mkdir('/' . $directory)); //can't create existing folders
$this->assertTrue($this->instance->rmdir('/' . $directory));

Expand Down

0 comments on commit 3929678

Please sign in to comment.