Merge remote-tracking branch 'origin/golang-binary'

# Conflicts: # deepfence_frontend/apps/dashboard/src/components/scan-configure-forms/VulnerabilityScanConfigureForm.tsx
deepfence · Sep 7, 2023 · e7a4f20 · e7a4f20
2 parents 0630a61 + 2735423
commit e7a4f20
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/deepfence_agent/plugins/package-scanner b/deepfence_agent/plugins/package-scanner
diff --git a/deepfence_ctl/cmd/scan.go b/deepfence_ctl/cmd/scan.go
@@ -455,7 +455,7 @@ func init() {
 
 	scanStartSubCmd.PersistentFlags().String("node-ids", "", "Node id")
 	scanStartSubCmd.PersistentFlags().String("node-type", "", "Resource type (host, container, image)")
-	scanStartSubCmd.PersistentFlags().String("scan-config", "all", "vulnerability scan type (all,base,ruby,python,javascript,php,golang,java,rust,dotnet)")
+	scanStartSubCmd.PersistentFlags().String("scan-config", "all", "vulnerability scan type (all,base,ruby,python,javascript,php,golang,golang-binary,java,rust,rust-binary,dotnet)")
 
 	scanStatusSubCmd.PersistentFlags().String("scan-id", "", "Scan id")
 

diff --git a/deepfence_server/handler/scan_reports.go b/deepfence_server/handler/scan_reports.go
@@ -221,10 +221,21 @@ func (h *Handler) StartVulnerabilityScanHandler(w http.ResponseWriter, r *http.R
 		return
 	}
 
+	err = h.Validator.Struct(reqs)
+	if err != nil {
+		h.respondError(&ValidatorError{err: err}, w)
+		return
+	}
+
 	binArgs := make(map[string]string, 0)
 	if len(reqs.ScanConfigLanguages) != 0 {
 		languages := []string{}
 		for i := range reqs.ScanConfigLanguages {
+			err = h.Validator.Struct(reqs.ScanConfigLanguages[i])
+			if err != nil {
+				h.respondError(&ValidatorError{err: err}, w)
+				return
+			}
 			languages = append(languages, reqs.ScanConfigLanguages[i].Language)
 		}
 		binArgs["scan_type"] = strings.Join(languages, ",")

diff --git a/deepfence_server/model/scans.go b/deepfence_server/model/scans.go
@@ -6,11 +6,11 @@ import (
 )
 
 type VulnerabilityScanConfigLanguage struct {
-	Language string `json:"language" required:"true" enum:"all,base,ruby,python,javascript,php,golang,java,rust,dotnet"`
+	Language string `json:"language" validate:"required,oneof=base ruby python javascript php golang golang-binary java rust rust-binary dotnet" required:"true" enum:"base,ruby,python,javascript,php,golang,golang-binary,java,rust,rust-binary,dotnet"`
 }
 
 type VulnerabilityScanConfig struct {
-	ScanConfigLanguages []VulnerabilityScanConfigLanguage `json:"scan_config" required:"true"`
+	ScanConfigLanguages []VulnerabilityScanConfigLanguage `json:"scan_config" validate:"required,min=1" required:"true"`
 }
 
 type VulnerabilityScanTriggerReq struct {
+1 −1		main.go
+17 −20		sbom/syft/syft.go
+14 −11		scanner/grype/grype.go
+14 −0		utils/type.go