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

Jump to bottom

Dont show remediation if not exists #486

Merged
merged 6 commits into from
Sep 12, 2023
Merged

Dont show remediation if not exists #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e792775
don't show Remediation if not exists
attiasas Sep 12, 2023
05dd693
merge dev
attiasas Sep 12, 2023
6793215
rename
attiasas Sep 12, 2023
e94055e
review changes
attiasas Sep 12, 2023
c2f0c66
review changes
attiasas Sep 12, 2023
bc66f8b
review changes
attiasas Sep 12, 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
4 changes: 2 additions & 2 deletions utils/outputwriter/outputwriter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ func MarkAsCodeSnippet(snippet string) string {

func GetJasMarkdownDescription(severity, finding string) string {
headerRow := "| Severity | Finding |\n"
separatorRow := "| :---: | :---: |\n"
separatorRow := "| :--------------: | :---: |\n"
return headerRow + separatorRow + fmt.Sprintf("| %s | %s |", severity, finding)
}

Expand All @@ -224,7 +224,7 @@ Found issue with the following snippet
at %s (line %d)
`,
MarkAsCodeSnippet(location.Snippet),
location.File,
MarkAsQuote(location.File),
location.StartLine)
}

Expand Down
29 changes: 18 additions & 11 deletions utils/outputwriter/simplifiedoutput.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,9 @@ func (smo *SimplifiedOutput) VulnerabilitiesContent(vulnerabilities []formats.Vu
}

func (smo *SimplifiedOutput) ApplicableCveReviewContent(severity, finding, fullDetails, cveDetails, remediation string) string {
return fmt.Sprintf(`
### 📦🔍 Applicable dependency CVE Vulnerability
var contentBuilder strings.Builder
contentBuilder.WriteString(fmt.Sprintf(`
### 📦🔍 Contextual Analysis CVE Vulnerability

%s

Expand All @@ -124,15 +125,21 @@ func (smo *SimplifiedOutput) ApplicableCveReviewContent(severity, finding, fullD

%s

#### Remediation

%s

`,
GetJasMarkdownDescription(smo.FormattedSeverity(severity, "Applicable", false), finding),
fullDetails,
cveDetails,
remediation)
cveDetails))

if len(remediation) > 0 {
contentBuilder.WriteString(fmt.Sprintf(`
#### Remediation

%s

`,
remediation))
}
return contentBuilder.String()
}

func (smo *SimplifiedOutput) IacReviewContent(severity, finding, fullDetails string) string {
Expand Down Expand Up @@ -177,11 +184,11 @@ func (smo *SimplifiedOutput) SastReviewContent(severity, finding, fullDetails st
---
Vulnerable data flow analysis result:
`)
for i, location := range flow {
for _, location := range flow {
contentBuilder.WriteString(fmt.Sprintf(`
%d. %s (at %s line %d)
%s %s (at %s line %d)
`,
i+1,
"↘️",
MarkAsQuote(location.Snippet),
location.File,
location.StartLine,
Expand Down
19 changes: 12 additions & 7 deletions utils/outputwriter/standardoutput.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,11 @@ func (so *StandardOutput) VulnerabilitiesContent(vulnerabilities []formats.Vulne
}

func (so *StandardOutput) ApplicableCveReviewContent(severity, finding, fullDetails, cveDetails, remediation string) string {
return fmt.Sprintf(`
var contentBuilder strings.Builder
contentBuilder.WriteString(fmt.Sprintf(`
<div align="center">

### 📦🔍 Applicable dependency CVE Vulnerability
### 📦🔍 Contextual Analysis CVE Vulnerability

%s

Expand All @@ -150,6 +151,12 @@ func (so *StandardOutput) ApplicableCveReviewContent(severity, finding, fullDeta

</details>

`,
GetJasMarkdownDescription(so.FormattedSeverity(severity, "Applicable", false), finding),
fullDetails,
cveDetails))

contentBuilder.WriteString(fmt.Sprintf(`
<details>
<summary> <b>Remediation</b> </summary>
<br>
Expand All @@ -159,10 +166,8 @@ func (so *StandardOutput) ApplicableCveReviewContent(severity, finding, fullDeta
</details>

`,
GetJasMarkdownDescription(so.FormattedSeverity(severity, "Applicable", false), finding),
fullDetails,
cveDetails,
remediation)
remediation))
return contentBuilder.String()
}

func (so *StandardOutput) IacReviewContent(severity, finding, fullDetails string) string {
Expand Down Expand Up @@ -228,7 +233,7 @@ func (so *StandardOutput) SastReviewContent(severity, finding, fullDetails strin
`)
for _, location := range flow {
contentBuilder.WriteString(fmt.Sprintf(`
%s. %s (at %s line %d)
%s %s (at %s line %d)
`,
"↘️",
MarkAsQuote(location.Snippet),
Expand Down
Loading