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

regscale/integrations/commercial/qualys/__init__.py

@@ -34,9 +34,8 @@ from regscale.integrations.commercial.qualys.scanner import QualysTotalCloudJSON
 from regscale.integrations.commercial.qualys.variables import QualysVariables
 from regscale.integrations.scanner_integration import IntegrationAsset, IntegrationFinding
 from regscale.integrations.variables import ScannerVariables
-from regscale.models import Asset, Issue, Search, regscale_models
-from regscale.models.app_models.click import NotRequiredIf, regscale_ssp_id, save_output_to, ssp_or_component_id
-from regscale.models.integration_models.ecr_models.data import Finding
+from regscale.models import Asset, Issue, Search, regscale_models, IssueStatus, IssueSeverity
+from regscale.models.app_models.click import NotRequiredIf, save_output_to, ssp_or_component_id
 from regscale.models.integration_models.flat_file_importer import FlatFileImporter
 from regscale.models.integration_models.qualys import (
     Qualys,
@@ -2116,7 +2115,7 @@ def lookup_asset(asset_list: list, asset_id: str = None) -> list[Asset]:
     return list(set(asset_list)) or []
 
 
-def map_qualys_severity_to_regscale(severity: int) -> tuple[str, str]:
+def map_qualys_severity_to_regscale(severity: int) -> tuple[IssueSeverity, str]:
     """
     Map Qualys vulnerability severity to RegScale Issue severity
 
@@ -2125,12 +2124,12 @@ def map_qualys_severity_to_regscale(severity: int) -> tuple[str, str]:
     :rtype: tuple[str, str]
     """
     if severity <= 2:
-        return "III - Low - Other Weakness", "low"
+        return IssueSeverity.Low, "low"
     if severity == 3:
-        return "II - Moderate - Reportable Condition", "moderate"
+        return IssueSeverity.Moderate, "moderate"
     if severity > 3:
-        return "I - High - Significant Deficiency", "high"
-    return "IV - Not Assigned", "low"
+        return IssueSeverity.High, "high"
+    return IssueSeverity.NotAssigned, "low"
 
 
 def create_regscale_issue_from_vuln(

regscale/integrations/commercial/qualys/scanner.py

@@ -4,6 +4,7 @@ Qualys Total Cloud scanner integration class using JSONLScannerIntegration.
 
 import logging
 import os
+import threading
 import time
 import traceback
 import xml.etree.ElementTree as ET
@@ -1554,17 +1555,21 @@ class QualysTotalCloudJSONLIntegration(JSONLScannerIntegration):
 
         return vulnerability_id
 
-    def set_severity_count_for_scan(self, severity: str, scan_history: regscale_models.ScanHistory) -> None:
+    def set_severity_count_for_scan(
+        self, severity: str, scan_history: regscale_models.ScanHistory, lock: Optional[threading.RLock] = None
+    ) -> None:
         """
         Override parent method to ensure Qualys scan history severity counts are properly updated.
         This ensures that the vulnerability counts are accurately reflected in the scan history.
 
         :param str severity: Severity of the vulnerability
         :param regscale_models.ScanHistory scan_history: Scan history object
+        :param Optional[threading.RLock] lock: Thread lock for synchronization
         :rtype: None
         """
-        # Use parent method to update severity counts
-        super().set_severity_count_for_scan(severity, scan_history)
+        # Use parent method to update severity counts with thread-safe locking
+        # Pass lock if provided, otherwise use our instance lock
+        super().set_severity_count_for_scan(severity, scan_history, lock or self.scan_history_lock)
 
     def create_scan_history(self) -> regscale_models.ScanHistory:
         """

regscale/integrations/commercial/synqly/assets.py

@@ -74,6 +74,23 @@ def sync_axonius(regscale_ssp_id: int, filter: str) -> None:
     assets_axonius.run_sync(regscale_ssp_id=regscale_ssp_id, filter=filter.split(";") if filter else [])
 
 
+@assets.command(name="sync_claroty_xdome")
+@regscale_ssp_id()
+@click.option(
+    "--filter",
+    help='STRING: Apply filters to the query. Can be a single filter "field[operator]value" or semicolon-separated filters "field1[op]value1;field2[op]value2"',
+    required=False,
+    type=str,
+    default=None,
+)
+def sync_claroty_xdome(regscale_ssp_id: int, filter: str) -> None:
+    """Sync Assets from Claroty Xdome to RegScale."""
+    from regscale.models.integration_models.synqly_models.connectors import Assets
+
+    assets_claroty_xdome = Assets("claroty_xdome")
+    assets_claroty_xdome.run_sync(regscale_ssp_id=regscale_ssp_id, filter=filter.split(";") if filter else [])
+
+
 @assets.command(name="sync_crowdstrike")
 @regscale_ssp_id()
 @click.option(

regscale/integrations/commercial/synqly/vulnerabilities.py

@@ -44,8 +44,9 @@ def build_query(provider, validate, list_fields):
 @vulnerabilities.command(name="sync_crowdstrike")
 @regscale_ssp_id()
 @click.option(
-    "--vuln_filter",
-    help="Filter the vulnerabilities for the selected severity. (Options: critical, high, medium, low, info)",
+    "--minimum_severity_filter",
+    "-s",
+    help="Minimum severity of the vulnerabilities to sync. (Options: critical, high, medium, low, info), e.g. providing high will sync all vulnerabilities with a severity of high and critical.",
     required=False,
     type=click.Choice(["critical", "high", "medium", "low", "info"]),
     default=None,
@@ -78,7 +79,12 @@ def build_query(provider, validate, list_fields):
     required=False,
 )
 def sync_crowdstrike(
-    regscale_ssp_id: int, vuln_filter: str, scan_date: datetime, all_scans: bool, asset_filter: str, url: str
+    regscale_ssp_id: int,
+    minimum_severity_filter: str,
+    scan_date: datetime,
+    all_scans: bool,
+    asset_filter: str,
+    url: str,
 ) -> None:
     """Sync Vulnerabilities from Crowdstrike to RegScale."""
     from regscale.models.integration_models.synqly_models.connectors import Vulnerabilities
@@ -86,7 +92,7 @@ def sync_crowdstrike(
     vulnerabilities_crowdstrike = Vulnerabilities("crowdstrike")
     vulnerabilities_crowdstrike.run_sync(
         regscale_ssp_id=regscale_ssp_id,
-        vuln_filter=vuln_filter,
+        minimum_severity_filter=minimum_severity_filter,
         scan_date=scan_date,
         all_scans=all_scans,
         filter=asset_filter.split(";") if asset_filter else [],
@@ -97,8 +103,9 @@ def sync_crowdstrike(
 @vulnerabilities.command(name="sync_nucleus")
 @regscale_ssp_id()
 @click.option(
-    "--vuln_filter",
-    help="Filter the vulnerabilities for the selected severity. (Options: critical, high, medium, low, info)",
+    "--minimum_severity_filter",
+    "-s",
+    help="Minimum severity of the vulnerabilities to sync. (Options: critical, high, medium, low, info), e.g. providing high will sync all vulnerabilities with a severity of high and critical.",
     required=False,
     type=click.Choice(["critical", "high", "medium", "low", "info"]),
     default=None,
@@ -121,7 +128,7 @@ def sync_crowdstrike(
     default=None,
 )
 def sync_nucleus(
-    regscale_ssp_id: int, vuln_filter: str, scan_date: datetime, all_scans: bool, asset_filter: str
+    regscale_ssp_id: int, minimum_severity_filter: str, scan_date: datetime, all_scans: bool, asset_filter: str
 ) -> None:
     """Sync Vulnerabilities from Nucleus to RegScale."""
     from regscale.models.integration_models.synqly_models.connectors import Vulnerabilities
@@ -129,7 +136,7 @@ def sync_nucleus(
     vulnerabilities_nucleus = Vulnerabilities("nucleus")
     vulnerabilities_nucleus.run_sync(
         regscale_ssp_id=regscale_ssp_id,
-        vuln_filter=vuln_filter,
+        minimum_severity_filter=minimum_severity_filter,
         scan_date=scan_date,
         all_scans=all_scans,
         filter=asset_filter.split(";") if asset_filter else [],
@@ -139,8 +146,9 @@ def sync_nucleus(
 @vulnerabilities.command(name="sync_qualys_cloud")
 @regscale_ssp_id()
 @click.option(
-    "--vuln_filter",
-    help="Filter the vulnerabilities for the selected severity. (Options: critical, high, medium, low, info)",
+    "--minimum_severity_filter",
+    "-s",
+    help="Minimum severity of the vulnerabilities to sync. (Options: critical, high, medium, low, info), e.g. providing high will sync all vulnerabilities with a severity of high and critical.",
     required=False,
     type=click.Choice(["critical", "high", "medium", "low", "info"]),
     default=None,
@@ -167,7 +175,7 @@ def sync_nucleus(
     default=None,
 )
 def sync_qualys_cloud(
-    regscale_ssp_id: int, vuln_filter: str, scan_date: datetime, all_scans: bool, asset_filter: str
+    regscale_ssp_id: int, minimum_severity_filter: str, scan_date: datetime, all_scans: bool, asset_filter: str
 ) -> None:
     """Sync Vulnerabilities from Qualys Cloud to RegScale."""
     from regscale.models.integration_models.synqly_models.connectors import Vulnerabilities
@@ -175,7 +183,7 @@ def sync_qualys_cloud(
     vulnerabilities_qualys_cloud = Vulnerabilities("qualys_cloud")
     vulnerabilities_qualys_cloud.run_sync(
         regscale_ssp_id=regscale_ssp_id,
-        vuln_filter=vuln_filter,
+        minimum_severity_filter=minimum_severity_filter,
         scan_date=scan_date,
         all_scans=all_scans,
         filter=asset_filter.split(";") if asset_filter else [],
@@ -185,8 +193,9 @@ def sync_qualys_cloud(
 @vulnerabilities.command(name="sync_rapid7_insight_cloud")
 @regscale_ssp_id()
 @click.option(
-    "--vuln_filter",
-    help="Filter the vulnerabilities for the selected severity. (Options: critical, high, medium, low, info)",
+    "--minimum_severity_filter",
+    "-s",
+    help="Minimum severity of the vulnerabilities to sync. (Options: critical, high, medium, low, info), e.g. providing high will sync all vulnerabilities with a severity of high and critical.",
     required=False,
     type=click.Choice(["critical", "high", "medium", "low", "info"]),
     default=None,
@@ -213,7 +222,7 @@ def sync_qualys_cloud(
     default=None,
 )
 def sync_rapid7_insight_cloud(
-    regscale_ssp_id: int, vuln_filter: str, scan_date: datetime, all_scans: bool, asset_filter: str
+    regscale_ssp_id: int, minimum_severity_filter: str, scan_date: datetime, all_scans: bool, asset_filter: str
 ) -> None:
     """Sync Vulnerabilities from Rapid7 Insight Cloud to RegScale."""
     from regscale.models.integration_models.synqly_models.connectors import Vulnerabilities
@@ -221,7 +230,7 @@ def sync_rapid7_insight_cloud(
     vulnerabilities_rapid7_insight_cloud = Vulnerabilities("rapid7_insight_cloud")
     vulnerabilities_rapid7_insight_cloud.run_sync(
         regscale_ssp_id=regscale_ssp_id,
-        vuln_filter=vuln_filter,
+        minimum_severity_filter=minimum_severity_filter,
         scan_date=scan_date,
         all_scans=all_scans,
         filter=asset_filter.split(";") if asset_filter else [],
@@ -231,8 +240,9 @@ def sync_rapid7_insight_cloud(
 @vulnerabilities.command(name="sync_servicenow_vr")
 @regscale_ssp_id()
 @click.option(
-    "--vuln_filter",
-    help="Filter the vulnerabilities for the selected severity. (Options: critical, high, medium, low, info)",
+    "--minimum_severity_filter",
+    "-s",
+    help="Minimum severity of the vulnerabilities to sync. (Options: critical, high, medium, low, info), e.g. providing high will sync all vulnerabilities with a severity of high and critical.",
     required=False,
     type=click.Choice(["critical", "high", "medium", "low", "info"]),
     default=None,
@@ -259,7 +269,7 @@ def sync_rapid7_insight_cloud(
     default=None,
 )
 def sync_servicenow_vr(
-    regscale_ssp_id: int, vuln_filter: str, scan_date: datetime, all_scans: bool, asset_filter: str
+    regscale_ssp_id: int, minimum_severity_filter: str, scan_date: datetime, all_scans: bool, asset_filter: str
 ) -> None:
     """Sync Vulnerabilities from Servicenow Vr to RegScale."""
     from regscale.models.integration_models.synqly_models.connectors import Vulnerabilities
@@ -267,7 +277,7 @@ def sync_servicenow_vr(
     vulnerabilities_servicenow_vr = Vulnerabilities("servicenow_vr")
     vulnerabilities_servicenow_vr.run_sync(
         regscale_ssp_id=regscale_ssp_id,
-        vuln_filter=vuln_filter,
+        minimum_severity_filter=minimum_severity_filter,
         scan_date=scan_date,
         all_scans=all_scans,
         filter=asset_filter.split(";") if asset_filter else [],
@@ -277,8 +287,9 @@ def sync_servicenow_vr(
 @vulnerabilities.command(name="sync_tanium_cloud")
 @regscale_ssp_id()
 @click.option(
-    "--vuln_filter",
-    help="Filter the vulnerabilities for the selected severity. (Options: critical, high, medium, low, info)",
+    "--minimum_severity_filter",
+    "-s",
+    help="Minimum severity of the vulnerabilities to sync. (Options: critical, high, medium, low, info), e.g. providing high will sync all vulnerabilities with a severity of high and critical.",
     required=False,
     type=click.Choice(["critical", "high", "medium", "low", "info"]),
     default=None,
@@ -305,7 +316,7 @@ def sync_servicenow_vr(
     default=None,
 )
 def sync_tanium_cloud(
-    regscale_ssp_id: int, vuln_filter: str, scan_date: datetime, all_scans: bool, asset_filter: str
+    regscale_ssp_id: int, minimum_severity_filter: str, scan_date: datetime, all_scans: bool, asset_filter: str
 ) -> None:
     """Sync Vulnerabilities from Tanium Cloud to RegScale."""
     from regscale.models.integration_models.synqly_models.connectors import Vulnerabilities
@@ -313,7 +324,7 @@ def sync_tanium_cloud(
     vulnerabilities_tanium_cloud = Vulnerabilities("tanium_cloud")
     vulnerabilities_tanium_cloud.run_sync(
         regscale_ssp_id=regscale_ssp_id,
-        vuln_filter=vuln_filter,
+        minimum_severity_filter=minimum_severity_filter,
         scan_date=scan_date,
         all_scans=all_scans,
         filter=asset_filter.split(";") if asset_filter else [],
@@ -323,8 +334,9 @@ def sync_tanium_cloud(
 @vulnerabilities.command(name="sync_tenable_cloud")
 @regscale_ssp_id()
 @click.option(
-    "--vuln_filter",
-    help="Filter the vulnerabilities for the selected severity. (Options: critical, high, medium, low, info)",
+    "--minimum_severity_filter",
+    "-s",
+    help="Minimum severity of the vulnerabilities to sync. (Options: critical, high, medium, low, info), e.g. providing high will sync all vulnerabilities with a severity of high and critical.",
     required=False,
     type=click.Choice(["critical", "high", "medium", "low", "info"]),
     default=None,
@@ -357,7 +369,12 @@ def sync_tanium_cloud(
     required=False,
 )
 def sync_tenable_cloud(
-    regscale_ssp_id: int, vuln_filter: str, scan_date: datetime, all_scans: bool, asset_filter: str, url: str
+    regscale_ssp_id: int,
+    minimum_severity_filter: str,
+    scan_date: datetime,
+    all_scans: bool,
+    asset_filter: str,
+    url: str,
 ) -> None:
     """Sync Vulnerabilities from Tenable Cloud to RegScale."""
     from regscale.models.integration_models.synqly_models.connectors import Vulnerabilities
@@ -365,7 +382,7 @@ def sync_tenable_cloud(
     vulnerabilities_tenable_cloud = Vulnerabilities("tenable_cloud")
     vulnerabilities_tenable_cloud.run_sync(
         regscale_ssp_id=regscale_ssp_id,
-        vuln_filter=vuln_filter,
+        minimum_severity_filter=minimum_severity_filter,
         scan_date=scan_date,
         all_scans=all_scans,
         filter=asset_filter.split(";") if asset_filter else [],