Fix more tests and refactor importer_runner

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

Author: sbs2001

vulnerabilities/importers/nvd.py

@@ -92,7 +92,6 @@ def to_advisories(self, nvd_data):
                 vulnerability_id=cve_id,
                 summary=summary,
                 references=references,
-                impacted_package_urls=[],  # nopep8
             )
 
     @staticmethod

vulnerabilities/models.py

@@ -129,13 +129,13 @@ class Package(PackageURLMixin):
     @property
     def vulnerable_to(self):
         return self.vulnerabilities.filter(
-            packagerelatedvulnerability__is_vulnerable=True,
+            packagerelatedvulnerability__package=self,
         )
 
     @property
     def resolved_to(self):
-        return self.vulnerabilities.filter(
-            packagerelatedvulnerability__is_vulnerable=False,
+        return Vulnerability.objects.filter(
+            packagerelatedvulnerability__patched_package=self,
         )
 
     class Meta:

vulnerabilities/tests/test_debian_oval.py

@@ -1,16 +1,13 @@
 import os
 import unittest
 from unittest.mock import patch
-from unittest.mock import MagicMock
 import xml.etree.ElementTree as ET
-from collections import OrderedDict
-import asyncio
 
 from packageurl import PackageURL
 
-from vulnerabilities.oval_parser import OvalParser
 from vulnerabilities.importers.debian_oval import DebianOvalDataSource
 from vulnerabilities.data_source import Advisory
+from vulnerabilities.helpers import AffectedPackageWithPatchedPackage
 
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -40,66 +37,67 @@ def test_get_data_from_xml_doc(self, mock_write):
         expected_advisories = [
             Advisory(
                 summary="denial of service",
-                impacted_package_urls={
-                    PackageURL(
-                        type="deb",
-                        namespace=None,
-                        name="krb5",
-                        version="0.11.1+dfsg-5+deb7u1",
-                        qualifiers=OrderedDict([("distro", "wheezy")]),
-                        subpath=None,
-                    )
-                },
-                resolved_package_urls={
-                    PackageURL(
-                        type="deb",
-                        namespace=None,
-                        name="krb5",
-                        version="1.11.1+dfsg-5+deb7u1",
-                        qualifiers=OrderedDict([("distro", "wheezy")]),
-                        subpath=None,
-                    ),
-                    PackageURL(
-                        type="deb",
-                        namespace=None,
-                        name="krb5",
-                        version="2.3.9",
-                        qualifiers=OrderedDict([("distro", "wheezy")]),
-                        subpath=None,
-                    ),
-                },
                 vulnerability_id="CVE-2002-2443",
+                affected_packages_with_patched_package=[
+                    AffectedPackageWithPatchedPackage(
+                        vulnerable_package=PackageURL(
+                            type="deb",
+                            namespace=None,
+                            name="krb5",
+                            version="0.11.1+dfsg-5+deb7u1",
+                            qualifiers={"distro": "wheezy"},
+                            subpath=None,
+                        ),
+                        patched_package=PackageURL(
+                            type="deb",
+                            namespace=None,
+                            name="krb5",
+                            version="1.11.1+dfsg-5+deb7u1",
+                            qualifiers={"distro": "wheezy"},
+                            subpath=None,
+                        ),
+                    )
+                ],
+                references=[],
             ),
             Advisory(
                 summary="security update",
                 vulnerability_id="CVE-2001-1593",
-                impacted_package_urls={
-                    PackageURL(
-                        type="deb",
-                        namespace=None,
-                        name="a2ps",
-                        version="1.11.1+dfsg-5+deb7u1",
-                        qualifiers={"distro": "wheezy"},
-                        subpath=None,
+                affected_packages_with_patched_package=[
+                    AffectedPackageWithPatchedPackage(
+                        vulnerable_package=PackageURL(
+                            type="deb",
+                            namespace=None,
+                            name="a2ps",
+                            version="0.11.1+dfsg-5+deb7u1",
+                            qualifiers={"distro": "wheezy"},
+                            subpath=None,
+                        ),
+                        patched_package=None,
                     ),
-                    PackageURL(
-                        type="deb",
-                        namespace=None,
-                        name="a2ps",
-                        version="2.3.9",
-                        qualifiers={"distro": "wheezy"},
-                        subpath=None,
+                    AffectedPackageWithPatchedPackage(
+                        vulnerable_package=PackageURL(
+                            type="deb",
+                            namespace=None,
+                            name="a2ps",
+                            version="1.11.1+dfsg-5+deb7u1",
+                            qualifiers={"distro": "wheezy"},
+                            subpath=None,
+                        ),
+                        patched_package=None,
                     ),
-                    PackageURL(
-                        type="deb",
-                        namespace=None,
-                        name="a2ps",
-                        version="0.11.1+dfsg-5+deb7u1",
-                        qualifiers={"distro": "wheezy"},
-                        subpath=None,
+                    AffectedPackageWithPatchedPackage(
+                        vulnerable_package=PackageURL(
+                            type="deb",
+                            namespace=None,
+                            name="a2ps",
+                            version="2.3.9",
+                            qualifiers={"distro": "wheezy"},
+                            subpath=None,
+                        ),
+                        patched_package=None,
                     ),
-                },
-                resolved_package_urls=set(),
+                ],
                 references=[],
             ),
         ]