Merge branch 'gotree' into 'v3'

update: go tree

See merge request develop/client!14

Author: chenhaoxuan

go.mod

@@ -4,6 +4,7 @@ go 1.23.4
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.7
+	github.com/Masterminds/semver v1.5.0
 	github.com/antchfx/xmlquery v1.4.1
 	github.com/antlr4-go/antlr/v4 v4.13.1
 	github.com/bahlo/generic-list-go v0.2.0

go.sum

@@ -2,6 +2,8 @@ dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ=
 github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo=
+github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
+github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=

module/go_mod/go.go

@@ -5,10 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/murphysecurity/murphysec/env"
-	"github.com/murphysecurity/murphysec/infra/sl"
-	"github.com/repeale/fp-go"
-	"go.uber.org/zap"
 	"io"
 	"os/exec"
 	"path/filepath"
@@ -17,6 +13,7 @@ import (
 	"github.com/murphysecurity/murphysec/model"
 	"github.com/murphysecurity/murphysec/utils"
 	"github.com/pkg/errors"
+	"go.uber.org/zap"
 	"golang.org/x/mod/modfile"
 )
 
@@ -35,50 +32,24 @@ func (Inspector) CheckDir(dir string) bool {
 }
 
 func (Inspector) InspectProject(ctx context.Context) error {
-	task := model.UseInspectionTask(ctx)
 	logger := logctx.Use(ctx)
-	modFilePath := filepath.Join(task.Dir(), "go.mod")
-	logger.Debug("Reading go.mod", zap.String("path", modFilePath))
-	data, e := utils.ReadFileLimited(modFilePath, 1024*1024*4)
-	if e != nil {
-		return errors.WithMessage(e, "Open GoMod file")
-	}
-	logger.Debug("Parsing go.mod")
-	f, e := modfile.ParseLax(filepath.Base(modFilePath), data, nil)
-	if e != nil {
-		return errors.WithMessage(e, "Parse go mod failed")
-	}
-	var dependencies []model.DependencyItem
-	if !env.DoNotBuild {
-		// try command go list
-		dependencies, e = doGoList(ctx, task.Dir())
-		if e != nil {
-			if errors.Is(e, _ErrGoNotFound) {
-				logger.Debug("Go not found, skip GoList")
-			} else {
-				// log it and go on
-				logger.Warn("GoList failed", zap.Error(e))
-			}
-			dependencies = append(dependencies, fp.Map(mapRequireToDependencyItem)(sl.FilterNotNull(f.Require))...)
+	if privatePath, ok := ctx.Value("privateSourceAddr").(string); ok {
+		logger.Debug("Use private path", zap.String("path", privatePath))
+		if err := setPrivatePath(privatePath, logger); err != nil {
+			return err
 		}
 	}
-	if len(dependencies) == 0 {
-		if !env.DoNotBuild {
-			logger.Warn("no dependencies found, backup")
+	if proxyPath, ok := ctx.Value("proxyAddr").(string); ok {
+		logger.Debug("Use proxy path", zap.String("path", proxyPath))
+		if err := setProxyPath(proxyPath, logger); err != nil {
+			return err
 		}
-		dependencies = append(dependencies, fp.Map(mapRequireToDependencyItem)(sl.FilterNotNull(f.Require))...)
 	}
-	m := model.Module{
-		PackageManager: "gomod",
-		ModulePath:     modFilePath,
-		ModuleName:     "<NoNameModule>",
-		Dependencies:   dependencies,
-	}
-	if f.Module != nil {
-		m.ModuleVersion = f.Module.Mod.Version
-		m.ModuleName = f.Module.Mod.Path
+	if err := buildScan(ctx); err != nil {
+		if err := baseScan(ctx); err != nil {
+			return err
+		}
 	}
-	task.AddModule(m)
 	return nil
 }