wip

Author: medilies

src/Dompurify/DompurifyCli.php

@@ -12,6 +12,8 @@ class DompurifyCli implements CliInterface, HasSetupInterface
 {
     protected DompurifyCliConfig $config;
 
+    // TODO: better injection (fs and process)
+
     /** @param DompurifyCliConfig $config */
     public function configure(ConfigInterface $config): static
     {
@@ -30,15 +32,7 @@ public function exec(string $html): string
     {
         $htmlFile = $this->saveHtml($html);
 
-        $binPath = __DIR__.DIRECTORY_SEPARATOR.'cli.js';
-
-        $binAbsPath = realpath($binPath);
-
-        if ($binAbsPath === false) {
-            throw new XsslessException("Cannot locate '$binPath'");
-        }
-
-        $process = new Process([$this->config->getNodePath(), $binAbsPath, $htmlFile]);
+        $process = new Process([$this->config->getNodePath(), $this->binPath(), $htmlFile]);
         $process->mustRun();
 
         $output = $process->getOutput();
@@ -57,18 +51,24 @@ public function exec(string $html): string
         return $clean;
     }
 
-    private function saveHtml(string $value): string
+    private function binPath(): string
     {
-        // TODO: take path from config
-        $tempDir = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR);
-        $dir = $tempDir.DIRECTORY_SEPARATOR.'xssless';
+        // TODO: allow config to override
+        $binPath = __DIR__.DIRECTORY_SEPARATOR.'cli.js';
 
-        if (! file_exists($dir)) {
-            if (mkdir($dir, 0777, true) === false) {
-                throw new XsslessException("Could not create temporary directory '{$dir}'");
-            }
+        $binAbsPath = realpath($binPath);
+
+        if ($binAbsPath === false) {
+            throw new XsslessException("Cannot locate '$binPath'");
         }
 
+        return $binAbsPath;
+    }
+
+    private function saveHtml(string $value): string
+    {
+        $dir = $this->tempDir();
+
         $fileName = mt_rand().'-'.str_replace([' ', '.'], '', microtime()).'.xss';
 
         $path = $dir.DIRECTORY_SEPARATOR.$fileName;
@@ -79,4 +79,19 @@ private function saveHtml(string $value): string
 
         return $path;
     }
+
+    private function tempDir(): string
+    {
+        // TODO: take path from config
+        $tempDir = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR);
+        $dir = $tempDir.DIRECTORY_SEPARATOR.'xssless';
+
+        if (! file_exists($dir)) {
+            if (mkdir($dir, 0777, true) === false) {
+                throw new XsslessException("Could not create temporary directory '{$dir}'");
+            }
+        }
+
+        return $dir;
+    }
 }

src/Dompurify/DompurifyService.php

@@ -15,6 +15,8 @@ class DompurifyService implements HasSetupInterface, ServiceInterface
 {
     private DompurifyServiceConfig $config;
 
+    // TODO: better injection (fs and process http)
+
     // TODO: private
     public Process $serviceProcess;
     // ? add static array for all processes
@@ -33,8 +35,6 @@ public function setup(): void
         $process->mustRun();
     }
 
-    // ========================================================================
-
     public function send(string $html): string
     {
         $url = "http://{$this->config->getHost()}:{$this->config->getPort()}";
@@ -49,8 +49,6 @@ public function send(string $html): string
         return $res->getBody();
     }
 
-    // ========================================================================
-
     public function start(): static
     {
         $this->serviceProcess = new Process([
@@ -107,6 +105,7 @@ public function throwIfFailedOnTerm(): void
         }
 
         // TODO: fix windows check
+        // https://github.com/medilies/xssless/actions/runs/10288495452/job/28474063301#step:7:26
         if ($this->isSigTerm() || $this->isWindows()) {
             return;
         }
@@ -142,8 +141,8 @@ private function isSigTerm(): bool
         return $this->serviceProcess->getTermSignal() === 15;
     }
 
-    private function isSigHup(): bool
-    {
-        return $this->serviceProcess->getTermSignal() === 1;
-    }
+    // private function isSigHup(): bool
+    // {
+    //     return $this->serviceProcess->getTermSignal() === 1;
+    // }
 }