regscale-cli 6.19.1.0__py3-none-any.whl → 6.20.0.0__py3-none-any.whl

regscale/models/integration_models/flat_file_importer/__init__.py

@@ -10,16 +10,17 @@ from abc import ABC, abstractmethod
 from collections import namedtuple
 from datetime import datetime, timedelta
 from os import PathLike
-from typing import Any, Callable, Generator, Iterator, List, Optional, Sequence, TextIO, Tuple, Union, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Callable, Generator, Iterator, List, Optional, Sequence, TextIO, Tuple, Union
 
 if TYPE_CHECKING:
     from regscale.integrations.scanner_integration import IntegrationAsset, IntegrationFinding
 
+from pathlib import Path
+
 import click
 import requests
 import xmltodict
 from openpyxl.reader.excel import load_workbook
-from pathlib import Path
 
 from regscale.core.app.api import Api
 from regscale.core.app.application import Application
@@ -237,12 +238,13 @@ class FlatFileImporter(ABC):
             asset_id = vuln.dns or vuln.ipAddress
             if not asset_id:
                 return None
-
             severity = self.finding_severity_map.get(vuln.severity.capitalize(), regscale_models.IssueSeverity.Low)
             status = self.map_status_to_issue_status(vuln.status)
             cve: Optional[str] = getattr(vuln, "cve", "")
             extract_vuln: Any = self.extract_ghsa_strings(getattr(vuln, "plugInName", ""))
             plugin_name = getattr(vuln, "plugInName", getattr(vuln, "title", ""))
+            plugin_id = str(vuln.plugInId) if vuln.plugInId else ""
+            non_cve_identifier = self.determine_non_cve_identifier(cve)
             if not self.assert_valid_cve(cve):
                 if isinstance(extract_vuln, list):
                     cve = ", ".join(extract_vuln)
@@ -251,7 +253,8 @@ class FlatFileImporter(ABC):
                     # with CVE or not.
                     cve = extract_vuln
             if not self.assert_valid_cve(cve):
-                plugin_name = cve
+                if not non_cve_identifier:
+                    plugin_name = cve
                 cve = ""
             remediation_description = ""
             if remediation := vuln.extra_data.get("solution"):
@@ -269,18 +272,19 @@ class FlatFileImporter(ABC):
                 severity=severity,
                 status=status,
                 asset_identifier=asset_id,
-                external_id=str(vuln.plugInId),
-                rule_id=str(vuln.plugInId),
+                external_id=non_cve_identifier or plugin_id,
+                rule_id=plugin_id,
                 first_seen=vuln.firstSeen,
                 last_seen=vuln.lastSeen,
                 remediation=remediation_description,
                 cvss_score=vuln.vprScore,
                 cve=cve,
                 cvss_v3_base_score=vuln.cvsSv3BaseScore,
-                source_rule_id=str(vuln.plugInId),
+                source_rule_id=plugin_id,
                 vulnerability_type="Vulnerability Scan",
                 baseline=f"{self.name} Host",
                 results=vuln.title,
+                plugin_id=plugin_id or non_cve_identifier or plugin_name,
                 plugin_name=plugin_name,
                 date_created=vuln.firstSeen,
                 date_last_updated=vuln.lastSeen,
@@ -838,10 +842,10 @@ class FlatFileImporter(ABC):
         :param str aws_profile: The AWS profile to use for S3 access
         :param Optional[bool] upload_file: Whether to upload the file to RegScale after processing, defaults to True
         """
-        from regscale.core.app.utils.file_utils import download_from_s3
-        from regscale.validation.record import validate_regscale_object
         from regscale.core.app.application import Application
+        from regscale.core.app.utils.file_utils import download_from_s3
         from regscale.exceptions import ValidationException
+        from regscale.validation.record import validate_regscale_object
 
         if s3_bucket:
             download_from_s3(s3_bucket, s3_prefix, folder_path, aws_profile)
@@ -890,6 +894,7 @@ class FlatFileImporter(ABC):
         :rtype: Callable[[Callable], click.option]
         """
         import os
+
         from regscale.models.app_models.click import NotRequiredIf
 
         mapping_dir = os.path.join("./", "mappings", import_name)
@@ -1101,3 +1106,15 @@ class FlatFileImporter(ABC):
         """
         pattern = r"^CVE-\d{4}-\d{4,}$"
         return bool(re.match(pattern, cve))
+
+    @staticmethod
+    def determine_non_cve_identifier(vuln_id: str) -> str:
+        """
+        Determine the non-CVE identifier based on the CVE string
+
+        :param str vuln_id: The Vulnerability Identifier string
+        :return: The non-CVE identifier
+        :rtype: str
+        """
+        match_regex = "^(?:(?:ALSA|ALSA2|ALAS|ALAS2|ELSA)-(?:19|20)\\d{2}-\\d{4,5}|GHSA-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4})$"
+        return vuln_id if re.match(match_regex, vuln_id) else ""