Skip to content

fix: Guard against race condition in FileStore::createCacheDir #466

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
Sarsharses wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Guard against race condition in FileStore::createCacheDir #466

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
5 changes: 3 additions & 2 deletions src/Cache/FileStore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,9 @@ public function getCacheFile(): string
*/
protected function createCacheDir()
{
if ( ! file_exists($this->cacheDir)) {
mkdir($this->cacheDir);
if ( ! is_dir($this->cacheDir)) {
// Suppress "File exists" warning when a concurrent request wins the race.
@mkdir($this->cacheDir, 0777, true);
}
}

Expand Down
22 changes: 22 additions & 0 deletions tests/Cache/FileStoreTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,28 @@ public function it_creates_cache_file_if_file_does_not_exist(): void
$this->assertEquals(null, $this->fileStore->get($this->checksum));
}

/**
* @test
*
* @covers ::createCacheFile
* @covers ::createCacheDir
*/
public function it_creates_nested_cache_dir_recursively(): void
{
$nestedDir = Config::get('file.dir') . 'nested' . DS . 'cache' . DS;
$cacheFile = Config::get('file.name');
$fileStore = new FileStore($nestedDir, $cacheFile);

$fileStore->set($this->checksum, 'Test');

$this->assertDirectoryExists($nestedDir);
$this->assertFileExists($nestedDir . $cacheFile);

unlink($nestedDir . $cacheFile);
rmdir($nestedDir);
rmdir(\dirname($nestedDir));
}

/**
* @test
*
Expand Down