Move purifier init to the blockHandler. Provide purifier test. Fix bug #27

n0str · n0str · commit e73e4207efb5 · 2018-10-14T18:25:12.000+03:00
diff --git a/EditorJS/BlockHandler.php b/EditorJS/BlockHandler.php
@@ -19,23 +19,16 @@ class BlockHandler
      */
     private $rules = null;
 
-    /**
-     * @var \HTMLPurifier_Config
-     */
-    private $sanitizer;
-
     /**
      * BlockHandler constructor
      *
-     * @param \HTMLPurifier_Config $sanitizer
-     * @param string               $configuration
+     * @param string $configuration
      *
      * @throws EditorJSException
      */
-    public function __construct($configuration, $sanitizer)
+    public function __construct($configuration)
     {
         $this->rules = new ConfigLoader($configuration);
-        $this->sanitizer = $sanitizer;
     }
 
     /**
@@ -228,11 +221,32 @@ private function sanitize($rules, $blockData)
      */
     private function getPurifier($allowedTags)
     {
-        $sanitizer = clone $this->sanitizer;
+        $sanitizer = $this->getDefaultPurifier();
+
         $sanitizer->set('HTML.Allowed', $allowedTags);
 
         $purifier = new \HTMLPurifier($sanitizer);
 
         return $purifier;
     }
+
+    /**
+     * Initialize HTML Purifier with default settings
+     */
+    private function getDefaultPurifier()
+    {
+        $sanitizer = \HTMLPurifier_Config::createDefault();
+
+        $sanitizer->set('HTML.TargetBlank', true);
+        $sanitizer->set('URI.AllowedSchemes', ['http' => true, 'https' => true]);
+        $sanitizer->set('AutoFormat.RemoveEmpty', true);
+
+        if (!is_dir('/tmp/purifier')) {
+            mkdir('/tmp/purifier', 0777, true);
+        }
+
+        $sanitizer->set('Cache.SerializerPath', '/tmp/purifier');
+
+        return $sanitizer;
+    }
 }
diff --git a/EditorJS/EditorJS.php b/EditorJS/EditorJS.php
@@ -24,11 +24,6 @@ class EditorJS
      */
     public $handler;
 
-    /**
-     * @var \HTMLPurifier_Config
-     */
-    public $sanitizer;
-
     /**
      * EditorJS constructor.
      * Splits JSON string to separate blocks
@@ -40,8 +35,7 @@ class EditorJS
      */
     public function __construct($json, $configuration)
     {
-        $this->initPurifier();
-        $this->handler = new BlockHandler($configuration, $this->sanitizer);
+        $this->handler = new BlockHandler($configuration);
 
         /**
          * Check if json string is empty
@@ -102,24 +96,6 @@ public function __construct($json, $configuration)
         $this->validateBlocks();
     }
 
-    /**
-     * Initialize HTML Purifier with default settings
-     */
-    private function initPurifier()
-    {
-        $this->sanitizer = \HTMLPurifier_Config::createDefault();
-
-        $this->sanitizer->set('HTML.TargetBlank', true);
-        $this->sanitizer->set('URI.AllowedSchemes', ['http' => true, 'https' => true]);
-        $this->sanitizer->set('AutoFormat.RemoveEmpty', true);
-
-        if (!is_dir('/tmp/purifier')) {
-            mkdir('/tmp/purifier', 0777, true);
-        }
-
-        $this->sanitizer->set('Cache.SerializerPath', '/tmp/purifier');
-    }
-
     /**
      * Sanitize and return array of blocks according to the Handler's rules.
      *
diff --git a/tests/BlockHandlerTest.php b/tests/BlockHandlerTest.php
@@ -71,4 +71,15 @@ public function testListTool()
         $this->assertEquals("second", $result[0]['data']['items'][1]);
         $this->assertEquals("third", $result[0]['data']['items'][2]);
     }
+
+    public function testHtmlPurifier()
+    {
+        $data = '{"time":1539180803359,"blocks":[{"type":"header","data":{"text":"<b>t</b><i>e</i><u>st</u>","level":2}}, {"type":"quote","data":{"text":"<b>t</b><i>e</i><u>st</u>","caption":"", "alignment":"left"}}]}';
+        $editor = new EditorJS($data, $this->configuration);
+        $result = $editor->getBlocks();
+
+        $this->assertEquals(2, count($result));
+        $this->assertEquals('test', $result[0]['data']['text']);
+        $this->assertEquals('<b>t</b><i>e</i><u>st</u>', $result[1]['data']['text']);
+    }
 }
diff --git a/tests/samples/test-config.json b/tests/samples/test-config.json
@@ -33,12 +33,13 @@
     },
     "quote": {
       "text": {
-        "type": "string"
+        "type": "string",
+        "allowedTags": "i,b,u"
       },
       "caption": {
         "type": "string"
       },
-      "size": {
+      "alignment": {
         "type": "string",
         "canBeOnly": ["left", "right"]
       }
