Commit latest parsing changes #1079

Reference: #1079

Signed-off-by: John M. Horan <johnmhoran@gmail.com>

vulnerabilities/importer.py

@@ -439,8 +439,12 @@ def get_data_from_xml_doc(
         oval_doc = oval_parsed_data.oval_document
         timestamp = oval_doc.getGenerator().getTimestamp()
 
+        print("\noval_parsed_data = {}\n".format(oval_parsed_data))
+        print("\nraw_data = {}\n".format(raw_data))
+
         # convert definition_data to Advisory objects
         for definition_data in raw_data:
+            print("\ndefinition_data = {}\n".format(definition_data))
             # These fields are definition level, i.e common for all elements
             # connected/linked to an OvalDefinition
             vuln_id = definition_data["vuln_id"]
@@ -457,8 +461,9 @@ def get_data_from_xml_doc(
                 for url in definition_data["reference_urls"]
             ]
             affected_packages = []
+            print('\ndefinition_data["test_data"] = {}\n'.format(definition_data["test_data"]))
             for test_data in definition_data["test_data"]:
-                print("\ntest_data = {}\n".format(test_data["package_list"]))
+                print("\ntest_data['package_list'] = {}\n".format(test_data["package_list"]))
                 for package_name in test_data["package_list"]:
                     affected_version_range = test_data["version_ranges"]
                     vrc = RANGE_CLASS_BY_SCHEMES[pkg_metadata["type"]]

vulnerabilities/oval_parser.py

@@ -187,6 +187,8 @@ def get_severity_from_definition(definition: OvalDefinition) -> Set[str]:
     def get_vuln_id_from_definition(definition):
         # SUSE and Ubuntu OVAL files will get cves via this loop
         for child in definition.element.iter():
+            # if child.get("ref_id"):
+            #     return child.get("ref_id")
             # Must also check whether 'source' field exists and value is 'CVE'
             # TODO: what if there are multiple elements that satisfy the condition?
             # Add to list and report as separate AdvisoryData() objects?