From 50506be5461e5382f2a68e7cb51ab5ecccf46f13 Mon Sep 17 00:00:00 2001 From: Kota Kanbe Date: Thu, 4 Oct 2018 16:01:55 +0900 Subject: [PATCH] [WIP] feat(report): show repository of affected pkgs (#713) feat(report): show repository of affected pkgs --- report/tui.go | 14 +++++++++++--- report/util.go | 14 ++++++++++++-- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/report/tui.go b/report/tui.go index d49cdad6..48fe9857 100644 --- a/report/tui.go +++ b/report/tui.go @@ -709,9 +709,17 @@ func setChangelogLayout(g *gocui.Gui) error { for _, affected := range vinfo.AffectedPackages { // packages detected by OVAL may not be actually installed if pack, ok := currentScanResult.Packages[affected.Name]; ok { - lines = append(lines, - "* "+pack.FormatVersionFromTo( - affected.NotFixedYet, affected.FixState)) + var line string + if pack.Repository != "" { + line = fmt.Sprintf("* %s (%s)", + pack.FormatVersionFromTo(affected.NotFixedYet, affected.FixState), + pack.Repository) + } else { + line = fmt.Sprintf("* %s", + pack.FormatVersionFromTo(affected.NotFixedYet, affected.FixState), + ) + } + lines = append(lines, line) if len(pack.AffectedProcs) != 0 { for _, p := range pack.AffectedProcs { diff --git a/report/util.go b/report/util.go index 2e31544e..5d9e7af5 100644 --- a/report/util.go +++ b/report/util.go @@ -203,8 +203,18 @@ No CVE-IDs are found in updatable packages. vuln.AffectedPackages.Sort() for _, affected := range vuln.AffectedPackages { if pack, ok := r.Packages[affected.Name]; ok { - data = append(data, []string{"Affected PKG", - pack.FormatVersionFromTo(affected.NotFixedYet, affected.FixState)}) + var line string + if pack.Repository != "" { + line = fmt.Sprintf("%s (%s)", + pack.FormatVersionFromTo(affected.NotFixedYet, affected.FixState), + pack.Repository) + } else { + line = fmt.Sprintf("%s", + pack.FormatVersionFromTo(affected.NotFixedYet, affected.FixState), + ) + } + data = append(data, []string{"Affected Pkg", line}) + if len(pack.AffectedProcs) != 0 { for _, p := range pack.AffectedProcs { data = append(data, []string{"",