Fix: garbled characters caused by intercepting a string in maxbytes i…

…nterceptor (#398)
loggie-io · Nov 2, 2022 · de7dc61 · de7dc61
1 parent c620367
commit de7dc61
Show file tree

Hide file tree

Showing 7 changed files with 287 additions and 3 deletions.
diff --git a/go.mod b/go.mod
@@ -30,6 +30,8 @@ require (
 	github.com/shirou/gopsutil/v3 v3.22.2
 	github.com/smartystreets-prototypes/go-disruptor v0.0.0-20200316140655-c96477fd7a6a
 	github.com/stretchr/testify v1.7.5
+	github.com/thinkeridea/go-extend v1.3.2
+	go.uber.org/atomic v1.7.0
 	go.uber.org/automaxprocs v0.0.0-20200415073007-b685be8c1c23
 	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
 	golang.org/x/text v0.3.7
@@ -94,7 +96,6 @@ require (
 	github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect
 	github.com/xdg/stringprep v1.0.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
 	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
 	golang.org/x/mod v0.4.2 // indirect
 	golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c // indirect

diff --git a/go.sum b/go.sum
@@ -779,6 +779,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.5 h1:s5PTfem8p8EbKQOctVV53k6jCJt3UX4IEJzwh+C324Q=
 github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/thinkeridea/go-extend v1.3.2 h1:0ZImRXpJc+wBNIrNEMbTuKwIvJ6eFoeuNAewvzONrI0=
+github.com/thinkeridea/go-extend v1.3.2/go.mod h1:xqN1e3y1PdVSij1VZp6iPKlO8I4jLbS8CUuTySj981g=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
 github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo=

diff --git a/pkg/interceptor/maxbytes/interceptor.go b/pkg/interceptor/maxbytes/interceptor.go
@@ -18,10 +18,10 @@ package maxbytes
 
 import (
 	"fmt"
-
 	"github.com/loggie-io/loggie/pkg/core/api"
 	"github.com/loggie-io/loggie/pkg/core/source"
 	"github.com/loggie-io/loggie/pkg/pipeline"
+	"github.com/thinkeridea/go-extend/exunicode/exutf8"
 )
 
 const Type = "maxbytes"
@@ -75,7 +75,7 @@ func (i *Interceptor) Intercept(invoker source.Invoker, invocation source.Invoca
 	event := invocation.Event
 	body := event.Body()
 	if len(body) > i.config.MaxBytes {
-		event.Fill(event.Meta(), event.Header(), body[:i.config.MaxBytes])
+		event.Fill(event.Meta(), event.Header(), exutf8.RuneSub(body, 0, i.config.MaxBytes))
 	}
 	return invoker.Invoke(invocation)
 }

diff --git a/vendor/github.com/thinkeridea/go-extend/LICENSE b/vendor/github.com/thinkeridea/go-extend/LICENSE
diff --git a/vendor/github.com/thinkeridea/go-extend/exunicode/exutf8/doc.go b/vendor/github.com/thinkeridea/go-extend/exunicode/exutf8/doc.go
diff --git a/vendor/github.com/thinkeridea/go-extend/exunicode/exutf8/utf8.go b/vendor/github.com/thinkeridea/go-extend/exunicode/exutf8/utf8.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -321,6 +321,9 @@ github.com/spf13/pflag
 # github.com/stretchr/testify v1.7.5
 ## explicit; go 1.13
 github.com/stretchr/testify/assert
+# github.com/thinkeridea/go-extend v1.3.2
+## explicit; go 1.13
+github.com/thinkeridea/go-extend/exunicode/exutf8
 # github.com/tklauser/go-sysconf v0.3.9
 ## explicit; go 1.13
 github.com/tklauser/go-sysconf