Show Not Fixed Yet in report, tui
This commit is contained in:
@@ -60,15 +60,6 @@ func (ps Packages) Merge(other Packages) Packages {
|
||||
return merged
|
||||
}
|
||||
|
||||
// FormatVersionsFromTo returns updatable packages
|
||||
func (ps Packages) FormatVersionsFromTo() string {
|
||||
ss := []string{}
|
||||
for _, pack := range ps {
|
||||
ss = append(ss, pack.FormatVersionFromTo())
|
||||
}
|
||||
return strings.Join(ss, "\n")
|
||||
}
|
||||
|
||||
// FormatUpdatablePacksSummary returns a summary of updatable packages
|
||||
func (ps Packages) FormatUpdatablePacksSummary() string {
|
||||
nUpdatable := 0
|
||||
@@ -121,9 +112,12 @@ func (p Package) FormatNewVer() string {
|
||||
}
|
||||
|
||||
// FormatVersionFromTo formats installed and new package version
|
||||
func (p Package) FormatVersionFromTo() string {
|
||||
return fmt.Sprintf("%s-%s - %s",
|
||||
p.Name, p.FormatVer(), p.FormatNewVer())
|
||||
func (p Package) FormatVersionFromTo(notFixedYet bool) string {
|
||||
to := p.FormatNewVer()
|
||||
if notFixedYet {
|
||||
to = "Not Fixed Yet"
|
||||
}
|
||||
return fmt.Sprintf("%s-%s - %s", p.Name, p.FormatVer(), to)
|
||||
}
|
||||
|
||||
// FormatChangelog formats the changelog
|
||||
|
||||
@@ -189,7 +189,11 @@ func toSlackAttachments(r models.ScanResult) (attaches []*attachment) {
|
||||
new := []string{}
|
||||
for _, affected := range vinfo.AffectedPackages {
|
||||
if p, ok := r.Packages[affected.Name]; ok {
|
||||
new = append(new, p.FormatNewVer())
|
||||
if affected.NotFixedYet {
|
||||
new = append(new, "Not Fixed Yet")
|
||||
} else {
|
||||
new = append(new, p.FormatNewVer())
|
||||
}
|
||||
} else {
|
||||
new = append(new, "?")
|
||||
}
|
||||
|
||||
@@ -767,7 +767,7 @@ func detailLines() (string, error) {
|
||||
for _, affected := range vinfo.AffectedPackages {
|
||||
// packages detected by OVAL may not be actually installed
|
||||
if pack, ok := r.Packages[affected.Name]; ok {
|
||||
packsVer = append(packsVer, pack.FormatVersionFromTo())
|
||||
packsVer = append(packsVer, pack.FormatVersionFromTo(affected.NotFixedYet))
|
||||
}
|
||||
}
|
||||
sort.Strings(vinfo.CpeNames)
|
||||
|
||||
@@ -219,7 +219,7 @@ No CVE-IDs are found in updatable packages.
|
||||
vuln.AffectedPackages.Sort()
|
||||
for _, affected := range vuln.AffectedPackages {
|
||||
if pack, ok := r.Packages[affected.Name]; ok {
|
||||
packsVer = append(packsVer, pack.FormatVersionFromTo())
|
||||
packsVer = append(packsVer, pack.FormatVersionFromTo(affected.NotFixedYet))
|
||||
}
|
||||
}
|
||||
sort.Strings(vuln.CpeNames)
|
||||
|
||||
Reference in New Issue
Block a user