Escape strings with quotes (labstack#9)

freedomskyx · Dec 20, 2016 · 7355c05 · 7355c05
1 parent 447fe74
commit 7355c05
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/log/log.go b/log/log.go
@@ -387,9 +387,9 @@ func (l *Logger) log(v Lvl, format string, args ...interface{}) {
 				if format == "json" {
 					buf.WriteString(message[1:])
 				} else {
-					buf.WriteString(`"message":"`)
-					buf.WriteString(message)
-					buf.WriteString(`"}`)
+					buf.WriteString(`"message":`)
+					buf.WriteString(strconv.Quote(message))
+					buf.WriteString(`}`)
 				}
 			} else {
 				// Text header

diff --git a/log/log_test.go b/log/log_test.go
@@ -110,6 +110,15 @@ func TestJSON(t *testing.T) {
 	assert.Contains(t, b.String(), `"name":"value"`)
 }
 
+func TestStringWithQuotes(t *testing.T) {
+	l := New("test")
+	b := new(bytes.Buffer)
+	l.SetOutput(b)
+	l.SetLevel(DEBUG)
+	l.Debugf("Content-Type: %q", "")
+	assert.Contains(t, b.String(), `"message":"Content-Type: \"\""`)
+}
+
 func BenchmarkLog(b *testing.B) {
 	l := New("test")
 	l.SetOutput(new(bytes.Buffer))