Merge pull request #189 from KingCrunch/folder-permissions

mkdir() doesn't take care about the umask
liip · May 29, 2013 · 407c4f7 · 407c4f7
2 parents 6459655 + 30b4519
commit 407c4f7
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 7 deletions.
diff --git a/Imagine/Cache/Resolver/AbstractFilesystemResolver.php b/Imagine/Cache/Resolver/AbstractFilesystemResolver.php
@@ -27,6 +27,11 @@ abstract class AbstractFilesystemResolver implements ResolverInterface, CacheMan
      */
     protected $cacheManager;
 
+    /**
+     * @var int
+     */
+    protected $folderPermissions = 0777;
+
     /**
      * Constructs a filesystem based cache resolver.
      *
@@ -55,6 +60,14 @@ public function setBasePath($basePath)
         $this->basePath = $basePath;
     }
 
+    /**
+     * @param int $mkdirMode
+     */
+    public function setFolderPermissions ($folderPermissions)
+    {
+        $this->folderPermissions = $folderPermissions;
+    }
+
     /**
      * Stores the content into a static file.
      *
@@ -70,13 +83,7 @@ public function store(Response $response, $targetPath, $filter)
     {
         $dir = pathinfo($targetPath, PATHINFO_DIRNAME);
 
-        try {
-            if (!is_dir($dir)) {
-                $this->filesystem->mkdir($dir);
-            }
-        } catch (IOException $e) {
-            throw new \RuntimeException(sprintf('Could not create directory %s', $dir), 0, $e);
-        }
+        $this->makeFolder($dir);
 
         file_put_contents($targetPath, $response->getContent());
 
@@ -101,6 +108,24 @@ public function remove($targetPath, $filter)
         return !file_exists($filename);
     }
 
+    /**
+     * @param string $dir
+     * @throws \RuntimeException
+     */
+    protected function makeFolder ($dir)
+    {
+        if (!is_dir($dir)) {
+            $parent = dirname($dir);
+            try {
+                $this->makeFolder($parent);
+                $this->filesystem->mkdir($dir);
+                $this->filesystem->chmod($dir, $this->folderPermissions);
+            } catch (IOException $e) {
+                throw new \RuntimeException(sprintf('Could not create directory %s', $dir), 0, $e);
+            }
+        }
+    }
+
     /**
      * Return the local filepath.
      *

diff --git a/Resources/config/imagine.xml b/Resources/config/imagine.xml
@@ -170,6 +170,9 @@
             <call method="setBasePath">
                 <argument type="string">%liip_imagine.cache.resolver.base_path%</argument>
             </call>
+            <call method="setFolderPermissions">
+                <argument type="string">%liip_imagine.cache_mkdir_mode%</argument>
+            </call>
         </service>
 
         <service id="liip_imagine.cache.resolver.no_cache" class="%liip_imagine.cache.resolver.no_cache.class%">

diff --git a/Tests/Imagine/Cache/Resolver/AbstractFilesystemResolverTest.php b/Tests/Imagine/Cache/Resolver/AbstractFilesystemResolverTest.php
@@ -34,6 +34,29 @@ public function testStoreCyrillicFilename()
         $this->assertEquals($data, file_get_contents($targetPath));
     }
 
+    public function testMkdirVerifyPermissionOnLastLevel () {
+        if (false !== strpos(strtolower(PHP_OS), 'win')) {
+            $this->markTestSkipped('mkdir mode is ignored on windows');
+        }
+
+        $resolver = $this->getMockAbstractFilesystemResolver(new Filesystem());
+
+
+        $resolver->store(new Response(''), $this->tempDir . '/first-level/second-level/cats.jpeg', 'thumbnail');
+        $this->assertEquals(040777, fileperms($this->tempDir . '/first-level/second-level'));
+    }
+
+    public function testMkdirVerifyPermissionOnFirstLevel () {
+        if (false !== strpos(strtolower(PHP_OS), 'win')) {
+            $this->markTestSkipped('mkdir mode is ignored on windows');
+        }
+
+        $resolver = $this->getMockAbstractFilesystemResolver(new Filesystem());
+
+        $resolver->store(new Response(''), $this->tempDir . '/first-level/second-level/cats.jpeg', 'thumbnail');
+        $this->assertEquals(040777, fileperms($this->tempDir . '/first-level'));
+    }
+
     public function testStoreInvalidDirectory()
     {
         if (false !== strpos(strtolower(PHP_OS), 'win')) {