add some defense code

scouter-contrib · Apr 18, 2021 · cf7bc37 · cf7bc37
1 parent 67ff775
commit cf7bc37
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/scouterx/common/netdata/dataoutputx.go b/scouterx/common/netdata/dataoutputx.go
@@ -175,6 +175,8 @@ func (out *DataOutputX) WriteString(value string) (*DataOutputX, error) {
 	var err error
 	if length == 0 {
 		_, err = out.WriteInt8(0)
+	} else if length > 100000 {
+		err = out.WriteBlob([]byte("huge string omitted..."))
 	} else {
 		err = out.WriteBlob([]byte(value))
 	}

diff --git a/scouterx/strace/tracemain.go b/scouterx/strace/tracemain.go
@@ -4,14 +4,14 @@ import (
 	"context"
 	"fmt"
 	"github.com/scouter-contrib/scouter-agent-golang/scouterx/common"
+	"github.com/scouter-contrib/scouter-agent-golang/scouterx/common/netdata"
+	"github.com/scouter-contrib/scouter-agent-golang/scouterx/common/util"
 	"github.com/scouter-contrib/scouter-agent-golang/scouterx/common/util/keygen"
 	"github.com/scouter-contrib/scouter-agent-golang/scouterx/conf"
 	"github.com/scouter-contrib/scouter-agent-golang/scouterx/counter"
 	"github.com/scouter-contrib/scouter-agent-golang/scouterx/netio"
 	"github.com/scouter-contrib/scouter-agent-golang/scouterx/netio/tcpclient"
 	"github.com/scouter-contrib/scouter-agent-golang/scouterx/strace/tctxmanager"
-	"github.com/scouter-contrib/scouter-agent-golang/scouterx/common/netdata"
-	"github.com/scouter-contrib/scouter-agent-golang/scouterx/common/util"
 	"net/http"
 	"runtime"
 	"strconv"
@@ -356,6 +356,7 @@ func endAnyService(ctx context.Context) {
 }
 
 func endStuckServiceForcibly(tctx *netio.TraceContext) {
+	defer common.ReportScouterPanic()
 	if ac.StuckServiceRemoveEnabled {
 		step := netdata.NewPMessageStep(util.MillisToNow(tctx.StartTime))
 		step.SetMessage(netio.SendHashedMessage("Service currently may running, not finished!"))