Fix/query id type (#281)

* revert queryId to generic interface

Author: diogopcx

.goreleaser.yml

@@ -57,6 +57,4 @@ brews:
     test: |
       system "#{bin}/cx version"
     install: |-
-      pkgshare.mkpath
-      cp_r "assets", pkgshare
       bin.install "cx"

internal/commands/result.go

@@ -350,7 +350,7 @@ func parseResults(results *wrappers.ScanResultsCollection) ([]wrappers.SarifDriv
 func findRule(ruleIds map[interface{}]bool, result *wrappers.ScanResult) *wrappers.SarifDriverRule {
 	var sarifRule wrappers.SarifDriverRule
 
-	if result.ScanResultData.QueryID == 0 {
+	if result.ScanResultData.QueryID == nil {
 		sarifRule.ID = result.ID
 	} else {
 		sarifRule.ID = getRuleID(result.ScanResultData.QueryID)

internal/commands/scan.go

@@ -318,7 +318,7 @@ func findProject(projectName string) (string, error) {
 	projectsWrapper := wrappers.NewHTTPProjectsWrapper(projects)
 	resp, _, err := projectsWrapper.Get(params)
 	if err != nil {
-		return "", errors.Wrapf(err, "%s\n", failedGettingAll)
+		return "", err
 	}
 	if resp.FilteredTotalCount > 0 {
 		for i := 0; i < len(resp.Projects); i++ {
@@ -329,7 +329,7 @@ func findProject(projectName string) (string, error) {
 	} else {
 		projectID, err = createProject(projectName)
 		if err != nil {
-			return "", errors.Wrapf(err, "%s", failedCreatingProj)
+			return "", err
 		}
 	}
 	return projectID, nil

internal/commands/util/configuration.go

@@ -18,14 +18,17 @@ const (
 )
 
 var properties = map[string]bool{
-	params.AstAPIKey:                true,
 	params.BaseURIKey:               true,
 	params.BaseAuthURIKey:           true,
 	params.TenantKey:                true,
-	params.ProxyTypeKey:             true,
 	params.ProxyKey:                 true,
-	params.AccessKeySecretConfigKey: true,
+	params.ProxyTypeKey:             true,
 	params.AccessKeyIDConfigKey:     true,
+	params.AccessKeySecretConfigKey: true,
+	params.AstAPIKey:                true,
+	params.BranchKey:                true,
+	params.ScaToolKey:               true,
+	params.ClientTimeoutKey:         true,
 }
 
 func NewConfigCommand() *cobra.Command {

internal/commands/util/env.go

@@ -5,21 +5,26 @@ import (
 	"os"
 
 	"github.com/MakeNowJust/heredoc"
-
 	"github.com/spf13/cobra"
 )
 
+const formatString = "%30v: %s\n"
+
 func NewEnvCheckCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "env",
 		Short: "Shows the current profiles configuration properties",
-		Example: heredoc.Doc(`
+		Example: heredoc.Doc(
+			`
 			$ cx utils env
-		`),
+		`,
+		),
 		Annotations: map[string]string{
-			"command:doc": heredoc.Doc(`
+			"command:doc": heredoc.Doc(
+				`
 				https://checkmarx.atlassian.net/wiki/x/VJGXtw
-			`),
+			`,
+			),
 		},
 		RunE: runEnvChecks(),
 	}
@@ -29,24 +34,9 @@ func NewEnvCheckCommand() *cobra.Command {
 func runEnvChecks() func(cmd *cobra.Command, args []string) error {
 	return func(cmd *cobra.Command, args []string) error {
 		fmt.Printf("\nDetected Environment Variables:\n\n")
-		fmt.Printf("%30v", "CX_BASE_URI: ")
-		fmt.Println(os.Getenv("CX_BASE_URI"))
-		fmt.Printf("%30v", "CX_BASE_AUTH_URI: ")
-		fmt.Println(os.Getenv("CX_BASE_AUTH_URI"))
-		fmt.Printf("%30v", "CX_TENANT: ")
-		fmt.Println(os.Getenv("CX_TENANT"))
-		fmt.Printf("%30v", "HTTP_PROXY: ")
-		fmt.Println(os.Getenv("HTTP_PROXY"))
-		fmt.Printf("%30v", "HTTP_PROXY_TYPE: ")
-		fmt.Println(os.Getenv("CX_PROXY_AUTH_TYPE"))
-		fmt.Printf("%30v", "CX_CLIENT_ID: ")
-		fmt.Println(os.Getenv("CX_CLIENT_ID"))
-		fmt.Printf("%30v", "CX_CLIENT_SECRET: ")
-		fmt.Println(os.Getenv("CX_CLIENT_SECRET"))
-		fmt.Printf("%30v", "CX_APIKEY: ")
-		fmt.Println(os.Getenv("CX_APIKEY"))
-		fmt.Printf("%30v", "CX_BRANCH: ")
-		fmt.Println(os.Getenv("CX_BRANCH"))
+		for param := range properties {
+			fmt.Printf(formatString, param, os.Getenv(param))
+		}
 		return nil
 	}
 }

internal/params/filters.go

@@ -120,4 +120,5 @@ var BaseFilters = []string{
 	"requirements.txt",
 	"requirement.txt",
 	"composer.lock",
+	"Dockerfile",
 }

internal/wrappers/results-json.go

@@ -70,7 +70,7 @@ type ScanResultPackageData struct {
 }
 
 type ScanResultData struct {
-	QueryID      uint64                   `json:"queryId,omitempty"`
+	QueryID      interface{}              `json:"queryId,omitempty"`
 	QueryName    string                   `json:"queryName,omitempty"`
 	Group        string                   `json:"group,omitempty"`
 	ResultHash   string                   `json:"resultHash,omitempty"`

test/integration/data/Dockerfile

@@ -0,0 +1,16 @@
+# Example: docker build . -t dsvw && docker run -p 65412:65412 dsvw
+
+FROM alpine:3.11
+
+RUN apk --no-cache add git python3 py-lxml \
+    && rm -rf /var/cache/apk/*
+
+WORKDIR /
+RUN git clone https://github.com/stamparm/DSVW
+
+WORKDIR /DSVW
+RUN sed -i 's/127.0.0.1/0.0.0.0/g' dsvw.py
+
+EXPOSE 65412
+
+CMD ["python3", "dsvw.py"]