From 8bd835d1bc85930a285b1478800e44320f07336c Mon Sep 17 00:00:00 2001 From: Sebastien Delafond Date: Tue, 19 Jul 2016 09:53:37 +0000 Subject: Proper key names: actualDescription -> description, description -> title CVS version numbers english/security/oval/parseJSON2Oval.py: 1.4 -> 1.5 english/security/oval/oval/definition/generator.py: 1.9 -> 1.10 english/security/oval/oval/parser/dsa.py: 1.3 -> 1.4 english/security/oval/oval/parser/wml.py: 1.3 -> 1.4 --- english/security/oval/oval/definition/generator.py | 6 +++++- english/security/oval/oval/parser/dsa.py | 4 ++-- english/security/oval/oval/parser/wml.py | 2 +- english/security/oval/parseJSON2Oval.py | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/english/security/oval/oval/definition/generator.py b/english/security/oval/oval/definition/generator.py index 4fcba433352..60c026c28ea 100644 --- a/english/security/oval/oval/definition/generator.py +++ b/english/security/oval/oval/definition/generator.py @@ -415,6 +415,10 @@ def createDefinition (dsa, dsaref): logging.log(logging.WARNING, "DSA %s: Package information missed. Ignoring this DSA." % dsa) dsaref["packages"] = "" + if not dsaref.has_key("title"): + logging.log(logging.WARNING, "DSA %s: title information missed." % dsa) + dsaref["title"] = "" + if not dsaref.has_key("description"): logging.log(logging.WARNING, "DSA %s: Description information missed." % dsa) dsaref["description"] = "" @@ -453,7 +457,7 @@ def createDefinition (dsa, dsaref): metadata.appendChild ( __createXMLElement ("reference", attrs = {"source" : source, "ref_id" : ref_id, "ref_url" : "http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s" % ref_id}) ) #TODO: move this info to other place - metadata.appendChild ( __createXMLElement ("description", dsaref.get("actualDescription",""))) + metadata.appendChild ( __createXMLElement ("description", dsaref["description"])) debianMetadata = __createXMLElement ("debian") if dsaref.has_key("date"): debianMetadata.appendChild ( __createXMLElement ("date", dsaref["date"]) ) diff --git a/english/security/oval/oval/parser/dsa.py b/english/security/oval/oval/parser/dsa.py index 1ec9fb3b6d5..cb66c23bbdc 100644 --- a/english/security/oval/oval/parser/dsa.py +++ b/english/security/oval/oval/parser/dsa.py @@ -63,8 +63,8 @@ def parseFile (path): descrpatern = re.compile (r'(CVE-\d+-\d+)') result = descrpatern.search (line) if result: - data["description"] = result.groups()[0] - logging.log(logging.DEBUG, "Extracted CVE ID: " + data["description"]) + data["title"] = result.groups()[0] + logging.log(logging.DEBUG, "Extracted CVE ID: " + data["title"]) continue refspatern = re.compile (r'secrefs>(.*?)') diff --git a/english/security/oval/oval/parser/wml.py b/english/security/oval/oval/parser/wml.py index a3686bf514e..7dd010fdc81 100644 --- a/english/security/oval/oval/parser/wml.py +++ b/english/security/oval/oval/parser/wml.py @@ -50,7 +50,7 @@ def parseFile (path): descrpatern = re.compile (r'description>(.*?)') result = descrpatern.search (line) if result: - data["actualDescription"] = result.groups()[0] + data["description"] = result.groups()[0] continue sinfopatern = re.compile (r'(.*?)') diff --git a/english/security/oval/parseJSON2Oval.py b/english/security/oval/parseJSON2Oval.py index c44d09012bf..7a963e430ba 100644 --- a/english/security/oval/parseJSON2Oval.py +++ b/english/security/oval/parseJSON2Oval.py @@ -68,11 +68,11 @@ def parseJSON(json_data, year): # sys.exit(1) ovalId = oval.definition.generator.getOvalId(CVE) dsaref.update({ovalId: {"packages": package, - 'description': CVE, # "title" element in XML + 'title': CVE, 'vulnerable': "yes", 'date': str(today.isoformat()), 'fixed': f_str, - 'actualDescription': json_data[package][CVE].get("description",""), + 'description': json_data[package][CVE].get("description",""), 'moreinfo': "", 'release': release, 'secrefs': CVE}}) logging.log(logging.DEBUG, "Created entry in dsaref %s" % ovalId) -- cgit v1.2.3