Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[Cache] Make FilesystemTagAwareAdapter::prune() remove dangling symlinks #47567

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
merged 1 commit into from
Oct 11, 2022
Merged

[Cache] Make FilesystemTagAwareAdapter::prune() remove dangling symlinks #47567

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
51 changes: 49 additions & 2 deletions src/Symfony/Component/Cache/Adapter/FilesystemTagAwareAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
class FilesystemTagAwareAdapter extends AbstractTagAwareAdapter implements PruneableInterface
{
use FilesystemTrait {
prune as private doPrune;
doClear as private doClearCache;
doSave as private doSaveCache;
}
Expand All @@ -41,6 +42,48 @@ public function __construct(string $namespace = '', int $defaultLifetime = 0, st
$this->init($namespace, $directory);
}

public function prune(): bool
{
$ok = $this->doPrune();

set_error_handler(static function () {});
$chars = '+-ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';

try {
foreach ($this->scanHashDir($this->directory.self::TAG_FOLDER.\DIRECTORY_SEPARATOR) as $dir) {
$dir .= \DIRECTORY_SEPARATOR;
$keepDir = false;
for ($i = 0; $i < 38; ++$i) {
if (!is_dir($dir.$chars[$i])) {
continue;
}
for ($j = 0; $j < 38; ++$j) {
if (!is_dir($d = $dir.$chars[$i].\DIRECTORY_SEPARATOR.$chars[$j])) {
continue;
}
foreach (scandir($d, \SCANDIR_SORT_NONE) ?: [] as $link) {
if ('.' === $link || '..' === $link) {
continue;
}
if ('_' !== $dir[-2] && realpath($d.\DIRECTORY_SEPARATOR.$link)) {
$keepDir = true;
} else {
unlink($d.\DIRECTORY_SEPARATOR.$link);
}
}
$keepDir ?: rmdir($d);
}
$keepDir ?: rmdir($dir.$chars[$i]);
}
$keepDir ?: rmdir($dir);
}
} finally {
restore_error_handler();
}

return $ok;
}

protected function doClear(string $namespace): bool
{
$ok = $this->doClearCache($namespace);
Expand All @@ -52,9 +95,11 @@ protected function doClear(string $namespace): bool
set_error_handler(static function () {});
$chars = '+-ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';

$this->tmpSuffix ??= str_replace('/', '-', base64_encode(random_bytes(6)));

try {
foreach ($this->scanHashDir($this->directory.self::TAG_FOLDER.\DIRECTORY_SEPARATOR) as $dir) {
if (rename($dir, $renamed = substr_replace($dir, bin2hex(random_bytes(4)), -8))) {
if (rename($dir, $renamed = substr_replace($dir, $this->tmpSuffix.'_', -9))) {
$dir = $renamed.\DIRECTORY_SEPARATOR;
} else {
$dir .= \DIRECTORY_SEPARATOR;
Expand Down Expand Up @@ -178,10 +223,12 @@ protected function doInvalidate(array $tagIds): bool
continue;
}

$this->tmpSuffix ??= str_replace('/', '-', base64_encode(random_bytes(6)));

set_error_handler(static function () {});

try {
if (rename($tagFolder, $renamed = substr_replace($tagFolder, bin2hex(random_bytes(4)), -9))) {
if (rename($tagFolder, $renamed = substr_replace($tagFolder, $this->tmpSuffix.'_', -10))) {
$tagFolder = $renamed.\DIRECTORY_SEPARATOR;
} else {
$renamed = null;
Expand Down
20 changes: 9 additions & 11 deletions src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
trait FilesystemCommonTrait
{
private string $directory;
private string $tmp;
private string $tmpSuffix;

private function init(string $namespace, ?string $directory)
{
Expand Down Expand Up @@ -86,27 +86,25 @@ private function write(string $file, string $data, int $expiresAt = null)
{
set_error_handler(__CLASS__.'::throwError');
try {
if (!isset($this->tmp)) {
$this->tmp = $this->directory.bin2hex(random_bytes(6));
}
$tmp = $this->directory.$this->tmpSuffix ??= str_replace('/', '-', base64_encode(random_bytes(6)));
try {
$h = fopen($this->tmp, 'x');
$h = fopen($tmp, 'x');
} catch (\ErrorException $e) {
if (!str_contains($e->getMessage(), 'File exists')) {
throw $e;
}

$this->tmp = $this->directory.bin2hex(random_bytes(6));
$h = fopen($this->tmp, 'x');
$tmp = $this->directory.$this->tmpSuffix = str_replace('/', '-', base64_encode(random_bytes(6)));
$h = fopen($tmp, 'x');
}
fwrite($h, $data);
fclose($h);

if (null !== $expiresAt) {
touch($this->tmp, $expiresAt ?: time() + 31556952); // 1 year in seconds
touch($tmp, $expiresAt ?: time() + 31556952); // 1 year in seconds
}

return rename($this->tmp, $file);
return rename($tmp, $file);
} finally {
restore_error_handler();
}
Expand Down Expand Up @@ -180,8 +178,8 @@ public function __destruct()
if (method_exists(parent::class, '__destruct')) {
parent::__destruct();
}
if (isset($this->tmp) && is_file($this->tmp)) {
unlink($this->tmp);
if (isset($this->tmpSuffix) && is_file($this->directory.$this->tmpSuffix)) {
unlink($this->directory.$this->tmpSuffix);
}
}
}