vulnsrc_rhel: minor changes

Code reorganisation
This commit is contained in:
Grégoire Unbekandt 2017-12-22 10:48:22 +01:00 committed by Grégoire Unbekandt
parent ac86a36740
commit 4e4e98f328

View File

@ -201,6 +201,8 @@ func parseRHSA(ovalReader io.Reader) (vulnerabilities []database.VulnerabilityWi
// Init vulnerability // Init vulnerability
vulnerability := database.VulnerabilityWithAffected{ vulnerability := database.VulnerabilityWithAffected{
Vulnerability: database.Vulnerability{ Vulnerability: database.Vulnerability{
Name: rhsaName(definition),
Link: rhsaLink(definition),
Severity: severity(definition), Severity: severity(definition),
Description: description(definition), Description: description(definition),
}, },
@ -211,13 +213,12 @@ func parseRHSA(ovalReader io.Reader) (vulnerabilities []database.VulnerabilityWi
// Only RHSA is present // Only RHSA is present
if len(definition.References) == 1 { if len(definition.References) == 1 {
vulnerability.Name = rhsaName(definition)
vulnerability.Link = definition.References[0].URI vulnerability.Link = definition.References[0].URI
vulnerabilities = append(vulnerabilities, vulnerability) vulnerabilities = append(vulnerabilities, vulnerability)
} else { } else {
for _, reference := range definition.References[1:] { for _, reference := range definition.References[1:] {
vulnerability.Name = name(reference) vulnerability.Name = reference.ID
vulnerability.Link = link(reference) vulnerability.Link = reference.URI
vulnerabilities = append(vulnerabilities, vulnerability) vulnerabilities = append(vulnerabilities, vulnerability)
} }
} }
@ -387,14 +388,13 @@ func severity(def definition) database.Severity {
} }
} }
func name(ref reference) string {
return ref.ID
}
func link(ref reference) string {
return ref.URI
}
func rhsaName(def definition) string { func rhsaName(def definition) string {
return strings.TrimSpace(def.Title[:strings.Index(def.Title, ": ")]) return strings.TrimSpace(def.Title[:strings.Index(def.Title, ": ")])
} }
func rhsaLink(def definition) (link string) {
if len(def.References) > 0 {
link = def.References[0].URI
}
return
}