rewrite get_gitlab_package_type

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

Author: ziadhany

vulnerabilities/importers/gitlab.py

@@ -17,7 +17,6 @@
 from typing import Optional
 
 import pytz
-import saneyaml
 from dateutil import parser as dateparser
 from django.db.models.query import QuerySet
 from fetchcode.vcs import fetch_via_vcs
@@ -42,6 +41,7 @@
 from vulnerabilities.utils import AffectedPackage as LegacyAffectedPackage
 from vulnerabilities.utils import build_description
 from vulnerabilities.utils import get_affected_packages_by_patched_package
+from vulnerabilities.utils import load_yaml
 from vulnerabilities.utils import nearest_patched_package
 from vulnerabilities.utils import resolve_version_range
 
@@ -86,7 +86,7 @@ def advisory_data(self) -> Iterable[AdvisoryData]:
  glob = "**/*.yml"
  files = (p for p in path.glob(glob) if p.is_file())
  for file in files:
- purl_type = get_gitlab_package_type(path=file)
+ purl_type = get_gitlab_package_type(path=file, root=path)
  if not purl_type:
  logger.error(f"Unknow gitlab directory structure {file!r}")
  continue
@@ -102,16 +102,14 @@ def advisory_data(self) -> Iterable[AdvisoryData]:
  self.vcs_response.delete()
 
 
-def get_gitlab_package_type(path: Path):
+def get_gitlab_package_type(path: Path, root: Path):
  """
- Return a package type extracted from a gitlab advisory path or None
+ Return a package type extracted from a gitlab advisory path
  """
- parts = path.parts
-
- if len(parts) < 3:
- return
-
- return parts[3]
+ relative = path.relative_to(root)
+ parts = relative.parts
+ gitlab_schema = parts[0]
+ return gitlab_schema
 
 
 def get_purl(package_slug):
@@ -184,8 +182,8 @@ def parse_gitlab_advisory(file):
  identifiers:
  - "GMS-2018-26"
  """
- with open(file) as f:
- gitlab_advisory = saneyaml.load(f)
+ gitlab_advisory = load_yaml(file)
+
  if not isinstance(gitlab_advisory, dict):
  logger.error(
  f"parse_gitlab_advisory: unknown gitlab advisory format in {file!r} with data: {gitlab_advisory!r}"

vulnerabilities/tests/test_gitlab.py

@@ -100,22 +100,31 @@ def test_get_purl():
 
 def test_get_gitlab_package_type():
  assert (
- get_gitlab_package_type(Path("/tmp/tmp9317bd5i/maven/com.google.gwt/gwt/CVE-2013-4204.yml"))
+ get_gitlab_package_type(
+ Path("/tmp/tmp9317bd5i/maven/com.google.gwt/gwt/CVE-2013-4204.yml"),
+ Path("/tmp/tmp9317bd5i/"),
+ )
  == "maven"
  )
  assert (
  get_gitlab_package_type(
  Path(
  "/tmp/tmp9317bd5i/maven/io.projectreactor.netty/reactor-netty-http/CVE-2020-5404.yml"
- )
+ ),
+ Path("/tmp/tmp9317bd5i/"),
  )
  == "maven"
  )
  assert (
  get_gitlab_package_type(
- Path("/tmp/tmp9317bd5i/go/github.com/cloudflare/cfrpki/CVE-2021-3909.yml")
+ Path("/tmp/tmp9317bd5i/go/github.com/cloudflare/cfrpki/CVE-2021-3909.yml"),
+ Path("/tmp/tmp9317bd5i/"),
  )
  == "go"
  )
- assert get_gitlab_package_type(Path("/tmp/tmp9317bd5i/gem/rexml/CVE-2021-28965.yml")) == "gem"
- assert get_gitlab_package_type(Path()) is None
+ assert (
+ get_gitlab_package_type(
+ Path("/tmp/tmp9317bd5i/gem/rexml/CVE-2021-28965.yml"), Path("/tmp/tmp9317bd5i/")
+ )
+ == "gem"
+ )