Merge pull request #108 from JarvusInnovations/fixes/create-exemption…

…s-cache fix(exemptions): create cache directory automatically
JarvusInnovations · Feb 2, 2021 · b665dd9 · b665dd9
2 parents c969d63 + 6fea57f
commit b665dd9
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/php-classes/Gatekeeper/Utils/IPPattern.php b/php-classes/Gatekeeper/Utils/IPPattern.php
@@ -42,11 +42,8 @@ public static function parse($pattern)
         }
 
         // try to load from filesystem cache
-        $cacheFilePath = join('/', [
-            Storage::getLocalStorageRoot(),
-            static::$fsRootDir,
-            $patternHash . '.php'
-        ]);
+        $cacheDirPath = Storage::getLocalStorageRoot() . '/' . static::$fsRootDir;
+        $cacheFilePath = "{$cacheDirPath}/{$patternHash}.php";
 
         try {
             $closure = include($cacheFilePath);
@@ -80,7 +77,6 @@ public static function parse($pattern)
 
         // fast path for static IP lists
         if (count($subPatternsByType['cidr']) === 0 && count($subPatternsByType['wildcard']) === 0) {
-            // TODO: cache to a file?
             return $cache[$patternHash] = $subPatternsByType['ip'];
         }
 
@@ -107,6 +103,10 @@ public static function parse($pattern)
         $closureFunctionString .= "};\n";
 
         // write to filesystem
+        if (!is_dir($cacheDirPath)) {
+            mkdir($cacheDirPath, 0777, true);
+        }
+
         file_put_contents($cacheFilePath, $closureFunctionString);
 
         return $cache[$patternHash] = include($cacheFilePath);