add agent version

Author: piexlmax

model/request/engine.go

@@ -24,6 +24,7 @@ type AgentRegisterReq struct {
 	ServerPath        string `json:"serverPath"`
 	ServerEnv         string `json:"serverEnv"`
 	Pid               string `json:"pid"`
+	ProjectVersion    string `json:"projectVersion"`
 }
 
 type HookRuleReq struct {
@@ -68,6 +69,7 @@ type Pant struct {
 
 type Component struct {
 	PackagePath      string `json:"packagePath"`
+	PackageVersion   string `json:"packageVersion"`
 	PackageSignature string `json:"packageSignature"`
 	PackageName      string `json:"packageName"`
 	PackageAlgorithm string `json:"packageAlgorithm"`

service/auxiliary.go

@@ -20,7 +20,7 @@ func GenAQLForGolang(packageName, version string) string {
 }
 
 // 获取包
-func GetMod() []request.Component {
+func GetMod() ([]request.Component, string) {
 	//fmt.Println(getCurrentPath())
 	path, _ := os.Executable()
 	return scanFile(path, true)
@@ -35,7 +35,7 @@ func isExe(file string, info fs.FileInfo) bool {
 }
 
 // 从二进制文件读取包信息
-func scanFile(file string, mustPrint bool) (packages []request.Component) {
+func scanFile(file string, mustPrint bool) (packages []request.Component, agentVersion string) {
 	bi, err := buildinfo.ReadFile(file)
 	if err != nil {
 		if mustPrint {
@@ -45,7 +45,7 @@ func scanFile(file string, mustPrint bool) (packages []request.Component) {
 				fmt.Fprintf(os.Stderr, "%s: %v\n", file, err)
 			}
 		}
-		return packages
+		return packages, agentVersion
 	}
 	fmt.Printf("%s: %s\n", file, bi.GoVersion)
 	bi.GoVersion = "" // suppress printing go version again
@@ -57,16 +57,21 @@ func scanFile(file string, mustPrint bool) (packages []request.Component) {
 		if licl[0] == "dep" {
 			fmt.Printf("依赖:%s\t版本:%s\n", licl[1], licl[2])
 			aql := GenAQLForGolang(licl[1], licl[2])
+			if licl[1] == "github.com/HXSecurity/DongTai-agent-go" {
+				fmt.Println("当前探针版本为：" + licl[2])
+				agentVersion = licl[2]
+			}
 			packages = append(packages, request.Component{
 				PackageName:      aql,
 				PackageAlgorithm: "SHA-1",
 				PackagePath:      file,
+				PackageVersion:   licl[2],
 				PackageSignature: utils.SHA1(aql),
 			},
 			)
 		}
 	}
-	return
+	return packages, agentVersion
 }
 
 // 获取服务信息

service/engine.go

@@ -78,6 +78,7 @@ func AgentRegister() (err error) {
 	OS := runtime.GOOS
 	hostname, _ := os.Hostname()
 	version := "1.0.0"
+	packages, agentVersion := GetMod()
 	if global.Config.DongtaiGoProjectVersion != "" {
 		version = global.Config.DongtaiGoProjectVersion
 	}
@@ -132,7 +133,8 @@ func AgentRegister() (err error) {
 		AutoCreateProject: global.Config.DongtaiGoProjectCreate,
 		Name:              name,
 		Language:          "GO",
-		Version:           version,
+		Version:           agentVersion,
+		ProjectVersion:    version,
 		ProjectName:       projectName,
 		Hostname:          hostname,
 		Network:           ips,
@@ -201,13 +203,12 @@ func AgentRegister() (err error) {
 						}
 						req.ServerAddr = ip.String()
 						agentId, err := api.AgentRegister(req)
-
 						if err != nil {
 							fmt.Println(err)
 							break
 						}
 						global.AgentId = agentId
-						UploadSca()
+						UploadSca(packages)
 						go func() {
 							for {
 								time.Sleep(10 * time.Second)
@@ -257,8 +258,7 @@ func PingPang() {
 	req.Detail.AgentId = global.AgentId
 	api.ReportUpload(req)
 }
-func UploadSca() {
-	packages := GetMod()
+func UploadSca(packages []request.Component) {
 	var req request.UploadReq
 	req.Type = 18
 	req.Detail.AgentId = global.AgentId