arno/clair
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

database: ignore min versions during new vulnerability insertions

Browse Source
This commit is contained in:
Quentin Machu 2016-02-04 22:47:01 -05:00 committed by Jimmy Zelinskie
parent cf3573cf67
commit e3a25e5368
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
database/pgsql/vulnerability.go
View File

@ -200,8 +200,8 @@ func (pgSQL *pgSQL) insertVulnerability(vulnerability database.Vulnerability, on
// //
// TODO(Quentin-M): We could use !updateFixedIn to just copy FixedIn/Affects rows from the // TODO(Quentin-M): We could use !updateFixedIn to just copy FixedIn/Affects rows from the
// existing vulnerability in order to make metadata updates much faster. // existing vulnerability in order to make metadata updates much faster.
fixedIn, updateFixedIn := applyFixedInDiff(existingVulnerability.FixedIn, vulnerability.FixedIn) var updateFixedIn bool
vulnerability.FixedIn = fixedIn vulnerability.FixedIn, updateFixedIn = applyFixedInDiff(existingVulnerability.FixedIn, vulnerability.FixedIn)
if !updateMetadata && !updateFixedIn { if !updateMetadata && !updateFixedIn {
tx.Commit() tx.Commit()
@ -214,6 +214,16 @@ func (pgSQL *pgSQL) insertVulnerability(vulnerability database.Vulnerability, on
tx.Rollback() tx.Rollback()
return handleError("r_vulnerability", err) return handleError("r_vulnerability", err)
} }
} else {
// The vulnerability is new, we don't want to have any types.MinVersion as they are only used
// for diffing existing vulnerabilities.
var fixedIn []database.FeatureVersion
for _, fv := range vulnerability.FixedIn {
if fv.Version != types.MinVersion {
fixedIn = append(fixedIn, fv)
}
}
vulnerability.FixedIn = fixedIn
} }
// Find or insert Vulnerability's Namespace. // Find or insert Vulnerability's Namespace.