Add the License, add a Git Importer to fireeye

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

Author: ziadhany

vulnerabilities/importers/__init__.py

@@ -11,6 +11,7 @@
 from vulnerabilities.importers import archlinux
 from vulnerabilities.importers import debian
 from vulnerabilities.importers import debian_oval
+from vulnerabilities.importers import fireeye
 from vulnerabilities.importers import github
 from vulnerabilities.importers import gitlab
 from vulnerabilities.importers import nginx
@@ -35,6 +36,7 @@
     archlinux.ArchlinuxImporter,
     ubuntu.UbuntuImporter,
     debian_oval.DebianOvalImporter,
+    fireeye.FireyeImporter,
 ]
 
 IMPORTERS_REGISTRY = {x.qualified_name: x for x in IMPORTERS_REGISTRY}

vulnerabilities/importers/fireeye.py

@@ -10,50 +10,31 @@
 import re
 from typing import Iterable
 
-from fetchcode.vcs.git import fetch_via_git
-
 from vulnerabilities.importer import AdvisoryData
-from vulnerabilities.importer import Importer
+from vulnerabilities.importer import GitImporter
 from vulnerabilities.importer import Reference
-from vulnerabilities.importer import logger
 from vulnerabilities.utils import build_description
 from vulnerabilities.utils import dedupe
 
 
-class FireyeImporter(Importer):
-    spdx_license_expression = "unknown"
-    license_url = ""
-    url = "git+https://github.com/mandiant/Vulnerability-Disclosures"
-
-    def advisory_data(self) -> Iterable[AdvisoryData]:
-        forked_dir = fork_and_get_dir(self.url)
-        for file in get_files(forked_dir):
-            yield parse_advisory_data(file)
-
-
-def ForkError():
-    pass
-
-
-def fork_and_get_dir(url) -> dict:
-    try:
-        fork_directory = fetch_via_git(url=url)
-        return fork_directory.dest_dir
-    except Exception as e:
-        logger.error(f"Can't clone url {url}")
-        raise ForkError() from e
+class FireyeImporter(GitImporter):
+    spdx_license_expression = "CC-BY-SA-4.0 AND MIT"
+    license_url = "https://github.com/mandiant/Vulnerability-Disclosures/blob/master/README.md"
 
+    def __init__(self):
+        super().__init__(repo_url="git+https://github.com/mandiant/Vulnerability-Disclosures")
 
-def get_files(fork_directory):
-    for root_dir in os.listdir(fork_directory):
-        if root_dir in ("README.md", ".git"):
-            continue
+    def advisory_data(self, _keep_clone=True) -> Iterable[AdvisoryData]:
+        self.clone()
+        for root_dir in os.listdir(self.vcs_response.dest_dir):
+            if root_dir in ("README.md", ".git"):
+                continue
 
-        for root, _, files in os.walk(os.path.join(fork_directory, root_dir)):
-            for file in files:
-                if file.endswith((".md", ".MD")):
-                    with open(os.path.join(root, file), "r", encoding="ISO-8859-1") as f:
-                        yield f.read()
+            for root, _, files in os.walk(os.path.join(self.vcs_response.dest_dir, root_dir)):
+                for file in files:
+                    if file.endswith((".md", ".MD")):
+                        with open(os.path.join(root, file), "r", encoding="ISO-8859-1") as f:
+                            yield parse_advisory_data(f.read())
 
 
 def parse_advisory_data(raw_data) -> AdvisoryData:
@@ -79,7 +60,7 @@ def parse_advisory_data(raw_data) -> AdvisoryData:
 
     return AdvisoryData(
         aliases=get_aliases(database_id, cve_ref),
-        summary=build_description("".join(summary), "".join(description)),
+        summary=build_description(" ".join(summary), " ".join(description)),
         references=get_references(references),
         # date_published=disc_timeline,
     )