Refactor all importer tests to work with VulnerabilityReferenceArgs dataclass

Signed-off-by: Shivam Sandbhor <shivam.sandbhor@gmail.com>

Author: sbs2001

vulnerabilities/tests/test_archlinux.py

@@ -63,9 +63,8 @@ def test_import(self):
                 return_value=self.mock_response
         ):
             runner.run()
-
         assert models.Vulnerability.objects.count() == 6
-        assert models.VulnerabilityReference.objects.count() == 4
+        assert models.VulnerabilityReference.objects.count() == 10
         assert models.PackageRelatedVulnerability.objects.filter(
             is_vulnerable=True).count() == 12
         assert models.PackageRelatedVulnerability.objects.filter(

vulnerabilities/tests/test_debian_oval.py

@@ -70,8 +70,6 @@ def test_get_data_from_xml_doc(self, mock_write):
                         version='2.3.9',
                         qualifiers=OrderedDict([('distro', 'wheezy')]),
                         subpath=None)},
-                reference_urls=set(),
-                reference_ids=[],
                 cve_id='CVE-2002-2443'
             ),
             Advisory(
@@ -98,8 +96,6 @@ def test_get_data_from_xml_doc(self, mock_write):
                                version='0:1.11.1+dfsg-5+deb7u1',
                                qualifiers=OrderedDict([('distro', 'wheezy')]),
                                subpath=None)},
-                reference_urls=set(),
-                reference_ids=[],
                 cve_id='CVE-2001-1593')
 
         }

vulnerabilities/tests/test_gentoo.py

@@ -30,6 +30,7 @@
 
 from vulnerabilities.importers.gentoo import GentooDataSource
 from vulnerabilities.data_source import Advisory
+from vulnerabilities.data_source import VulnerabilityReferenceUnit
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 TEST_DATA = os.path.join(BASE_DIR, "test_data/gentoo/glsa-201709-09.xml")
@@ -107,8 +108,7 @@ def test_process_file(self):
                         version='1.9.7',
                         qualifiers=OrderedDict(),
                         subpath=None)},
-                reference_urls=[],
-                reference_ids=['GLSA-201709-09'],
+                vuln_references=[VulnerabilityReferenceUnit(url='https://security.gentoo.org/glsa/201709-09',reference_id='GLSA-201709-09')],
                 cve_id='CVE-2017-9800')]
 
         found_data = self.data_src.process_file(TEST_DATA)

vulnerabilities/tests/test_import_runner.py

@@ -28,6 +28,7 @@
 from vulnerabilities.data_source import Advisory
 from vulnerabilities.data_source import DataSource
 from vulnerabilities.data_source import PackageURL
+from vulnerabilities.data_source import VulnerabilityReferenceUnit
 from vulnerabilities.import_runner import ImportRunner
 from vulnerabilities.import_runner import _insert_vulnerabilities_and_references
 
@@ -70,7 +71,7 @@ def save(self):
     Advisory(
         cve_id='MOCK-CVE-2020-1337',
         summary='vulnerability description here',
-        reference_urls=['https://example.com/with/more/info/MOCK-CVE-2020-1337'],
+        vuln_references=[VulnerabilityReferenceUnit(url='https://example.com/with/more/info/MOCK-CVE-2020-1337')],
         impacted_package_urls=[PackageURL(name='mock-webserver', type='pypi', version='1.2.33')],
         resolved_package_urls=[PackageURL(name='mock-webserver', type='pypi', version='1.2.34')],
     )

vulnerabilities/tests/test_openssl.py

@@ -28,6 +28,7 @@
 
 from vulnerabilities.importers.openssl import OpenSSLDataSource
 from vulnerabilities.data_source import Advisory
+from vulnerabilities.data_source import VulnerabilityReferenceUnit
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 TEST_DATA = os.path.join(BASE_DIR, 'test_data/', 'openssl_xml_data.xml')
@@ -86,10 +87,9 @@ def test_to_advisory(self):
                         version='1.1.1g',
                         qualifiers=OrderedDict(),
                         subpath=None)},
-                reference_urls=[
-                    'https://github.com/openssl/openssl/commit/' +
-                    'eb563247aef3e83dda7679c43f9649270462e5b1'],
-                reference_ids=[],
+                vuln_references=[VulnerabilityReferenceUnit(
+                    url='https://github.com/openssl/openssl/commit/' +
+                    'eb563247aef3e83dda7679c43f9649270462e5b1')],
                 cve_id='CVE-2020-1967'),
             Advisory(
                 summary='There is an overflow bug in the x64_64 Montgomery squaring procedure '
@@ -189,11 +189,12 @@ def test_to_advisory(self):
                                qualifiers=OrderedDict(), subpath=None),
                     PackageURL(type='generic', namespace=None, name='openssl', version='1.0.2u',
                                qualifiers=OrderedDict(), subpath=None)},
-                reference_urls=['https://github.com/openssl/openssl/commit/' +
-                                '419102400a2811582a7a3d4a4e317d72e5ce0a8f',
-                                'https://github.com/openssl/openssl/commit/' +
-                                'f1c5eea8a817075d31e43f5876993c6710238c98'],
-                reference_ids=[],
+                vuln_references=[VulnerabilityReferenceUnit(
+                                url='https://github.com/openssl/openssl/commit/' +
+                                '419102400a2811582a7a3d4a4e317d72e5ce0a8f'),
+                                VulnerabilityReferenceUnit(
+                                url='https://github.com/openssl/openssl/commit/' +
+                                'f1c5eea8a817075d31e43f5876993c6710238c98')],
                 cve_id='CVE-2019-1551')
         ]
         found_data = OpenSSLDataSource.to_advisories(data)

vulnerabilities/tests/test_redhat_importer.py

@@ -29,6 +29,7 @@
 
 import vulnerabilities.importers.redhat as redhat
 from vulnerabilities.data_source import Advisory
+from vulnerabilities.data_source import VulnerabilityReferenceUnit
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 TEST_DATA = os.path.join(BASE_DIR, 'test_data/', 'redhat.json')
@@ -74,11 +75,7 @@ def test_to_advisory(self):
                         qualifiers=OrderedDict(),
                         subpath=None)],
                 resolved_package_urls=[],
-                reference_urls=[
-                    'https://access.redhat.com/hydra/rest/securitydata/cve/CVE-2016-9401.json'],
-                reference_ids=[
-                    'RHSA-2017:1931',
-                    'RHSA-2017:0725'],
+                vuln_references=sorted([VulnerabilityReferenceUnit(url='https://bugzilla.redhat.com/show_bug.cgi?id=1396383', reference_id='1396383'), VulnerabilityReferenceUnit(url='https://access.redhat.com/errata/RHSA-2017:1931', reference_id='RHSA-2017:1931'), VulnerabilityReferenceUnit(url='https://access.redhat.com/errata/RHSA-2017:0725', reference_id='RHSA-2017:0725'), VulnerabilityReferenceUnit(url='https://access.redhat.com/hydra/rest/securitydata/cve/CVE-2016-9401.json', reference_id='')], key=lambda x: x.url),
                 cve_id='CVE-2016-9401'),
             Advisory(
                 summary=('CVE-2016-10200 kernel: l2tp: Race condition '
@@ -106,26 +103,20 @@ def test_to_advisory(self):
                         qualifiers=OrderedDict(),
                         subpath=None)],
                 resolved_package_urls=[],
-                reference_urls=[
-                    'https://access.redhat.com/hydra/rest/securitydata/cve/CVE-2016-10200.json'],
-                reference_ids=[
-                    'RHSA-2017:1842',
-                    'RHSA-2017:2437',
-                    'RHSA-2017:2077',
-                    'RHSA-2017:2444'],
+                vuln_references=sorted([VulnerabilityReferenceUnit(url='https://bugzilla.redhat.com/show_bug.cgi?id=1430347', reference_id='1430347'), VulnerabilityReferenceUnit(url='https://access.redhat.com/errata/RHSA-2017:1842', reference_id='RHSA-2017:1842'), VulnerabilityReferenceUnit(url='https://access.redhat.com/errata/RHSA-2017:2437', reference_id='RHSA-2017:2437'), VulnerabilityReferenceUnit(url='https://access.redhat.com/errata/RHSA-2017:2077', reference_id='RHSA-2017:2077'), VulnerabilityReferenceUnit(url='https://access.redhat.com/errata/RHSA-2017:2444', reference_id='RHSA-2017:2444'), VulnerabilityReferenceUnit(url='https://access.redhat.com/hydra/rest/securitydata/cve/CVE-2016-10200.json', reference_id='')],key=lambda x:x.url),
                 cve_id='CVE-2016-10200'),
             Advisory(
                 summary=('CVE-2017-12168 Kernel: kvm: ARM64: '
                          'assert failure when accessing PMCCNTR register'),
                 impacted_package_urls=[],
                 resolved_package_urls=[],
-                reference_urls=[
-                    'https://access.redhat.com/hydra/rest/securitydata/cve/CVE-2017-12168.json'],
-                reference_ids=[],
+                vuln_references=sorted([VulnerabilityReferenceUnit(url='https://bugzilla.redhat.com/show_bug.cgi?id=1492984', reference_id='1492984'), VulnerabilityReferenceUnit(url='https://access.redhat.com/hydra/rest/securitydata/cve/CVE-2017-12168.json', reference_id='')], key=lambda x:x.url),
                 cve_id='CVE-2017-12168'),
         }
 
         found_data = set()
         for adv in data:
-            found_data.add(redhat.to_advisory(adv))
+            adv = redhat.to_advisory(adv)
+            adv.vuln_references = sorted(adv.vuln_references, key=lambda x : x.url) 
+            found_data.add(adv)
         assert expected_data == found_data

vulnerabilities/tests/test_retiredotnet.py

@@ -28,6 +28,7 @@
 
 from vulnerabilities.importers.retiredotnet import RetireDotnetDataSource
 from vulnerabilities.data_source import Advisory
+from vulnerabilities.data_source import VulnerabilityReferenceUnit
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 
@@ -114,8 +115,7 @@ def test_process_file(self):
                     version='1.1.5',
                     qualifiers=OrderedDict(),
                     subpath=None)},
-            reference_urls=['https://github.com/aspnet/Announcements/issues/359'],
-            reference_ids=[],
+            vuln_references=[VulnerabilityReferenceUnit(url='https://github.com/aspnet/Announcements/issues/359', reference_id='')],
             cve_id='CVE-2019-0982')
 
         found_data = self.data_src.process_file(path)

vulnerabilities/tests/test_ruby.py

@@ -31,6 +31,7 @@
 from vulnerabilities.importers.ruby import RubyDataSource
 from vulnerabilities.data_source import GitDataSourceConfiguration
 from vulnerabilities.data_source import Advisory
+from vulnerabilities.data_source import VulnerabilityReferenceUnit
 
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -82,8 +83,7 @@ def test_process_file(self, mock_write):
                         version='2.0.3',
                         qualifiers=OrderedDict(),
                         subpath=None)},
-                reference_urls=['https://github.com/sinatra/sinatra/pull/1379'],
-                reference_ids=[],
+                vuln_references=[VulnerabilityReferenceUnit(url='https://github.com/sinatra/sinatra/pull/1379')],
                 cve_id='CVE-2018-7212'),
             Advisory(
                 summary=('Sinatra before 2.0.2 has XSS via the 400 Bad Request '
@@ -111,8 +111,7 @@ def test_process_file(self, mock_write):
                         version='2.0.3',
                         qualifiers=OrderedDict(),
                         subpath=None)},
-                reference_urls=['https://github.com/sinatra/sinatra/issues/1428'],
-                reference_ids=[],
+                vuln_references=[VulnerabilityReferenceUnit(url='https://github.com/sinatra/sinatra/issues/1428')],
                 cve_id='CVE-2018-11627'),
             None}
 

vulnerabilities/tests/test_safety_db.py

@@ -30,6 +30,7 @@
 from vulnerabilities.import_runner import ImportRunner
 from vulnerabilities.importers.safety_db import VersionAPI
 from vulnerabilities.importers.safety_db import categorize_versions
+from vulnerabilities.data_source import VulnerabilityReferenceUnit
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 TEST_DATA = os.path.join(BASE_DIR, 'test_data/')

vulnerabilities/tests/test_suse_backports.py

@@ -65,8 +65,6 @@ def test_process_file(self):
                         version='3.0.10-1.1.1',
                         qualifiers=OrderedDict(),
                         subpath=None)],
-                reference_urls=[],
-                reference_ids=[],
                 cve_id='CVE-2009-1313'),
             Advisory(
                 summary='',
@@ -79,8 +77,6 @@ def test_process_file(self):
                             version='3.5-1.1.5',
                             qualifiers=OrderedDict(),
                             subpath=None)],
-                reference_urls=[],
-                reference_ids=[],
                 cve_id='CVE-2009-1313'),
             Advisory(
                 summary='',
@@ -93,8 +89,6 @@ def test_process_file(self):
                         version='3.0.10-1.1.1',
                         qualifiers=OrderedDict(),
                         subpath=None)],
-                reference_urls=[],
-                reference_ids=[],
                 cve_id='CVE-2009-1313'),
             Advisory(
                 summary='',
@@ -107,8 +101,6 @@ def test_process_file(self):
                         version='0.7.0.r4359-15.9.2',
                         qualifiers=OrderedDict(),
                         subpath=None)],
-                reference_urls=[],
-                reference_ids=[],
                 cve_id='CVE-2009-0365'),
             Advisory(
                 summary='',
@@ -121,8 +113,6 @@ def test_process_file(self):
                         version='0.7.0.r4359-15.9.2',
                         qualifiers=OrderedDict(),
                         subpath=None)],
-                reference_urls=[],
-                reference_ids=[],
                 cve_id='CVE-2009-0578'),
         ]