regscale-cli 6.21.0.0__py3-none-any.whl → 6.21.2.0__py3-none-any.whl

regscale/integrations/commercial/cpe.py

@@ -109,6 +109,23 @@ def extract_product_name_and_version(cpe_string: str) -> Dict:
     :rtype: Dict
     """
     # convert to version 2.3 if 2.2
+    # TODO: Note this is an incomplete conversion as the additional properties
+    # in the URI format (which is still supported in 2.3) are separated by
+    # tildes (~) after the final colon. We should extend this to support them
+    # at some point to be safe. Example from NISTIR7697 the 2.3 dictionary
+    # specification:
+    #
+    # WFN:
+    #     wfn:[part="o",vendor="microsoft",product="windows_vista",version="6\.0",
+    #     update="sp1",edition=NA,language=NA,sw_edition="home_premium",
+    #     target_sw=NA,target_hw="x64",other=NA]
+    #
+    # WFN bound to a URI:
+    #     cpe:/o:microsoft:windows_vista:6.0:sp1:~-~home_premium~-~x64~-
+    #
+    # WFN bound to a formatted string:
+    #     cpe:2.3:o:microsoft:windows_vista:6.0:sp1:-:-:home_premium:-:x64:-
+    #
     if cpe_string.startswith("cpe:/"):
         cpe_string = cpe_string.replace("cpe:/", "cpe:2.3:")
 
@@ -117,7 +134,7 @@ def extract_product_name_and_version(cpe_string: str) -> Dict:
 
     # Extract the product name and version
     # parts[3] is the product name, parts[4] is the version
-    part = parts[2]
+    part = parts[2] if len(parts) > 2 else None
     logger.debug(f"part: {part}")
     vendor_name = parts[3] if len(parts) > 3 else None
     product_name = parts[4] if len(parts) > 4 else None

regscale/integrations/commercial/import_all/import_all_cmd.py

@@ -87,7 +87,7 @@ def import_all_scans(
     from regscale.integrations.commercial.aqua.aqua import import_aqua
     from regscale.integrations.commercial.aws.cli import import_scans as import_aws
     from regscale.integrations.commercial.burp import import_burp
-    from regscale.integrations.commercial.defender import import_alerts
+    from regscale.integrations.commercial.microsoft_defender.defender import import_alerts
     from regscale.integrations.commercial.ecr import import_ecr
     from regscale.integrations.commercial.grype.commands import import_scans as import_grype_scans
     from regscale.integrations.commercial.ibm import import_appscan
@@ -96,7 +96,7 @@ def import_all_scans(
     from regscale.integrations.commercial.prisma import import_prisma
     from regscale.integrations.commercial.qualys import import_scans as import_qualys
     from regscale.integrations.commercial.snyk import import_snyk
-    from regscale.integrations.commercial.tenablev2.click import import_nessus
+    from regscale.integrations.commercial.tenablev2.commands import import_nessus
     from regscale.integrations.commercial.trivy import import_scans as import_trivy_scans
     from regscale.integrations.commercial.veracode import import_veracode
     from regscale.integrations.commercial.xray import import_xray