fix: UPF抓包脚本或telnet方式

features/trace/tcpdump.go

@@ -130,15 +130,15 @@ func TcpdumpNeUPFTask(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// 开始
+	// 开始telnet
-	if body.RunType == "start" {
+	if body.RunType == "start_telnet" {
 		// 创建TCP连接
 		conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", neInfo.Ip, 5002))
 		if err != nil {
-			conn.Close()
 			ctx.JSON(w, 200, result.ErrMsg(err.Error()))
 			return
 		}
+		defer conn.Close()
 
 		filePcapName := fmt.Sprintf("tmp_%s_%s.pcap", body.NeType, body.NeId)
 		cmdStr := fmt.Sprintf("pcap dispatch trace on max 100000 file %s", filePcapName)
@@ -169,15 +169,15 @@ func TcpdumpNeUPFTask(w http.ResponseWriter, r *http.Request) {
 		conn.Close()
 		return
 	}
-	// 停止
+	// 停止telnet
-	if body.RunType == "stop" {
+	if body.RunType == "stop_telnet" {
 		// 创建TCP连接
 		conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", neInfo.Ip, 5002))
 		if err != nil {
-			conn.Close()
 			ctx.JSON(w, 200, result.ErrMsg(err.Error()))
 			return
 		}
+		defer conn.Close()
 
 		filePcapName := fmt.Sprintf("tmp_%s_%s.pcap", body.NeType, body.NeId)
 		cmdStr := "pcap dispatch trace off"
@@ -268,5 +268,72 @@ func TcpdumpNeUPFTask(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// 开始-脚本字符串
+	if body.RunType == "start_str" {
+		fileLogName := fmt.Sprintf("tmp_%s_%s.log", body.NeType, body.NeId)
+		filePcapName := fmt.Sprintf("tmp_%s_%s.pcap", body.NeType, body.NeId)
+		scriptStr := "#!/bin/expect\nset capcmd [lindex $argv 0]\nspawn telnet localhost 5002\nexpect \"upfd1# \"\nsend \"$capcmd\\n\"\nexpect \"upfd1# \"\nsend \"quit\\n\"\nexpect \"eof\""
+		writeLog := fmt.Sprintf(" > %s 2>&1 \ncat %s", fileLogName, fileLogName) // 执行信息写入日志文件输出，避免弹出code 127
+
+		capCmdStr := fmt.Sprintf("%s file %s", body.Cmd, filePcapName)
+
+		cmdStr := fmt.Sprintf("cd /tmp\n\necho '%s' > cap.sh\n\nchmod +x cap.sh\n\n./cap.sh '%s'%s", scriptStr, capCmdStr, writeLog)
+		usernameNe := conf.Get("ne.user").(string) // 网元统一用户
+		sshHost := fmt.Sprintf("%s@%s", usernameNe, neInfo.Ip)
+		msg, err := cmd.ExecWithCheck("ssh", sshHost, cmdStr)
+		if err != nil {
+			ctx.JSON(w, 200, result.ErrMsg(err.Error()))
+		} else {
+			s := strings.Index(msg, "pcap dispatch trace:")
+			if s != -1 {
+				e := strings.Index(msg, "\r\nupfd1#")
+				msg = msg[s:e]
+			} else {
+				msg = "Executed, please stop before proceeding"
+			}
+			ctx.JSON(w, 200, result.OkData(map[string]any{
+				"cmd":      capCmdStr,
+				"msg":      msg,
+				"fileName": filePcapName,
+			}))
+		}
+		return
+	}
+	// 停止-脚本字符串
+	if body.RunType == "stop_str" {
+		fileLogName := fmt.Sprintf("tmp_%s_%s.log", body.NeType, body.NeId)
+		filePcapName := fmt.Sprintf("tmp_%s_%s.pcap", body.NeType, body.NeId)
+		scriptStr := "#!/bin/expect\nset capcmd [lindex $argv 0]\nspawn telnet localhost 5002\nexpect \"upfd1# \"\nsend \"$capcmd\\n\"\nexpect \"upfd1# \"\nsend \"quit\\n\"\nexpect \"eof\""
+		writeLog := fmt.Sprintf(" > %s 2>&1 \ncat %s", fileLogName, fileLogName) // 执行信息写入日志文件输出，避免弹出code 127
+
+		capCmdStr := body.Cmd
+
+		cmdStr := fmt.Sprintf("cd /tmp\n\necho '%s' > cap.sh\n\nchmod +x cap.sh\n\n./cap.sh '%s'%s", scriptStr, capCmdStr, writeLog)
+
+		usernameNe := conf.Get("ne.user").(string) // 网元统一用户
+		sshHost := fmt.Sprintf("%s@%s", usernameNe, neInfo.Ip)
+		msg, err := cmd.ExecWithCheck("ssh", sshHost, cmdStr)
+		if err != nil {
+			ctx.JSON(w, 200, result.ErrMsg(err.Error()))
+		} else {
+			s := strings.Index(msg, "pcap dispatch trace:")
+			if s == -1 {
+				s = strings.Index(msg, "Write ")
+			}
+			if s != -1 {
+				e := strings.Index(msg, "\r\nupfd1#")
+				msg = msg[s:e]
+			} else {
+				msg = "No stoppable found"
+			}
+			ctx.JSON(w, 200, result.OkData(map[string]any{
+				"cmd":      capCmdStr,
+				"msg":      msg,
+				"fileName": filePcapName,
+			}))
+		}
+		return
+	}
+
 	ctx.JSON(w, 200, result.ErrMsg("runType is start or stop"))
 }