Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cxone dev michael #38

Merged
merged 2 commits into from
Dec 11, 2023
Merged

Cxone dev michael #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11a83db
project-in-application api change prep
michaelkubiaczyk Dec 11, 2023
34c23b4
Fixing SARIF report without preset access
michaelkubiaczyk Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkg/checkmarxone/checkmarxone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,6 +841,16 @@ func (sys *SystemInstance) CreateProjectInApplication(projectName, applicationID
header.Set("Content-Type", "application/json")

data, err := sendRequest(sys, http.MethodPost, fmt.Sprintf("/projects/application/%v", applicationID), bytes.NewBuffer(jsonValue), header, []int{})

if err != nil && err.Error()[0:8] == "HTTP 404" { // At some point, the api /projects/applications will be removed and instead the normal /projects API will do the job.
jsonData["applicationIds"] = []string{applicationID}
jsonValue, err = json.Marshal(data)
if err != nil {
return project, err
}
data, err = sendRequest(sys, http.MethodPost, "/projects", bytes.NewReader(jsonValue), header, []int{})
}

if err != nil {
return project, errors.Wrapf(err, "failed to create project %v under %v", projectName, applicationID)
}
Expand Down
35 changes: 17 additions & 18 deletions pkg/checkmarxone/cxjson_to_sarif.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"github.com/SAP/jenkins-library/pkg/format"
"github.com/SAP/jenkins-library/pkg/log"
"github.com/SAP/jenkins-library/pkg/piperutils"
"github.com/pkg/errors"
)

// ConvertCxJSONToSarif is the entrypoint for the Parse function
Expand All @@ -24,14 +23,14 @@ func ConvertCxJSONToSarif(sys System, serverURL string, scanResults *[]ScanResul
sarif.Runs = append(sarif.Runs, checkmarxRun)
rulesArray := []format.SarifRule{}

queries, err := sys.GetQueries()
/*queries, err := sys.GetQueries()
if err != nil {
return sarif, errors.Wrap(err, "Failed to retrieve list of queries")
}
}*/

baseURL := "https://" + serverURL + "/results/" + scanMeta.ScanID + "/" + scanMeta.ProjectID

cweIdsForTaxonomies := make(map[int64]int) //use a map to avoid duplicates
cweIdsForTaxonomies := make(map[int]int) //use a map to avoid duplicates
cweCounter := 0
//maxretries := 5

Expand All @@ -41,15 +40,15 @@ func ConvertCxJSONToSarif(sys System, serverURL string, scanResults *[]ScanResul
log.Entry().Debug("[SARIF] Now handling results.")

for _, r := range *scanResults {
query := getQuery(queries, r.Data.QueryID)
/*query := getQuery(queries, r.Data.QueryID)
if query == nil {
return sarif, errors.New(fmt.Sprintf("Unknown queryid in results: %d", r.Data.QueryID))
}
}*/

_, haskey := cweIdsForTaxonomies[query.CweID]
_, haskey := cweIdsForTaxonomies[r.VulnerabilityDetails.CweId]

if !haskey {
cweIdsForTaxonomies[query.CweID] = cweCounter
cweIdsForTaxonomies[r.VulnerabilityDetails.CweId] = cweCounter
cweCounter++
}

Expand All @@ -59,14 +58,14 @@ func ConvertCxJSONToSarif(sys System, serverURL string, scanResults *[]ScanResul
result := *new(format.Results)

//General
result.RuleID = fmt.Sprintf("checkmarxOne-%v/%d", query.Language, query.QueryID)
result.RuleIndex = cweIdsForTaxonomies[query.CweID]
result.RuleID = fmt.Sprintf("checkmarxOne-%v/%d", r.Data.LanguageName, r.Data.QueryID)
result.RuleIndex = cweIdsForTaxonomies[r.VulnerabilityDetails.CweId]
result.Level = "none"
msg := new(format.Message)
if apiDescription != "" {
msg.Text = apiDescription
} else {
msg.Text = query.Name
msg.Text = r.Data.QueryName
}
result.Message = msg

Expand Down Expand Up @@ -199,18 +198,18 @@ func ConvertCxJSONToSarif(sys System, serverURL string, scanResults *[]ScanResul
//handle the rules array
rule := *new(format.SarifRule)

rule.ID = fmt.Sprintf("checkmarxOne-%v/%d", query.Language, query.QueryID)
words := strings.Split(query.Name, "_")
rule.ID = fmt.Sprintf("checkmarxOne-%v/%d", r.Data.LanguageName, r.Data.QueryID)
words := strings.Split(r.Data.QueryName, "_")
for w := 0; w < len(words); w++ {
words[w] = piperutils.Title(strings.ToLower(words[w]))
}
rule.Name = strings.Join(words, "")

rule.HelpURI = fmt.Sprintf("%v/sast/description/%v/%v", baseURL, query.QueryDescriptionID, query.QueryID)
rule.HelpURI = fmt.Sprintf("%v/sast/description/%v/%v", baseURL, r.VulnerabilityDetails.CweId, r.Data.QueryID)
rule.Help = new(format.Help)
rule.Help.Text = rule.HelpURI
rule.ShortDescription = new(format.Message)
rule.ShortDescription.Text = query.Name
rule.ShortDescription.Text = r.Data.QueryName
rule.Properties = new(format.SarifRuleProperties)

if len(r.VulnerabilityDetails.Compliances) > 0 {
Expand All @@ -221,7 +220,7 @@ func ConvertCxJSONToSarif(sys System, serverURL string, scanResults *[]ScanResul
rule.Properties.Tags = append(rule.Properties.Tags, r.VulnerabilityDetails.Compliances[cat])
}
}
switch query.Severity {
switch r.Severity {
case "INFORMATION":
rule.Properties.SecuritySeverity = "0.0"
case "LOW":
Expand All @@ -234,8 +233,8 @@ func ConvertCxJSONToSarif(sys System, serverURL string, scanResults *[]ScanResul
rule.Properties.SecuritySeverity = "10.0"
}

if query.CweID != 0 {
rule.Properties.Tags = append(rule.Properties.Tags, fmt.Sprintf("external/cwe/cwe-%d", query.CweID))
if r.VulnerabilityDetails.CweId != 0 {
rule.Properties.Tags = append(rule.Properties.Tags, fmt.Sprintf("external/cwe/cwe-%d", r.VulnerabilityDetails.CweId))
}
rulesArray = append(rulesArray, rule)
}
Expand Down