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

Fix diff logic (#619)

Browse Source 
* fix: change ControlPath to .vuls of SSH option (#618)

* fix: Bug of diff logic
This commit is contained in:
Kota Kanbe
2018-03-16 15:07:26 +09:00
committed by GitHub
parent d3c421a4a8
commit fd1429fef0
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
report/util.go
View File

@@ -344,11 +344,14 @@ func getDiffCves(previous, current models.ScanResult) models.VulnInfos {
updated := models.VulnInfos{}
for _, v := range current.ScannedCves {
if previousCveIDsSet[v.CveID] {
if isCveInfoUpdated(v.CveID, previous, current) || isCveFixed(v, previous) {
if isCveInfoUpdated(v.CveID, previous, current) {
updated[v.CveID] = v
util.Log.Debugf("updated or new release: %s", v.CveID)
util.Log.Debugf("updated: %s", v.CveID)
} else if isCveFixed(v, previous) {
updated[v.CveID] = v
util.Log.Debugf("fixed: %s", v.CveID)
} else {
util.Log.Debugf("same and not new Release: %s", v.CveID)
util.Log.Debugf("same: %s", v.CveID)
}
} else {
util.Log.Debugf("new: %s", v.CveID)
@@ -406,7 +409,14 @@ func isCveInfoUpdated(cveID string, previous, current models.ScanResult) bool {
}
}
return !reflect.DeepEqual(curLastModified, prevLastModified)
for _, t := range cTypes {
if !curLastModified[t].Equal(prevLastModified[t]) {
util.Log.Debugf("%s LastModified not equal: \n%s\n%s",
cveID, curLastModified[t], prevLastModified[t])
return true
}
}
return false
}
// jsonDirPattern is file name pattern of JSON directory

4
report/util_test.go
View File

@@ -77,7 +77,7 @@ func TestIsCveInfoUpdated(t *testing.T) {
CveID: "CVE-2017-0002",
CveContents: models.NewCveContents(
models.CveContent{
Type: models.NVD,
Type: models.JVN,
CveID: "CVE-2017-0002",
LastModified: old,
},
@@ -91,7 +91,7 @@ func TestIsCveInfoUpdated(t *testing.T) {
CveID: "CVE-2017-0002",
CveContents: models.NewCveContents(
models.CveContent{
Type: models.NVD,
Type: models.JVN,
CveID: "CVE-2017-0002",
LastModified: old,
},