Fix #94: Preserve CDATA for unsafe content

sibprogrammer · Aug 23, 2024 · a0c4e1e · a0c4e1e
1 parent 418966b
commit a0c4e1e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/internal/utils/utils.go b/internal/utils/utils.go
@@ -143,6 +143,9 @@ func FormatXml(reader io.Reader, writer io.Writer, indent string, colors int) er
 				_, _ = fmt.Fprint(writer, tagColor(">"))
 				startTagClosed = true
 			}
+			if hasContent && (strings.Contains(str, "&") || strings.Contains(str, "<")) {
+				str = "<![CDATA[" + str + "]]>"
+			}
 			_, _ = fmt.Fprint(writer, str)
 		case xml.Comment:
 			if !startTagClosed {

diff --git a/internal/utils/utils_test.go b/internal/utils/utils_test.go
@@ -37,6 +37,7 @@ func TestFormatXml(t *testing.T) {
 		"unformatted12.xml": "formatted12.xml",
 		"unformatted13.xml": "formatted13.xml",
 		"unformatted14.xml": "formatted14.xml",
+		"unformatted15.xml": "formatted15.xml",
 	}
 
 	for unformattedFile, expectedFile := range files {

diff --git a/test/data/xml/formatted15.xml b/test/data/xml/formatted15.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Top><![CDATA[Ding&Dong=]]></Top>
diff --git a/test/data/xml/unformatted15.xml b/test/data/xml/unformatted15.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><Top><![CDATA[Ding&Dong=]]></Top>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?xml version="1.0" encoding="UTF-8"?>
		<Top><![CDATA[Ding&Dong=]]></Top>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<?xml version="1.0" encoding="UTF-8"?><Top><![CDATA[Ding&Dong=]]></Top>