Resolve merge conflict

Signed-off-by: ziadhany <ziadhany2016@gmail.com>

Author: ziadhany

vulnerabilities/importers/github_osv.py

@@ -8,16 +8,13 @@
 #
 import json
 import logging
-from io import BytesIO
 from pathlib import Path
 from typing import Iterable
-from zipfile import ZipFile
-
-import requests
 
 from vulnerabilities.importer import AdvisoryData
 from vulnerabilities.importer import Importer
 from vulnerabilities.importers.osv import parse_advisory_data
+from vulnerabilities.utils import get_advisory_url
 
 logger = logging.getLogger(__name__)
 
@@ -26,6 +23,7 @@ class GithubOSVImporter(Importer):
     license_url = "https://github.com/github/advisory-database/blob/main/LICENSE.md"
     spdx_license_expression = "CC-BY-4.0"
     repo_url = "git+https://github.com/github/advisory-database/"
+    importer_name = "GithubOSV Importer"
 
     def advisory_data(self) -> Iterable[AdvisoryData]:
         supported_ecosystems = [
@@ -41,13 +39,19 @@ def advisory_data(self) -> Iterable[AdvisoryData]:
         ]
         try:
             self.clone(repo_url=self.repo_url)
-            path = Path(self.vcs_response.dest_dir)
+            base_path = Path(self.vcs_response.dest_dir)
             # filter out non-github-reviewed files and only keep the files end-with .json
-            advisory_dirs = path / "advisories/github-reviewed"
+            advisory_dirs = base_path / "advisories/github-reviewed"
             for file in advisory_dirs.glob("**/*.json"):
+                advisory_url = get_advisory_url(
+                    file=file,
+                    base_path=base_path,
+                    url="https://github.com/github/advisory-database/blob/main/",
+                )
                 with open(file) as f:
                     raw_data = json.load(f)
-            yield parse_advisory_data(raw_data, supported_ecosystems)
+                print(advisory_url)
+                yield parse_advisory_data(raw_data, supported_ecosystems, advisory_url)
         finally:
             if self.vcs_response:
                 self.vcs_response.delete()

vulnerabilities/importers/oss_fuzz.py

@@ -40,7 +40,7 @@ def advisory_data(self) -> Iterable[AdvisoryData]:
                         url="https://github.com/pypa/advisory-database/blob/main/",
                     )
                     yield parse_advisory_data(
-                        yaml_data, supported_ecosystem="oss-fuzz", advisory_url=advisory_url
+                        yaml_data, supported_ecosystems=["oss-fuzz"], advisory_url=advisory_url
                     )
         finally:
             if self.vcs_response:

vulnerabilities/importers/osv.py

@@ -43,8 +43,9 @@
     "cargo": "cargo",
 }
 
+
 def parse_advisory_data(
-    raw_data: dict, supported_ecosystems, advisory_url: str
+        raw_data: dict, supported_ecosystems, advisory_url: str
 ) -> Optional[AdvisoryData]:
     """
     Return an AdvisoryData build from a ``raw_data`` mapping of OSV advisory and

vulnerabilities/importers/pypa.py

@@ -34,7 +34,7 @@ def advisory_data(self) -> Iterable[AdvisoryData]:
             for advisory_url, raw_data in fork_and_get_files(base_path=path):
                 yield parse_advisory_data(
                     raw_data=raw_data,
-                    supported_ecosystem=["pypi"],
+                    supported_ecosystems=["pypi"],
                     advisory_url=advisory_url,
                 )
         finally:

vulnerabilities/importers/pysec.py

@@ -39,4 +39,6 @@ def advisory_data(self) -> Iterable[AdvisoryData]:
                     continue
                 with zip_file.open(file_name) as f:
                     vul_info = json.load(f)
-                    yield parse_advisory_data(raw_data=vul_info, supported_ecosystems=["pypi"], advisory_url=url)
+                    yield parse_advisory_data(
+                        raw_data=vul_info, supported_ecosystems=["pypi"], advisory_url=url
+                    )

vulnerabilities/tests/test_data/github_osv/github_osv_expected_1.json

@@ -117,5 +117,6 @@
     }
   ],
   "date_published": "2017-10-24T18:33:36+00:00",
-  "weaknesses": [400]
+  "weaknesses": [400],
+  "url": "https://github.com/github/advisory-database/blob/main/advisories/github-reviewed/github_osv_test_1.json"
 }

vulnerabilities/tests/test_data/github_osv/github_osv_expected_2.json

@@ -74,5 +74,6 @@
     }
   ],
   "date_published": "2022-03-23T00:00:23+00:00",
-  "weaknesses": [190]
+  "weaknesses": [190],
+  "url": "https://github.com/github/advisory-database/blob/main/advisories/github-reviewed/github_osv_test_2.json"
 }

vulnerabilities/tests/test_data/github_osv/github_osv_expected_3.json

@@ -137,5 +137,6 @@
     }
   ],
   "date_published": "2021-06-15T16:05:22+00:00",
-  "weaknesses": [79]
+  "weaknesses": [79],
+  "url": "https://github.com/github/advisory-database/blob/main/advisories/github-reviewed/github_osv_test_3.json"
 }

vulnerabilities/tests/test_data/github_osv/github_osv_expected_4.json

@@ -189,5 +189,6 @@
   "date_published": "2017-10-24T18:33:38+00:00",
   "weaknesses": [
     352
-  ]
+  ],
+    "url": "https://github.com/github/advisory-database/blob/main/advisories/github-reviewed/github_osv_test_4.json"
 }

vulnerabilities/tests/test_data/github_osv/github_osv_expected_5.json

@@ -219,5 +219,6 @@
   "date_published": "2023-07-03T21:30:57+00:00",
   "weaknesses": [
     20
-  ]
+  ],
+  "url": "https://github.com/github/advisory-database/blob/main/advisories/github-reviewed/github_osv_test_5.json"
 }