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

Merge pull request #327 from jzelinskie/bad-ns-copy

Browse Source 
Fix areas only copying namespace names
This commit is contained in:
Jimmy Zelinskie 2017-02-23 02:12:00 -05:00 committed by GitHub
commit 8bc9183db3
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
database/pgsql/vulnerability.go
View File

@ -241,7 +241,7 @@ func (pgSQL *pgSQL) insertVulnerability(vulnerability database.Vulnerability, on
if fifv.Feature.Namespace.Name == "" { if fifv.Feature.Namespace.Name == "" {
// As there is no Namespace on that FixedIn FeatureVersion, set it to the Vulnerability's // As there is no Namespace on that FixedIn FeatureVersion, set it to the Vulnerability's
// Namespace. // Namespace.
fifv.Feature.Namespace.Name = vulnerability.Namespace.Name fifv.Feature.Namespace = vulnerability.Namespace
} else if fifv.Feature.Namespace.Name != vulnerability.Namespace.Name { } else if fifv.Feature.Namespace.Name != vulnerability.Namespace.Name {
msg := "could not insert an invalid vulnerability that contains FixedIn FeatureVersion that are not in the same namespace as the Vulnerability" msg := "could not insert an invalid vulnerability that contains FixedIn FeatureVersion that are not in the same namespace as the Vulnerability"
log.Warning(msg) log.Warning(msg)

14
updater.go
View File

@ -333,12 +333,14 @@ func (lv *lockableVulnerability) appendFunc(metadataKey string, metadata interfa
} }
} }
// doVulnerabilitiesNamespacing takes Vulnerabilities that don't have a Namespace and split them // doVulnerabilitiesNamespacing takes Vulnerabilities that don't have a
// into multiple vulnerabilities that have a Namespace and only contains the FixedIn // Namespace and split them into multiple vulnerabilities that have a Namespace
// FeatureVersions corresponding to their Namespace. // and only contains the FixedIn FeatureVersions corresponding to their
// Namespace.
// //
// It helps simplifying the fetchers that share the same metadata about a Vulnerability regardless // It helps simplifying the fetchers that share the same metadata about a
// of their actual namespace (ie. same vulnerability information for every version of a distro). // Vulnerability regardless of their actual namespace (ie. same vulnerability
// information for every version of a distro).
func doVulnerabilitiesNamespacing(vulnerabilities []database.Vulnerability) []database.Vulnerability { func doVulnerabilitiesNamespacing(vulnerabilities []database.Vulnerability) []database.Vulnerability {
vulnerabilitiesMap := make(map[string]*database.Vulnerability) vulnerabilitiesMap := make(map[string]*database.Vulnerability)
@ -351,7 +353,7 @@ func doVulnerabilitiesNamespacing(vulnerabilities []database.Vulnerability) []da
if vulnerability, ok := vulnerabilitiesMap[index]; !ok { if vulnerability, ok := vulnerabilitiesMap[index]; !ok {
newVulnerability := v newVulnerability := v
newVulnerability.Namespace.Name = fv.Feature.Namespace.Name newVulnerability.Namespace = fv.Feature.Namespace
newVulnerability.FixedIn = []database.FeatureVersion{fv} newVulnerability.FixedIn = []database.FeatureVersion{fv}
vulnerabilitiesMap[index] = &newVulnerability vulnerabilitiesMap[index] = &newVulnerability