initialize hexapi with cache and sort imports

Signed-off-by: Tushar912 <tushar.912u@gmail.com>

Author: tushar912

vulnerabilities/importers/elixir_security.py

@@ -17,17 +17,13 @@
 #  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
 #  VulnerableCode should be considered or used as legal advice. Consult an Attorney
 #  for any legal advice.
-#  VulnerableCode is a free software code scanning tool from nexB Inc. and others.
+#  VulnerableCode is a free software tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/vulnerablecode/ for support and download.
 
 import asyncio
-import yaml
-import json
-import requests
-import re
-from typing import Set
-from typing import List
+from typing import List, Set
 
+import yaml
 from dephell_specifier import RangeSpecifier
 from packageurl import PackageURL
 
@@ -74,23 +70,18 @@ def collect_packages(self):
         packages = set()
         files = self._updated_files.union(self._added_files)
         for f in files:
-            with open(f) as file:
-                data = yaml.safe_load(file)
-                if data.get("package"):
-                    packages.add(data["package"])
+            data = load_yaml(f)
+            if data.get("package"):
+                packages.add(data["package"])
 
         return packages
 
-    def generate_all_version_list(self, pkg_name):
+    def get_versions_from_range(self, version_list, pkg_name):
+        pkg_versions = []
         if not getattr(self, 'pkg_manager_api', None):
             self.pkg_manager_api = HexVersionAPI()
-        version_list = self.pkg_manager_api.get(
+        all_version_list = self.pkg_manager_api.get(
             pkg_name)
-        return version_list
-
-    def get_versions_from_range(self, version_list, pkg_name):
-        pkg_versions = []
-        all_version_list = self.generate_all_version_list(pkg_name)
         if version_list is None:
             return
         version_ranges = {RangeSpecifier(r) for r in version_list}
@@ -100,40 +91,49 @@ def get_versions_from_range(self, version_list, pkg_name):
         return pkg_versions
 
     def process_file(self, path):
-        with open(path) as f:
-            yaml_file = yaml.safe_load(f)
-            pkg_name = yaml_file["package"]
-            safe_pkg_versions = []
-            if yaml_file.get("unaffected_versions"):
-                safe_pkg_versions = self.get_versions_from_range(
-                    yaml_file["patched_versions"] +
-                    yaml_file["unaffected_versions"],
-                    pkg_name,
-                )
-            else:
-                safe_pkg_versions = self.get_versions_from_range(
-                    yaml_file["patched_versions"], pkg_name
-                )
-
-            cve_id = "CVE-"+str(yaml_file["cve"])
-            safe_purls = []
-            if safe_pkg_versions is not None:
-                safe_purls = {
-                    PackageURL(name=pkg_name, type="hex", version=version)
-                    for version in safe_pkg_versions
-                }
-
-            vuln_reference = [
-                Reference(
-                    reference_id=yaml_file["id"],
-                    url=yaml_file["link"],
-                )
-            ]
-
-            return Advisory(
-                summary=yaml_file["description"],
-                impacted_package_urls=[],
-                resolved_package_urls=safe_purls,
-                cve_id=cve_id,
-                vuln_references=vuln_reference,
+        yaml_file = load_yaml(path)
+        pkg_name = yaml_file["package"]
+        safe_pkg_versions = []
+        if yaml_file.get("unaffected_versions"):
+            safe_pkg_versions = self.get_versions_from_range(
+                yaml_file["patched_versions"] +
+                yaml_file["unaffected_versions"],
+                pkg_name,
+            )
+        else:
+            safe_pkg_versions = self.get_versions_from_range(
+                yaml_file["patched_versions"], pkg_name
+            )
+        if yaml_file.get('cve'):
+            cve_id = "CVE-" + yaml_file["cve"]
+        else:
+            cve_id = ""
+
+        safe_purls = []
+        if safe_pkg_versions is not None:
+            safe_purls = {
+                PackageURL(name=pkg_name, type="hex", version=version)
+                for version in safe_pkg_versions
+            }
+
+        vuln_reference = [
+            Reference(
+                reference_id=yaml_file["id"],
+            ),
+            Reference(
+                url=yaml_file["link"],
             )
+        ]
+
+        return Advisory(
+            summary=yaml_file["description"],
+            impacted_package_urls=[],
+            resolved_package_urls=safe_purls,
+            cve_id=cve_id,
+            vuln_references=vuln_reference,
+        )
+
+
+def load_yaml(path):
+    with open(path) as f:
+        return yaml.safe_load(f)

vulnerabilities/tests/test_elixir_security.py

@@ -17,22 +17,20 @@
 #  OR CONDITIONS OF ANY KIND, either express or implied. No content created from
 #  VulnerableCode should be considered or used as legal advice. Consult an Attorney
 #  for any legal advice.
-#  VulnerableCode is a free software code scanning tool from nexB Inc. and others.
+#  VulnerableCode is a free software tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/vulnerablecode/ for support and download.
 
 import os
-from unittest import TestCase
-from unittest.mock import patch
 from collections import OrderedDict
+from unittest import TestCase
 
-from vulnerabilities.data_source import Reference
 from packageurl import PackageURL
 
 from vulnerabilities.data_source import Advisory
+from vulnerabilities.data_source import Reference
 from vulnerabilities.importers.elixir_security import ElixirSecurityDataSource
 from vulnerabilities.package_managers import HexVersionAPI
 
-
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
@@ -43,26 +41,7 @@ def setUpClass(cls):
             "repository_url": 'https://github.com/dependabot/elixir-security-advisories',
         }
         cls.data_src = ElixirSecurityDataSource(1, config=data_source_cfg)
-        cls.data_src.pkg_manager_api = HexVersionAPI()
-
-    @patch('vulnerabilities.package_managers.HexVersionAPI.get',
-           return_value=[
-            "0.5.2",
-            "0.5.1",
-            "0.5.0",
-            "0.4.0",
-            "0.3.1",
-            "0.3.0",
-            "0.2.0",
-            "0.1.3",
-            "0.1.2",
-            "0.1.1",
-            "0.1.0",
-                    ])
-    def test_generate_all_version_list(self, mock_write):
-        package = "coherence"
-        actual_list = self.data_src.generate_all_version_list(package)
-        expected_list = [
+        cls.data_src.pkg_manager_api = HexVersionAPI({'coherence': [
             "0.5.2",
             "0.5.1",
             "0.5.0",
@@ -74,24 +53,9 @@ def test_generate_all_version_list(self, mock_write):
             "0.1.2",
             "0.1.1",
             "0.1.0",
-        ]
-        assert actual_list == expected_list
+                    ]})
 
-    @patch('vulnerabilities.package_managers.HexVersionAPI.get',
-           return_value=[
-            "0.5.2",
-            "0.5.1",
-            "0.5.0",
-            "0.4.0",
-            "0.3.1",
-            "0.3.0",
-            "0.2.0",
-            "0.1.3",
-            "0.1.2",
-            "0.1.1",
-            "0.1.0",
-                ])
-    def test_process_file(self, mock_write):
+    def test_process_file(self):
 
         path = os.path.join(BASE_DIR, "test_data/elixir_security/test_file.yml")
         expected_data = Advisory(
@@ -108,7 +72,8 @@ def test_process_file(self, mock_write):
             },
             vuln_references=[
                 Reference(reference_id='2aae6e3a-24a3-4d5f-86ff-b964eaf7c6d1',
-                          url="https://github.com/smpallen99/coherence/issues/270")
+                          ),
+                Reference(url='https://github.com/smpallen99/coherence/issues/270')
             ],
             cve_id="CVE-2018-20301",
         )