fix bug with empty type flag #2135

Checkmarx · Feb 25, 2021 · e7eadf8 · e7eadf8
1 parent 12baa85
commit e7eadf8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/internal/console/scan.go b/internal/console/scan.go
@@ -220,7 +220,7 @@ func scan() error {
 		Add(&yamlParser.Parser{}).
 		Add(terraformParser.NewDefault()).
 		Add(&dockerParser.Parser{}).
-		Build(types)
+		Build(querySource.Types)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/engine/query/source.go b/pkg/engine/query/source.go
@@ -15,9 +15,11 @@ import (
 )
 
 // FilesystemSource this type defines a struct with a path to a filesystem source of queries
+// Source is the path to the queries
+// Types are the types given by the flag --type for query selection mechanism
 type FilesystemSource struct {
-	source string
-	types  []string
+	Source string
+	Types  []string
 }
 
 const (
@@ -33,9 +35,12 @@ const (
 
 // NewFilesystemSource initializes a NewFilesystemSource with source to queries and types of queries to load
 func NewFilesystemSource(source string, types []string) *FilesystemSource {
+	if len(types) == 0 {
+		types = []string{""}
+	}
 	return &FilesystemSource{
-		source: filepath.FromSlash(source),
-		types:  types,
+		Source: filepath.FromSlash(source),
+		Types:  types,
 	}
 }
 
@@ -69,7 +74,7 @@ func GetPathToLibrary(platform, relativeBasePath string) string {
 
 // GetGenericQuery returns the library.rego for the platform passed in the argument
 func (s *FilesystemSource) GetGenericQuery(platform string) (string, error) {
-	pathToLib := GetPathToLibrary(platform, s.source)
+	pathToLib := GetPathToLibrary(platform, s.Source)
 
 	content, err := ioutil.ReadFile(filepath.Clean(pathToLib))
 	if err != nil {
@@ -84,8 +89,8 @@ func (s *FilesystemSource) CheckType(queryPlatform interface{}) bool {
 	if queryPlatform.(string) == "Common" {
 		return true
 	}
-	if s.types[0] != "" {
-		return strings.Contains(strings.ToUpper(strings.Join(s.types, ",")), strings.ToUpper(queryPlatform.(string)))
+	if s.Types[0] != "" {
+		return strings.Contains(strings.ToUpper(strings.Join(s.Types, ",")), strings.ToUpper(queryPlatform.(string)))
 	}
 	return true
 }
@@ -94,7 +99,7 @@ func (s *FilesystemSource) CheckType(queryPlatform interface{}) bool {
 // QueryMetadata struct
 func (s *FilesystemSource) GetQueries() ([]model.QueryMetadata, error) {
 	queryDirs := make([]string, 0)
-	err := filepath.Walk(s.source,
+	err := filepath.Walk(s.Source,
 		func(p string, f os.FileInfo, err error) error {
 			if err != nil {
 				return err