use hashed username in cache dir

Author: bshaffer

src/Google/Cache/File.php

@@ -151,11 +151,14 @@ private function getCacheDir($file, $forWrite)
     // use the first 2 characters of the hash as a directory prefix
     // this should prevent slowdowns due to huge directory listings
     // and thus give some basic amount of scalability
-    $dirHash = substr(md5($file), 0, 2);
+    $fileHash = substr(md5($file), 0, 2);
+    $userHash = md5(get_current_user());
+    $dirHash = $fileHash . DIRECTORY_SEPARATOR . $userHash;
+
     // 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, 0777, true)) {
+      if (!mkdir($storageDir, 0700, true)) {
         $this->log(
             'error',
             'File cache creation failed',
@@ -199,7 +202,7 @@ private function acquireLock($type, $storageFile)
       return false;
     }
     if ($type == LOCK_EX) {
-      chmod($storageFile, 0666 & ~umask());
+      chmod($storageFile, 0600);
     }
     $count = 0;
     while (!flock($this->fh, $type | LOCK_NB)) {

tests/Google/CacheTest.php

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