diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Filesystem] fix lock file permissions

Browse Source
This commit is contained in:
Nicolas Grekas 2014-11-30 11:30:45 +01:00
parent 309de6dd61
commit ceecb502f8
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Symfony/Component/Filesystem/LockHandler.php
View File

@ -49,9 +49,7 @@ class LockHandler
throw new IOException(sprintf('The directory "%s" is not writable.', $lockPath), 0, null, $lockPath);
}
$name = sprintf('%s-%s', preg_replace('/[^a-z0-9\._-]+/i', '-', $name), hash('sha256', $name));
$this->file = sprintf('%s/%s', $lockPath, $name);
$this->file = sprintf('%s/sf.%s.%s.lock', $lockPath, preg_replace('/[^a-z0-9\._-]+/i', '-', $name), hash('sha256', $name));
}
/**
@ -67,14 +65,24 @@ class LockHandler
return true;
}
// Set an error handler to not trigger the registered error handler if
// the file can not be opened.
// Silence both userland and native PHP error handlers
$errorLevel = error_reporting(0);
set_error_handler('var_dump', 0);
$this->handle = @fopen($this->file, 'c');
if (!$this->handle = fopen($this->file, 'r')) {
if ($this->handle = fopen($this->file, 'x')) {
chmod($this->file, 0444);
} elseif (!$this->handle = fopen($this->file, 'r')) {
usleep(100); // Give some time for chmod() to complete
$this->handle = fopen($this->file, 'r');
}
}
restore_error_handler();
error_reporting($errorLevel);
if (!$this->handle) {
throw new IOException(sprintf('Unable to fopen "%s".', $this->file), 0, null, $this->file);
$error = error_get_last();
throw new IOException($error['message'], 0, null, $this->file);
}
// On Windows, even if PHP doc says the contrary, LOCK_NB works, see

2
src/Symfony/Component/Filesystem/Tests/LockHandlerTest.php
View File

@ -28,7 +28,7 @@ class LockHandlerTest extends \PHPUnit_Framework_TestCase
{
$lock = new LockHandler('<?php echo "% hello word ! %" ?>');
$file = sprintf('%s/-php-echo-hello-word--4b3d9d0d27ddef3a78a64685dda3a963e478659a9e5240feaf7b4173a8f28d5f', sys_get_temp_dir());
$file = sprintf('%s/sf.-php-echo-hello-word-.4b3d9d0d27ddef3a78a64685dda3a963e478659a9e5240feaf7b4173a8f28d5f.lock', sys_get_temp_dir());
// ensure the file does not exist before the lock
@unlink($file);