Dispatchable Resource Tests

Author: bajb

.gitignore

@@ -0,0 +1,2 @@
+/vendor
+/composer.lock

tests/asset/x.jpg resources/css/css.jpg

@@ -0,0 +1,4 @@
+/* @do-not-dispatch */
+body {
+  background: yellow url(../img/x.jpg);
+}

resources/css/do-not-modify.css

@@ -1,3 +1,32 @@
 body {
   background: yellow url(../img/x.jpg);
 }
+
+body.nofile {
+  background: yellow url();
+}
+
+body.localfile {
+  background: yellow url('css.jpg');
+}
+
+
+body.subfile {
+  background: yellow url('sub/subimg.jpg');
+}
+
+body.externalfile {
+  background: yellow url('http://www.example.com/background.jpg');
+}
+
+body.append {
+  background: yellow url(../img/x.jpg?x=y&request=b);
+}
+
+html {
+  background: yellow url(../img/missing-file.jpg);
+}
+
+#invalid-relative {
+  background: yellow url(../../../img/missing-file.jpg);
+}

tests/asset2/sub/x.jpg resources/css/sub/subimg.jpg

@@ -50,6 +50,10 @@ public function getResourceUri($relativeFullPath): ?string
       return $relativeFullPath;
     }
     $hash = $this->getFileHash($this->getFilePath($relativeFullPath));
+    if(!$hash)
+    {
+      return null;
+    }
     return Path::custom('/', array_merge($this->_baseUri, [$hash, $relativeFullPath]));
   }
 
@@ -79,6 +83,10 @@ public function getFilePath($relativePath)
 
   protected function getFileHash($fullPath)
   {
+    if(!file_exists($fullPath))
+    {
+      return null;
+    }
     $key = 'pdspfh-' . md5($fullPath) . '-' . filectime($fullPath);
 
     if(function_exists("apcu_fetch"))

resources/css/test.css

@@ -46,13 +46,14 @@ public function setContent($content)
    */
   protected function _processContent()
   {
-    if(strpos($this->_content, '@' . 'do-not-dispatch') !== false)
+    //Treat as a standard resource if no resource manager has been set.
+    if(!isset($this->_manager))
     {
       return;
     }
 
-    //Treat as a standard resource if no resource manager has been set.
-    if(!isset($this->_manager))
+    //Do not modify file content
+    if(strpos($this->_content, '@' . 'do-not-dispatch') !== false)
     {
       return;
     }
@@ -95,7 +96,7 @@ protected function _dispatchNestedUrl($uri)
 
     if(empty($url))
     {
-      return $uri[0];
+      return "url('" . ($path ?? $uri[0]) . "')";
     }
 
     if(!empty($append))
@@ -115,14 +116,19 @@ protected function _dispatchNestedUrl($uri)
    */
   protected function makeFullPath($relativePath, $workingDirectory)
   {
+    if($relativePath == '.')
+    {
+      return $workingDirectory;
+    }
     $levelUps = substr_count($relativePath, '../');
     if($levelUps > 0)
     {
       $relativePath = str_replace('../', '', $relativePath);
       $workingDirectoryParts = explode('/', $workingDirectory);
-      if(count($workingDirectoryParts) <= $levelUps)
+      if($levelUps > count($workingDirectoryParts))
       {
-        return $relativePath;
+        //Relative to this directory is not allowed
+        return null;
       }
       return implode('/', array_slice($workingDirectoryParts, $levelUps)) . $relativePath;
     }

src/Manager/ResourceManager.php

@@ -22,5 +22,12 @@ public function testProcessesContent()
     $resource->setContent(file_get_contents(Path::system($root, Dispatch::RESOURCES_DIR, 'css', 'test.css')));
     $content = $resource->getContent();
     $this->assertContains('url(\'r/d41d8cd9/img/x.jpg\')', $content);
+    $this->assertContains('url(\'r/d41d8cd9/css/css.jpg\')', $content);
+    $this->assertContains('url(\'http://www.example.com/background.jpg\')', $content);
+    $this->assertContains('url(\'img/missing-file.jpg\')', $content);
+
+    $resource->setProcessingPath('css/do-not-modify.css');
+    $resource->setContent(file_get_contents(Path::system($root, Dispatch::RESOURCES_DIR, 'css', 'do-not-modify.css')));
+    $this->assertContains('url(../img/x.jpg)', $resource->getContent());
   }
 }