SVG Sanitizer Enhanced

packages/Webkul/Core/src/Traits/Sanitizer.php

@@ -7,21 +7,42 @@ use enshrined\svgSanitize\Sanitizer as MainSanitizer;
 
 trait Sanitizer
 {
+    /**
+     * List of mime types which needs to check.
+     */
+    public $mimeTypes = [
+        'image/svg',
+        'image/svg+xml'
+    ];
+
     /**
      * Sanitize SVG file.
      *
      * @param  string  $path
      * @return void
      */
-    public function sanitizeSVG($path)
+    public function sanitizeSVG($path, $mimeType)
     {
-        /* sanitizer instance */
+        if ($this->checkMimeType($mimeType)) {
-        $sanitizer = new MainSanitizer();
+            /* sanitizer instance */
+            $sanitizer = new MainSanitizer();
 
-        /* grab svg file */
+            /* grab svg file */
-        $dirtySVG = Storage::get($path);
+            $dirtySVG = Storage::get($path);
 
-        /* save sanitized svg */
+            /* save sanitized svg */
-        Storage::put($path, $sanitizer->sanitize($dirtySVG));
+            Storage::put($path, $sanitizer->sanitize($dirtySVG));
+        }
+    }
+
+    /**
+     * Sanitize SVG file.
+     *
+     * @param  string  $path
+     * @return void
+     */
+    public function checkMimeType($mimeType)
+    {
+        return in_array($mimeType, $this->mimeTypes);
     }
 }

packages/Webkul/Product/src/Repositories/SearchRepository.php

@@ -54,9 +54,7 @@ class SearchRepository extends Repository
     {
         $path = request()->file('image')->store('product-search');
 
-        if ($data['image']->getMimeType() === 'image/svg') {
+        $this->sanitizeSVG($path, $data['image']->getMimeType());
-            $this->sanitizeSVG($path);
-        }
 
         return Storage::url($path);
     }

packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php

@@ -158,9 +158,7 @@ class ConfigurationController extends Controller
                             $saveImage[substr($imageId, 6, 1)] = $path = request()->file($file)->store($dir);
                         }
 
-                        if ($image->getMimeType() === 'image/svg') {
+                        $this->sanitizeSVG($path, $image->getMimeType());
-                            $this->sanitizeSVG($path);
-                        }
                     }
                 } else {
                     if (isset($advertisement[$index][$imageId]) && $advertisement[$index][$imageId] && !request()->hasFile($file)) {