Fix github improver

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

Author: TG1999

vulnerabilities/helpers.py

@@ -178,7 +178,8 @@ def nearest_patched_package(
 
         affected_package_with_patched_package_objects.append(
             AffectedPackage(
-                vulnerable_package=vulnerable_package.purl, patched_package=patched_package.purl
+                vulnerable_package=vulnerable_package.purl,
+                patched_package=patched_package.purl if patched_package else None,
             )
         )
 

vulnerabilities/importers/github.py

@@ -527,11 +527,10 @@ def resolve_version_range(
     for package_version in package_versions or []:
         if package_version in ignorable_versions:
             continue
-        # Remove leading 'v'
-        if package_version.startswith("v") or package_version.startswith("V"):
-            package_version = package_version.replace("V", "").replace("v", "")
         # Remove whitespace
         package_version = package_version.replace(" ", "")
+        # Remove leading 'v'
+        package_version = package_version.lstrip("v").lstrip("V")
         try:
             version = affected_version_range.version_class(package_version)
         except Exception:

vulnerabilities/package_managers_2.py

@@ -13,6 +13,7 @@
 from dateutil import parser as dateparser
 from django.utils.dateparse import parse_datetime
 
+from vulnerabilities.helpers import get_item
 from vulnerabilities.package_managers import VersionResponse
 
 LOGGER = logging.getLogger(__name__)
@@ -31,7 +32,11 @@ class VersionResponse:
 
 
 def get_response(url, type="json"):
-    resp = requests.get(url=url)
+    try:
+        resp = requests.get(url=url)
+    except:
+        LOGGER.error(traceback.format_exc())
+        return None
     if not resp.status_code == 200:
         LOGGER.error(f"Error while fetching {url}: {resp.status_code}")
         return None
@@ -86,14 +91,12 @@ def fetch(self, pkg):
             self.cache[pkg] = versions
             return
 
-        for version, download_items in response["releases"].items() or {}:
+        for version, download_items in response.get("releases").items() or {}:
             if download_items:
                 latest_download_item = max(
                     download_items,
                     key=lambda download_item: dateparser.parse(
-                        download_item["upload_time_iso_8601"]
-                        if "upload_time_iso_8601" in download_item
-                        else LOGGER.error(f"{download_item} has no upload_time_iso_8601")
+                        download_item.get("upload_time_iso_8601")
                     ),
                 )
                 versions.add(
@@ -117,8 +120,12 @@ def fetch(self, pkg):
             self.cache[pkg] = versions
             return
         for release in response:
-            if release["number"] and release["published_at"]:
+            release_date = None
+            if release.get("published_at"):
                 release_date = dateparser.parse(release["published_at"])
+            elif release.get("created_at"):
+                release_date = dateparser.parse(release["created_at"])
+            if release.get("number"):
                 versions.add(LegacyVersion(value=release["number"], release_date=release_date))
             else:
                 LOGGER.error(f"Failed to parse release {release}")
@@ -196,9 +203,9 @@ def nuget_url(pkg_name: str) -> str:
     @staticmethod
     def extract_versions(resp: dict) -> Set[LegacyVersion]:
         all_versions = set()
-        for entry_group in resp["items"] or []:
-            for entry in entry_group["items"] or []:
-                catalog_entry = entry["catalogEntry"] or {}
+        for entry_group in resp.get("items") or []:
+            for entry in entry_group.get("items") or []:
+                catalog_entry = entry.get("catalogEntry") or {}
                 version = catalog_entry.get("version")
                 release_date = dateparser.parse(catalog_entry.get("published"))
                 if version and release_date:
@@ -345,7 +352,7 @@ def composer_url(pkg_name: str) -> Optional[str]:
     @staticmethod
     def extract_versions(resp: dict, pkg_name: str) -> Set[LegacyVersion]:
         all_versions = set()
-        for version in resp["packages"][pkg_name]:
+        for version in get_item(resp, "packages", pkg_name):
             if "dev" in version:
                 continue
 
@@ -355,7 +362,9 @@ def extract_versions(resp: dict, pkg_name: str) -> Set[LegacyVersion]:
             all_versions.add(
                 LegacyVersion(
                     value=version.lstrip("v"),
-                    release_date=dateparser.parse(resp["packages"][pkg_name][version]["time"]),
+                    release_date=dateparser.parse(
+                        get_item(resp, "packages", pkg_name, version, "time")
+                    ),
                 )
             )
         return all_versions