Fix pysec importer

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

Author: TG1999

vulnerabilities/importers/pysec.py

@@ -23,17 +23,18 @@
 import logging
 from io import BytesIO
 from typing import Iterable
+from typing import List
 from typing import Optional
 from zipfile import ZipFile
 
 import dateparser
 import requests
 from packageurl import PackageURL
-from univers.version_range import InvalidVersionRange
 from univers.version_range import PypiVersionRange
 from univers.versions import InvalidVersion
 from univers.versions import PypiVersion
 from univers.versions import SemverVersion
+from univers.versions import Version
 
 from vulnerabilities.helpers import dedupe
 from vulnerabilities.importer import AdvisoryData
@@ -73,14 +74,22 @@ def parse_advisory_data(raw_data: dict) -> Optional[AdvisoryData]:
     raw_id = raw_data["id"]
     summary = raw_data.get("summary") or ""
     aliases = get_aliases(raw_data)
+    aliases.append(raw_id)
+    aliases = dedupe(aliases)
     date_published = get_published_date(raw_data)
     severity = list(get_severities(raw_data))
     references = get_references(raw_data, severity)
 
     affected_packages = []
     if "affected" not in raw_data:
         logger.error(f"affected_packages not found - {raw_id !r}")
-        return
+        return AdvisoryData(
+            aliases=aliases,
+            summary=summary,
+            references=references,
+            affected_packages=[],
+            date_published=date_published,
+        )
 
     for affected_pkg in raw_data.get("affected") or []:
         purl = get_affected_purl(affected_pkg, raw_id)
@@ -110,7 +119,7 @@ def parse_advisory_data(raw_data: dict) -> Optional[AdvisoryData]:
     )
 
 
-def fixed_filter(fixed_range) -> []:
+def fixed_filter(fixed_range) -> Iterable[str]:
     """
     Return a list of fixed version strings given a ``fixed_range`` mapping of OSV data.
     >>> list(fixed_filter({"type": "SEMVER", "events": [{"introduced": "0"}, {"fixed": "1.6.0"}]}))
@@ -124,7 +133,7 @@ def fixed_filter(fixed_range) -> []:
             yield fixed
 
 
-def get_aliases(raw_data) -> []:
+def get_aliases(raw_data) -> List[str]:
     """
     aliases field is optional , id is required and these are all aliases from our perspective
     converting list of two fields to a dict then , convert it to a list to make sure a list is unique
@@ -147,7 +156,7 @@ def get_published_date(raw_data):
     return published and dateparser.parse(published)
 
 
-def get_severities(raw_data) -> []:
+def get_severities(raw_data) -> Iterable[VulnerabilitySeverity]:
     for sever_list in raw_data.get("severity") or []:
         if sever_list.get("type") == "CVSS_V3":
             yield VulnerabilitySeverity(
@@ -173,7 +182,7 @@ def get_severities(raw_data) -> []:
         )
 
 
-def get_references(raw_data, severities) -> []:
+def get_references(raw_data, severities) -> List[Reference]:
     references = raw_data.get("references") or []
     return [Reference(url=ref["url"], severities=severities) for ref in references if ref]
 
@@ -199,14 +208,16 @@ def get_affected_version_range(affected_pkg, raw_id):
     affected_versions = affected_pkg.get("versions")
     if affected_versions:
         try:
-            return PypiVersionRange(affected_versions)
-        except InvalidVersionRange:
-            logger.error(f"InvalidVersionRange affected_pkg_version_range Error - {raw_id !r} ")
+            return PypiVersionRange.from_versions(affected_versions)
+        except Exception as e:
+            logger.error(
+                f"InvalidVersionRange affected_pkg_version_range Error - {raw_id !r} {e!r}"
+            )
     else:
         logger.error(f"affected_pkg_version_range not found - {raw_id !r} ")
 
 
-def get_fixed_version(fixed_range, raw_id) -> []:
+def get_fixed_version(fixed_range, raw_id) -> List[Version]:
     """
     Return a list of fixed versions, using fixed_filter we get the list of fixed version strings,
     then we pass every element to their univers.versions , then we dedupe the result