parse cmds

Author: yiplee

cmd/scanner/cmd.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"bufio"
+	"encoding/json"
+	"strings"
+)
+
+func parseCmd(cmd string) ([]string, bool) {
+	var args []string
+	if err := json.Unmarshal([]byte(cmd), &args); err != nil {
+		s := bufio.NewScanner(strings.NewReader(cmd))
+		s.Split(scanWords)
+
+		for s.Scan() {
+			arg := s.Text()
+			args = append(args, arg)
+		}
+	}
+
+	return args, len(args) >= 1
+}

cmd/scanner/cmd_test.go

@@ -0,0 +1,54 @@
+package main
+
+import (
+	"os/exec"
+	"reflect"
+	"testing"
+)
+
+func Test_parseCmd(t *testing.T) {
+	type args struct {
+		cmd string
+	}
+	tests := []struct {
+		name  string
+		args  args
+		want  []string
+		want1 bool
+	}{
+		{
+			name:  "string array",
+			args:  args{cmd: `["foo","--bar","haha"]`},
+			want:  []string{"foo", "--bar", "haha"},
+			want1: true,
+		},
+		{
+			name:  "string",
+			args:  args{cmd: "foo --bar haha"},
+			want:  []string{"foo", "--bar", "haha"},
+			want1: true,
+		},
+		{
+			name:  "with quote",
+			args:  args{cmd: `./group --debug --name "haha xixi"`},
+			want:  []string{"./group", "--debug", "--name", `"haha xixi"`},
+			want1: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, got1 := parseCmd(tt.args.cmd)
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("parseCmd() got = %v, want %v", got, tt.want)
+			}
+			if got1 != tt.want1 {
+				t.Errorf("parseCmd() got1 = %v, want %v", got1, tt.want1)
+			}
+
+			if got1 {
+				cmd := exec.Command(got[0], got[1:]...)
+				t.Log(cmd.String())
+			}
+		})
+	}
+}

cmd/scanner/log.go

@@ -73,7 +73,6 @@ func parseLog(token []byte, log *Entry) {
 
 	for k, v := range values {
 		value := cast.ToString(v)
-		// value = removeSurroundingQuotes(value)
 
 		switch k {
 		case fieldNameLevel:

cmd/scanner/main.go

@@ -5,7 +5,6 @@ import (
 	"bytes"
 	"context"
 	"encoding/base64"
-	"encoding/json"
 	"flag"
 	"io"
 	"os"
@@ -43,8 +42,9 @@ func main() {
 
 	var input io.Reader = os.Stdin
 
-	var args []string
-	if _ = json.Unmarshal([]byte(*cmd), &args); len(args) > 0 {
+	if args, ok := parseCmd(*cmd); ok {
+		logrus.Infoln("scan:", args)
+
 		pr, pw, err := os.Pipe()
 		if err != nil {
 			logrus.Panicln("os.Pipe", err)