Stage/vuls
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Kota Kanbe
2017-05-01 19:25:25 +09:00
committed by kota kanbe
parent aafbdcd34d
commit 342a1c6cff
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -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)
============================

8
models/models.go
View File

@@ -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)

4
report/slack.go
View File

@@ -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{

4
report/tui.go
View File

@@ -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{

6
report/util.go
View File

@@ -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("-")