addresses root cache dir permissions issue

Author: bshaffer

src/Google/Cache/File.php

@@ -153,20 +153,36 @@ private function getCacheDir($file, $forWrite)
     // and thus give some basic amount of scalability
     $fileHash = substr(md5($file), 0, 2);
     $userHash = md5(get_current_user());
-    $dirHash = $fileHash . DIRECTORY_SEPARATOR . $userHash;
+    $dirHash = $userHash . DIRECTORY_SEPARATOR . $fileHash;
 
     // 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)) {
+    $rootCacheDir = rtrim($this->path, DIRECTORY_SEPARATOR);
+    $storageDir = $rootCacheDir . DIRECTORY_SEPARATOR . $dirHash;
+
+    if ($forWrite && !is_dir($storageDir)) {
+      // create root dir
+      if (!is_dir($rootCacheDir)) {
+        if (!mkdir($rootCacheDir, 0777, true)) {
+          $this->log(
+              'error',
+              'File cache creation failed',
+              array('dir' => $rootCacheDir)
+          );
+          throw new Google_Cache_Exception("Could not create cache directory: $rootCacheDir");
+        }
+      }
+
+      // create dir for file
       if (!mkdir($storageDir, 0700, true)) {
         $this->log(
             'error',
             'File cache creation failed',
             array('dir' => $storageDir)
         );
-        throw new Google_Cache_Exception("Could not create storage directory: $storageDir");
+        throw new Google_Cache_Exception("Could not create cache directory: $storageDir");
       }
     }
+
     return $storageDir;
   }
 

tests/Google/CacheTest.php

@@ -40,7 +40,7 @@ public function testFileWithTrailingSlash()
     $this->getSetDelete($cache);
   }
 
-  public function testCacheDirectoryPermissions()
+  public function testBaseCacheDirectoryPermissions()
   {
     $dir = sys_get_temp_dir() . '/google-api-php-client/tests/' . rand();
     $cache = new Google_Cache_File($dir);
@@ -51,6 +51,20 @@ public function testCacheDirectoryPermissions()
     $filename = $method->invoke($cache, 'foo');
     $stat = stat($dir);
 
+    $this->assertEquals(0777 & ~umask(), $stat['mode'] & 0777);
+  }
+
+  public function testCacheDirectoryPermissions()
+  {
+    $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(dirname($filename));
+
     $this->assertEquals(0700, $stat['mode'] & 0777);
   }