regscale-cli 6.27.0.1__py3-none-any.whl → 6.27.2.0__py3-none-any.whl

regscale/models/integration_models/synqly_models/connectors/vulnerabilities.py

@@ -122,16 +122,6 @@ class Vulnerabilities(SynqlyModel):
         if asset_filter:
             self.logger.debug(f"Asset filter: {asset_filter}")
 
-        self.logger.info(f"Fetching vulnerability data from {self.integration_name}...")
-        findings = (
-            self.fetch_integration_data(
-                func=self.tenant.engine_client.vulnerabilities.query_findings,
-                filter=vuln_filter,  # Only severity/date filters for findings
-                **kwargs,
-            )
-            if self.can_fetch_vulns
-            else []
-        )
         self.logger.info(f"Fetching asset data from {self.integration_name}...")
         assets = (
             self.fetch_integration_data(
@@ -143,6 +133,17 @@ class Vulnerabilities(SynqlyModel):
             else []
         )
 
+        self.logger.info(f"Fetching vulnerability data from {self.integration_name}...")
+        findings = (
+            self.fetch_integration_data(
+                func=self.tenant.engine_client.vulnerabilities.query_findings,
+                filter=vuln_filter,  # Only severity/date filters for findings
+                **kwargs,
+            )
+            if self.can_fetch_vulns
+            else []
+        )
+
         self.scanner_integration = VulnerabilitiesIntegration(plan_id=regscale_ssp_id)
         self.logger.info(f"Mapping {self.provider} asset(s) data to RegScale asset(s)...")
         if assets:

regscale/models/integration_models/synqly_models/ocsf_mapper.py

@@ -5,7 +5,11 @@ from typing import Any, Union, TYPE_CHECKING, Optional
 
 if TYPE_CHECKING:
     from regscale.models.integration_models.synqly_models.connectors import Edr, Ticketing, Vulnerabilities
-    from synqly.engine.resources.ocsf.resources.v_1_3_0.resources.securityfinding import ResourceDetails, Vulnerability
+    from synqly.engine.resources.ocsf.resources.v_1_3_0.resources.securityfinding import (
+        Finding,
+        ResourceDetails,
+        Vulnerability,
+    )
 
 from synqly import engine
 from synqly.engine import CreateTicketRequest
@@ -152,7 +156,39 @@ class Mapper:
         )
 
     @staticmethod
-    def _parse_finding_data(finding: "SecurityFinding", vuln: Optional["Vulnerability"] = None) -> dict:
+    def _determine_date(
+        attribute: str, finding: Optional["Finding"] = None, vuln: Optional["Vulnerability"] = None
+    ) -> datetime:
+        """
+        Determine the date based on the provided vulnerability or finding
+
+        :param str attribute: The attribute to determine the date for
+        :param Optional[SecurityFinding] finding: The finding to determine the date for
+        :param Optional[Vulnerability] vuln: The vulnerability to determine the date for
+        :return: The date
+        :rtype: datetime
+        """
+        from regscale.core.utils.date import normalize_timestamp
+
+        vuln_date = getattr(vuln, attribute) if vuln else None
+        fallback_vuln_date = getattr(vuln, attribute.replace("_dt", ""), None) if vuln else None
+        finding_date = getattr(finding, attribute) if finding else None
+        fallback_finding_date = getattr(finding, attribute.replace("_dt", ""), None) if finding else None
+        if vuln_date:
+            return vuln_date
+        elif finding_date:
+            return finding_date
+        # No datetime objects, lets try the epoch integers
+        if fallback_vuln_date:
+            fallback_vuln_date = normalize_timestamp(fallback_vuln_date)
+            return datetime.fromtimestamp(fallback_vuln_date)
+        elif fallback_finding_date:
+            fallback_finding_date = normalize_timestamp(fallback_finding_date)
+            return datetime.fromtimestamp(fallback_finding_date)
+        else:
+            return datetime.now()
+
+    def _parse_finding_data(self, finding: "SecurityFinding", vuln: Optional["Vulnerability"] = None) -> dict:
         """
         Parse the data from the SecurityFinding object
 
@@ -164,16 +200,20 @@ class Mapper:
 
         finding_data = {
             "cve": None,
-            "first_seen": vuln.first_seen_time_dt if vuln else finding.finding.first_seen_time_dt,
-            "last_seen": vuln.last_seen_time_dt if vuln else finding.finding.last_seen_time_dt,
+            "first_seen": self._determine_date("first_seen_time_dt", getattr(finding, "finding", None), vuln),
+            "last_seen": self._determine_date("last_seen_time_dt", getattr(finding, "finding", None), vuln),
             "plugin_id": vuln.cve.uid if vuln else finding.finding.product_uid,
-            "severity": int(vuln.severity) if vuln else finding.severity_id,
+            "severity": vuln.severity if vuln and getattr(vuln, "severity") else finding.severity_id,
             "remediation": getattr(vuln, "remediation") if vuln else finding.finding.remediation.desc,
         }
         if vuln:
             finding_data["cve"] = vuln.cve.uid
         else:
             finding_data["cve"] = finding.finding.title if "cve" in finding.finding.title.lower() else None
+        try:
+            finding_data["severity"] = int(finding_data["severity"])
+        except ValueError:
+            finding_data["severity"] = 0
         if isinstance(finding_data["remediation"], Remediation):
             finding_data["remediation"] = finding_data["remediation"].desc
         elif isinstance(finding_data["remediation"], dict):
@@ -227,9 +267,9 @@ class Mapper:
             """
             base = vuln if vuln else finding.finding
             finding_data = self._parse_finding_data(finding, vuln)
-            if resource.data:
-                dns = resource.data.get("hostname")
-                ip_address = resource.data.get("ipv4")
+            if resource_data := getattr(resource, "data"):
+                dns = resource_data.get("hostname")
+                ip_address = resource_data.get("ipv4")
             else:
                 dns = resource.uid if vuln else None
                 ip_address = None

regscale/models/integration_models/synqly_models/synqly_model.py

@@ -700,10 +700,7 @@ class SynqlyModel(BaseModel, ABC):
         if query_filter:
             query_filter = self.validate_filters(query_filter)
         integration_data: list = []
-        fetch_res = func(
-            filter=query_filter,
-            limit=limit,
-        )
+        fetch_res = self._fetch_data_with_retries(func=func, limit=limit, filter=query_filter)
         self.logger.info(f"Received {len(fetch_res.result)} record(s) from {self.integration_name}.")
         integration_data.extend(fetch_res.result)
         # check and handle pagination
@@ -711,24 +708,49 @@ class SynqlyModel(BaseModel, ABC):
             try:
                 # fetch.cursor can be an int as a string, or a continuation token
                 while int(fetch_res.cursor) == len(integration_data):
-                    fetch_res = func(
-                        filter=query_filter,
-                        limit=limit,
-                        cursor=fetch_res.cursor,
+                    fetch_res = self._fetch_data_with_retries(
+                        func=func, limit=limit, cursor=fetch_res.cursor, filter=query_filter
                     )
                     integration_data.extend(fetch_res.result)
             except ValueError:
                 while fetch_res.cursor:
-                    fetch_res = func(
-                        filter=query_filter,
-                        limit=limit,
-                        cursor=fetch_res.cursor,
+                    fetch_res = self._fetch_data_with_retries(
+                        func=func, limit=limit, cursor=fetch_res.cursor, filter=query_filter
                     )
                     integration_data.extend(fetch_res.result)
                     self.logger.info(f"Received {len(integration_data)} record(s) from {self.integration_name}...")
         self.logger.info(f"Fetched {len(integration_data)} total record(s) from {self.integration_name}...")
         return integration_data
 
+    def _fetch_data_with_retries(
+        self, func: Callable, limit: int, cursor: Union[str, int, None] = None, filter: Optional[str] = None
+    ) -> Any:
+        """
+        Fetches data from the integration using the provided function and handles pagination
+
+        :param Callable func: The function to fetch data from the integration
+        :param int limit: The limit of records to fetch
+        :param Optional[str] filter: The filter to apply to the data
+        :return: The data from the integration
+        :rtype: Any
+        """
+        import time
+
+        retries = 0
+        sleep_timers = [10, 20, 40]
+        while retries < 3:
+            try:
+                if cursor:
+                    return func(limit=limit, filter=filter, cursor=cursor)
+                else:
+                    return func(limit=limit, filter=filter)
+            except Exception as e:
+                self.logger.error(f"Error fetching data with retries: {e}")
+                self.logger.error(f"Retrying in {sleep_timers[retries]} seconds...")
+                time.sleep(sleep_timers[retries])
+                retries += 1
+        error_and_exit("Failed to fetch data after 3 retries")
+
     def run_integration_sync(self, *args, **kwargs) -> None:
         """
         Runs the sync process for the integration

{regscale_cli-6.27.0.1.dist-info → regscale_cli-6.27.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: regscale-cli
-Version: 6.27.0.1
+Version: 6.27.2.0
 Summary: Command Line Interface (CLI) for bulk processing/loading data into RegScale
 Home-page: https://github.com/RegScale/regscale-cli
 Author: Travis Howerton

{regscale_cli-6.27.0.1.dist-info → regscale_cli-6.27.2.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 regscale/__init__.py,sha256=ZygAIkX6Nbjag1czWdQa-yP-GM1mBE_9ss21Xh__JFc,34
-regscale/_version.py,sha256=Osrs4pJBb55zQAQEB_LRVHlIdaSiQB-xSdkw85Zyotk,1198
+regscale/_version.py,sha256=Lq40cZd2OT7sJZZWQh9y8KbuzbrUJbNhz2k2NIgwDVs,1198
 regscale/regscale.py,sha256=4LzcbkBxPh23cCLANVEEr6uNoZ0sebHec0N-VJm5_vA,31480
 regscale/airflow/__init__.py,sha256=yMwN0Bz4JbM0nl5qY_hPegxo_O2ilhTOL9PY5Njhn-s,270
 regscale/airflow/click_dags.py,sha256=H3SUR5jkvInNMv1gu-VG-Ja_H-kH145CpQYNalWNAbE,4520
@@ -57,7 +57,7 @@ regscale/core/app/internal/workflow.py,sha256=SpgYk1QyzdilVLOK1fFzaKhdLspumaugf5
 regscale/core/app/utils/XMLIR.py,sha256=M_RrCsbjznihatkucCKw6dPgHTPQczXyqIdUXWhuCLI,8328
 regscale/core/app/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 regscale/core/app/utils/api_handler.py,sha256=T1meKw6Yi3ZAgRbQ1xuKDVh9Q9B8mbMqqN_LrSwIlAM,11765
-regscale/core/app/utils/app_utils.py,sha256=c7V61VYaHaz_4o4YNmpQl0gZ3bHlbRwfpj-fUBVcb_s,37134
+regscale/core/app/utils/app_utils.py,sha256=k_HEO4cFIddZMUtr56Z8A5NEjLz1Tl8vl2c3pqjXKvc,38652
 regscale/core/app/utils/file_utils.py,sha256=x7cqYPxJ-PgSb2lX_K6zhdqyGQjOCmr04lnqdBQV3hI,9269
 regscale/core/app/utils/parser_utils.py,sha256=aBEgcFwbJMD-ARf3wzf-tyWwR6NHvzEcdYcPMm8hGqo,2533
 regscale/core/app/utils/pickle_file_handler.py,sha256=iMdv4N8z00TB5LyPdxIcLKNRpDQVWQ8ZQWAqCKpqmF0,1695
@@ -145,7 +145,7 @@ regscale/integrations/commercial/aqua/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCe
 regscale/integrations/commercial/aqua/aqua.py,sha256=bdwqyir9ztGRwqZlWBQIHjtBEo2utSy5HJoraAx823I,2656
 regscale/integrations/commercial/aws/__init__.py,sha256=Pii3CMGvIwZnTSenuvDvuybWXBtIRdGyvF02sykzg1A,203
 regscale/integrations/commercial/aws/cli.py,sha256=Q2QlUcbYRzZzg9VZ5RDOTdVkkWc4UFYX7f5cMNlOZMY,14853
-regscale/integrations/commercial/aws/scanner.py,sha256=odN8nWhIlxGLBdVVVgfhp9wHq5yE32pzr9BK7OIjDkw,56770
+regscale/integrations/commercial/aws/scanner.py,sha256=2XtHT3En5VoFYt-qGnIsNenThofZHkzC3fbJwHA6gPI,56765
 regscale/integrations/commercial/aws/inventory/__init__.py,sha256=nBWBRs_lTbp3tfCcnmN855qQpnXtwyJ5miTXlD7Uhcs,4302
 regscale/integrations/commercial/aws/inventory/base.py,sha256=KL1Ntz0h0WGDu84LQf3y92uLl9a0sl4yIFi6-ZIFAMI,2068
 regscale/integrations/commercial/aws/inventory/resources/__init__.py,sha256=wP8TMIixWGCn2rBNFW6XzhME-xO8kpxi9edMUJgpso4,523
@@ -182,7 +182,7 @@ regscale/integrations/commercial/mappings/csf_controls.json,sha256=EHOLWrnFr0oRs
 regscale/integrations/commercial/mappings/nist_800_53_r5_controls.json,sha256=Vuh8RkKhX84U8VG2zoLG94QL7mvWIF28M-u8B4paxgw,123879
 regscale/integrations/commercial/microsoft_defender/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 regscale/integrations/commercial/microsoft_defender/defender.py,sha256=JQLdSiGMuDFGXH8wdb3NQXuobcBprg1PR11OEOEBYyQ,51702
-regscale/integrations/commercial/microsoft_defender/defender_api.py,sha256=_Gij8I26tTt6B0RTqRyKPAi58gwl_TnKwe1fu80CPIM,29433
+regscale/integrations/commercial/microsoft_defender/defender_api.py,sha256=GJf0H-4BacSLNtCXFU1Yb02mYS-jVuX40Z75bn6UqjQ,29434
 regscale/integrations/commercial/microsoft_defender/defender_constants.py,sha256=pYIVii1ouy3FYM58UbAdlcYdVoC54vEv0M2FjFk0XmU,9516
 regscale/integrations/commercial/microsoft_defender/defender_scanner.py,sha256=gUTtbv-yB2gDa3xXZpx1Ygq0hqa77I28516UOrwvla4,10615
 regscale/integrations/commercial/nessus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -208,9 +208,9 @@ regscale/integrations/commercial/sarif/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JC
 regscale/integrations/commercial/sarif/sairf_importer.py,sha256=gCuDsybT0jbhCtQLJW0L88hLxUpWIgatVERU4D6_9Xc,17886
 regscale/integrations/commercial/sarif/sarif_converter.py,sha256=3KJ7GBt8iJzTKdlUNq5rRx9JaoIHcESdbQim7AfhvNk,1910
 regscale/integrations/commercial/sicura/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-regscale/integrations/commercial/sicura/api.py,sha256=8qFzENIpso7fuTWxXmzaWUAkDSTMQkcXB_cbfHPSDBE,32109
+regscale/integrations/commercial/sicura/api.py,sha256=dUpLcMgOVTxmfit7Mt118o6y_nQy1nwMLEbbW7euRYw,33982
 regscale/integrations/commercial/sicura/commands.py,sha256=bDphozdUeuEVwspIjqBCOrQUIGAIFJpmg8ltzh3i8kc,2052
-regscale/integrations/commercial/sicura/scanner.py,sha256=vkfwU7sUGGnLu4N1Ue-Ruhhq8n4i6kS7-0Kdx2lhKXE,17721
+regscale/integrations/commercial/sicura/scanner.py,sha256=3n0OLvD0n-i1BRG4ZHIJOEVO0xj_IYEJ1h0YBvtKG3U,19046
 regscale/integrations/commercial/sicura/variables.py,sha256=FOdXj5bTtmsAYJYLdLxYMalKhkP1l0bWjA5bCmvgvdU,676
 regscale/integrations/commercial/stig_mapper_integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 regscale/integrations/commercial/stig_mapper_integration/click_commands.py,sha256=tLD9WObChb4NBd_sWnX05QPqXbiXOzdAp-v5YAObuDc,1200
@@ -229,10 +229,10 @@ regscale/integrations/commercial/tenablev2/__init__.py,sha256=UpSY_oww83kz9c7amd
 regscale/integrations/commercial/tenablev2/authenticate.py,sha256=VPTmxaVCaah2gJYNeU9P1KoQ734ohGQ-wcVy6JfqDTE,1247
 regscale/integrations/commercial/tenablev2/cis_parsers.py,sha256=7F6OSgYXSKMNpEyyWxPilt1u9SZRuQY21Qbp9fGbD9o,17167
 regscale/integrations/commercial/tenablev2/cis_scanner.py,sha256=uMuE48-ZfYSMyFBdJsPgR-biV7OtGYV64-2QZBwKsn0,17550
-regscale/integrations/commercial/tenablev2/commands.py,sha256=ZB2rZ0RKQ0rkRGrbuw2CJogbEBee8u0I-2WAy4qYvnc,32605
+regscale/integrations/commercial/tenablev2/commands.py,sha256=r7TnD1Aqk2qaIy8xx9baSErnbH5EQwrEHgu2QDfUwIE,32605
 regscale/integrations/commercial/tenablev2/jsonl_scanner.py,sha256=6dv92JslX_p_N6vuwCj4hj1OPy935a-ZjPz0dsWaXuw,83577
 regscale/integrations/commercial/tenablev2/sc_scanner.py,sha256=WQ7ctneHz3fYOrR_GvVUJL3BuKNoN515y7pG8ATMjOM,24102
-regscale/integrations/commercial/tenablev2/scanner.py,sha256=vQAa5_oSSceg6BlGCizsT3cHCG2-rphvN1ww_KAcfnE,21527
+regscale/integrations/commercial/tenablev2/scanner.py,sha256=MEEyFKEdQdV8QUQUwL3eK7aLMvJppdACj2Mt7JZ4bv4,21462
 regscale/integrations/commercial/tenablev2/stig_parsers.py,sha256=xv68Vk7BhTIAM5RZqlCRK3fOd2qcVTGgtTM3DFiuhuY,7780
 regscale/integrations/commercial/tenablev2/sync_compliance.py,sha256=_7_VwJm2xHUk-4Pzaz-ywQ3FNuMgRUn9IlRW3m9e97M,22083
 regscale/integrations/commercial/tenablev2/utils.py,sha256=_MmvcR71PmvH4dQ1k4M-q4PYAg0EE_aQ9w4cUdP7SwE,3359
@@ -248,7 +248,7 @@ regscale/integrations/commercial/wizv2/file_cleanup.py,sha256=ENBO9RDXL2kyHkBYaS
 regscale/integrations/commercial/wizv2/issue.py,sha256=fTYRTpf1bjWfPe1MgKhUkv7-ahQzib4hDGJVCTbvDpI,46238
 regscale/integrations/commercial/wizv2/reports.py,sha256=GTP_bNGqxofKNEucDfbbE5RmjIEmMZgZLZT_sYdi0Ew,8794
 regscale/integrations/commercial/wizv2/sbom.py,sha256=gdjB33PG67LrZXZUji7KCLjJ_CuiXE5nX_EcACo-DNk,4471
-regscale/integrations/commercial/wizv2/scanner.py,sha256=AbNvmOHsLd-toVvQStft7sGhHd8c6KHFc8SB1qTt3gg,93886
+regscale/integrations/commercial/wizv2/scanner.py,sha256=JREqiYYS-ZZUgg7gEzLdYzYh7tlILB6_OBjFYpxXshE,95413
 regscale/integrations/commercial/wizv2/variables.py,sha256=SdMZyKsAn-JxjVNMCWA6Im4h_7Sb2JlJ3vS6aorzHpc,3812
 regscale/integrations/commercial/wizv2/compliance/__init__.py,sha256=t0WhxpC75lVQ1P_abMlyrTqXJKXGI4ZRp9C-5_gF4A0,377
 regscale/integrations/commercial/wizv2/compliance/helpers.py,sha256=HXSFgYtYDE6TdpbEYxvqaz4s673oaveurnyuuG5lgV8,22983
@@ -271,7 +271,7 @@ regscale/integrations/integration/integration.py,sha256=pr_fbqBieYbqp3PdBjuqKuZC
 regscale/integrations/integration/inventory.py,sha256=gHL1a6VSV3zf4DTmksEy8qXNrqhIun8TwLxhRpuEMqY,341
 regscale/integrations/integration/issue.py,sha256=HaCF_5F_U_E5ecYlMgOZiM-yhXnt7OLj47OAJkf9X3g,3507
 regscale/integrations/public/__init__.py,sha256=oohbRYt88NZyMoFvQGrx6kVQROZrxAwlKIumL2yUh2g,3348
-regscale/integrations/public/cci_importer.py,sha256=HI6b3N3NXX7IBnqmEe0KSFnkSuATnfQWVC1ETCcAm3M,16390
+regscale/integrations/public/cci_importer.py,sha256=MZLX1YlaVCiVgDiFZkQV-0iHmBqkuT_vSadbDUCDLdw,31494
 regscale/integrations/public/cisa.py,sha256=EE2rN4GWWEk5VLt4iMVwGMYB6yYPxe6KyW_tLs8dDmA,21870
 regscale/integrations/public/criticality_updater.py,sha256=bekadBBJkym5Dd9JZFNQmY3I0e1xgBvxkyVwgCNOKus,2806
 regscale/integrations/public/emass.py,sha256=culHHuXUlVYkB6DcVcnUvpBzU1eRyyVGgsJ3KqC8HOw,13672
@@ -336,12 +336,12 @@ regscale/models/app_models/mapping.py,sha256=tga2kCsEZT-YvnJIgiHy_qRcFp25Xzk0Ykb
 regscale/models/app_models/pipeline.py,sha256=qzrkQvvW6d8rqbBjMR8wkT2obez0tnKyY_TxtxLh6VE,909
 regscale/models/integration_models/CCI_List.xml,sha256=qwHzCrZ3KQnLLmrF6J9dE_trhVcUdIw-7WFTtvPmNLM,3226054
 regscale/models/integration_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-regscale/models/integration_models/aqua.py,sha256=XR2qrzCOI_bXrFPVcgbxUyaE1m0Oe2NSH7ph1hn8q2w,10697
+regscale/models/integration_models/aqua.py,sha256=MI_qltODiERdGpmwoRD7_U1ISmBMl30mjpPf8brjdhQ,10717
 regscale/models/integration_models/azure_alerts.py,sha256=2etrpvcxa7jVQrc98bJlVGd3xPcw-YwJ65c3pfSf0uA,8408
 regscale/models/integration_models/base64.py,sha256=sxV6O5qY1_TstJENX5jBPsSdQwmA83-NNhgJFunXiZE,570
 regscale/models/integration_models/burp.py,sha256=FBEBkH3U0Q8vq71FFoWnvgLRF5Hkr9GYmQFmNNHFrVk,16932
 regscale/models/integration_models/burp_models.py,sha256=UytDTAcCaxyu-knFkm_mEUH6UmWK3OTXKSC9Sc6OjVs,3669
-regscale/models/integration_models/cisa_kev_data.json,sha256=NQpI-0sN-kJdasvfcqjmjlWJZpNJbgYVs-l_MlOuTD8,1295585
+regscale/models/integration_models/cisa_kev_data.json,sha256=g9yH6zg8DARdu4A1E4VvQJ5pGGffuCZRpsd2RkhwjGY,1306997
 regscale/models/integration_models/defender_data.py,sha256=jsAcjKxiGmumGerj7xSWkFd6r__YpuKDnYX5o7xHDiE,2844
 regscale/models/integration_models/defenderimport.py,sha256=Ze4kgwns-IYPyO7sBjEzW8PXWlxwU-DAo2fIyRcTC3k,6242
 regscale/models/integration_models/drf.py,sha256=Aq7AdLa_CH97NrnR-CxaFI22JjVN9uCxVN7Z-BBUaNU,18896
@@ -368,22 +368,22 @@ regscale/models/integration_models/axonius_models/connectors/assets.py,sha256=6m
 regscale/models/integration_models/ecr_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 regscale/models/integration_models/ecr_models/data.py,sha256=l28DCidXar1JygYBQZL9MYenQA9N-Cx3Skf51IOjZcw,1017
 regscale/models/integration_models/ecr_models/ecr.py,sha256=oAkQ-SDS3Mjrn291dh9qF5LaRYGFJnmuNY28UyrzIfg,7293
-regscale/models/integration_models/flat_file_importer/__init__.py,sha256=HYO7mrqnBaXKyo7dBNGnVqYY7m_1OjTadJKfg4f_ae4,40595
+regscale/models/integration_models/flat_file_importer/__init__.py,sha256=8RNe5LU_mHvO4bH2wO_1d2pijy2s4n7nhpjN25xZF2o,40633
 regscale/models/integration_models/sbom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 regscale/models/integration_models/sbom/cyclone_dx.py,sha256=0pFR0BWBrF5c8_cC_8mj2MXvNOMHOdHbBYXvTVfFAh8,4058
 regscale/models/integration_models/synqly_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-regscale/models/integration_models/synqly_models/capabilities.json,sha256=MqbVQ3qdu4cDHkAXF50zanx4CnFiIhIwW1Iw8CS-4j0,442882
+regscale/models/integration_models/synqly_models/capabilities.json,sha256=oV1EzsM5z2abuVWhoxcgJ7Sg1mT6DQ7sNtJPbYwS330,442978
 regscale/models/integration_models/synqly_models/connector_types.py,sha256=8nxptkTexpskySnmL0obNAff_iu_fx6tJ7i1-4hJvao,461
 regscale/models/integration_models/synqly_models/filter_parser.py,sha256=8rdnHH7gW1A_uWRTexZXzCH-HzRVy5nlvFgtc7ztcsQ,12160
-regscale/models/integration_models/synqly_models/ocsf_mapper.py,sha256=ftObPhGg9CamnwRZ5z6qi8pW2Gu4JYy8apEo33o7q00,16960
+regscale/models/integration_models/synqly_models/ocsf_mapper.py,sha256=3M1O8yz0jBRav30lK8BU1xUL5STixetRSpIp5bWhRzg,18746
 regscale/models/integration_models/synqly_models/param.py,sha256=Xt5Zm6lC_VkLj7LF2qXo72TJZHysqttsp5ai0NCf1po,2643
-regscale/models/integration_models/synqly_models/synqly_model.py,sha256=3nNELO4TcbvzS8u0eZqGVUUFycS5BR0NA8oWAbw3R_k,36801
+regscale/models/integration_models/synqly_models/synqly_model.py,sha256=RPxieh3r9dVdkt7IliiNEqEqvhbXv3UFuEEZ4-MNqGc,37965
 regscale/models/integration_models/synqly_models/tenants.py,sha256=kewIZw-iv18bNXJGG3ghwuFJ4CK5iXQhn_x2-xvV0iM,1078
 regscale/models/integration_models/synqly_models/connectors/__init__.py,sha256=J3YS7KXLnTPRzeM3lUQpy6HKH7CxPPsWCB-sPXSWcYA,189
 regscale/models/integration_models/synqly_models/connectors/assets.py,sha256=HHNIAVh5pRuJe8sStqhFEc6VnX2wT0FcY5178nbQgkQ,3705
 regscale/models/integration_models/synqly_models/connectors/edr.py,sha256=kio3uoEYubCHretpDOJqxdwmzid1IzbVYz0BF64zeL0,5547
 regscale/models/integration_models/synqly_models/connectors/ticketing.py,sha256=yRBuCkRAVfa_C91r3WqJ9gxrQsoD0qV9cY48YXpJl70,25358
-regscale/models/integration_models/synqly_models/connectors/vulnerabilities.py,sha256=nGS3XqRGTITz2XLSSr766DAfbngOT_D9DUFhaG--Plc,8239
+regscale/models/integration_models/synqly_models/connectors/vulnerabilities.py,sha256=7fsPHtWSrHxlqAXGURvQ4VWunmAs-acz7O8ABHshdBw,8240
 regscale/models/integration_models/tenable_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 regscale/models/integration_models/tenable_models/integration.py,sha256=lplL8zmjTFuhLreW-4y7G1fiCOBgzNAaATq800jgTQc,10271
 regscale/models/integration_models/tenable_models/models.py,sha256=dmG7btkN4YkDWwnfW5Ldc3tWEAGjPiaRgJjrqMOkPEU,15846
@@ -559,7 +559,7 @@ tests/regscale/integrations/commercial/test_jira.py,sha256=oyPdDpjh4MiKlUYN14Za9
 tests/regscale/integrations/commercial/test_npm_audit.py,sha256=g8Dyvb3hmYPKgTF6l7MNKnuiBEStK5tM8jFbs594IBQ,988
 tests/regscale/integrations/commercial/test_okta.py,sha256=J3bBdotRRkIqdsEVLZLyt5PBI5u_dpmxXZnVFuSG1bs,47149
 tests/regscale/integrations/commercial/test_sarif_converter.py,sha256=uONCJEfiV2flUIDa-iwFd_h5RnHSaFHoyvNrXtcOhVU,11251
-tests/regscale/integrations/commercial/test_sicura.py,sha256=0N_8xjpDUgzrxFUPC1cTQs9Znk7qxgMRb500LVzozqw,13235
+tests/regscale/integrations/commercial/test_sicura.py,sha256=FaY0uOOKf7zyd2ejLtg07hMRIHDapi5n4qvxBc1s6MM,13192
 tests/regscale/integrations/commercial/test_snow.py,sha256=LKAeme78hl0VzzLP-rXZnA5-3CCBrJLgYUlxOW2hYnM,16076
 tests/regscale/integrations/commercial/test_sonarcloud.py,sha256=IB3nD9KbkTBXJgjF4RujUod54VUI0CMYanqoQ40suBk,15291
 tests/regscale/integrations/commercial/test_sqlserver.py,sha256=TktSuFoyLUmdimRxoN8wxBQwr75igWxA8mN83Isnuvw,7119
@@ -592,7 +592,7 @@ tests/regscale/integrations/commercial/wizv2/test_wiz_control_normalization.py,s
 tests/regscale/integrations/commercial/wizv2/test_wiz_findings_comprehensive.py,sha256=zieuADKOAlBjPPlUkgSvMMZOr4CvnIZTl_0MvsyK4XA,14955
 tests/regscale/integrations/commercial/wizv2/test_wiz_inventory_comprehensive.py,sha256=2vEB9Hz_M1D2YQyZC3fD6RJCeXlRbUT3PRsu3DDek-A,27089
 tests/regscale/integrations/commercial/wizv2/test_wiz_status_mapping.py,sha256=ZUeRHUt547FV0svfiGEIwyRuItoTDKtMeJFvBWuhWhg,6967
-tests/regscale/integrations/commercial/wizv2/test_wizv2.py,sha256=qZ6Dh54NTfIJHy5PbaoLl1W4syTPl3htVqZvM5o6pAc,61072
+tests/regscale/integrations/commercial/wizv2/test_wizv2.py,sha256=WoRyyrJLW6Nnie1G6McWZc24OAe0A2KYhqXMyOiOSnw,66522
 tests/regscale/integrations/commercial/wizv2/test_wizv2_utils.py,sha256=U3qOibYbzF1adPPdpTbqyeWCT6t8cRaLy__o9F8mLO0,25182
 tests/regscale/integrations/commercial/wizv2/compliance/__init__.py,sha256=_ceZ5sfxe2B6jHQuisE8iYg_G68IkArHYq1oTC9Ede0,47
 tests/regscale/integrations/commercial/wizv2/compliance/test_helpers.py,sha256=0fuC9cuSSXzWeRrm9Y0KC7uOZsOPpiOz48m_C8nF6lg,35411
@@ -610,7 +610,7 @@ tests/regscale/integrations/commercial/wizv2/utils/__init__.py,sha256=PIKcAU5kcq
 tests/regscale/integrations/commercial/wizv2/utils/test_main.py,sha256=VExH4ORw3C4KBzZiQwwtRpeGnsQhl5r0FMk0wD6OCBo,60749
 tests/regscale/integrations/public/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/regscale/integrations/public/test_alienvault.py,sha256=epxuflNgibIl1aYCU0FTVXXFWJbiqt0mYBV4HVaZYuw,9211
-tests/regscale/integrations/public/test_cci.py,sha256=Zv5igmyYJpAwIAHrGQ-3Pd8MLvY8bh-B5FALL41PPU8,19525
+tests/regscale/integrations/public/test_cci.py,sha256=Xtyuwv1N8wTgvnUs7oWkWwp7yOC3MO77gyqOKFXC5mI,44314
 tests/regscale/integrations/public/test_cisa.py,sha256=onfmI-8Nuhr7g0C87gweGoWhAubcqkmammRUD8QCQFE,41376
 tests/regscale/integrations/public/test_emass.py,sha256=fDjQcsiXFhWGB399fikfW_khCrixB3nEL3cBlAm4XbQ,21797
 tests/regscale/integrations/public/test_fedramp.py,sha256=ppVsyj-zQRq5isH0Ht1_s9jrJUSBJSs9y976-LDHpwE,70161
@@ -635,9 +635,9 @@ tests/regscale/models/test_regscale_model.py,sha256=ZsrEZkC4EtdIsoQuayn1xv2gEGcV
 tests/regscale/models/test_report.py,sha256=IqUq7C__a1_q_mLaz0PE9Lq6fHggBsB14-AzEYNBxLw,4666
 tests/regscale/models/test_tenable_integrations.py,sha256=y1qaW77H094VSGHjZdlvF66UCt-nPEib9Mv3cdwbM94,32435
 tests/regscale/models/test_user_model.py,sha256=e9olv28qBApgnvK6hFHOgXjUC-pkaV8aGDirEIWASL4,4427
-regscale_cli-6.27.0.1.dist-info/LICENSE,sha256=ytNhYQ9Rmhj_m-EX2pPq9Ld6tH5wrqqDYg-fCf46WDU,1076
-regscale_cli-6.27.0.1.dist-info/METADATA,sha256=_pivqE24yPp_EYyjmO1UZ7oa5cxPf_gox0TJrnNTfzA,34231
-regscale_cli-6.27.0.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-regscale_cli-6.27.0.1.dist-info/entry_points.txt,sha256=cLOaIP1eRv1yZ2u7BvpE3aB4x3kDrDwkpeisKOu33z8,269
-regscale_cli-6.27.0.1.dist-info/top_level.txt,sha256=Uv8VUCAdxRm70bgrD4YNEJUmDhBThad_1aaEFGwRByc,15
-regscale_cli-6.27.0.1.dist-info/RECORD,,
+regscale_cli-6.27.2.0.dist-info/LICENSE,sha256=ytNhYQ9Rmhj_m-EX2pPq9Ld6tH5wrqqDYg-fCf46WDU,1076
+regscale_cli-6.27.2.0.dist-info/METADATA,sha256=urTKR5zkhFizHfI1rxRo29oWv7HRbGHOxLSVbO8U_Ts,34231
+regscale_cli-6.27.2.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+regscale_cli-6.27.2.0.dist-info/entry_points.txt,sha256=cLOaIP1eRv1yZ2u7BvpE3aB4x3kDrDwkpeisKOu33z8,269
+regscale_cli-6.27.2.0.dist-info/top_level.txt,sha256=Uv8VUCAdxRm70bgrD4YNEJUmDhBThad_1aaEFGwRByc,15
+regscale_cli-6.27.2.0.dist-info/RECORD,,

tests/regscale/integrations/commercial/test_sicura.py

@@ -15,7 +15,6 @@ class TestSicuraAPI(unittest.TestCase):
     def setUp(self):
         """Set up test environment."""
         self.api = SicuraAPI()
-        self.api.csrf_token = "test_token"
         self.api.base_url = "https://sicura-test.example.com"
         self.api.session = mock.MagicMock()
 

tests/regscale/integrations/commercial/wizv2/test_wizv2.py

@@ -522,6 +522,35 @@ class TestWizVulnerabilityIntegration(unittest.TestCase):
         severity = WizVulnerabilityIntegration.get_issue_severity("Unknown")
         self.assertEqual(severity, regscale_models.IssueSeverity.Low)
 
+    def test_get_issue_severity_none_maps_to_not_assigned(self, mock_parent_init):
+        """Test REG-17981: Handle NONE severity from Wiz config findings."""
+        severity = WizVulnerabilityIntegration.get_issue_severity("None")
+        self.assertEqual(severity, regscale_models.IssueSeverity.NotAssigned)
+
+    @patch("regscale.integrations.commercial.wizv2.scanner.WizVulnerabilityIntegration.authenticate")
+    def test_should_process_finding_by_severity_none_treated_as_informational(
+        self, mock_authenticate, mock_parent_init
+    ):
+        """Test REG-17981: NONE severity should be treated as informational for filtering."""
+        mock_authenticate.return_value = None
+        integration = WizVulnerabilityIntegration(plan_id=self.plan_id)
+        self._initialize_scanner_attributes(integration)
+        integration.app.config["scanners"] = {"wiz": {"minimumSeverity": "low"}}
+        # NONE severity should be filtered out when min is "low" (treated as informational)
+        self.assertFalse(integration.should_process_finding_by_severity("NONE"))
+
+    @patch("regscale.integrations.commercial.wizv2.scanner.WizVulnerabilityIntegration.authenticate")
+    def test_should_process_finding_by_severity_none_allowed_with_informational(
+        self, mock_authenticate, mock_parent_init
+    ):
+        """Test REG-17981: NONE severity should be allowed when min severity is informational."""
+        mock_authenticate.return_value = None
+        integration = WizVulnerabilityIntegration(plan_id=self.plan_id)
+        self._initialize_scanner_attributes(integration)
+        integration.app.config["scanners"] = {"wiz": {"minimumSeverity": "informational"}}
+        # NONE severity should be processed when min is "informational"
+        self.assertTrue(integration.should_process_finding_by_severity("NONE"))
+
     @patch("regscale.integrations.commercial.wizv2.scanner.WizVulnerabilityIntegration.authenticate")
     def test_should_process_finding_by_severity_critical(self, mock_authenticate, mock_parent_init):
         mock_authenticate.return_value = None
@@ -687,6 +716,63 @@ class TestWizVulnerabilityIntegration(unittest.TestCase):
         asset_id = integration.get_asset_id_from_node(node, WizVulnerabilityType.VULNERABILITY)
         self.assertIsNone(asset_id)
 
+    @patch("regscale.integrations.commercial.wizv2.scanner.WizVulnerabilityIntegration.authenticate")
+    def test_get_asset_id_with_none_value_returns_none(self, mock_authenticate, mock_parent_init):
+        """Test REG-17981: Handle None value for asset container without AttributeError."""
+        from regscale.integrations.commercial.wizv2.core.constants import WizVulnerabilityType
+
+        mock_authenticate.return_value = None
+        integration = WizVulnerabilityIntegration(plan_id=self.plan_id)
+        node = {"vulnerableAsset": None}
+        asset_id = integration.get_asset_id_from_node(node, WizVulnerabilityType.VULNERABILITY)
+        self.assertIsNone(asset_id)
+
+    @patch("regscale.integrations.commercial.wizv2.scanner.WizVulnerabilityIntegration.authenticate")
+    def test_get_asset_id_with_none_resource_returns_none(self, mock_authenticate, mock_parent_init):
+        """Test REG-17981: Handle None value for resource field without AttributeError."""
+        from regscale.integrations.commercial.wizv2.core.constants import WizVulnerabilityType
+
+        mock_authenticate.return_value = None
+        integration = WizVulnerabilityIntegration(plan_id=self.plan_id)
+        node = {"resource": None}
+        asset_id = integration.get_asset_id_from_node(node, WizVulnerabilityType.CONFIGURATION)
+        self.assertIsNone(asset_id)
+
+    @patch("regscale.integrations.commercial.wizv2.scanner.WizVulnerabilityIntegration.authenticate")
+    def test_get_asset_id_with_non_dict_value_returns_none(self, mock_authenticate, mock_parent_init):
+        """Test REG-17981: Handle non-dict value for asset container without AttributeError."""
+        from regscale.integrations.commercial.wizv2.core.constants import WizVulnerabilityType
+
+        mock_authenticate.return_value = None
+        integration = WizVulnerabilityIntegration(plan_id=self.plan_id)
+        # Test with a string value instead of dict
+        node = {"vulnerableAsset": "not-a-dict"}
+        asset_id = integration.get_asset_id_from_node(node, WizVulnerabilityType.VULNERABILITY)
+        self.assertIsNone(asset_id)
+
+    @patch("regscale.integrations.commercial.wizv2.scanner.WizVulnerabilityIntegration.authenticate")
+    def test_get_provider_unique_id_with_none_value_returns_none(self, mock_authenticate, mock_parent_init):
+        """Test REG-17981: Handle None value in get_provider_unique_id_from_node without AttributeError."""
+        from regscale.integrations.commercial.wizv2.core.constants import WizVulnerabilityType
+
+        mock_authenticate.return_value = None
+        integration = WizVulnerabilityIntegration(plan_id=self.plan_id)
+        node = {"vulnerableAsset": None}
+        provider_id = integration.get_provider_unique_id_from_node(node, WizVulnerabilityType.VULNERABILITY)
+        self.assertIsNone(provider_id)
+
+    @patch("regscale.integrations.commercial.wizv2.scanner.WizVulnerabilityIntegration.authenticate")
+    def test_get_provider_unique_id_with_non_dict_returns_none(self, mock_authenticate, mock_parent_init):
+        """Test REG-17981: Handle non-dict value in get_provider_unique_id_from_node without AttributeError."""
+        from regscale.integrations.commercial.wizv2.core.constants import WizVulnerabilityType
+
+        mock_authenticate.return_value = None
+        integration = WizVulnerabilityIntegration(plan_id=self.plan_id)
+        # Test with a list value instead of dict
+        node = {"vulnerableAsset": ["not", "a", "dict"]}
+        provider_id = integration.get_provider_unique_id_from_node(node, WizVulnerabilityType.VULNERABILITY)
+        self.assertIsNone(provider_id)
+
     @patch("regscale.integrations.commercial.wizv2.scanner.WizVulnerabilityIntegration.authenticate")
     def test_get_provider_unique_id_standard(self, mock_authenticate, mock_parent_init):
         from regscale.integrations.commercial.wizv2.core.constants import WizVulnerabilityType