diff --git a/README.md b/README.md index fb738303..6912dcb7 100644 --- a/README.md +++ b/README.md @@ -342,7 +342,7 @@ CVE-2016-5636 10.0 (High) Integer overflow in the get_data functio View full report. ``` -$ vuls report -format-full-text +$ vuls report -format-full-text | less localhost (amazon 2015.09) ============================ diff --git a/models/models.go b/models/models.go index fe4211d2..277cea56 100644 --- a/models/models.go +++ b/models/models.go @@ -568,8 +568,8 @@ type Changelog struct { Method string } -// ToStringCurrentVersion returns package name-version-release -func (p PackageInfo) ToStringCurrentVersion() string { +// FormatCurrentVer returns package name-version-release +func (p PackageInfo) FormatCurrentVer() string { str := p.Name if 0 < len(p.Version) { str = fmt.Sprintf("%s-%s", str, p.Version) @@ -580,8 +580,8 @@ func (p PackageInfo) ToStringCurrentVersion() string { return str } -// ToStringNewVersion returns package name-version-release -func (p PackageInfo) ToStringNewVersion() string { +// FormatNewVer returns package name-version-release +func (p PackageInfo) FormatNewVer() string { str := p.Name if 0 < len(p.NewVersion) { str = fmt.Sprintf("%s-%s", str, p.NewVersion) diff --git a/report/slack.go b/report/slack.go index 434bc06b..fd9b5bf1 100644 --- a/report/slack.go +++ b/report/slack.go @@ -170,7 +170,7 @@ func toSlackAttachments(scanResult models.ScanResult) (attaches []*attachment) { curentPackages := []string{} for _, p := range cveInfo.Packages { - curentPackages = append(curentPackages, p.ToStringCurrentVersion()) + curentPackages = append(curentPackages, p.FormatCurrentVer()) } for _, n := range cveInfo.CpeNames { curentPackages = append(curentPackages, n) @@ -178,7 +178,7 @@ func toSlackAttachments(scanResult models.ScanResult) (attaches []*attachment) { newPackages := []string{} for _, p := range cveInfo.Packages { - newPackages = append(newPackages, p.ToStringNewVersion()) + newPackages = append(newPackages, p.FormatNewVer()) } a := attachment{ diff --git a/report/tui.go b/report/tui.go index 1ee1de60..564c6154 100644 --- a/report/tui.go +++ b/report/tui.go @@ -799,8 +799,8 @@ func detailLines() (string, error) { packages = append(packages, fmt.Sprintf( "%s -> %s", - pack.ToStringCurrentVersion(), - pack.ToStringNewVersion())) + pack.FormatCurrentVer(), + pack.FormatNewVer())) } data := dataForTmpl{ diff --git a/report/util.go b/report/util.go index adf85f27..51ac589a 100644 --- a/report/util.go +++ b/report/util.go @@ -118,7 +118,7 @@ No CVE-IDs are found in updatable packages. var packsVer string for _, p := range d.Packages { packsVer += fmt.Sprintf( - "%s -> %s\n", p.ToStringCurrentVersion(), p.ToStringNewVersion()) + "%s -> %s\n", p.FormatCurrentVer(), p.FormatNewVer()) } for _, n := range d.CpeNames { packsVer += n @@ -460,7 +460,7 @@ func addPackageInfos(table *uitable.Table, packs []models.PackageInfo) *uitable. title = "Package" } ver := fmt.Sprintf( - "%s -> %s", p.ToStringCurrentVersion(), p.ToStringNewVersion()) + "%s -> %s", p.FormatCurrentVer(), p.FormatNewVer()) table.AddRow(title, ver) } return table @@ -501,7 +501,7 @@ func formatOneChangelog(p models.PackageInfo) string { } packVer := fmt.Sprintf("%s -> %s", - p.ToStringCurrentVersion(), p.ToStringNewVersion()) + p.FormatCurrentVer(), p.FormatNewVer()) var delim bytes.Buffer for i := 0; i < len(packVer); i++ { delim.WriteString("-")