Fix duplicate subdirectories for file type views.

When a template path ends with the current subDir property we shouldn't re-apply that subDir as it will result in bad paths. Refs #11316
cakephp · Nov 7, 2017 · 115a354 · 115a354
1 parent e6e3179
commit 115a354
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/src/View/View.php b/src/View/View.php
@@ -1243,12 +1243,16 @@ protected function _getViewFileName($name = null)
     {
         $templatePath = $subDir = '';
 
-        if ($this->subDir !== null) {
-            $subDir = $this->subDir . DIRECTORY_SEPARATOR;
-        }
         if ($this->templatePath) {
             $templatePath = $this->templatePath . DIRECTORY_SEPARATOR;
         }
+        if (strlen($this->subDir)) {
+            $subDir = $this->subDir . DIRECTORY_SEPARATOR;
+            // Check if templatePath already terminates with subDir
+            if (strrpos($templatePath, $subDir) == strlen($templatePath) - strlen($subDir)) {
+                $subDir = '';
+            }
+        }
 
         if ($name === null) {
             $name = $this->template;

diff --git a/tests/TestCase/View/ViewTest.php b/tests/TestCase/View/ViewTest.php
@@ -650,6 +650,31 @@ public function testGetViewFileNameDirectoryTraversal()
         $view->getViewFileName('../../../../bootstrap');
     }
 
+    /**
+     * Test getViewFileName doesn't re-apply existing subdirectories
+     *
+     * @return void
+     */
+    public function testGetViewFileNameSubDir()
+    {
+        $viewOptions = [
+            'plugin' => null,
+            'name' => 'Posts',
+            'viewPath' => 'Posts/json',
+            'layoutPath' => 'json',
+        ];
+        $view = new TestView(null, null, null, $viewOptions);
+
+        $expected = TEST_APP . 'TestApp' . DS . 'Template' . DS . 'Posts' . DS . 'json' . DS . 'index.ctp';
+        $result = $view->getViewFileName('index');
+        $this->assertPathEquals($expected, $result);
+
+        $view->subDir = 'json';
+        $result = $view->getViewFileName('index');
+        $expected = TEST_APP . 'TestApp' . DS . 'Template' . DS . 'Posts' . DS . 'json' . DS . 'index.ctp';
+        $this->assertPathEquals($expected, $result);
+    }
+
     /**
      * Test getting layout filenames
      *