fix serialization of special html chars

dims · dims · commit db06a1b643e5 · 2020-04-15T09:11:57.000-04:00
Signed-off-by: Davanum Srinivas &lt;davanum@gmail.com&gt;
diff --git a/klogr/klogr.go b/klogr/klogr.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"runtime"
 	"sort"
+	"strings"
 
 	"github.com/go-logr/logr"
 	"k8s.io/klog/v2"
@@ -139,8 +140,11 @@ func pretty(value interface{}) string {
 			value = err.Error()
 		}
 	}
-	jb, _ := json.Marshal(value)
-	return string(jb)
+	buffer := &bytes.Buffer{}
+	encoder := json.NewEncoder(buffer)
+	encoder.SetEscapeHTML(false)
+	encoder.Encode(value)
+	return strings.TrimSpace(string(buffer.Bytes()))
 }
 
 func (l klogger) Info(msg string, kvList ...interface{}) {
diff --git a/klogr/klogr_test.go b/klogr/klogr_test.go
@@ -66,6 +66,12 @@ func TestInfo(t *testing.T) {
 			text:          "test",
 			keysAndValues: []interface{}{"akey", "avalue", "akey2"},
 			expectedOutput: ` "msg"="test"  "akey"="avalue" "akey2"=null
+`,
+		},
+		"should correctly html characters": {
+			text:          "test",
+			keysAndValues: []interface{}{"akey", "<&>"},
+			expectedOutput: ` "msg"="test"  "akey"="<&>"
 `,
 		},
 		"should correctly handle odd-numbers of KVs in both log values and Info args": {

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`	`"fmt"`
`9`	`9`	`"runtime"`
`10`	`10`	`"sort"`
	`11`	`+ "strings"`
`11`	`12`
`12`	`13`	`"github.com/go-logr/logr"`
`13`	`14`	`"k8s.io/klog/v2"`
`@@ -139,8 +140,11 @@ func pretty(value interface{}) string {`
`139`	`140`	`value = err.Error()`
`140`	`141`	`}`
`141`	`142`	`}`
`142`		`- jb, _ := json.Marshal(value)`
`143`		`- return string(jb)`
	`143`	`+ buffer := &bytes.Buffer{}`
	`144`	`+ encoder := json.NewEncoder(buffer)`
	`145`	`+ encoder.SetEscapeHTML(false)`
	`146`	`+ encoder.Encode(value)`
	`147`	`+ return strings.TrimSpace(string(buffer.Bytes()))`
`144`	`148`	`}`
`145`	`149`
`146`	`150`	`func (l klogger) Info(msg string, kvList ...interface{}) {`