From 0849fa881a98d8f1231a6959d40e7eda4a8ffc06 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 31 Jan 2017 18:29:56 +0100
Subject: [PATCH] more cleanup in embedSVG

now comments and line breaks between tags are removed
---
 _test/data/media/wiki/test.svg           | 11 ++++++++
 _test/tests/inc/common_embedSVG.test.php | 34 ++++++++++++++++++++++++
 inc/common.php                           |  6 +++--
 3 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 _test/data/media/wiki/test.svg
 create mode 100644 _test/tests/inc/common_embedSVG.test.php

diff --git a/_test/data/media/wiki/test.svg b/_test/data/media/wiki/test.svg
new file mode 100644
index 0000000000..3c2d541841
--- /dev/null
+++ b/_test/data/media/wiki/test.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generated by IcoMoon.io -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" viewBox="0 0 64 64">
+<!--
+     this is a
+     multiline
+     comment
+-->
+<path d="M64 20l-32-16-32 16 32 16 32-16zM32 9.311l21.379 10.689-21.379 10.689-21.379-10.689 21.379-10.689zM57.59 28.795l6.41 3.205-32 16-32-16 6.41-3.205 25.59 12.795zM57.59 40.795l6.41 3.205-32 16-32-16 6.41-3.205 25.59 12.795z" fill="#000000"></path>
+</svg>
diff --git a/_test/tests/inc/common_embedSVG.test.php b/_test/tests/inc/common_embedSVG.test.php
new file mode 100644
index 0000000000..1b1b5edbc9
--- /dev/null
+++ b/_test/tests/inc/common_embedSVG.test.php
@@ -0,0 +1,34 @@
+<?php
+
+class common_embedSVG_test extends DokuWikiTest {
+
+    /**
+     * embed should succeed with a cleaned up result
+     */
+    function test_success() {
+        $file = mediaFN('wiki:test.svg');
+        $clean =
+            '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" '.
+            'width="64" height="64" viewBox="0 0 64 64"><path d="M64 20l-32-16-32 16 32 16 32-16zM32 '.
+            '9.311l21.379 10.689-21.379 10.689-21.379-10.689 21.379-10.689zM57.59 28.795l6.41 3.205-32 16-32-16 '.
+            '6.41-3.205 25.59 12.795zM57.59 40.795l6.41 3.205-32 16-32-16 6.41-3.205 25.59 12.795z" '.
+            'fill="#000000"></path></svg>';
+
+        ob_start();
+        $this->assertTrue(embedSVG($file));
+        $svg = ob_get_clean();
+        $this->assertEquals($clean, $svg);
+    }
+
+    /**
+     * embed should fail because of the file size limit
+     */
+    function test_fail() {
+        $file = mediaFN('wiki:test.svg');
+        ob_start();
+        $this->assertFalse(embedSVG($file, 100));
+        $svg = ob_get_clean();
+        $this->assertEquals('', $svg);
+    }
+
+}
diff --git a/inc/common.php b/inc/common.php
index ad93ba6a26..5620e000c0 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -2031,8 +2031,10 @@ function embedSVG($file, $maxsize = 2048) {
     if(filesize($file) > $maxsize) return false;
     if(!is_readable($file)) return false;
     $content = file_get_contents($file);
-    $content = preg_replace('/<\?xml .*?\?>/i', '', $content);
-    $content = preg_replace('/<!DOCTYPE .*?>/i', '', $content);
+    $content = preg_replace('/<!--.*?(-->)/s','', $content); // comments
+    $content = preg_replace('/<\?xml .*?\?>/i', '', $content); // xml header
+    $content = preg_replace('/<!DOCTYPE .*?>/i', '', $content); // doc type
+    $content = preg_replace('/>\s+</s', '><', $content); // newlines between tags
     $content = trim($content);
     if(substr($content, 0, 5) !== '<svg ') return false;
     echo $content;