fix(report): remove duplicated refreshing logic when report with -diff (#1160)
This commit is contained in:
@@ -127,16 +127,10 @@ func FillCveInfos(dbclient DBClient, rs []models.ScanResult, dir string) ([]mode
|
||||
return nil, err
|
||||
}
|
||||
|
||||
diff, err := diff(rs, prevs)
|
||||
rs, err = diff(rs, prevs)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for i, r := range diff {
|
||||
if err := fillCvesWithNvdJvn(dbclient.CveDB, &r); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
rs[i] = r
|
||||
}
|
||||
}
|
||||
|
||||
for i, r := range rs {
|
||||
|
||||
@@ -504,7 +504,7 @@ func loadPrevious(currs models.ScanResults) (prevs models.ScanResults, err error
|
||||
path := filepath.Join(dir, filename)
|
||||
r, err := loadOneServerScanResult(path)
|
||||
if err != nil {
|
||||
util.Log.Errorf("%+v", err)
|
||||
util.Log.Debugf("%+v", err)
|
||||
continue
|
||||
}
|
||||
if r.Family == result.Family && r.Release == result.Release {
|
||||
|
||||
@@ -96,7 +96,7 @@ func (p *ReportCmd) SetFlags(f *flag.FlagSet) {
|
||||
"-cvss-over=6.5 means reporting CVSS Score 6.5 and over (default: 0 (means report all))")
|
||||
|
||||
f.BoolVar(&c.Conf.Diff, "diff", false,
|
||||
"Difference between previous result and current result ")
|
||||
"Difference between previous result and current result")
|
||||
|
||||
f.BoolVar(&c.Conf.IgnoreUnscoredCves, "ignore-unscored-cves", false,
|
||||
"Don't report the unscored CVEs")
|
||||
|
||||
Reference in New Issue
Block a user