Merge pull request #839 from google/file-cache-umask

File cache umask

Author: bshaffer

src/Google/Cache/File.php

@@ -155,7 +155,7 @@ private function getCacheDir($file, $forWrite)
     // trim the directory separator from the path to prevent double separators
     $storageDir = rtrim($this->path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $dirHash;
     if ($forWrite && ! is_dir($storageDir)) {
-      if (! mkdir($storageDir, 0700, true)) {
+      if (!mkdir($storageDir, 0777, true)) {
         $this->log(
             'error',
             'File cache creation failed',
@@ -199,7 +199,7 @@ private function acquireLock($type, $storageFile)
       return false;
     }
     if ($type == LOCK_EX) {
-      chmod($storageFile, 0600);
+      chmod($storageFile, 0666 & ~umask());
     }
     $count = 0;
     while (!flock($this->fh, $type | LOCK_NB)) {

tests/Google/CacheTest.php

@@ -40,6 +40,48 @@ public function testFileWithTrailingSlash()
     $this->getSetDelete($cache);
   }
 
+  public function testFileDirectoryPermissions()
+  {
+    $dir = sys_get_temp_dir() . '/google-api-php-client/tests/' . rand();
+    $cache = new Google_Cache_File($dir);
+    $cache->set('foo', 'bar');
+
+    $method = new ReflectionMethod($cache, 'getWriteableCacheFile');
+    $method->setAccessible(true);
+    $filename = $method->invoke($cache, 'foo');
+    $stat = stat($dir);
+
+    $this->assertEquals(0777 & ~umask(), $stat['mode'] & 0777);
+  }
+
+  public function testFileWithDefaultMask()
+  {
+    $dir = sys_get_temp_dir() . '/google-api-php-client/tests/';
+    $cache = new Google_Cache_File($dir);
+    $cache->set('foo', 'bar');
+
+    $method = new ReflectionMethod($cache, 'getWriteableCacheFile');
+    $method->setAccessible(true);
+    $filename = $method->invoke($cache, 'foo');
+    $stat = stat($filename);
+
+    $this->assertEquals(0666 & ~umask(), $stat['mode'] & 0777);
+  }
+
+  public function testFileWithCustomMask()
+  {
+    $dir = sys_get_temp_dir() . '/google-api-php-client/tests/';
+    $cache = new Google_Cache_File($dir, null);
+    $cache->set('foo', 'bar');
+
+    $method = new ReflectionMethod($cache, 'getWriteableCacheFile');
+    $method->setAccessible(true);
+    $filename = $method->invoke($cache, 'foo');
+    $stat = stat($filename);
+
+    $this->assertEquals(0666 & ~umask(), $stat['mode'] & 0777);
+  }
+
   public function testNull()
   {
     $cache = new Google_Cache_Null();