[BUGFIX] Prevent infinite loops caused by symlinks

sitegeist · Aug 26, 2019 · d53c9c6 · d53c9c6
1 parent 218e7ae
commit d53c9c6
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/Classes/Utility/ComponentLoader.php b/Classes/Utility/ComponentLoader.php
@@ -139,10 +139,12 @@ public function findComponentsInNamespace(string $namespace, string $ext = '.htm
             return [];
         }
 
+        $scannedPaths = [];
         return $this->scanForComponents(
             $this->namespaces[$namespace],
             $ext,
-            $namespace
+            $namespace,
+            $scannedPaths
         );
     }
 
@@ -152,20 +154,27 @@ public function findComponentsInNamespace(string $namespace, string $ext = '.htm
      * @param string $path
      * @param string $ext
      * @param string $namespace
+     * @param array $scannedPaths  Collection of paths that have already been scanned for components;
+     *                             this prevents infinite loops caused by circular symlinks
      * @return array
      */
-    protected function scanForComponents(string $path, string $ext, string $namespace): array
+    protected function scanForComponents(string $path, string $ext, string $namespace, array &$scannedPaths): array
     {
         $components = [];
 
         $componentCandidates = scandir($path);
         foreach ($componentCandidates as $componentName) {
-            $componentPath = $path . DIRECTORY_SEPARATOR . $componentName;
+            // Skip relative links
+            if ($componentName === '.' || $componentName === '..') {
+                continue;
+            }
 
-            // Only search for directories
-            if ($componentName === '.' || $componentName === '..' || !is_dir($componentPath)) {
+            // Only search for directories and prevent infinite loops
+            $componentPath = realpath($path . DIRECTORY_SEPARATOR . $componentName);
+            if (!is_dir($componentPath) || isset($scannedPaths[$componentPath])) {
                 continue;
             }
+            $scannedPaths[$componentPath] = true;
 
             $componentNamespace = $namespace . '\\' . $componentName;
             $componentFile = $componentPath . DIRECTORY_SEPARATOR . $componentName . $ext;
@@ -178,7 +187,7 @@ protected function scanForComponents(string $path, string $ext, string $namespac
             // Continue recursively
             $components = array_merge(
                 $components,
-                $this->scanForComponents($componentPath, $ext, $componentNamespace)
+                $this->scanForComponents($componentPath, $ext, $componentNamespace, $scannedPaths)
             );
         }
 

diff --git a/Tests/Fixtures/ComponentLoader/Atom/ComponentLoaderSymlink b/Tests/Fixtures/ComponentLoader/Atom/ComponentLoaderSymlink
@@ -0,0 +1 @@
+../../ComponentLoaderSymlink/
diff --git a/Tests/Fixtures/ComponentLoader/Molecule/Circular b/Tests/Fixtures/ComponentLoader/Molecule/Circular
@@ -0,0 +1 @@
+../
diff --git a/Tests/Fixtures/ComponentLoader/Molecule/Example b/Tests/Fixtures/ComponentLoader/Molecule/Example
@@ -0,0 +1 @@
+../Example/
diff --git a/Tests/Fixtures/ComponentLoaderSymlink/ComponentLoaderSymlink.html b/Tests/Fixtures/ComponentLoaderSymlink/ComponentLoaderSymlink.html
diff --git a/Tests/Unit/ComponentLoaderTest.php b/Tests/Unit/ComponentLoaderTest.php
@@ -15,7 +15,7 @@ protected function setUp()
 
     protected function getFixturePath($fixtureName)
     {
-        return dirname(__FILE__) . '/../Fixtures/' . $fixtureName;
+        return realpath(dirname(__FILE__) . '/../Fixtures/' . $fixtureName);
     }
 
     public function addNamespaceProvider()
@@ -177,6 +177,7 @@ public function findComponentsInNamespaceProvider()
                 '.html',
                 [
                     'Sitegeist\\Fixtures\\ComponentLoader\\Atom\\Button' => $this->getFixturePath('ComponentLoader/Atom/Button/Button.html'),
+                    'Sitegeist\\Fixtures\\ComponentLoader\\Atom\\ComponentLoaderSymlink' => $this->getFixturePath('ComponentLoader/Atom/ComponentLoaderSymlink/ComponentLoaderSymlink.html'),
                     'Sitegeist\\Fixtures\\ComponentLoader\\Atom\\Link' => $this->getFixturePath('ComponentLoader/Atom/Link/Link.html'),
                     'Sitegeist\\Fixtures\\ComponentLoader\\Example' => $this->getFixturePath('ComponentLoader/Example/Example.html'),
                     'Sitegeist\\Fixtures\\ComponentLoader\\Molecule\\Teaser' => $this->getFixturePath('ComponentLoader/Molecule/Teaser/Teaser.html'),