Merge pull request #140 from dims/fix-serialization-of-special-html-c…

…hars

fix serialization of special html chars

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{}) {

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": {