[FILE][TemporaryFile] Fix various issues now that we also have Symfony's file abstractions
This commit is contained in:
@@ -20,6 +20,7 @@
|
||||
namespace App\Util;
|
||||
|
||||
use App\Util\Exception\TemporaryFileException;
|
||||
use Symfony\Component\Mime\MimeTypes;
|
||||
|
||||
/**
|
||||
* Class oriented at providing automatic temporary file handling.
|
||||
@@ -27,7 +28,9 @@ use App\Util\Exception\TemporaryFileException;
|
||||
* @package GNUsocial
|
||||
*
|
||||
* @author Alexei Sorokin <sor.alexei@meowr.ru>
|
||||
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
|
||||
* @author Hugo Sales <hugo@hsal.es>
|
||||
* @author Diogo Peralta Cordeiro <mail@diogo.site>
|
||||
* @copyright 2020-2021 Free Software Foundation, Inc http://www.fsf.org
|
||||
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
|
||||
*/
|
||||
class TemporaryFile extends \SplFileInfo
|
||||
@@ -36,19 +39,25 @@ class TemporaryFile extends \SplFileInfo
|
||||
|
||||
/**
|
||||
* @param array $options - ['prefix' => ?string, 'suffix' => ?string, 'mode' => ?string, 'directory' => ?string]
|
||||
* Description of options:
|
||||
* > prefix: The file name will begin with that prefix, default is 'gs-php'
|
||||
* > suffix: The file name will begin with that prefix, default is ''
|
||||
* > mode: The file name will begin with that prefix, default is 'w+b'
|
||||
* > directory: The file name will begin with that prefix, default is the system's temporary
|
||||
*
|
||||
* @throws TemporaryFileException
|
||||
*/
|
||||
public function __construct(array $options = [])
|
||||
{
|
||||
$attempts = 16;
|
||||
$filename = uniqid(($options['directory'] ?? (sys_get_temp_dir() . '/')) . ($options['prefix'] ?? 'gs-php')) . ($options['suffix'] ?? '');
|
||||
for ($count = 0; $count < $attempts; ++$count) {
|
||||
$filename = uniqid(($options['directory'] ?? (sys_get_temp_dir() . '/')) . ($options['prefix'] ?? 'gs-php')) . ($options['suffix'] ?? '');
|
||||
|
||||
$this->resource = @fopen($filename, $options['mode'] ?? 'w+b');
|
||||
if ($this->resource !== false) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if ($count == $attempts) {
|
||||
if ($count == $attempts && $this->resource !== false) {
|
||||
// @codeCoverageIgnoreStart
|
||||
$this->cleanup();
|
||||
throw new TemporaryFileException('Could not open file: ' . $filename);
|
||||
@@ -64,21 +73,28 @@ class TemporaryFile extends \SplFileInfo
|
||||
$this->cleanup();
|
||||
}
|
||||
|
||||
public function write($data): int
|
||||
/**
|
||||
* Binary-safe file write
|
||||
*
|
||||
* @see https://php.net/manual/en/function.fwrite.php
|
||||
*
|
||||
* @param string $data The string that is to be written.
|
||||
*
|
||||
* @return null|false|int the number of bytes written, false on error, null on null resource/stream
|
||||
*/
|
||||
public function write(string $data): int | false | null
|
||||
{
|
||||
if (!is_null($this->resource)) {
|
||||
return fwrite($this->resource, $data);
|
||||
} else {
|
||||
// @codeCoverageIgnoreStart
|
||||
return null;
|
||||
// @codeCoverageIgnoreEnd
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Closes the file descriptor if opened.
|
||||
*
|
||||
* @return bool Whether successful
|
||||
* @return bool true on success or false on failure.
|
||||
*/
|
||||
protected function close(): bool
|
||||
{
|
||||
@@ -120,15 +136,27 @@ class TemporaryFile extends \SplFileInfo
|
||||
* Release the hold on the temporary file and move it to the desired
|
||||
* location, setting file permissions in the process.
|
||||
*
|
||||
* @param string File destination
|
||||
* @param int New file permissions (in octal mode)
|
||||
* @param string $directory Path where the file should be stored
|
||||
* @param string $filename The filename
|
||||
* @param int $dirmode New directory permissions (in octal mode)
|
||||
* @param int $filemode New file permissions (in octal mode)
|
||||
*
|
||||
* @throws TemporaryFileException
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function commit(string $destpath, int $umode = 0644): void
|
||||
public function move(string $directory, string $filename, int $dirmode = 0655, int $filemode = 0644): void
|
||||
{
|
||||
if (!is_dir($directory)) {
|
||||
if (false === @mkdir($directory, $dirmode, true) && !is_dir($directory)) {
|
||||
throw new TemporaryFileException(sprintf('Unable to create the "%s" directory.', $directory));
|
||||
}
|
||||
} elseif (!is_writable($directory)) {
|
||||
throw new TemporaryFileException(sprintf('Unable to write in the "%s" directory.', $directory));
|
||||
}
|
||||
|
||||
$destpath = rtrim($directory, '/\\') . DIRECTORY_SEPARATOR . $this->getName($filename);
|
||||
|
||||
$temppath = $this->getRealPath();
|
||||
|
||||
// Might be attempted, and won't end well
|
||||
@@ -138,21 +166,59 @@ class TemporaryFile extends \SplFileInfo
|
||||
|
||||
// Memorise if the file was there and see if there is access
|
||||
$exists = file_exists($destpath);
|
||||
if (!@touch($destpath)) {
|
||||
throw new TemporaryFileException(
|
||||
'Insufficient permissions for destination: "' . $destpath . '"'
|
||||
);
|
||||
} elseif (!$exists) {
|
||||
// If the file wasn't there, clean it up in case of a later failure
|
||||
unlink($destpath);
|
||||
}
|
||||
|
||||
if (!$this->close()) {
|
||||
// @codeCoverageIgnoreStart
|
||||
throw new TemporaryFileException('Could not close the resource');
|
||||
// @codeCoverageIgnoreEnd
|
||||
}
|
||||
|
||||
rename($temppath, $destpath);
|
||||
chmod($destpath, $umode);
|
||||
set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
|
||||
$renamed = rename($this->getPathname(), $destpath);
|
||||
restore_error_handler();
|
||||
chmod($destpath, $filemode);
|
||||
if (!$renamed) {
|
||||
if (!$exists) {
|
||||
// If the file wasn't there, clean it up in case of a later failure
|
||||
unlink($destpath);
|
||||
}
|
||||
throw new TemporaryFileException(sprintf('Could not move the file "%s" to "%s" (%s).', $this->getPathname(), $destpath, strip_tags($error)));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* This function is a copy of Symfony\Component\HttpFoundation\File\File->getMimeType()
|
||||
* Returns the mime type of the file.
|
||||
*
|
||||
* The mime type is guessed using a MimeTypeGuesserInterface instance,
|
||||
* which uses finfo_file() then the "file" system binary,
|
||||
* depending on which of those are available.
|
||||
*
|
||||
* @return null|string The guessed mime type (e.g. "application/pdf")
|
||||
*
|
||||
* @see MimeTypes
|
||||
*/
|
||||
public function getMimeType()
|
||||
{
|
||||
if (!class_exists(MimeTypes::class)) {
|
||||
throw new \LogicException('You cannot guess the mime type as the Mime component is not installed. Try running "composer require symfony/mime".');
|
||||
}
|
||||
|
||||
return MimeTypes::getDefault()->guessMimeType($this->getPathname());
|
||||
}
|
||||
|
||||
/**
|
||||
* This function is a copy of Symfony\Component\HttpFoundation\File\File->getName()
|
||||
* Returns locale independent base name of the given path.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
protected function getName(string $name)
|
||||
{
|
||||
$originalName = str_replace('\\', '/', $name);
|
||||
$pos = strrpos($originalName, '/');
|
||||
$originalName = false === $pos ? $originalName : substr($originalName, $pos + 1);
|
||||
|
||||
return $originalName;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user