Skip to content

fix: resolve race condition in get_dir_file_info() when files are deleted concurrently #10407

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

Open
gr8man wants to merge 1 commit into
base: develop
Choose a base branch
from
+20 −2
Open

fix: resolve race condition in get_dir_file_info() when files are deleted concurrently #10407

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions system/Helpers/filesystem_helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,10 @@ function get_dir_file_info(string $sourceDir, bool $topLevelOnly = true, bool $r
if (is_dir($sourceDir . $file) && $file[0] !== '.' && $topLevelOnly === false) {
get_dir_file_info($sourceDir . $file . DIRECTORY_SEPARATOR, $topLevelOnly, true);
} elseif ($file[0] !== '.') {
$fileData[$file] = get_file_info($sourceDir . $file);
$fileData[$file]['relative_path'] = $relativePath;
if (($info = get_file_info($sourceDir . $file)) !== null) {
$fileData[$file] = $info;
$fileData[$file]['relative_path'] = $relativePath;
}
}
}

Expand Down
16 changes: 16 additions & 0 deletions tests/system/Helpers/FilesystemHelperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,22 @@ public function testGetDirFileInfoFailure(): void
$this->assertSame($expected, get_dir_file_info(SUPPORTPATH . 'Files#baker'));
}

public function testGetDirFileInfoIgnoresDirectoriesWhenTopLevelOnlyIsTrue(): void
{
$dir = WRITEPATH . 'test_get_dir_file_info';
mkdir($dir . '/subdir', 0777, true);
file_put_contents($dir . '/file.txt', 'test');

$result = get_dir_file_info($dir, true);

unlink($dir . '/file.txt');
rmdir($dir . '/subdir');
rmdir($dir);

$this->assertArrayHasKey('file.txt', $result);
$this->assertArrayNotHasKey('subdir', $result);
}

public function testGetFileInfo(): void
{
$file = SUPPORTPATH . 'Files/baker/banana.php';
Expand Down
Loading