feature: 增加maven指定模块参数和自定义branch参数

Author: chenhaoxuan

cmd/murphy/internal/scan/cmd.go

@@ -42,6 +42,8 @@ var webhookMode common.WebhookModeFlag
 var extraData string
 var scanCodeHash bool
 var gradleProjectFilter gradle.ProjectFilter
+var branch string
+var mavenModuleName []string
 
 func Cmd() *cobra.Command {
 	var c cobra.Command
@@ -52,6 +54,7 @@ func Cmd() *cobra.Command {
 	c.Flags().BoolVar(&jsonOutput, "json", false, "output in json format")
 	c.Flags().BoolVar(&isDeep, "deep", false, "enable enhanced deep insight, code features identification, vulnerability accessibility analysis")
 	c.Flags().BoolVar(&noBuild, "no-build", false, "skip project building")
+	c.Flags().StringVar(&branch, "branch", "", "")
 	c.Flags().StringVar(&projectNameCli, "project-name", "", "specify project name")
 	c.Flags().BoolVar(&onlyTaskId, "only-task-id", false, "print task id after task created, the scan result will not be printed")
 	c.Flags().StringVar(&privateSourceId, "maven-setting-id", "", "specify the id of the Maven settings.xml file used during the scan")
@@ -74,6 +77,8 @@ func DfCmd() *cobra.Command {
 	c.Flags().BoolVar(&jsonOutput, "json", false, "output in json format")
 	c.Flags().BoolVar(&isDeep, "deep", false, "enable enhanced deep insight, code features identification, vulnerability accessibility analysis")
 	c.Flags().BoolVar(&noBuild, "no-build", false, "skip project building")
+	c.Flags().StringVar(&branch, "branch", "", "")
+	c.Flags().StringArrayVar(&mavenModuleName, "maven-module-name", make([]string, 0), "retains module")
 	c.Flags().StringVar(&projectNameCli, "project-name", "", "specify project name")
 	c.Flags().StringVar(&mavenSettingsPath, "maven-settings", "", "specify the path of maven settings")
 	c.Flags().BoolVar(&onlyTaskId, "only-task-id", false, "print task id after task created, the scan result will not be printed")

cmd/murphy/internal/scan/scan.go

@@ -153,6 +153,7 @@ func scan(ctx context.Context, dir string, accessType model.AccessType, mode mod
 	createSubtask.PackagePrivateName = privateSourceName
 	createSubtask.ProjectTagNames = projectTagNames
 	createSubtask.IsAutonomous = scanCodeHash
+	createSubtask.Branch = &branch
 	if createSubtask.ProjectTagNames == nil {
 		createSubtask.ProjectTagNames = make([]string, 0)
 	}
@@ -194,7 +195,6 @@ func scan(ctx context.Context, dir string, accessType model.AccessType, mode mod
 	}
 	cv.DisplayAlertMessage(ctx, createTaskResp.AlertMessage)
 	cv.DisplaySubtaskCreated(ctx, createTaskResp.ProjectsName, createTaskResp.SubtaskID)
-
 	// create task object
 	task := &model.ScanTask{
 		Mode:            mode,
@@ -207,6 +207,7 @@ func scan(ctx context.Context, dir string, accessType model.AccessType, mode mod
 		MavenSourceName: privateSourceName,
 		IsNoBuild:       noBuild,
 		IsAutonomous:    scanCodeHash,
+		MavenModuleName: mavenModuleName,
 	}
 	if gitSummary != nil {
 		task.GitUrl = gitSummary.RemoteAddr

model/inspection_task.go

@@ -10,6 +10,10 @@ type InspectionTask struct {
 	inspectionDir string
 }
 
+func (i *InspectionTask) MavenModuleName() []string {
+	return i.scanTask.MavenModuleName
+}
+
 // IsNoBuild返回当前扫描器是否编译
 func (i *InspectionTask) IsNoBuild() bool {
 	return i.scanTask.IsNoBuild

model/scantask.go

@@ -21,6 +21,7 @@ type ScanTask struct {
 	IsNoBuild       bool
 	IsInternalCmd   bool
 	IsAutonomous    bool
+	MavenModuleName []string
 }
 
 func (s *ScanTask) BuildInspectionTask(dir string) *InspectionTask {

module/maven/maven.go

@@ -23,7 +23,19 @@ type Dependency struct {
 func (d Dependency) IsZero() bool {
 	return len(d.Children) == 0 && d.ArtifactId == "" && d.GroupId == "" && d.Version == ""
 }
-
+func checkMavenModule(ctx context.Context, dir string) bool {
+	task := model.UseInspectionTask(ctx)
+	mavenModule := task.MavenModuleName()
+	if len(mavenModule) == 0 {
+		return true
+	}
+	for _, j := range mavenModule {
+		if j == filepath.Dir(dir) {
+			return true
+		}
+	}
+	return false
+}
 func (d Dependency) String() string {
 	return fmt.Sprintf("%v: %v", d.Coordinate, d.Children)
 }
@@ -80,6 +92,9 @@ func ScanMavenProject(ctx context.Context, task *model.InspectionTask) ([]model.
 		strategy = model.ScanStrategyBackup
 	}
 	for _, entry := range deps.ListAllEntries() {
+		if !checkMavenModule(ctx, entry.relativePath) {
+			continue
+		}
 		task.AddModule(model.Module{
 			PackageManager: "maven",
 			ModuleName:     entry.coordinate.Name(),