Merge pull request #209 from koriym/validate-tmp-dir

Validate tmp directory
ray-di · Jan 19, 2024 · 80b12a6 · 80b12a6
2 parents 41fcf7d + 93ea388
commit 80b12a6
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 26 deletions.
diff --git a/composer.json b/composer.json
@@ -44,8 +44,8 @@
     "scripts" :{
         "test": ["phpunit"],
         "tests": ["@cs", "@test", "@sa"],
-        "coverage": ["php -dzend_extension=xdebug.so -dxdebug.mode=coverage phpunit --coverage-text --coverage-html=build/coverage"],
-        "pcov": ["php -dextension=pcov.so -d pcov.enabled=1 phpunit --coverage-text --coverage-html=build/coverage  --coverage-clover=coverage.xml"],
+        "coverage": ["php -dzend_extension=xdebug.so -dxdebug.mode=coverage ./vendor/bin/phpunit --coverage-text --coverage-html=build/coverage"],
+        "pcov": ["php -dextension=pcov.so -d pcov.enabled=1 ./vendor/bin/phpunit --coverage-text --coverage-html=build/coverage  --coverage-clover=coverage.xml"],
         "cs": ["phpcs --standard=./phpcs.xml sl-src src tests"],
         "cs-fix": ["phpcbf sl-src src tests"],
         "clean": ["phpstan clear-result-cache", "psalm --clear-cache", "rm -rf tests/tmp/*.php"],

diff --git a/sl-src/Cache.php b/sl-src/Cache.php
@@ -1,26 +1,27 @@
 <?php
 
-declare(strict_types=1);
+    declare(strict_types=1);
 
-namespace Ray\ServiceLocator;
+    namespace Ray\ServiceLocator;
 
-use Ray\ServiceLocator\Exception\DirectoryNotWritableException;
+    use Ray\ServiceLocator\Exception\DirectoryNotWritableException;
 
-use function file_exists;
-use function file_put_contents;
-use function hash;
-use function is_writable;
-use function mkdir;
-use function pathinfo;
-use function rename;
-use function serialize;
-use function substr;
-use function tempnam;
-use function unlink;
-use function unserialize;
+    use function file_exists;
+    use function file_put_contents;
+    use function hash;
+    use function is_dir;
+    use function is_writable;
+    use function mkdir;
+    use function pathinfo;
+    use function rename;
+    use function serialize;
+    use function substr;
+    use function tempnam;
+    use function unlink;
+    use function unserialize;
 
-use const DIRECTORY_SEPARATOR;
-use const PATHINFO_DIRNAME;
+    use const DIRECTORY_SEPARATOR;
+    use const PATHINFO_DIRNAME;
 
 /**
  * Minimal cache
@@ -32,6 +33,10 @@ final class Cache
 
     public function __construct(string $tmpDir)
     {
+        if (! is_writable($tmpDir)) {
+            throw new DirectoryNotWritableException($tmpDir);
+        }
+
         $this->tmpDir = $tmpDir;
     }
 
@@ -61,16 +66,18 @@ private function getFilename(string $id): string
         $hash = hash('crc32', $id);
 
         $dir = $this->tmpDir
-            . DIRECTORY_SEPARATOR
-            . substr($hash, 0, 2);
-        if (! is_writable($dir)) {
-            mkdir($dir, 0777, true);
+        . DIRECTORY_SEPARATOR
+        . substr($hash, 0, 2);
+        if (! is_dir($dir) && ! @mkdir($dir) && ! is_dir($dir) && ! is_writable($dir)) {
+            // @codeCoverageIgnoreStart
+            throw new DirectoryNotWritableException($dir);
+            // @codeCoverageIgnoreEnd
         }
 
         return $dir
-            . DIRECTORY_SEPARATOR
-            . $hash
-            . '.php';
+        . DIRECTORY_SEPARATOR
+        . $hash
+        . '.php';
     }
 
     private function writeFile(string $filename, string $value): void