Skip to content

[stable20] show better error messages when a file with a forbidden path is encountered #26290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Mar 26, 2021
Merged

[stable20] show better error messages when a file with a forbidden path is encountered #26290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
show better error messages when a file with a forbidden path is encou… 
…ntered

Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @backportbot
icewind1991 authored and backportbot[bot] committed Mar 25, 2021
commit 82a2492c336faea00d6e822a7b0284ced7f41796
12 changes: 4 additions & 8 deletions lib/private/Files/Storage/Local.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,16 +286,14 @@ public function unlink($path) {
}
}

private function treeContainsBlacklistedFile(string $path): bool {
private function checkTreeForForbiddenItems(string $path) {
$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path));
foreach ($iterator as $file) {
/** @var \SplFileInfo $file */
if (Filesystem::isFileBlacklisted($file->getBasename())) {
return true;
throw new ForbiddenException('Invalid path: ' . $file->getPathname(), false);
}
}

return false;
}

public function rename($path1, $path2) {
Expand Down Expand Up @@ -335,9 +333,7 @@ public function rename($path1, $path2) {
return $result;
}

if ($this->treeContainsBlacklistedFile($this->getSourcePath($path1))) {
throw new ForbiddenException('Invalid path', false);
}
$this->checkTreeForForbiddenItems($this->getSourcePath($path1));
}

return rename($this->getSourcePath($path1), $this->getSourcePath($path2));
Expand Down Expand Up @@ -435,7 +431,7 @@ public function hasUpdated($path, $time) {
*/
public function getSourcePath($path) {
if (Filesystem::isFileBlacklisted($path)) {
throw new ForbiddenException('Invalid path', false);
throw new ForbiddenException('Invalid path: ' . $path, false);
}

$fullPath = $this->datadir . $path;
Expand Down